refac: substitute | by Optional

This commit is contained in:
Ibis Prevedello 2023-04-03 17:27:41 -03:00
commit cec6a41973
13 changed files with 27 additions and 27 deletions

View file

@ -5,7 +5,7 @@
import types import types
from copy import deepcopy 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.constants import DIRECT_TYPES
from langflow.graph.utils import load_file from langflow.graph.utils import load_file
@ -15,11 +15,11 @@ from langflow.utils.logger import logger
class Node: 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.id: str = data["id"]
self._data = data self._data = data
self.edges: List[Edge] = [] self.edges: List[Edge] = []
self.base_type: str | None = base_type self.base_type: Optional[str] = base_type
self._parse_data() self._parse_data()
self._built_object = None self._built_object = None
self._built = False self._built = False

View file

@ -1,4 +1,4 @@
from typing import Dict, List from typing import Dict, List, Optional
from langchain.agents import loading from langchain.agents import loading
@ -21,7 +21,7 @@ class AgentCreator(LangChainTypeCreator):
self.type_dict[name] = agent self.type_dict[name] = agent
return self.type_dict return self.type_dict
def get_signature(self, name: str) -> Dict | None: def get_signature(self, name: str) -> Optional[Dict]:
try: try:
if name in get_custom_nodes(self.type_name).keys(): if name in get_custom_nodes(self.type_name).keys():
return get_custom_nodes(self.type_name)[name] return get_custom_nodes(self.type_name)[name]

View file

@ -1,4 +1,4 @@
from typing import Dict, List from typing import Dict, List, Optional
from langflow.interface.base import LangChainTypeCreator from langflow.interface.base import LangChainTypeCreator
from langflow.interface.custom_lists import chain_type_to_cls_dict 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 self.type_dict = chain_type_to_cls_dict
return self.type_dict return self.type_dict
def get_signature(self, name: str) -> Dict | None: def get_signature(self, name: str) -> Optional[Dict]:
try: try:
return build_template_from_class(name, chain_type_to_cls_dict) return build_template_from_class(name, chain_type_to_cls_dict)
except ValueError as exc: except ValueError as exc:

View file

@ -1,4 +1,4 @@
from typing import Dict, List from typing import Dict, List, Optional
from langflow.interface.base import LangChainTypeCreator from langflow.interface.base import LangChainTypeCreator
from langflow.interface.custom_lists import documentloaders_type_to_cls_dict 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: def type_to_loader_dict(self) -> Dict:
return documentloaders_type_to_cls_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.""" """Get the signature of a document loader."""
try: try:
return build_template_from_class(name, documentloaders_type_to_cls_dict) return build_template_from_class(name, documentloaders_type_to_cls_dict)

View file

@ -1,4 +1,4 @@
from typing import Dict, List from typing import Dict, List, Optional
from langflow.interface.base import LangChainTypeCreator from langflow.interface.base import LangChainTypeCreator
from langflow.interface.custom_lists import embedding_type_to_cls_dict 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: def type_to_loader_dict(self) -> Dict:
return embedding_type_to_cls_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.""" """Get the signature of an embedding."""
try: try:
return build_template_from_class(name, embedding_type_to_cls_dict) return build_template_from_class(name, embedding_type_to_cls_dict)

View file

@ -1,4 +1,4 @@
from typing import Dict, List from typing import Dict, List, Optional
from langflow.interface.base import LangChainTypeCreator from langflow.interface.base import LangChainTypeCreator
from langflow.interface.custom_lists import llm_type_to_cls_dict 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 self.type_dict = llm_type_to_cls_dict
return self.type_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.""" """Get the signature of an llm."""
try: try:
return build_template_from_class(name, llm_type_to_cls_dict) return build_template_from_class(name, llm_type_to_cls_dict)

View file

@ -1,4 +1,4 @@
from typing import Dict, List from typing import Dict, List, Optional
from langflow.interface.base import LangChainTypeCreator from langflow.interface.base import LangChainTypeCreator
from langflow.interface.custom_lists import memory_type_to_cls_dict 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 self.type_dict = memory_type_to_cls_dict
return self.type_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.""" """Get the signature of a memory."""
try: try:
return build_template_from_class(name, memory_type_to_cls_dict) return build_template_from_class(name, memory_type_to_cls_dict)

View file

@ -1,4 +1,4 @@
from typing import Dict, List from typing import Dict, List, Optional
from langchain.prompts import loading from langchain.prompts import loading
@ -17,7 +17,7 @@ class PromptCreator(LangChainTypeCreator):
self.type_dict = loading.type_to_loader_dict self.type_dict = loading.type_to_loader_dict
return self.type_dict return self.type_dict
def get_signature(self, name: str) -> Dict | None: def get_signature(self, name: str) -> Optional[Dict]:
try: try:
if name in get_custom_nodes(self.type_name).keys(): if name in get_custom_nodes(self.type_name).keys():
return get_custom_nodes(self.type_name)[name] return get_custom_nodes(self.type_name)[name]

View file

@ -1,4 +1,4 @@
from typing import Callable, Dict, List from typing import Callable, Dict, List, Optional
from langchain.agents import agent_toolkits from langchain.agents import agent_toolkits
@ -39,7 +39,7 @@ class ToolkitCreator(LangChainTypeCreator):
return self.type_dict return self.type_dict
def get_signature(self, name: str) -> Dict | None: def get_signature(self, name: str) -> Optional[Dict]:
try: try:
return build_template_from_class(name, self.type_to_loader_dict) return build_template_from_class(name, self.type_to_loader_dict)
except ValueError as exc: except ValueError as exc:

View file

@ -1,4 +1,4 @@
from typing import Dict, List from typing import Dict, List, Optional
from langchain.agents.load_tools import ( from langchain.agents.load_tools import (
_BASE_TOOLS, _BASE_TOOLS,
@ -59,7 +59,7 @@ TOOL_INPUTS = {
class ToolCreator(LangChainTypeCreator): class ToolCreator(LangChainTypeCreator):
type_name: str = "tools" type_name: str = "tools"
tools_dict: Dict | None = None tools_dict: Optional[Dict] = None
@property @property
def type_to_loader_dict(self) -> Dict: def type_to_loader_dict(self) -> Dict:
@ -67,7 +67,7 @@ class ToolCreator(LangChainTypeCreator):
self.tools_dict = get_tools_dict() self.tools_dict = get_tools_dict()
return self.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.""" """Get the signature of a tool."""
base_classes = ["Tool"] base_classes = ["Tool"]

View file

@ -1,4 +1,4 @@
from typing import Dict, List from typing import Dict, List, Optional
from langflow.interface.base import LangChainTypeCreator from langflow.interface.base import LangChainTypeCreator
from langflow.interface.custom_lists import vectorstores_type_to_cls_dict 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: def type_to_loader_dict(self) -> Dict:
return vectorstores_type_to_cls_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.""" """Get the signature of an embedding."""
try: try:
return build_template_from_class(name, vectorstores_type_to_cls_dict) return build_template_from_class(name, vectorstores_type_to_cls_dict)

View file

@ -1,4 +1,4 @@
from typing import Dict, List from typing import Dict, List, Optional
from langchain import requests from langchain import requests
@ -17,7 +17,7 @@ class WrapperCreator(LangChainTypeCreator):
} }
return self.type_dict return self.type_dict
def get_signature(self, name: str) -> Dict | None: def get_signature(self, name: str) -> Optional[Dict]:
try: try:
return build_template_from_class(name, self.type_to_loader_dict) return build_template_from_class(name, self.type_to_loader_dict)
except ValueError as exc: except ValueError as exc:

View file

@ -3,7 +3,7 @@ import tempfile
from pathlib import Path from pathlib import Path
import pytest 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 from langflow.interface.run import load_langchain_object