ref: standardize imports to use full qualified names (#7575)

* Remove models from __init__.py to avoid circular dependency

* [autofix.ci] apply automated fixes

* [autofix.ci] apply automated fixes (attempt 2/3)

* add back init to avoid backwards-compat issues

* [autofix.ci] apply automated fixes

* ref: standardize imports to use full qualified names

Replaces uses of the "public" APIs to use full qualified
names to reduce instances of circular dependencies

* [autofix.ci] apply automated fixes

* [autofix.ci] apply automated fixes (attempt 2/3)

* Fix path

* update starters"
"

* remove old files'

* [autofix.ci] apply automated fixes

* Fix some imports

* [autofix.ci] apply automated fixes

* ruff

* [autofix.ci] apply automated fixes

* starter projects?

* starter projects?

* [autofix.ci] apply automated fixes

* [autofix.ci] apply automated fixes

---------

Co-authored-by: autofix-ci[bot] <114827586+autofix-ci[bot]@users.noreply.github.com>

src/backend/base/langflow/__main__.py

@@ -596,8 +596,8 @@ def api_key(
                     "Default superuser not found. This command requires a superuser and AUTO_LOGIN to be enabled."
                 )
                 return None
-            from langflow.services.database.models.api_key import ApiKey, ApiKeyCreate
             from langflow.services.database.models.api_key.crud import create_api_key, delete_api_key
+            from langflow.services.database.models.api_key.model import ApiKey, ApiKeyCreate
 
             stmt = select(ApiKey).where(ApiKey.user_id == superuser.id)
             api_key = (await session.exec(stmt)).first()

src/backend/base/langflow/api/build.py

@@ -32,7 +32,7 @@ from langflow.graph.graph.base import Graph
 from langflow.graph.utils import log_vertex_build
 from langflow.schema.message import ErrorMessage
 from langflow.schema.schema import OutputValue
-from langflow.services.database.models.flow import Flow
+from langflow.services.database.models.flow.model import Flow
 from langflow.services.deps import get_chat_service, get_telemetry_service, session_scope
 from langflow.services.job_queue.service import JobQueueNotFoundError, JobQueueService
 from langflow.services.telemetry.schema import ComponentPayload, PlaygroundPayload

src/backend/base/langflow/api/health_check_router.py

@@ -6,7 +6,7 @@ from pydantic import BaseModel
 from sqlmodel import select
 
 from langflow.api.utils import DbSession
-from langflow.services.database.models.flow import Flow
+from langflow.services.database.models.flow.model import Flow
 from langflow.services.deps import get_chat_service
 
 health_check_router = APIRouter(tags=["Health Check"])

src/backend/base/langflow/api/utils.py

@@ -14,10 +14,10 @@ from sqlmodel.ext.asyncio.session import AsyncSession
 
 from langflow.graph.graph.base import Graph
 from langflow.services.auth.utils import get_current_active_user
-from langflow.services.database.models import User
+from langflow.services.database.models.flow.model import Flow
-from langflow.services.database.models.flow import Flow
+from langflow.services.database.models.message.model import MessageTable
-from langflow.services.database.models.message import MessageTable
 from langflow.services.database.models.transactions.model import TransactionTable
+from langflow.services.database.models.user.model import User
 from langflow.services.database.models.vertex_builds.model import VertexBuildTable
 from langflow.services.deps import get_session, session_scope
 from langflow.services.store.utils import get_lf_version_from_pypi

src/backend/base/langflow/api/v1/endpoints.py

@@ -40,8 +40,7 @@ from langflow.processing.process import process_tweaks, run_graph_internal
 from langflow.schema.graph import Tweaks
 from langflow.services.auth.utils import api_key_security, get_current_active_user
 from langflow.services.cache.utils import save_uploaded_file
-from langflow.services.database.models.flow import Flow
+from langflow.services.database.models.flow.model import Flow, FlowRead
-from langflow.services.database.models.flow.model import FlowRead
 from langflow.services.database.models.flow.utils import get_all_webhook_components_in_flow
 from langflow.services.database.models.user.model import User, UserRead
 from langflow.services.deps import get_session_service, get_settings_service, get_telemetry_service

src/backend/base/langflow/api/v1/files.py

@@ -11,7 +11,7 @@ from fastapi.responses import StreamingResponse
 
 from langflow.api.utils import CurrentActiveUser, DbSession
 from langflow.api.v1.schemas import UploadFileResponse
-from langflow.services.database.models.flow import Flow
+from langflow.services.database.models.flow.model import Flow
 from langflow.services.deps import get_settings_service, get_storage_service
 from langflow.services.settings.service import SettingsService
 from langflow.services.storage.service import StorageService

src/backend/base/langflow/api/v1/flows.py

@@ -24,8 +24,14 @@ from langflow.api.v1.schemas import FlowListCreate
 from langflow.helpers.user import get_user_by_flow_id_or_endpoint_name
 from langflow.initial_setup.constants import STARTER_FOLDER_NAME
 from langflow.logging import logger
-from langflow.services.database.models.flow import Flow, FlowCreate, FlowRead, FlowUpdate
+from langflow.services.database.models.flow.model import (
-from langflow.services.database.models.flow.model import AccessTypeEnum, FlowHeader
+    AccessTypeEnum,
+    Flow,
+    FlowCreate,
+    FlowHeader,
+    FlowRead,
+    FlowUpdate,
+)
 from langflow.services.database.models.flow.utils import get_webhook_component_in_flow
 from langflow.services.database.models.folder.constants import DEFAULT_FOLDER_NAME
 from langflow.services.database.models.folder.model import Folder

src/backend/base/langflow/api/v1/mcp.py

@@ -23,7 +23,8 @@ from langflow.base.mcp.util import get_flow_snake_case
 from langflow.helpers.flow import json_schema_from_flow
 from langflow.schema.message import Message
 from langflow.services.auth.utils import get_current_active_user
-from langflow.services.database.models import Flow, User
+from langflow.services.database.models.flow.model import Flow
+from langflow.services.database.models.user.model import User
 from langflow.services.deps import (
     get_db_service,
     get_settings_service,

src/backend/base/langflow/api/v1/schemas.py

@@ -14,7 +14,7 @@ from pydantic import (
 )
 
 from langflow.graph.schema import RunOutputs
-from langflow.schema import dotdict
+from langflow.schema.dotdict import dotdict
 from langflow.schema.graph import Tweaks
 from langflow.schema.schema import InputType, OutputType, OutputValue
 from langflow.serialization import constants as serialization_constants
@@ -22,8 +22,8 @@ from langflow.serialization.constants import MAX_ITEMS_LENGTH, MAX_TEXT_LENGTH
 from langflow.serialization.serialization import serialize
 from langflow.services.database.models.api_key.model import ApiKeyRead
 from langflow.services.database.models.base import orjson_dumps
-from langflow.services.database.models.flow import FlowCreate, FlowRead
+from langflow.services.database.models.flow.model import FlowCreate, FlowRead
-from langflow.services.database.models.user import UserRead
+from langflow.services.database.models.user.model import UserRead
 from langflow.services.settings.feature_flags import FeatureFlags
 from langflow.services.tracing.schema import Log
 

src/backend/base/langflow/api/v1/users.py

@@ -15,8 +15,8 @@ from langflow.services.auth.utils import (
     get_password_hash,
     verify_password,
 )
-from langflow.services.database.models.user import User, UserCreate, UserRead, UserUpdate
 from langflow.services.database.models.user.crud import get_user_by_id, update_user
+from langflow.services.database.models.user.model import User, UserCreate, UserRead, UserUpdate
 from langflow.services.deps import get_settings_service
 
 router = APIRouter(tags=["Users"], prefix="/users")

src/backend/base/langflow/api/v1/variable.py

@@ -4,7 +4,7 @@ from fastapi import APIRouter, HTTPException
 from sqlalchemy.exc import NoResultFound
 
 from langflow.api.utils import CurrentActiveUser, DbSession
-from langflow.services.database.models.variable import VariableCreate, VariableRead, VariableUpdate
+from langflow.services.database.models.variable.model import VariableCreate, VariableRead, VariableUpdate
 from langflow.services.deps import get_variable_service
 from langflow.services.variable.constants import CREDENTIAL_TYPE
 from langflow.services.variable.service import DatabaseVariableService

src/backend/base/langflow/api/v1/voice_mode.py

@@ -30,8 +30,9 @@ from langflow.logging import logger
 from langflow.memory import aadd_messagetables
 from langflow.schema.properties import Properties
 from langflow.services.auth.utils import get_current_user_for_websocket
-from langflow.services.database.models import MessageTable, User
 from langflow.services.database.models.flow.model import Flow
+from langflow.services.database.models.message.model import MessageTable
+from langflow.services.database.models.user.model import User
 from langflow.services.deps import get_variable_service, session_scope
 from langflow.utils.voice_utils import (
     BYTES_PER_24K_FRAME,

src/backend/base/langflow/api/v2/files.py

@@ -15,7 +15,7 @@ from sqlmodel import String, cast, col, select
 
 from langflow.api.schemas import UploadFileResponse
 from langflow.api.utils import CurrentActiveUser, DbSession
-from langflow.services.database.models.file import File as UserFile
+from langflow.services.database.models.file.model import File as UserFile
 from langflow.services.deps import get_settings_service, get_storage_service
 from langflow.services.storage.service import StorageService
 

src/backend/base/langflow/base/agents/agent.py

@@ -9,17 +9,16 @@ from langchain_core.runnables import Runnable
 from langflow.base.agents.callback import AgentAsyncHandler
 from langflow.base.agents.events import ExceptionWithMessageError, process_agent_events
 from langflow.base.agents.utils import data_to_messages
-from langflow.custom import Component
+from langflow.custom.custom_component.component import Component, _get_component_toolkit
-from langflow.custom.custom_component.component import _get_component_toolkit
 from langflow.field_typing import Tool
 from langflow.inputs.inputs import InputTypes, MultilineInput
 from langflow.io import BoolInput, HandleInput, IntInput, MessageTextInput
 from langflow.logging import logger
 from langflow.memory import delete_message
-from langflow.schema import Data
 from langflow.schema.content_block import ContentBlock
+from langflow.schema.data import Data
 from langflow.schema.message import Message
-from langflow.template import Output
+from langflow.template.field.base import Output
 from langflow.utils.constants import MESSAGE_SENDER_AI
 
 if TYPE_CHECKING:

src/backend/base/langflow/base/agents/crewai/crew.py

@@ -8,7 +8,7 @@ from crewai.tools.base_tool import Tool
 from langchain_core.agents import AgentAction, AgentFinish
 from pydantic import SecretStr
 
-from langflow.custom import Component
+from langflow.custom.custom_component.component import Component
 from langflow.inputs.inputs import HandleInput, InputTypes
 from langflow.io import BoolInput, IntInput, Output
 from langflow.schema.data import Data

src/backend/base/langflow/base/agents/utils.py

@@ -14,7 +14,7 @@ from langchain_core.prompts import BasePromptTemplate, ChatPromptTemplate
 from langchain_core.tools import BaseTool
 from pydantic import BaseModel
 
-from langflow.schema import Data
+from langflow.schema.data import Data
 
 from .default_prompts import XML_AGENT_PROMPT
 

src/backend/base/langflow/base/chains/model.py

@@ -1,5 +1,5 @@
-from langflow.custom import Component
+from langflow.custom.custom_component.component import Component
-from langflow.template import Output
+from langflow.template.field.base import Output
 
 
 class LCChainComponent(Component):

src/backend/base/langflow/base/composio/composio_base.py

@@ -8,8 +8,8 @@ from composio.exceptions import ApiKeyError
 from composio_langchain import ComposioToolSet
 from langchain_core.tools import Tool
 
-from langflow.custom import Component
+from langflow.custom.custom_component.component import Component
-from langflow.inputs import (
+from langflow.inputs.inputs import (
     AuthInput,
     MessageTextInput,
     SecretStrInput,

src/backend/base/langflow/base/compressors/model.py

@@ -1,9 +1,9 @@
 from abc import abstractmethod
 
-from langflow.custom import Component
+from langflow.custom.custom_component.component import Component
 from langflow.field_typing import BaseDocumentCompressor
 from langflow.io import DataInput, IntInput, MultilineInput
-from langflow.schema import Data
+from langflow.schema.data import Data
 from langflow.schema.dataframe import DataFrame
 from langflow.template.field.base import Output
 

src/backend/base/langflow/base/data/base_file.py

@@ -7,9 +7,9 @@ from zipfile import ZipFile, is_zipfile
 
 import pandas as pd
 
-from langflow.custom import Component
+from langflow.custom.custom_component.component import Component
 from langflow.io import BoolInput, FileInput, HandleInput, Output, StrInput
-from langflow.schema import Data
+from langflow.schema.data import Data
 from langflow.schema.dataframe import DataFrame
 from langflow.schema.message import Message
 

src/backend/base/langflow/base/data/utils.py

@@ -8,7 +8,7 @@ import orjson
 import yaml
 from defusedxml import ElementTree
 
-from langflow.schema import Data
+from langflow.schema.data import Data
 
 # Types of files that can be read simply by file.read()
 # and have 100% to be completely readable

src/backend/base/langflow/base/document_transformers/model.py

@@ -3,9 +3,9 @@ from typing import Any
 
 from langchain_core.documents import BaseDocumentTransformer
 
-from langflow.custom import Component
+from langflow.custom.custom_component.component import Component
 from langflow.io import Output
-from langflow.schema import Data
+from langflow.schema.data import Data
 from langflow.utils.util import build_loader_repr_from_data
 
 

src/backend/base/langflow/base/embeddings/model.py

@@ -1,4 +1,4 @@
-from langflow.custom import Component
+from langflow.custom.custom_component.component import Component
 from langflow.field_typing import Embeddings
 from langflow.io import Output
 

src/backend/base/langflow/base/flow_processing/utils.py

@@ -1,7 +1,7 @@
 from loguru import logger
 
 from langflow.graph.schema import ResultData, RunOutputs
-from langflow.schema import Data
+from langflow.schema.data import Data
 from langflow.schema.message import Message
 
 

src/backend/base/langflow/base/io/chat.py

@@ -1,4 +1,4 @@
-from langflow.custom import Component
+from langflow.custom.custom_component.component import Component
 
 
 class ChatComponent(Component):

src/backend/base/langflow/base/io/text.py

@@ -1,4 +1,4 @@
-from langflow.custom import Component
+from langflow.custom.custom_component.component import Component
 
 
 class TextComponent(Component):

src/backend/base/langflow/base/langchain_utilities/model.py

@@ -1,10 +1,11 @@
 from abc import abstractmethod
 from collections.abc import Sequence
 
-from langflow.custom import Component
+from langflow.custom.custom_component.component import Component
 from langflow.field_typing import Tool
 from langflow.io import Output
-from langflow.schema import Data, DataFrame
+from langflow.schema.data import Data
+from langflow.schema.dataframe import DataFrame
 
 
 class LCToolComponent(Component):

src/backend/base/langflow/base/mcp/util.py

@@ -18,7 +18,7 @@ from mcp.client.sse import sse_client
 from pydantic import BaseModel, Field, create_model
 from sqlmodel import select
 
-from langflow.services.database.models import Flow
+from langflow.services.database.models.flow.model import Flow
 
 HTTP_ERROR_STATUS_CODE = httpx_codes.BAD_REQUEST  # HTTP status code for client errors
 NULLABLE_TYPE_LENGTH = 2  # Number of types in a nullable union (the type itself + null)

src/backend/base/langflow/base/memory/memory.py

@@ -1,5 +1,5 @@
-from langflow.custom import CustomComponent
+from langflow.custom.custom_component.custom_component import CustomComponent
-from langflow.schema import Data
+from langflow.schema.data import Data
 from langflow.utils.constants import MESSAGE_SENDER_AI, MESSAGE_SENDER_USER
 
 

src/backend/base/langflow/base/memory/model.py

@@ -2,10 +2,10 @@ from abc import abstractmethod
 
 from langchain.memory import ConversationBufferMemory
 
-from langflow.custom import Component
+from langflow.custom.custom_component.component import Component
 from langflow.field_typing import BaseChatMemory
 from langflow.field_typing.constants import Memory
-from langflow.template import Output
+from langflow.template.field.base import Output
 
 
 class LCChatMemoryComponent(Component):

src/backend/base/langflow/base/models/model.py

@@ -9,10 +9,9 @@ from langchain_core.messages import AIMessage, BaseMessage, HumanMessage, System
 from langchain_core.output_parsers import BaseOutputParser
 
 from langflow.base.constants import STREAM_INFO_TEXT
-from langflow.custom import Component
+from langflow.custom.custom_component.component import Component
 from langflow.field_typing import LanguageModel
-from langflow.inputs import MessageInput
+from langflow.inputs.inputs import BoolInput, InputTypes, MessageInput, MultilineInput
-from langflow.inputs.inputs import BoolInput, InputTypes, MultilineInput
 from langflow.schema.message import Message
 from langflow.template.field.base import Output
 

src/backend/base/langflow/base/prompts/utils.py

@@ -2,7 +2,7 @@ from copy import deepcopy
 
 from langchain_core.documents import Document
 
-from langflow.schema import Data
+from langflow.schema.data import Data
 
 
 def data_to_string(record: Data) -> str:

src/backend/base/langflow/base/tools/run_flow.py

@@ -4,8 +4,7 @@ from typing import TYPE_CHECKING
 from loguru import logger
 from typing_extensions import override
 
-from langflow.custom import Component
+from langflow.custom.custom_component.component import Component, _get_component_toolkit
-from langflow.custom.custom_component.component import _get_component_toolkit
 from langflow.field_typing import Tool
 from langflow.graph.graph.base import Graph
 from langflow.graph.vertex.base import Vertex
@@ -15,10 +14,11 @@ from langflow.inputs.inputs import (
     InputTypes,
     MessageInput,
 )
-from langflow.schema import Data, dotdict
+from langflow.schema.data import Data
 from langflow.schema.dataframe import DataFrame
+from langflow.schema.dotdict import dotdict
 from langflow.schema.message import Message
-from langflow.template import Output
+from langflow.template.field.base import Output
 
 if TYPE_CHECKING:
     from langflow.base.tools.component_tool import ComponentToolkit

src/backend/base/langflow/base/vectorstores/model.py

@@ -2,12 +2,13 @@ from abc import abstractmethod
 from functools import wraps
 from typing import TYPE_CHECKING, Any
 
-from langflow.custom import Component
+from langflow.custom.custom_component.component import Component
 from langflow.field_typing import Text, VectorStore
 from langflow.helpers.data import docs_to_data
 from langflow.inputs.inputs import BoolInput
 from langflow.io import HandleInput, Output, QueryInput
-from langflow.schema import Data, DataFrame
+from langflow.schema.data import Data
+from langflow.schema.dataframe import DataFrame
 
 if TYPE_CHECKING:
     from langchain_core.documents import Document

src/backend/base/langflow/base/vectorstores/utils.py

@@ -1,4 +1,4 @@
-from langflow.schema import Data
+from langflow.schema.data import Data
 
 
 def chroma_collection_to_data(collection_dict: dict):

src/backend/base/langflow/components/Notion/add_content_to_page.py

@@ -10,8 +10,8 @@ from pydantic import BaseModel, Field
 
 from langflow.base.langchain_utilities.model import LCToolComponent
 from langflow.field_typing import Tool
-from langflow.inputs import MultilineInput, SecretStrInput, StrInput
+from langflow.inputs.inputs import MultilineInput, SecretStrInput, StrInput
-from langflow.schema import Data
+from langflow.schema.data import Data
 
 MIN_ROWS_IN_TABLE = 3
 

src/backend/base/langflow/components/Notion/create_page.py

@@ -7,8 +7,8 @@ from pydantic import BaseModel, Field
 
 from langflow.base.langchain_utilities.model import LCToolComponent
 from langflow.field_typing import Tool
-from langflow.inputs import MultilineInput, SecretStrInput, StrInput
+from langflow.inputs.inputs import MultilineInput, SecretStrInput, StrInput
-from langflow.schema import Data
+from langflow.schema.data import Data
 
 
 class NotionPageCreator(LCToolComponent):

src/backend/base/langflow/components/Notion/list_database_properties.py

@@ -5,8 +5,8 @@ from pydantic import BaseModel, Field
 
 from langflow.base.langchain_utilities.model import LCToolComponent
 from langflow.field_typing import Tool
-from langflow.inputs import SecretStrInput, StrInput
+from langflow.inputs.inputs import SecretStrInput, StrInput
-from langflow.schema import Data
+from langflow.schema.data import Data
 
 
 class NotionDatabaseProperties(LCToolComponent):

src/backend/base/langflow/components/Notion/list_pages.py

@@ -8,8 +8,8 @@ from pydantic import BaseModel, Field
 
 from langflow.base.langchain_utilities.model import LCToolComponent
 from langflow.field_typing import Tool
-from langflow.inputs import MultilineInput, SecretStrInput, StrInput
+from langflow.inputs.inputs import MultilineInput, SecretStrInput, StrInput
-from langflow.schema import Data
+from langflow.schema.data import Data
 
 
 class NotionListPages(LCToolComponent):

src/backend/base/langflow/components/Notion/list_users.py

@@ -4,8 +4,8 @@ from pydantic import BaseModel
 
 from langflow.base.langchain_utilities.model import LCToolComponent
 from langflow.field_typing import Tool
-from langflow.inputs import SecretStrInput
+from langflow.inputs.inputs import SecretStrInput
-from langflow.schema import Data
+from langflow.schema.data import Data
 
 
 class NotionUserList(LCToolComponent):

src/backend/base/langflow/components/Notion/page_content_viewer.py

@@ -5,8 +5,8 @@ from pydantic import BaseModel, Field
 
 from langflow.base.langchain_utilities.model import LCToolComponent
 from langflow.field_typing import Tool
-from langflow.inputs import SecretStrInput, StrInput
+from langflow.inputs.inputs import SecretStrInput, StrInput
-from langflow.schema import Data
+from langflow.schema.data import Data
 
 
 class NotionPageContent(LCToolComponent):

src/backend/base/langflow/components/Notion/search.py

@@ -6,8 +6,8 @@ from pydantic import BaseModel, Field
 
 from langflow.base.langchain_utilities.model import LCToolComponent
 from langflow.field_typing import Tool
-from langflow.inputs import DropdownInput, SecretStrInput, StrInput
+from langflow.inputs.inputs import DropdownInput, SecretStrInput, StrInput
-from langflow.schema import Data
+from langflow.schema.data import Data
 
 
 class NotionSearch(LCToolComponent):

src/backend/base/langflow/components/Notion/update_page_property.py

@@ -8,8 +8,8 @@ from pydantic import BaseModel, Field
 
 from langflow.base.langchain_utilities.model import LCToolComponent
 from langflow.field_typing import Tool
-from langflow.inputs import MultilineInput, SecretStrInput, StrInput
+from langflow.inputs.inputs import MultilineInput, SecretStrInput, StrInput
-from langflow.schema import Data
+from langflow.schema.data import Data
 
 
 class NotionPageUpdate(LCToolComponent):

src/backend/base/langflow/components/agentql/agentql_api.py

@@ -1,7 +1,7 @@
 import httpx
 from loguru import logger
 
-from langflow.custom import Component
+from langflow.custom.custom_component.component import Component
 from langflow.field_typing.range_spec import RangeSpec
 from langflow.io import (
     BoolInput,
@@ -12,7 +12,7 @@ from langflow.io import (
     Output,
     SecretStrInput,
 )
-from langflow.schema import Data
+from langflow.schema.data import Data
 
 
 class AgentQL(Component):

src/backend/base/langflow/components/agents/agent.py

@@ -9,7 +9,7 @@ from langflow.base.models.model_input_constants import (
     MODELS_METADATA,
 )
 from langflow.base.models.model_utils import get_model_name
-from langflow.components.helpers import CurrentDateComponent
+from langflow.components.helpers.current_date import CurrentDateComponent
 from langflow.components.helpers.memory import MemoryComponent
 from langflow.components.langchain_utilities.tool_calling import ToolCallingAgentComponent
 from langflow.custom.custom_component.component import _get_component_toolkit

src/backend/base/langflow/components/amazon/amazon_bedrock_embedding.py

@@ -1,7 +1,7 @@
 from langflow.base.models.aws_constants import AWS_EMBEDDING_MODEL_IDS, AWS_REGIONS
 from langflow.base.models.model import LCModelComponent
 from langflow.field_typing import Embeddings
-from langflow.inputs import SecretStrInput
+from langflow.inputs.inputs import SecretStrInput
 from langflow.io import DropdownInput, MessageTextInput, Output
 
 

src/backend/base/langflow/components/amazon/amazon_bedrock_model.py

@@ -1,7 +1,7 @@
 from langflow.base.models.aws_constants import AWS_REGIONS, AWS_MODEL_IDs
 from langflow.base.models.model import LCModelComponent
 from langflow.field_typing import LanguageModel
-from langflow.inputs import MessageTextInput, SecretStrInput
+from langflow.inputs.inputs import MessageTextInput, SecretStrInput
 from langflow.io import DictInput, DropdownInput
 
 

src/backend/base/langflow/components/amazon/s3_bucket_uploader.py

@@ -3,7 +3,7 @@ from typing import Any
 
 import boto3
 
-from langflow.custom import Component
+from langflow.custom.custom_component.component import Component
 from langflow.io import (
     BoolInput,
     DropdownInput,

src/backend/base/langflow/components/apify/apify_actor.py

@@ -7,11 +7,11 @@ from langchain_community.document_loaders.apify_dataset import ApifyDatasetLoade
 from langchain_core.tools import BaseTool
 from pydantic import BaseModel, Field, field_serializer
 
-from langflow.custom import Component
+from langflow.custom.custom_component.component import Component
 from langflow.field_typing import Tool
 from langflow.inputs.inputs import BoolInput
 from langflow.io import MultilineInput, Output, SecretStrInput, StrInput
-from langflow.schema import Data
+from langflow.schema.data import Data
 
 MAX_DESCRIPTION_LEN = 250
 

src/backend/base/langflow/components/assemblyai/assemblyai_get_subtitles.py

@@ -1,9 +1,9 @@
 import assemblyai as aai
 from loguru import logger
 
-from langflow.custom import Component
+from langflow.custom.custom_component.component import Component
 from langflow.io import DataInput, DropdownInput, IntInput, Output, SecretStrInput
-from langflow.schema import Data
+from langflow.schema.data import Data
 
 
 class AssemblyAIGetSubtitles(Component):

src/backend/base/langflow/components/assemblyai/assemblyai_lemur.py

@@ -1,9 +1,9 @@
 import assemblyai as aai
 from loguru import logger
 
-from langflow.custom import Component
+from langflow.custom.custom_component.component import Component
 from langflow.io import DataInput, DropdownInput, FloatInput, IntInput, MultilineInput, Output, SecretStrInput
-from langflow.schema import Data
+from langflow.schema.data import Data
 
 
 class AssemblyAILeMUR(Component):

src/backend/base/langflow/components/assemblyai/assemblyai_list_transcripts.py

@@ -1,9 +1,9 @@
 import assemblyai as aai
 from loguru import logger
 
-from langflow.custom import Component
+from langflow.custom.custom_component.component import Component
 from langflow.io import BoolInput, DropdownInput, IntInput, MessageTextInput, Output, SecretStrInput
-from langflow.schema import Data
+from langflow.schema.data import Data
 
 
 class AssemblyAIListTranscripts(Component):

src/backend/base/langflow/components/assemblyai/assemblyai_poll_transcript.py

@@ -1,10 +1,10 @@
 import assemblyai as aai
 from loguru import logger
 
-from langflow.custom import Component
+from langflow.custom.custom_component.component import Component
 from langflow.field_typing.range_spec import RangeSpec
 from langflow.io import DataInput, FloatInput, Output, SecretStrInput
-from langflow.schema import Data
+from langflow.schema.data import Data
 
 
 class AssemblyAITranscriptionJobPoller(Component):

src/backend/base/langflow/components/assemblyai/assemblyai_start_transcript.py

@@ -3,9 +3,9 @@ from pathlib import Path
 import assemblyai as aai
 from loguru import logger
 
-from langflow.custom import Component
+from langflow.custom.custom_component.component import Component
 from langflow.io import BoolInput, DropdownInput, FileInput, MessageTextInput, Output, SecretStrInput
-from langflow.schema import Data
+from langflow.schema.data import Data
 
 
 class AssemblyAITranscriptionJobCreator(Component):

src/backend/base/langflow/components/composio/composio_api.py

@@ -10,7 +10,7 @@ from langchain_core.tools import Tool
 
 # Local imports
 from langflow.base.langchain_utilities.model import LCToolComponent
-from langflow.inputs import (
+from langflow.inputs.inputs import (
     ConnectionInput,
     MessageTextInput,
     SecretStrInput,

src/backend/base/langflow/components/composio/gmail_composio.py

@@ -4,7 +4,7 @@ from typing import Any
 from composio import Action
 
 from langflow.base.composio.composio_base import ComposioBaseComponent
-from langflow.inputs import (
+from langflow.inputs.inputs import (
     BoolInput,
     FileInput,
     IntInput,

src/backend/base/langflow/components/confluence/confluence.py

@@ -1,9 +1,9 @@
 from langchain_community.document_loaders import ConfluenceLoader
 from langchain_community.document_loaders.confluence import ContentFormat
 
-from langflow.custom import Component
+from langflow.custom.custom_component.component import Component
 from langflow.io import BoolInput, DropdownInput, IntInput, Output, SecretStrInput, StrInput
-from langflow.schema import Data
+from langflow.schema.data import Data
 
 
 class ConfluenceComponent(Component):

src/backend/base/langflow/components/crewai/crewai.py

@@ -1,7 +1,7 @@
 from crewai import Agent
 
 from langflow.base.agents.crewai.crew import convert_llm, convert_tools
-from langflow.custom import Component
+from langflow.custom.custom_component.component import Component
 from langflow.io import BoolInput, DictInput, HandleInput, MultilineInput, Output
 
 

src/backend/base/langflow/components/crewai/hierarchical_task.py

@@ -1,5 +1,5 @@
 from langflow.base.agents.crewai.tasks import HierarchicalTask
-from langflow.custom import Component
+from langflow.custom.custom_component.component import Component
 from langflow.io import HandleInput, MultilineInput, Output
 
 

src/backend/base/langflow/components/crewai/sequential_task.py

@@ -1,5 +1,5 @@
 from langflow.base.agents.crewai.tasks import SequentialTask
-from langflow.custom import Component
+from langflow.custom.custom_component.component import Component
 from langflow.io import BoolInput, HandleInput, MultilineInput, Output
 
 

src/backend/base/langflow/components/crewai/sequential_task_agent.py

@@ -1,7 +1,7 @@
 from crewai import Agent, Task
 
 from langflow.base.agents.crewai.tasks import SequentialTask
-from langflow.custom import Component
+from langflow.custom.custom_component.component import Component
 from langflow.io import BoolInput, DictInput, HandleInput, MultilineInput, Output
 
 

src/backend/base/langflow/components/custom_component/custom_component.py

@@ -1,7 +1,7 @@
 # from langflow.field_typing import Data
-from langflow.custom import Component
+from langflow.custom.custom_component.component import Component
 from langflow.io import MessageTextInput, Output
-from langflow.schema import Data
+from langflow.schema.data import Data
 
 
 class CustomComponent(Component):

src/backend/base/langflow/components/data/api_request.py

@@ -12,7 +12,7 @@ import httpx
 import validators
 
 from langflow.base.curl.parse import parse_context
-from langflow.custom import Component
+from langflow.custom.custom_component.component import Component
 from langflow.inputs.inputs import TabInput
 from langflow.io import (
     BoolInput,
@@ -24,7 +24,7 @@ from langflow.io import (
     Output,
     TableInput,
 )
-from langflow.schema import Data
+from langflow.schema.data import Data
 from langflow.schema.dotdict import dotdict
 from langflow.services.deps import get_settings_service
 from langflow.utils.component_utils import set_current_fields, set_field_advanced, set_field_display

src/backend/base/langflow/components/data/csv_to_data.py

@@ -2,9 +2,9 @@ import csv
 import io
 from pathlib import Path
 
-from langflow.custom import Component
+from langflow.custom.custom_component.component import Component
 from langflow.io import FileInput, MessageTextInput, MultilineInput, Output
-from langflow.schema import Data
+from langflow.schema.data import Data
 
 
 class CSVToDataComponent(Component):

src/backend/base/langflow/components/data/directory.py

@@ -1,9 +1,9 @@
 from langflow.base.data.utils import TEXT_FILE_TYPES, parallel_load_data, parse_text_file_to_data, retrieve_file_paths
-from langflow.custom import Component
+from langflow.custom.custom_component.component import Component
 from langflow.io import BoolInput, IntInput, MessageTextInput, MultiselectInput
-from langflow.schema import Data
+from langflow.schema.data import Data
 from langflow.schema.dataframe import DataFrame
-from langflow.template import Output
+from langflow.template.field.base import Output
 
 
 class DirectoryComponent(Component):

src/backend/base/langflow/components/data/file.py

@@ -1,7 +1,7 @@
-from langflow.base.data import BaseFileComponent
+from langflow.base.data.base_file import BaseFileComponent
 from langflow.base.data.utils import TEXT_FILE_TYPES, parallel_load_data, parse_text_file_to_data
 from langflow.io import BoolInput, IntInput
-from langflow.schema import Data
+from langflow.schema.data import Data
 
 
 class FileComponent(BaseFileComponent):

src/backend/base/langflow/components/data/json_to_data.py

@@ -3,9 +3,9 @@ from pathlib import Path
 
 from json_repair import repair_json
 
-from langflow.custom import Component
+from langflow.custom.custom_component.component import Component
 from langflow.io import FileInput, MessageTextInput, MultilineInput, Output
-from langflow.schema import Data
+from langflow.schema.data import Data
 
 
 class JSONToDataComponent(Component):

src/backend/base/langflow/components/data/mcp_component.py

@@ -11,13 +11,12 @@ from langflow.base.mcp.util import (
     create_tool_coroutine,
     create_tool_func,
 )
-from langflow.custom import Component
+from langflow.custom.custom_component.component import Component
-from langflow.inputs import DropdownInput, TableInput
+from langflow.inputs.inputs import DropdownInput, InputTypes, TableInput
-from langflow.inputs.inputs import InputTypes
 from langflow.io import MessageTextInput, MultilineInput, Output, TabInput
 from langflow.io.schema import flatten_schema, schema_to_langflow_inputs
 from langflow.logging import logger
-from langflow.schema import DataFrame
+from langflow.schema.dataframe import DataFrame
 
 
 def maybe_unflatten_dict(flat: dict[str, Any]) -> dict[str, Any]:

src/backend/base/langflow/components/data/url.py

@@ -5,11 +5,12 @@ from bs4 import BeautifulSoup
 from langchain_community.document_loaders import RecursiveUrlLoader
 from loguru import logger
 
-from langflow.custom import Component
+from langflow.custom.custom_component.component import Component
 from langflow.field_typing.range_spec import RangeSpec
 from langflow.helpers.data import safe_convert
 from langflow.io import BoolInput, DropdownInput, IntInput, MessageTextInput, Output, SliderInput, TableInput
-from langflow.schema import DataFrame, Message
+from langflow.schema.dataframe import DataFrame
+from langflow.schema.message import Message
 from langflow.services.deps import get_settings_service
 
 # Constants

src/backend/base/langflow/components/data/webhook.py

@@ -1,8 +1,8 @@
 import json
 
-from langflow.custom import Component
+from langflow.custom.custom_component.component import Component
 from langflow.io import MultilineInput, Output
-from langflow.schema import Data
+from langflow.schema.data import Data
 
 
 class WebhookComponent(Component):

src/backend/base/langflow/components/datastax/astra_assistant_manager.py

@@ -14,11 +14,11 @@ from langflow.base.astra_assistants.util import (
     wrap_base_tool_as_tool_interface,
 )
 from langflow.custom.custom_component.component_with_cache import ComponentWithCache
-from langflow.inputs import DropdownInput, FileInput, HandleInput, MultilineInput
+from langflow.inputs.inputs import DropdownInput, FileInput, HandleInput, MultilineInput
 from langflow.memory import delete_message
 from langflow.schema.content_block import ContentBlock
 from langflow.schema.message import Message
-from langflow.template import Output
+from langflow.template.field.base import Output
 from langflow.utils.constants import MESSAGE_SENDER_AI
 
 if TYPE_CHECKING:

src/backend/base/langflow/components/datastax/astradb_cql.py

@@ -11,7 +11,7 @@ from langchain_core.tools import StructuredTool, Tool
 from langflow.base.langchain_utilities.model import LCToolComponent
 from langflow.io import DictInput, IntInput, SecretStrInput, StrInput, TableInput
 from langflow.logging import logger
-from langflow.schema import Data
+from langflow.schema.data import Data
 from langflow.schema.table import EditMode
 
 

src/backend/base/langflow/components/datastax/astradb_tool.py

@@ -10,7 +10,7 @@ from langchain_core.tools import StructuredTool, Tool
 from langflow.base.langchain_utilities.model import LCToolComponent
 from langflow.io import BoolInput, DictInput, HandleInput, IntInput, SecretStrInput, StrInput, TableInput
 from langflow.logging import logger
-from langflow.schema import Data
+from langflow.schema.data import Data
 from langflow.schema.table import EditMode
 
 

src/backend/base/langflow/components/datastax/create_assistant.py

@@ -2,9 +2,9 @@ from loguru import logger
 
 from langflow.base.astra_assistants.util import get_patched_openai_client
 from langflow.custom.custom_component.component_with_cache import ComponentWithCache
-from langflow.inputs import MultilineInput, StrInput
+from langflow.inputs.inputs import MultilineInput, StrInput
 from langflow.schema.message import Message
-from langflow.template import Output
+from langflow.template.field.base import Output
 
 
 class AssistantsCreateAssistant(ComponentWithCache):

src/backend/base/langflow/components/datastax/create_thread.py

@@ -1,8 +1,8 @@
 from langflow.base.astra_assistants.util import get_patched_openai_client
 from langflow.custom.custom_component.component_with_cache import ComponentWithCache
-from langflow.inputs import MultilineInput
+from langflow.inputs.inputs import MultilineInput
 from langflow.schema.message import Message
-from langflow.template import Output
+from langflow.template.field.base import Output
 
 
 class AssistantsCreateThread(ComponentWithCache):

src/backend/base/langflow/components/datastax/dotenv.py

@@ -2,10 +2,10 @@ import io
 
 from dotenv import load_dotenv
 
-from langflow.custom import Component
+from langflow.custom.custom_component.component import Component
-from langflow.inputs import MultilineSecretInput
+from langflow.inputs.inputs import MultilineSecretInput
 from langflow.schema.message import Message
-from langflow.template import Output
+from langflow.template.field.base import Output
 
 
 class Dotenv(Component):

src/backend/base/langflow/components/datastax/get_assistant.py

@@ -1,8 +1,8 @@
 from langflow.base.astra_assistants.util import get_patched_openai_client
 from langflow.custom.custom_component.component_with_cache import ComponentWithCache
-from langflow.inputs import MultilineInput, StrInput
+from langflow.inputs.inputs import MultilineInput, StrInput
 from langflow.schema.message import Message
-from langflow.template import Output
+from langflow.template.field.base import Output
 
 
 class AssistantsGetAssistantName(ComponentWithCache):

src/backend/base/langflow/components/datastax/getenvvar.py

@@ -1,9 +1,9 @@
 import os
 
-from langflow.custom import Component
+from langflow.custom.custom_component.component import Component
-from langflow.inputs import StrInput
+from langflow.inputs.inputs import StrInput
 from langflow.schema.message import Message
-from langflow.template import Output
+from langflow.template.field.base import Output
 
 
 class GetEnvVar(Component):

src/backend/base/langflow/components/datastax/run.py

@@ -4,10 +4,10 @@ from openai.lib.streaming import AssistantEventHandler
 
 from langflow.base.astra_assistants.util import get_patched_openai_client
 from langflow.custom.custom_component.component_with_cache import ComponentWithCache
-from langflow.inputs import MultilineInput
+from langflow.inputs.inputs import MultilineInput
-from langflow.schema import dotdict
+from langflow.schema.dotdict import dotdict
 from langflow.schema.message import Message
-from langflow.template import Output
+from langflow.template.field.base import Output
 
 
 class AssistantsRun(ComponentWithCache):

src/backend/base/langflow/components/deactivated/code_block_extractor.py

@@ -1,6 +1,6 @@
 import re
 
-from langflow.custom import Component
+from langflow.custom.custom_component.component import Component
 from langflow.field_typing import Input, Output, Text
 
 

src/backend/base/langflow/components/deactivated/documents_to_data.py

@@ -1,7 +1,7 @@
 from langchain_core.documents import Document
 
-from langflow.custom import CustomComponent
+from langflow.custom.custom_component.custom_component import CustomComponent
-from langflow.schema import Data
+from langflow.schema.data import Data
 
 
 class DocumentsToDataComponent(CustomComponent):

src/backend/base/langflow/components/deactivated/embed.py

@@ -1,6 +1,6 @@
-from langflow.custom import CustomComponent
+from langflow.custom.custom_component.custom_component import CustomComponent
 from langflow.field_typing import Embeddings
-from langflow.schema import Data
+from langflow.schema.data import Data
 
 
 class EmbedComponent(CustomComponent):

src/backend/base/langflow/components/deactivated/extract_key_from_data.py

@@ -1,5 +1,5 @@
-from langflow.custom import CustomComponent
+from langflow.custom.custom_component.custom_component import CustomComponent
-from langflow.schema import Data
+from langflow.schema.data import Data
 
 
 class ExtractKeyFromDataComponent(CustomComponent):

src/backend/base/langflow/components/deactivated/list_flows.py

@@ -1,5 +1,5 @@
-from langflow.custom import CustomComponent
+from langflow.custom.custom_component.custom_component import CustomComponent
-from langflow.schema import Data
+from langflow.schema.data import Data
 
 
 class ListFlowsComponent(CustomComponent):

src/backend/base/langflow/components/deactivated/mcp_sse.py

@@ -9,7 +9,7 @@ from langflow.base.mcp.util import (
     create_tool_coroutine,
     create_tool_func,
 )
-from langflow.custom import Component
+from langflow.custom.custom_component.component import Component
 from langflow.field_typing import Tool
 from langflow.io import MessageTextInput, Output
 

src/backend/base/langflow/components/deactivated/mcp_stdio.py

@@ -9,7 +9,7 @@ from langflow.base.mcp.util import (
     create_tool_coroutine,
     create_tool_func,
 )
-from langflow.custom import Component
+from langflow.custom.custom_component.component import Component
 from langflow.field_typing import Tool
 from langflow.io import MessageTextInput, Output
 

src/backend/base/langflow/components/deactivated/merge_data.py

@@ -1,8 +1,8 @@
 from loguru import logger
 
-from langflow.custom import Component
+from langflow.custom.custom_component.component import Component
 from langflow.io import DataInput, Output
-from langflow.schema import Data
+from langflow.schema.data import Data
 
 
 class MergeDataComponent(Component):

src/backend/base/langflow/components/deactivated/message.py

@@ -1,4 +1,4 @@
-from langflow.custom import CustomComponent
+from langflow.custom.custom_component.custom_component import CustomComponent
 from langflow.schema.message import Message
 from langflow.utils.constants import MESSAGE_SENDER_AI, MESSAGE_SENDER_USER
 

src/backend/base/langflow/components/deactivated/selective_passthrough.py

@@ -1,4 +1,4 @@
-from langflow.custom import Component
+from langflow.custom.custom_component.component import Component
 from langflow.field_typing import Text
 from langflow.io import BoolInput, DropdownInput, MessageTextInput, Output
 

src/backend/base/langflow/components/deactivated/should_run_next.py

@@ -1,7 +1,7 @@
 from langchain_core.messages import BaseMessage
 from langchain_core.prompts import PromptTemplate
 
-from langflow.custom import CustomComponent
+from langflow.custom.custom_component.custom_component import CustomComponent
 from langflow.field_typing import LanguageModel, Text
 
 

src/backend/base/langflow/components/deactivated/split_text.py

@@ -1,8 +1,8 @@
 from langchain_text_splitters import CharacterTextSplitter
 
-from langflow.custom import Component
+from langflow.custom.custom_component.component import Component
 from langflow.io import HandleInput, IntInput, MessageTextInput, Output
-from langflow.schema import Data
+from langflow.schema.data import Data
 from langflow.utils.util import unescape_string
 
 

src/backend/base/langflow/components/deactivated/store_message.py

@@ -1,4 +1,4 @@
-from langflow.custom import CustomComponent
+from langflow.custom.custom_component.custom_component import CustomComponent
 from langflow.memory import aget_messages, astore_message
 from langflow.schema.message import Message
 

src/backend/base/langflow/components/deactivated/sub_flow.py

@@ -3,11 +3,11 @@ from typing import TYPE_CHECKING, Any
 from loguru import logger
 
 from langflow.base.flow_processing.utils import build_data_from_result_data
-from langflow.custom import CustomComponent
+from langflow.custom.custom_component.custom_component import CustomComponent
 from langflow.graph.graph.base import Graph
 from langflow.graph.vertex.base import Vertex
 from langflow.helpers.flow import get_flow_inputs
-from langflow.schema import Data
+from langflow.schema.data import Data
 from langflow.schema.dotdict import dotdict
 from langflow.template.field.base import Input
 

src/backend/base/langflow/components/embeddings/astra_vectorize.py

@@ -1,6 +1,6 @@
 from typing import Any
 
-from langflow.custom import Component
+from langflow.custom.custom_component.component import Component
 from langflow.inputs.inputs import DictInput, DropdownInput, MessageTextInput, SecretStrInput
 from langflow.template.field.base import Output
 

src/backend/base/langflow/components/embeddings/google_generative_ai.py

@@ -6,7 +6,7 @@ from langchain_core.embeddings import Embeddings
 from langchain_google_genai import GoogleGenerativeAIEmbeddings
 from langchain_google_genai._common import GoogleGenerativeAIError
 
-from langflow.custom import Component
+from langflow.custom.custom_component.component import Component
 from langflow.io import MessageTextInput, Output, SecretStrInput
 
 MIN_DIMENSION_ERROR = "Output dimensionality must be at least 1"

src/backend/base/langflow/components/embeddings/similarity.py

@@ -2,9 +2,9 @@ from typing import Any
 
 import numpy as np
 
-from langflow.custom import Component
+from langflow.custom.custom_component.component import Component
 from langflow.io import DataInput, DropdownInput, Output
-from langflow.schema import Data
+from langflow.schema.data import Data
 
 
 class EmbeddingSimilarityComponent(Component):

src/backend/base/langflow/components/embeddings/text_embedder.py

@@ -1,9 +1,9 @@
 import logging
 from typing import TYPE_CHECKING
 
-from langflow.custom import Component
+from langflow.custom.custom_component.component import Component
 from langflow.io import HandleInput, MessageInput, Output
-from langflow.schema import Data
+from langflow.schema.data import Data
 
 if TYPE_CHECKING:
     from langflow.field_typing import Embeddings

src/backend/base/langflow/components/firecrawl/firecrawl_crawl_api.py

@@ -1,8 +1,8 @@
 import uuid
 
-from langflow.custom import Component
+from langflow.custom.custom_component.component import Component
 from langflow.io import DataInput, IntInput, MultilineInput, Output, SecretStrInput, StrInput
-from langflow.schema import Data
+from langflow.schema.data import Data
 
 
 class FirecrawlCrawlApi(Component):

src/backend/base/langflow/components/firecrawl/firecrawl_extract_api.py

@@ -1,6 +1,6 @@
 from loguru import logger
 
-from langflow.custom import Component
+from langflow.custom.custom_component.component import Component
 from langflow.io import (
     BoolInput,
     DataInput,
@@ -8,7 +8,7 @@ from langflow.io import (
     Output,
     SecretStrInput,
 )
-from langflow.schema import Data
+from langflow.schema.data import Data
 
 
 class FirecrawlExtractApi(Component):

src/backend/base/langflow/components/firecrawl/firecrawl_map_api.py

@@ -1,11 +1,11 @@
-from langflow.custom import Component
+from langflow.custom.custom_component.component import Component
 from langflow.io import (
     BoolInput,
     MultilineInput,
     Output,
     SecretStrInput,
 )
-from langflow.schema import Data
+from langflow.schema.data import Data
 
 
 class FirecrawlMapApi(Component):