From dc65f4681cf9d5d5dc9e1dd54d5169bf747be2b1 Mon Sep 17 00:00:00 2001 From: Gabriel Luiz Freitas Almeida Date: Tue, 2 Apr 2024 19:48:50 -0300 Subject: [PATCH] Refactor APIRequest class and update model imports --- src/backend/base/langflow/components/data/APIRequest.py | 9 ++------- .../base/langflow/components/helpers/SplitText.py | 1 - .../base/langflow/components/models/AnthropicModel.py | 1 + .../base/langflow/components/models/AzureOpenAIModel.py | 1 + .../langflow/components/models/BaiduQianfanChatModel.py | 1 + .../base/langflow/components/models/CohereModel.py | 2 +- .../components/models/GoogleGenerativeAIModel.py | 2 +- .../base/langflow/components/models/HuggingFaceModel.py | 2 +- 8 files changed, 8 insertions(+), 11 deletions(-) diff --git a/src/backend/base/langflow/components/data/APIRequest.py b/src/backend/base/langflow/components/data/APIRequest.py index 2b796dc32..762564aa8 100644 --- a/src/backend/base/langflow/components/data/APIRequest.py +++ b/src/backend/base/langflow/components/data/APIRequest.py @@ -58,9 +58,7 @@ class APIRequest(CustomComponent): data = body if body else None payload = json.dumps(data) try: - response = await client.request( - method, url, headers=headers, content=payload, timeout=timeout - ) + response = await client.request(method, url, headers=headers, content=payload, timeout=timeout) try: result = response.json() except Exception: @@ -117,10 +115,7 @@ class APIRequest(CustomComponent): bodies += [None] * (len(urls) - len(bodies)) # type: ignore async with httpx.AsyncClient() as client: results = await asyncio.gather( - *[ - self.make_request(client, method, u, headers, rec, timeout) - for u, rec in zip(urls, bodies) - ] + *[self.make_request(client, method, u, headers, rec, timeout) for u, rec in zip(urls, bodies)] ) self.status = results return results diff --git a/src/backend/base/langflow/components/helpers/SplitText.py b/src/backend/base/langflow/components/helpers/SplitText.py index 1af5d5302..3c823c4aa 100644 --- a/src/backend/base/langflow/components/helpers/SplitText.py +++ b/src/backend/base/langflow/components/helpers/SplitText.py @@ -54,7 +54,6 @@ class SplitTextComponent(CustomComponent): chunk_overlap: Optional[int] = 200, recursive: bool = False, ) -> list[Record]: - separators = [unescape_string(x) for x in separators] # Make sure chunk_size and chunk_overlap are ints diff --git a/src/backend/base/langflow/components/models/AnthropicModel.py b/src/backend/base/langflow/components/models/AnthropicModel.py index 29b2a1fe4..1e5a7aec5 100644 --- a/src/backend/base/langflow/components/models/AnthropicModel.py +++ b/src/backend/base/langflow/components/models/AnthropicModel.py @@ -5,6 +5,7 @@ from pydantic.v1 import SecretStr from langflow.base.constants import STREAM_INFO_TEXT from langflow.base.models.model import LCModelComponent +from langflow.field_typing import Text class AnthropicLLM(LCModelComponent): diff --git a/src/backend/base/langflow/components/models/AzureOpenAIModel.py b/src/backend/base/langflow/components/models/AzureOpenAIModel.py index 51117eb56..9e1d32bb7 100644 --- a/src/backend/base/langflow/components/models/AzureOpenAIModel.py +++ b/src/backend/base/langflow/components/models/AzureOpenAIModel.py @@ -5,6 +5,7 @@ from langchain_openai import AzureChatOpenAI from langflow.base.constants import STREAM_INFO_TEXT from langflow.base.models.model import LCModelComponent +from langflow.field_typing import Text class AzureChatOpenAIComponent(LCModelComponent): diff --git a/src/backend/base/langflow/components/models/BaiduQianfanChatModel.py b/src/backend/base/langflow/components/models/BaiduQianfanChatModel.py index f4a7415a4..f5e6497d0 100644 --- a/src/backend/base/langflow/components/models/BaiduQianfanChatModel.py +++ b/src/backend/base/langflow/components/models/BaiduQianfanChatModel.py @@ -5,6 +5,7 @@ from pydantic.v1 import SecretStr from langflow.base.constants import STREAM_INFO_TEXT from langflow.base.models.model import LCModelComponent +from langflow.field_typing import Text class QianfanChatEndpointComponent(LCModelComponent): diff --git a/src/backend/base/langflow/components/models/CohereModel.py b/src/backend/base/langflow/components/models/CohereModel.py index 21406f793..665aacc13 100644 --- a/src/backend/base/langflow/components/models/CohereModel.py +++ b/src/backend/base/langflow/components/models/CohereModel.py @@ -2,7 +2,7 @@ from typing import Optional from langchain_community.chat_models.cohere import ChatCohere from pydantic.v1 import SecretStr - +from langflow.field_typing import Text from langflow.base.constants import STREAM_INFO_TEXT from langflow.base.models.model import LCModelComponent diff --git a/src/backend/base/langflow/components/models/GoogleGenerativeAIModel.py b/src/backend/base/langflow/components/models/GoogleGenerativeAIModel.py index 412ff2d4e..0c2b8eef5 100644 --- a/src/backend/base/langflow/components/models/GoogleGenerativeAIModel.py +++ b/src/backend/base/langflow/components/models/GoogleGenerativeAIModel.py @@ -2,7 +2,7 @@ from typing import Optional from langchain_google_genai import ChatGoogleGenerativeAI from pydantic.v1 import SecretStr - +from langflow.field_typing import Text, RangeSpec from langflow.base.constants import STREAM_INFO_TEXT from langflow.base.models.model import LCModelComponent diff --git a/src/backend/base/langflow/components/models/HuggingFaceModel.py b/src/backend/base/langflow/components/models/HuggingFaceModel.py index 4be24ab13..19750ef9f 100644 --- a/src/backend/base/langflow/components/models/HuggingFaceModel.py +++ b/src/backend/base/langflow/components/models/HuggingFaceModel.py @@ -2,7 +2,7 @@ from typing import Optional from langchain_community.chat_models.huggingface import ChatHuggingFace from langchain_community.llms.huggingface_endpoint import HuggingFaceEndpoint - +from langflow.field_typing import Text from langflow.base.constants import STREAM_INFO_TEXT from langflow.base.models.model import LCModelComponent