From 4366b02c4f1a27f9befd0244161d938828ff6145 Mon Sep 17 00:00:00 2001 From: Gabriel Luiz Freitas Almeida Date: Thu, 12 Oct 2023 19:23:13 -0300 Subject: [PATCH] =?UTF-8?q?=F0=9F=94=80=20chore(field=5Ftyping):=20reorgan?= =?UTF-8?q?ize=20imports=20and=20update=20=5F=5Fall=5F=5F=20list=20for=20b?= =?UTF-8?q?etter=20readability=20and=20maintainability=20=F0=9F=94=A5=20ch?= =?UTF-8?q?ore(field=5Ftyping):=20remove=20unused=20base.py=20file=20as=20?= =?UTF-8?q?it=20is=20no=20longer=20needed=20=F0=9F=94=80=20chore(constants?= =?UTF-8?q?):=20update=20import=20statements=20and=20add=20type=20aliases?= =?UTF-8?q?=20for=20better=20readability=20and=20maintainability?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/backend/langflow/field_typing/__init__.py | 59 ++++++++++++++++--- src/backend/langflow/field_typing/base.py | 5 -- .../langflow/field_typing/constants.py | 9 ++- 3 files changed, 60 insertions(+), 13 deletions(-) delete mode 100644 src/backend/langflow/field_typing/base.py diff --git a/src/backend/langflow/field_typing/__init__.py b/src/backend/langflow/field_typing/__init__.py index 14cbba2d0..9a2161d3f 100644 --- a/src/backend/langflow/field_typing/__init__.py +++ b/src/backend/langflow/field_typing/__init__.py @@ -1,8 +1,53 @@ -from .base import NestedDict, Data -from .constants import * - -__all__ = ( - ["NestedDict", "Data"] - + list(LANGCHAIN_BASE_TYPES.keys()) - + list(CUSTOM_COMPONENT_SUPPORTED_TYPES.keys()) +# LANGCHAIN_BASE_TYPES = { +# "Chain": Chain, +# "AgentExecutor": AgentExecutor, +# "Tool": Tool, +# "BaseLLM": BaseLLM, +# "PromptTemplate": PromptTemplate, +# "BaseLoader": BaseLoader, +# "Document": Document, +# "TextSplitter": TextSplitter, +# "VectorStore": VectorStore, +# "Embeddings": Embeddings, +# "BaseRetriever": BaseRetriever, +# "BaseOutputParser": BaseOutputParser, +# "BaseMemory": BaseMemory, +# "BaseChatMemory": BaseChatMemory, +# } +from .constants import ( + Tool, + PromptTemplate, + Chain, + BaseChatMemory, + BaseLLM, + BaseLoader, + BaseMemory, + BaseOutputParser, + BaseRetriever, + VectorStore, + Embeddings, + TextSplitter, + Document, + AgentExecutor, + NestedDict, + Data, ) + +__all__ = [ + "NestedDict", + "Data", + "Tool", + "PromptTemplate", + "Chain", + "BaseChatMemory", + "BaseLLM", + "BaseLoader", + "BaseMemory", + "BaseOutputParser", + "BaseRetriever", + "VectorStore", + "Embeddings", + "TextSplitter", + "Document", + "AgentExecutor", +] diff --git a/src/backend/langflow/field_typing/base.py b/src/backend/langflow/field_typing/base.py deleted file mode 100644 index 48b737a63..000000000 --- a/src/backend/langflow/field_typing/base.py +++ /dev/null @@ -1,5 +0,0 @@ -from typing import Union, Dict, Any - -# Type alias for more complex dicts -NestedDict = Dict[str, Union[str, Dict]] -Data = Any diff --git a/src/backend/langflow/field_typing/constants.py b/src/backend/langflow/field_typing/constants.py index 4a8072b15..3ce429548 100644 --- a/src/backend/langflow/field_typing/constants.py +++ b/src/backend/langflow/field_typing/constants.py @@ -10,7 +10,14 @@ from langchain.schema.memory import BaseMemory from langchain.text_splitter import TextSplitter from langchain.tools import Tool from langchain.vectorstores.base import VectorStore -from langflow.field_typing import Data, NestedDict +from typing import Union, Dict + +# Type alias for more complex dicts +NestedDict = Dict[str, Union[str, Dict]] + + +class Data: + pass LANGCHAIN_BASE_TYPES = {