From cec6a4197332e77c48a59c39a2ae1eedf129b39e Mon Sep 17 00:00:00 2001 From: Ibis Prevedello Date: Mon, 3 Apr 2023 17:27:41 -0300 Subject: [PATCH] refac: substitute | by Optional --- src/backend/langflow/graph/base.py | 6 +++--- src/backend/langflow/interface/agents/base.py | 4 ++-- src/backend/langflow/interface/chains/base.py | 4 ++-- src/backend/langflow/interface/documentLoaders/base.py | 4 ++-- src/backend/langflow/interface/embeddings/base.py | 4 ++-- src/backend/langflow/interface/llms/base.py | 4 ++-- src/backend/langflow/interface/memories/base.py | 4 ++-- src/backend/langflow/interface/prompts/base.py | 4 ++-- src/backend/langflow/interface/toolkits/base.py | 4 ++-- src/backend/langflow/interface/tools/base.py | 6 +++--- src/backend/langflow/interface/vectorStore/base.py | 4 ++-- src/backend/langflow/interface/wrappers/base.py | 4 ++-- tests/test_cache.py | 2 +- 13 files changed, 27 insertions(+), 27 deletions(-) diff --git a/src/backend/langflow/graph/base.py b/src/backend/langflow/graph/base.py index 837dd4735..fa93ed8ed 100644 --- a/src/backend/langflow/graph/base.py +++ b/src/backend/langflow/graph/base.py @@ -5,7 +5,7 @@ import types from copy import deepcopy -from typing import Any, Dict, List +from typing import Any, Dict, List, Optional from langflow.graph.constants import DIRECT_TYPES from langflow.graph.utils import load_file @@ -15,11 +15,11 @@ from langflow.utils.logger import logger class Node: - def __init__(self, data: Dict, base_type: str | None = None) -> None: + def __init__(self, data: Dict, base_type: Optional[str] = None) -> None: self.id: str = data["id"] self._data = data self.edges: List[Edge] = [] - self.base_type: str | None = base_type + self.base_type: Optional[str] = base_type self._parse_data() self._built_object = None self._built = False diff --git a/src/backend/langflow/interface/agents/base.py b/src/backend/langflow/interface/agents/base.py index 464c04276..94cab1411 100644 --- a/src/backend/langflow/interface/agents/base.py +++ b/src/backend/langflow/interface/agents/base.py @@ -1,4 +1,4 @@ -from typing import Dict, List +from typing import Dict, List, Optional from langchain.agents import loading @@ -21,7 +21,7 @@ class AgentCreator(LangChainTypeCreator): self.type_dict[name] = agent return self.type_dict - def get_signature(self, name: str) -> Dict | None: + def get_signature(self, name: str) -> Optional[Dict]: try: if name in get_custom_nodes(self.type_name).keys(): return get_custom_nodes(self.type_name)[name] diff --git a/src/backend/langflow/interface/chains/base.py b/src/backend/langflow/interface/chains/base.py index 715608518..36542b7d4 100644 --- a/src/backend/langflow/interface/chains/base.py +++ b/src/backend/langflow/interface/chains/base.py @@ -1,4 +1,4 @@ -from typing import Dict, List +from typing import Dict, List, Optional from langflow.interface.base import LangChainTypeCreator from langflow.interface.custom_lists import chain_type_to_cls_dict @@ -17,7 +17,7 @@ class ChainCreator(LangChainTypeCreator): self.type_dict = chain_type_to_cls_dict return self.type_dict - def get_signature(self, name: str) -> Dict | None: + def get_signature(self, name: str) -> Optional[Dict]: try: return build_template_from_class(name, chain_type_to_cls_dict) except ValueError as exc: diff --git a/src/backend/langflow/interface/documentLoaders/base.py b/src/backend/langflow/interface/documentLoaders/base.py index 494fabfd3..844820d7b 100644 --- a/src/backend/langflow/interface/documentLoaders/base.py +++ b/src/backend/langflow/interface/documentLoaders/base.py @@ -1,4 +1,4 @@ -from typing import Dict, List +from typing import Dict, List, Optional from langflow.interface.base import LangChainTypeCreator from langflow.interface.custom_lists import documentloaders_type_to_cls_dict @@ -13,7 +13,7 @@ class DocumentLoaderCreator(LangChainTypeCreator): def type_to_loader_dict(self) -> Dict: return documentloaders_type_to_cls_dict - def get_signature(self, name: str) -> Dict | None: + def get_signature(self, name: str) -> Optional[Dict]: """Get the signature of a document loader.""" try: return build_template_from_class(name, documentloaders_type_to_cls_dict) diff --git a/src/backend/langflow/interface/embeddings/base.py b/src/backend/langflow/interface/embeddings/base.py index de1921b5e..25038a8a5 100644 --- a/src/backend/langflow/interface/embeddings/base.py +++ b/src/backend/langflow/interface/embeddings/base.py @@ -1,4 +1,4 @@ -from typing import Dict, List +from typing import Dict, List, Optional from langflow.interface.base import LangChainTypeCreator from langflow.interface.custom_lists import embedding_type_to_cls_dict @@ -13,7 +13,7 @@ class EmbeddingCreator(LangChainTypeCreator): def type_to_loader_dict(self) -> Dict: return embedding_type_to_cls_dict - def get_signature(self, name: str) -> Dict | None: + def get_signature(self, name: str) -> Optional[Dict]: """Get the signature of an embedding.""" try: return build_template_from_class(name, embedding_type_to_cls_dict) diff --git a/src/backend/langflow/interface/llms/base.py b/src/backend/langflow/interface/llms/base.py index 688845301..85f9035db 100644 --- a/src/backend/langflow/interface/llms/base.py +++ b/src/backend/langflow/interface/llms/base.py @@ -1,4 +1,4 @@ -from typing import Dict, List +from typing import Dict, List, Optional from langflow.interface.base import LangChainTypeCreator from langflow.interface.custom_lists import llm_type_to_cls_dict @@ -15,7 +15,7 @@ class LLMCreator(LangChainTypeCreator): self.type_dict = llm_type_to_cls_dict return self.type_dict - def get_signature(self, name: str) -> Dict | None: + def get_signature(self, name: str) -> Optional[Dict]: """Get the signature of an llm.""" try: return build_template_from_class(name, llm_type_to_cls_dict) diff --git a/src/backend/langflow/interface/memories/base.py b/src/backend/langflow/interface/memories/base.py index 99af98a1b..1bb4b054b 100644 --- a/src/backend/langflow/interface/memories/base.py +++ b/src/backend/langflow/interface/memories/base.py @@ -1,4 +1,4 @@ -from typing import Dict, List +from typing import Dict, List, Optional from langflow.interface.base import LangChainTypeCreator from langflow.interface.custom_lists import memory_type_to_cls_dict @@ -15,7 +15,7 @@ class MemoryCreator(LangChainTypeCreator): self.type_dict = memory_type_to_cls_dict return self.type_dict - def get_signature(self, name: str) -> Dict | None: + def get_signature(self, name: str) -> Optional[Dict]: """Get the signature of a memory.""" try: return build_template_from_class(name, memory_type_to_cls_dict) diff --git a/src/backend/langflow/interface/prompts/base.py b/src/backend/langflow/interface/prompts/base.py index f730481a9..597848b9c 100644 --- a/src/backend/langflow/interface/prompts/base.py +++ b/src/backend/langflow/interface/prompts/base.py @@ -1,4 +1,4 @@ -from typing import Dict, List +from typing import Dict, List, Optional from langchain.prompts import loading @@ -17,7 +17,7 @@ class PromptCreator(LangChainTypeCreator): self.type_dict = loading.type_to_loader_dict return self.type_dict - def get_signature(self, name: str) -> Dict | None: + def get_signature(self, name: str) -> Optional[Dict]: try: if name in get_custom_nodes(self.type_name).keys(): return get_custom_nodes(self.type_name)[name] diff --git a/src/backend/langflow/interface/toolkits/base.py b/src/backend/langflow/interface/toolkits/base.py index c78a9c051..5346ae4b5 100644 --- a/src/backend/langflow/interface/toolkits/base.py +++ b/src/backend/langflow/interface/toolkits/base.py @@ -1,4 +1,4 @@ -from typing import Callable, Dict, List +from typing import Callable, Dict, List, Optional from langchain.agents import agent_toolkits @@ -39,7 +39,7 @@ class ToolkitCreator(LangChainTypeCreator): return self.type_dict - def get_signature(self, name: str) -> Dict | None: + def get_signature(self, name: str) -> Optional[Dict]: try: return build_template_from_class(name, self.type_to_loader_dict) except ValueError as exc: diff --git a/src/backend/langflow/interface/tools/base.py b/src/backend/langflow/interface/tools/base.py index 1c9546f5c..4989a7d4b 100644 --- a/src/backend/langflow/interface/tools/base.py +++ b/src/backend/langflow/interface/tools/base.py @@ -1,4 +1,4 @@ -from typing import Dict, List +from typing import Dict, List, Optional from langchain.agents.load_tools import ( _BASE_TOOLS, @@ -59,7 +59,7 @@ TOOL_INPUTS = { class ToolCreator(LangChainTypeCreator): type_name: str = "tools" - tools_dict: Dict | None = None + tools_dict: Optional[Dict] = None @property def type_to_loader_dict(self) -> Dict: @@ -67,7 +67,7 @@ class ToolCreator(LangChainTypeCreator): self.tools_dict = get_tools_dict() return self.tools_dict - def get_signature(self, name: str) -> Dict | None: + def get_signature(self, name: str) -> Optional[Dict]: """Get the signature of a tool.""" base_classes = ["Tool"] diff --git a/src/backend/langflow/interface/vectorStore/base.py b/src/backend/langflow/interface/vectorStore/base.py index 01c222e07..6c2baa86d 100644 --- a/src/backend/langflow/interface/vectorStore/base.py +++ b/src/backend/langflow/interface/vectorStore/base.py @@ -1,4 +1,4 @@ -from typing import Dict, List +from typing import Dict, List, Optional from langflow.interface.base import LangChainTypeCreator from langflow.interface.custom_lists import vectorstores_type_to_cls_dict @@ -13,7 +13,7 @@ class VectorstoreCreator(LangChainTypeCreator): def type_to_loader_dict(self) -> Dict: return vectorstores_type_to_cls_dict - def get_signature(self, name: str) -> Dict | None: + def get_signature(self, name: str) -> Optional[Dict]: """Get the signature of an embedding.""" try: return build_template_from_class(name, vectorstores_type_to_cls_dict) diff --git a/src/backend/langflow/interface/wrappers/base.py b/src/backend/langflow/interface/wrappers/base.py index abfa559a1..8c5978013 100644 --- a/src/backend/langflow/interface/wrappers/base.py +++ b/src/backend/langflow/interface/wrappers/base.py @@ -1,4 +1,4 @@ -from typing import Dict, List +from typing import Dict, List, Optional from langchain import requests @@ -17,7 +17,7 @@ class WrapperCreator(LangChainTypeCreator): } return self.type_dict - def get_signature(self, name: str) -> Dict | None: + def get_signature(self, name: str) -> Optional[Dict]: try: return build_template_from_class(name, self.type_to_loader_dict) except ValueError as exc: diff --git a/tests/test_cache.py b/tests/test_cache.py index 0dcc665f6..85559bc7b 100644 --- a/tests/test_cache.py +++ b/tests/test_cache.py @@ -3,7 +3,7 @@ import tempfile from pathlib import Path import pytest -from langflow.cache.utils import PREFIX, compute_hash, save_cache +from langflow.cache.utils import PREFIX, save_cache from langflow.interface.run import load_langchain_object