From 87958c255e073eaf305206714be33fe0d709f77f Mon Sep 17 00:00:00 2001 From: Gabriel Luiz Freitas Almeida Date: Wed, 16 Aug 2023 21:43:35 -0300 Subject: [PATCH] =?UTF-8?q?=F0=9F=90=9B=20fix(endpoints.py):=20change=20ty?= =?UTF-8?q?pe=20annotation=20of=20session=5Fid=20parameter=20in=20process?= =?UTF-8?q?=5Fflow=20function=20to=20Union[None,=20str]=20to=20allow=20for?= =?UTF-8?q?=20None=20value=20=F0=9F=90=9B=20fix(schemas.py):=20change=20ty?= =?UTF-8?q?pe=20annotation=20of=20session=5Fid=20field=20in=20ProcessRespo?= =?UTF-8?q?nse=20schema=20to=20Optional[str]=20to=20allow=20for=20None=20v?= =?UTF-8?q?alue=20=F0=9F=90=9B=20fix(run.py):=20change=20return=20type=20a?= =?UTF-8?q?nnotation=20of=20build=5Fsorted=5Fvertices=5Fwith=5Fcaching=20f?= =?UTF-8?q?unction=20to=20Tuple[Any,=20Dict]=20to=20specify=20the=20return?= =?UTF-8?q?=20types=20=F0=9F=90=9B=20fix(process.py):=20change=20return=20?= =?UTF-8?q?type=20annotation=20of=20load=5Flangchain=5Fobject=20function?= =?UTF-8?q?=20to=20Tuple[Union[Chain,=20VectorStore],=20Dict[str,=20Any],?= =?UTF-8?q?=20str]=20to=20include=20the=20session=5Fid=20value=20in=20the?= =?UTF-8?q?=20return=20tuple?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/backend/langflow/api/v1/endpoints.py | 4 ++-- src/backend/langflow/api/v1/schemas.py | 2 +- src/backend/langflow/interface/run.py | 3 ++- src/backend/langflow/processing/process.py | 2 +- 4 files changed, 6 insertions(+), 5 deletions(-) diff --git a/src/backend/langflow/api/v1/endpoints.py b/src/backend/langflow/api/v1/endpoints.py index 51a397e1c..a6b85dde2 100644 --- a/src/backend/langflow/api/v1/endpoints.py +++ b/src/backend/langflow/api/v1/endpoints.py @@ -1,5 +1,5 @@ from http import HTTPStatus -from typing import Annotated, Optional +from typing import Annotated, Optional, Union from langflow.services.cache.utils import save_uploaded_file from langflow.services.database.models.flow import Flow @@ -75,7 +75,7 @@ async def process_flow( inputs: Optional[dict] = None, tweaks: Optional[dict] = None, clear_cache: Annotated[bool, Body(embed=True)] = False, # noqa: F821 - session_id: Annotated[str, Body(embed=True)] = None, # noqa: F821 + session_id: Annotated[Union[None, str], Body(embed=True)] = None, # noqa: F821 session: Session = Depends(get_session), ): """ diff --git a/src/backend/langflow/api/v1/schemas.py b/src/backend/langflow/api/v1/schemas.py index 1b1d763f3..65bf64dca 100644 --- a/src/backend/langflow/api/v1/schemas.py +++ b/src/backend/langflow/api/v1/schemas.py @@ -47,7 +47,7 @@ class ProcessResponse(BaseModel): """Process response schema.""" result: dict - session_id: str = None + session_id: Optional[str] = None class ChatMessage(BaseModel): diff --git a/src/backend/langflow/interface/run.py b/src/backend/langflow/interface/run.py index cb0573bf7..42cea0e98 100644 --- a/src/backend/langflow/interface/run.py +++ b/src/backend/langflow/interface/run.py @@ -1,3 +1,4 @@ +from typing import Any, Dict, Tuple from langflow.services.cache.utils import memoize_dict from langflow.graph import Graph from langflow.utils.logger import logger @@ -15,7 +16,7 @@ def build_langchain_object_with_caching(data_graph): @memoize_dict(maxsize=10) -def build_sorted_vertices_with_caching(data_graph): +def build_sorted_vertices_with_caching(data_graph) -> Tuple[Any, Dict]: """ Build langchain object from data_graph. """ diff --git a/src/backend/langflow/processing/process.py b/src/backend/langflow/processing/process.py index dc632e76b..396135e16 100644 --- a/src/backend/langflow/processing/process.py +++ b/src/backend/langflow/processing/process.py @@ -109,7 +109,7 @@ def clear_caches_if_needed(clear_cache: bool): def load_langchain_object( data_graph: Dict[str, Any], session_id: str -) -> Tuple[Union[Chain, VectorStore], Dict[str, Any]]: +) -> Tuple[Union[Chain, VectorStore], Dict[str, Any], str]: langchain_object, artifacts = get_build_result(data_graph, session_id) session_id = build_sorted_vertices_with_caching.hash logger.debug("Loaded LangChain object")