From 9b23dae530a79c1cf768baf5a2405fafdfb563d8 Mon Sep 17 00:00:00 2001 From: Gabriel Luiz Freitas Almeida Date: Fri, 3 Nov 2023 16:13:15 -0300 Subject: [PATCH] =?UTF-8?q?=F0=9F=90=9B=20fix(chat.py):=20remove=20unused?= =?UTF-8?q?=20user=20dependency=20in=20stream=5Fbuild=20function=20?= =?UTF-8?q?=F0=9F=90=9B=20fix(chat.py):=20handle=20KeyError=20when=20retri?= =?UTF-8?q?eving=20user=5Fid=20from=20cache=5Fservice=20=E2=9C=A8=20feat(c?= =?UTF-8?q?hat.py):=20use=20user=5Fid=20from=20cache=5Fservice=20instead?= =?UTF-8?q?=20of=20user.id=20in=20try=5Frunning=5Fcelery=5Ftask=20and=20ve?= =?UTF-8?q?rtex.build=20functions=20=F0=9F=94=A7=20chore(config.yaml):=20c?= =?UTF-8?q?omment=20out=20ConversationChain=20in=20chains=20configuration?= =?UTF-8?q?=20=F0=9F=94=A7=20chore(base.py):=20import=20SQLDatabaseChain?= =?UTF-8?q?=20from=20langchain=5Fexperimental.sql=20module=20and=20add=20i?= =?UTF-8?q?t=20to=20type=5Fdict?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/backend/langflow/api/v1/chat.py | 10 +++++++--- src/backend/langflow/config.yaml | 4 ++-- src/backend/langflow/interface/chains/base.py | 3 ++- 3 files changed, 11 insertions(+), 6 deletions(-) diff --git a/src/backend/langflow/api/v1/chat.py b/src/backend/langflow/api/v1/chat.py index a81d088d6..d6a022a57 100644 --- a/src/backend/langflow/api/v1/chat.py +++ b/src/backend/langflow/api/v1/chat.py @@ -127,7 +127,6 @@ async def stream_build( flow_id: str, chat_service: "ChatService" = Depends(get_chat_service), cache_service: "BaseCacheService" = Depends(get_cache_service), - user=Depends(get_current_active_user), ): """Stream the build process based on stored flow data.""" @@ -161,6 +160,11 @@ async def stream_build( number_of_nodes = len(graph.nodes) update_build_status(cache_service, flow_id, BuildStatus.IN_PROGRESS) + try: + user_id = cache_service[flow_id]["user_id"] + except KeyError: + logger.debug("No user_id found in cache_service") + user_id = None for i, vertex in enumerate(graph.generator_build(), 1): try: log_dict = { @@ -168,9 +172,9 @@ async def stream_build( } yield str(StreamData(event="log", data=log_dict)) if vertex.is_task: - vertex = try_running_celery_task(vertex, user.id) + vertex = try_running_celery_task(vertex, user_id) else: - vertex.build(user_id=user.id) + vertex.build(user_id=user_id) params = vertex._built_object_repr() valid = True logger.debug(f"Building node {str(vertex.vertex_type)}") diff --git a/src/backend/langflow/config.yaml b/src/backend/langflow/config.yaml index 3d44dae6d..d234ce8ea 100644 --- a/src/backend/langflow/config.yaml +++ b/src/backend/langflow/config.yaml @@ -20,8 +20,8 @@ chains: documentation: "https://python.langchain.com/docs/modules/chains/additional/llm_math" LLMCheckerChain: documentation: "https://python.langchain.com/docs/modules/chains/additional/llm_checker" - ConversationChain: - documentation: "" + # ConversationChain: + # documentation: "" SeriesCharacterChain: documentation: "" MidJourneyPromptChain: diff --git a/src/backend/langflow/interface/chains/base.py b/src/backend/langflow/interface/chains/base.py index 5bdc3efd8..3f324643d 100644 --- a/src/backend/langflow/interface/chains/base.py +++ b/src/backend/langflow/interface/chains/base.py @@ -9,6 +9,7 @@ from langflow.template.frontend_node.chains import ChainFrontendNode from loguru import logger from langflow.utils.util import build_template_from_class, build_template_from_method from langchain import chains +from langchain_experimental.sql import SQLDatabaseChain # Assuming necessary imports for Field, Template, and FrontendNode classes @@ -37,7 +38,7 @@ class ChainCreator(LangChainTypeCreator): } from langflow.interface.chains.custom import CUSTOM_CHAINS - # self.type_dict["SQLDatabaseChain"] = SQLDatabaseChain + self.type_dict["SQLDatabaseChain"] = SQLDatabaseChain self.type_dict.update(CUSTOM_CHAINS) # Filter according to settings.chains