From 4a6e15533e894f8a6ef7aec95800636e8af0a7b2 Mon Sep 17 00:00:00 2001 From: Gabriel Luiz Freitas Almeida Date: Sun, 25 Feb 2024 18:06:33 -0300 Subject: [PATCH] Update LLMS references to Models and Specs --- .../AmazonBedrockSpecs.py} | 0 .../AnthropicLLMSpecs.py} | 0 .../AnthropicSpecs.py} | 0 .../AzureChatOpenAISpecs.py} | 0 .../BaiduQianfanChatEndpointsSpecs.py} | 0 .../BaiduQianfanLLMEndpointsSpecs.py} | 0 .../CTransformersSpecs.py} | 0 .../ChatAnthropicSpecs.py} | 0 .../ChatLiteLLMSpecs.py} | 0 .../ChatOllamaEndpointSpecs.py} | 0 .../ChatOpenAISpecs.py} | 0 .../ChatVertexAISpecs.py} | 0 .../Cohere.py => model_specs/CohereSpecs.py} | 0 .../GoogleGenerativeAISpecs.py} | 0 .../HuggingFaceEndpointsSpecs.py} | 0 .../LlamaCppSpecs.py} | 0 .../OllamaLLMSpecs.py} | 0 .../VertexAISpecs.py} | 0 .../{llms => model_specs}/__init__.py | 0 ...AmazonBedrock.py => AmazonBedrockModel.py} | 4 +-- .../{Anthropic.py => AnthropicModel.py} | 9 +++--- .../{AzureOpenAI.py => AzureOpenAIModel.py} | 2 +- ...ianfanChat.py => BaiduQianfanChatModel.py} | 0 ...CTransformers.py => CTransformersModel.py} | 13 ++++++-- .../models/{Cohere.py => CohereModel.py} | 30 +++++++++++++++---- ...rativeAI.py => GoogleGenerativeAIModel.py} | 8 ++--- .../{HuggingFace.py => HuggingFaceModel.py} | 0 .../models/{LlamaCpp.py => LlamaCppModel.py} | 15 +++++++--- .../models/{Ollama.py => OllamaModel.py} | 2 +- .../models/{OpenAI.py => OpenAIModel.py} | 0 .../models/{VertexAi.py => VertexAiModel.py} | 2 +- src/backend/langflow/graph/vertex/types.py | 2 +- .../langflow/interface/importing/utils.py | 4 +-- .../langflow/interface/initialize/loading.py | 8 +++-- src/backend/langflow/interface/llms/base.py | 6 ++-- 35 files changed, 71 insertions(+), 34 deletions(-) rename src/backend/langflow/components/{llms/AmazonBedrock.py => model_specs/AmazonBedrockSpecs.py} (100%) rename src/backend/langflow/components/{llms/AnthropicLLM.py => model_specs/AnthropicLLMSpecs.py} (100%) rename src/backend/langflow/components/{llms/Anthropic.py => model_specs/AnthropicSpecs.py} (100%) rename src/backend/langflow/components/{llms/AzureChatOpenAI.py => model_specs/AzureChatOpenAISpecs.py} (100%) rename src/backend/langflow/components/{llms/BaiduQianfanChatEndpoints.py => model_specs/BaiduQianfanChatEndpointsSpecs.py} (100%) rename src/backend/langflow/components/{llms/BaiduQianfanLLMEndpoints.py => model_specs/BaiduQianfanLLMEndpointsSpecs.py} (100%) rename src/backend/langflow/components/{llms/CTransformers.py => model_specs/CTransformersSpecs.py} (100%) rename src/backend/langflow/components/{llms/ChatAnthropic.py => model_specs/ChatAnthropicSpecs.py} (100%) rename src/backend/langflow/components/{llms/ChatLiteLLM.py => model_specs/ChatLiteLLMSpecs.py} (100%) rename src/backend/langflow/components/{llms/ChatOllamaEndpoint.py => model_specs/ChatOllamaEndpointSpecs.py} (100%) rename src/backend/langflow/components/{llms/ChatOpenAI.py => model_specs/ChatOpenAISpecs.py} (100%) rename src/backend/langflow/components/{llms/ChatVertexAI.py => model_specs/ChatVertexAISpecs.py} (100%) rename src/backend/langflow/components/{llms/Cohere.py => model_specs/CohereSpecs.py} (100%) rename src/backend/langflow/components/{llms/GoogleGenerativeAI.py => model_specs/GoogleGenerativeAISpecs.py} (100%) rename src/backend/langflow/components/{llms/HuggingFaceEndpoints.py => model_specs/HuggingFaceEndpointsSpecs.py} (100%) rename src/backend/langflow/components/{llms/LlamaCpp.py => model_specs/LlamaCppSpecs.py} (100%) rename src/backend/langflow/components/{llms/OllamaLLM.py => model_specs/OllamaLLMSpecs.py} (100%) rename src/backend/langflow/components/{llms/VertexAI.py => model_specs/VertexAISpecs.py} (100%) rename src/backend/langflow/components/{llms => model_specs}/__init__.py (100%) rename src/backend/langflow/components/models/{AmazonBedrock.py => AmazonBedrockModel.py} (98%) rename src/backend/langflow/components/models/{Anthropic.py => AnthropicModel.py} (95%) rename src/backend/langflow/components/models/{AzureOpenAI.py => AzureOpenAIModel.py} (98%) rename src/backend/langflow/components/models/{BaiduQianfanChat.py => BaiduQianfanChatModel.py} (100%) rename src/backend/langflow/components/models/{CTransformers.py => CTransformersModel.py} (87%) rename src/backend/langflow/components/models/{Cohere.py => CohereModel.py} (51%) rename src/backend/langflow/components/models/{GoogleGenerativeAI.py => GoogleGenerativeAIModel.py} (95%) rename src/backend/langflow/components/models/{HuggingFace.py => HuggingFaceModel.py} (100%) rename src/backend/langflow/components/models/{LlamaCpp.py => LlamaCppModel.py} (95%) rename src/backend/langflow/components/models/{Ollama.py => OllamaModel.py} (99%) rename src/backend/langflow/components/models/{OpenAI.py => OpenAIModel.py} (100%) rename src/backend/langflow/components/models/{VertexAi.py => VertexAiModel.py} (98%) diff --git a/src/backend/langflow/components/llms/AmazonBedrock.py b/src/backend/langflow/components/model_specs/AmazonBedrockSpecs.py similarity index 100% rename from src/backend/langflow/components/llms/AmazonBedrock.py rename to src/backend/langflow/components/model_specs/AmazonBedrockSpecs.py diff --git a/src/backend/langflow/components/llms/AnthropicLLM.py b/src/backend/langflow/components/model_specs/AnthropicLLMSpecs.py similarity index 100% rename from src/backend/langflow/components/llms/AnthropicLLM.py rename to src/backend/langflow/components/model_specs/AnthropicLLMSpecs.py diff --git a/src/backend/langflow/components/llms/Anthropic.py b/src/backend/langflow/components/model_specs/AnthropicSpecs.py similarity index 100% rename from src/backend/langflow/components/llms/Anthropic.py rename to src/backend/langflow/components/model_specs/AnthropicSpecs.py diff --git a/src/backend/langflow/components/llms/AzureChatOpenAI.py b/src/backend/langflow/components/model_specs/AzureChatOpenAISpecs.py similarity index 100% rename from src/backend/langflow/components/llms/AzureChatOpenAI.py rename to src/backend/langflow/components/model_specs/AzureChatOpenAISpecs.py diff --git a/src/backend/langflow/components/llms/BaiduQianfanChatEndpoints.py b/src/backend/langflow/components/model_specs/BaiduQianfanChatEndpointsSpecs.py similarity index 100% rename from src/backend/langflow/components/llms/BaiduQianfanChatEndpoints.py rename to src/backend/langflow/components/model_specs/BaiduQianfanChatEndpointsSpecs.py diff --git a/src/backend/langflow/components/llms/BaiduQianfanLLMEndpoints.py b/src/backend/langflow/components/model_specs/BaiduQianfanLLMEndpointsSpecs.py similarity index 100% rename from src/backend/langflow/components/llms/BaiduQianfanLLMEndpoints.py rename to src/backend/langflow/components/model_specs/BaiduQianfanLLMEndpointsSpecs.py diff --git a/src/backend/langflow/components/llms/CTransformers.py b/src/backend/langflow/components/model_specs/CTransformersSpecs.py similarity index 100% rename from src/backend/langflow/components/llms/CTransformers.py rename to src/backend/langflow/components/model_specs/CTransformersSpecs.py diff --git a/src/backend/langflow/components/llms/ChatAnthropic.py b/src/backend/langflow/components/model_specs/ChatAnthropicSpecs.py similarity index 100% rename from src/backend/langflow/components/llms/ChatAnthropic.py rename to src/backend/langflow/components/model_specs/ChatAnthropicSpecs.py diff --git a/src/backend/langflow/components/llms/ChatLiteLLM.py b/src/backend/langflow/components/model_specs/ChatLiteLLMSpecs.py similarity index 100% rename from src/backend/langflow/components/llms/ChatLiteLLM.py rename to src/backend/langflow/components/model_specs/ChatLiteLLMSpecs.py diff --git a/src/backend/langflow/components/llms/ChatOllamaEndpoint.py b/src/backend/langflow/components/model_specs/ChatOllamaEndpointSpecs.py similarity index 100% rename from src/backend/langflow/components/llms/ChatOllamaEndpoint.py rename to src/backend/langflow/components/model_specs/ChatOllamaEndpointSpecs.py diff --git a/src/backend/langflow/components/llms/ChatOpenAI.py b/src/backend/langflow/components/model_specs/ChatOpenAISpecs.py similarity index 100% rename from src/backend/langflow/components/llms/ChatOpenAI.py rename to src/backend/langflow/components/model_specs/ChatOpenAISpecs.py diff --git a/src/backend/langflow/components/llms/ChatVertexAI.py b/src/backend/langflow/components/model_specs/ChatVertexAISpecs.py similarity index 100% rename from src/backend/langflow/components/llms/ChatVertexAI.py rename to src/backend/langflow/components/model_specs/ChatVertexAISpecs.py diff --git a/src/backend/langflow/components/llms/Cohere.py b/src/backend/langflow/components/model_specs/CohereSpecs.py similarity index 100% rename from src/backend/langflow/components/llms/Cohere.py rename to src/backend/langflow/components/model_specs/CohereSpecs.py diff --git a/src/backend/langflow/components/llms/GoogleGenerativeAI.py b/src/backend/langflow/components/model_specs/GoogleGenerativeAISpecs.py similarity index 100% rename from src/backend/langflow/components/llms/GoogleGenerativeAI.py rename to src/backend/langflow/components/model_specs/GoogleGenerativeAISpecs.py diff --git a/src/backend/langflow/components/llms/HuggingFaceEndpoints.py b/src/backend/langflow/components/model_specs/HuggingFaceEndpointsSpecs.py similarity index 100% rename from src/backend/langflow/components/llms/HuggingFaceEndpoints.py rename to src/backend/langflow/components/model_specs/HuggingFaceEndpointsSpecs.py diff --git a/src/backend/langflow/components/llms/LlamaCpp.py b/src/backend/langflow/components/model_specs/LlamaCppSpecs.py similarity index 100% rename from src/backend/langflow/components/llms/LlamaCpp.py rename to src/backend/langflow/components/model_specs/LlamaCppSpecs.py diff --git a/src/backend/langflow/components/llms/OllamaLLM.py b/src/backend/langflow/components/model_specs/OllamaLLMSpecs.py similarity index 100% rename from src/backend/langflow/components/llms/OllamaLLM.py rename to src/backend/langflow/components/model_specs/OllamaLLMSpecs.py diff --git a/src/backend/langflow/components/llms/VertexAI.py b/src/backend/langflow/components/model_specs/VertexAISpecs.py similarity index 100% rename from src/backend/langflow/components/llms/VertexAI.py rename to src/backend/langflow/components/model_specs/VertexAISpecs.py diff --git a/src/backend/langflow/components/llms/__init__.py b/src/backend/langflow/components/model_specs/__init__.py similarity index 100% rename from src/backend/langflow/components/llms/__init__.py rename to src/backend/langflow/components/model_specs/__init__.py diff --git a/src/backend/langflow/components/models/AmazonBedrock.py b/src/backend/langflow/components/models/AmazonBedrockModel.py similarity index 98% rename from src/backend/langflow/components/models/AmazonBedrock.py rename to src/backend/langflow/components/models/AmazonBedrockModel.py index 8465ca877..a2e008e2e 100644 --- a/src/backend/langflow/components/models/AmazonBedrock.py +++ b/src/backend/langflow/components/models/AmazonBedrockModel.py @@ -1,13 +1,13 @@ from typing import Optional from langchain_community.chat_models.bedrock import BedrockChat -from langflow.field_typing import Text from langflow import CustomComponent +from langflow.field_typing import Text class AmazonBedrockComponent(CustomComponent): - display_name: str = "Amazon Bedrock model" + display_name: str = "Amazon Bedrock Model" description: str = "Generate text using LLM model from Amazon Bedrock." def build_config(self): diff --git a/src/backend/langflow/components/models/Anthropic.py b/src/backend/langflow/components/models/AnthropicModel.py similarity index 95% rename from src/backend/langflow/components/models/Anthropic.py rename to src/backend/langflow/components/models/AnthropicModel.py index 86af33ede..793bec46a 100644 --- a/src/backend/langflow/components/models/Anthropic.py +++ b/src/backend/langflow/components/models/AnthropicModel.py @@ -2,14 +2,13 @@ from typing import Optional from langchain_community.chat_models.anthropic import ChatAnthropic from pydantic.v1 import SecretStr + +from langflow import CustomComponent from langflow.field_typing import Text -from langflow import CustomComponent - - class AnthropicLLM(CustomComponent): - display_name: str = "Anthropic model" + display_name: str = "AnthropicModel" description: str = "Generate text using Anthropic Chat&Completion large language models." def build_config(self): @@ -67,7 +66,7 @@ class AnthropicLLM(CustomComponent): try: output = ChatAnthropic( model_name=model, - anthropic_api_key=SecretStr(anthropic_api_key) if anthropic_api_key else None, + anthropic_api_key=(SecretStr(anthropic_api_key) if anthropic_api_key else None), max_tokens_to_sample=max_tokens, # type: ignore temperature=temperature, anthropic_api_url=api_endpoint, diff --git a/src/backend/langflow/components/models/AzureOpenAI.py b/src/backend/langflow/components/models/AzureOpenAIModel.py similarity index 98% rename from src/backend/langflow/components/models/AzureOpenAI.py rename to src/backend/langflow/components/models/AzureOpenAIModel.py index f640be109..06fbd444d 100644 --- a/src/backend/langflow/components/models/AzureOpenAI.py +++ b/src/backend/langflow/components/models/AzureOpenAIModel.py @@ -7,7 +7,7 @@ from langflow import CustomComponent class AzureChatOpenAIComponent(CustomComponent): - display_name: str = "AzureOpenAI model" + display_name: str = "AzureOpenAIModel" description: str = "Generate text using LLM model from Azure OpenAI." documentation: str = "https://python.langchain.com/docs/integrations/llms/azure_openai" beta = False diff --git a/src/backend/langflow/components/models/BaiduQianfanChat.py b/src/backend/langflow/components/models/BaiduQianfanChatModel.py similarity index 100% rename from src/backend/langflow/components/models/BaiduQianfanChat.py rename to src/backend/langflow/components/models/BaiduQianfanChatModel.py diff --git a/src/backend/langflow/components/models/CTransformers.py b/src/backend/langflow/components/models/CTransformersModel.py similarity index 87% rename from src/backend/langflow/components/models/CTransformers.py rename to src/backend/langflow/components/models/CTransformersModel.py index 16cb8ff1d..932b1b351 100644 --- a/src/backend/langflow/components/models/CTransformers.py +++ b/src/backend/langflow/components/models/CTransformersModel.py @@ -1,13 +1,13 @@ from typing import Dict, Optional from langchain_community.llms.ctransformers import CTransformers -from langflow.field_typing import Text from langflow import CustomComponent +from langflow.field_typing import Text class CTransformersComponent(CustomComponent): - display_name = "CTransformers model" + display_name = "CTransformersModel" description = "Generate text using CTransformers LLM models" documentation = "https://python.langchain.com/docs/modules/model_io/models/llms/integrations/ctransformers" @@ -31,7 +31,14 @@ class CTransformersComponent(CustomComponent): "inputs": {"display_name": "Input"}, } - def build(self, model: str, model_file: str, inputs: str, model_type: str, config: Optional[Dict] = None) -> Text: + def build( + self, + model: str, + model_file: str, + inputs: str, + model_type: str, + config: Optional[Dict] = None, + ) -> Text: output = CTransformers(model=model, model_file=model_file, model_type=model_type, config=config) message = output.invoke(inputs) result = message.content if hasattr(message, "content") else message diff --git a/src/backend/langflow/components/models/Cohere.py b/src/backend/langflow/components/models/CohereModel.py similarity index 51% rename from src/backend/langflow/components/models/Cohere.py rename to src/backend/langflow/components/models/CohereModel.py index 3342033b1..3912cb855 100644 --- a/src/backend/langflow/components/models/Cohere.py +++ b/src/backend/langflow/components/models/CohereModel.py @@ -1,18 +1,33 @@ from langchain_community.chat_models.cohere import ChatCohere + from langflow import CustomComponent from langflow.field_typing import Text class CohereComponent(CustomComponent): - display_name = "Cohere model" + display_name = "CohereModel" description = "Generate text using Cohere large language models." documentation = "https://python.langchain.com/docs/modules/model_io/models/llms/integrations/cohere" def build_config(self): return { - "cohere_api_key": {"display_name": "Cohere API Key", "type": "password", "password": True}, - "max_tokens": {"display_name": "Max Tokens", "default": 256, "type": "int", "show": True}, - "temperature": {"display_name": "Temperature", "default": 0.75, "type": "float", "show": True}, + "cohere_api_key": { + "display_name": "Cohere API Key", + "type": "password", + "password": True, + }, + "max_tokens": { + "display_name": "Max Tokens", + "default": 256, + "type": "int", + "show": True, + }, + "temperature": { + "display_name": "Temperature", + "default": 0.75, + "type": "float", + "show": True, + }, "inputs": {"display_name": "Input"}, } @@ -23,8 +38,13 @@ class CohereComponent(CustomComponent): max_tokens: int = 256, temperature: float = 0.75, ) -> Text: - output = ChatCohere(cohere_api_key=cohere_api_key, max_tokens=max_tokens, temperature=temperature) + output = ChatCohere( + cohere_api_key=cohere_api_key, + max_tokens=max_tokens, + temperature=temperature, + ) message = output.invoke(inputs) result = message.content if hasattr(message, "content") else message self.status = result return result + return result diff --git a/src/backend/langflow/components/models/GoogleGenerativeAI.py b/src/backend/langflow/components/models/GoogleGenerativeAIModel.py similarity index 95% rename from src/backend/langflow/components/models/GoogleGenerativeAI.py rename to src/backend/langflow/components/models/GoogleGenerativeAIModel.py index a3756a55a..ce967bd57 100644 --- a/src/backend/langflow/components/models/GoogleGenerativeAI.py +++ b/src/backend/langflow/components/models/GoogleGenerativeAIModel.py @@ -1,14 +1,14 @@ from typing import Optional from langchain_google_genai import ChatGoogleGenerativeAI # type: ignore -from langflow import CustomComponent -from langflow.field_typing import RangeSpec from pydantic.v1.types import SecretStr -from langflow.field_typing import Text + +from langflow import CustomComponent +from langflow.field_typing import RangeSpec, Text class GoogleGenerativeAIComponent(CustomComponent): - display_name: str = "Google Generative AI model" + display_name: str = "Google Generative AIModel" description: str = "Generate text using Google Generative AI to generate text." documentation: str = "http://docs.langflow.org/components/custom" diff --git a/src/backend/langflow/components/models/HuggingFace.py b/src/backend/langflow/components/models/HuggingFaceModel.py similarity index 100% rename from src/backend/langflow/components/models/HuggingFace.py rename to src/backend/langflow/components/models/HuggingFaceModel.py diff --git a/src/backend/langflow/components/models/LlamaCpp.py b/src/backend/langflow/components/models/LlamaCppModel.py similarity index 95% rename from src/backend/langflow/components/models/LlamaCpp.py rename to src/backend/langflow/components/models/LlamaCppModel.py index 925703007..af0de5159 100644 --- a/src/backend/langflow/components/models/LlamaCpp.py +++ b/src/backend/langflow/components/models/LlamaCppModel.py @@ -1,11 +1,13 @@ -from typing import Optional, List, Dict, Any -from langflow import CustomComponent +from typing import Any, Dict, List, Optional + from langchain_community.llms.llamacpp import LlamaCpp + +from langflow import CustomComponent from langflow.field_typing import Text class LlamaCppComponent(CustomComponent): - display_name = "LlamaCpp model" + display_name = "LlamaCppModel" description = "Generate text using llama.cpp model." documentation = "https://python.langchain.com/docs/modules/model_io/models/llms/integrations/llamacpp" @@ -17,7 +19,10 @@ class LlamaCppComponent(CustomComponent): "echo": {"display_name": "Echo", "advanced": True}, "f16_kv": {"display_name": "F16 KV", "advanced": True}, "grammar_path": {"display_name": "Grammar Path", "advanced": True}, - "last_n_tokens_size": {"display_name": "Last N Tokens Size", "advanced": True}, + "last_n_tokens_size": { + "display_name": "Last N Tokens Size", + "advanced": True, + }, "logits_all": {"display_name": "Logits All", "advanced": True}, "logprobs": {"display_name": "Logprobs", "advanced": True}, "lora_base": {"display_name": "Lora Base", "advanced": True}, @@ -134,3 +139,5 @@ class LlamaCppComponent(CustomComponent): result = message.content if hasattr(message, "content") else message self.status = result return result + self.status = result + return result diff --git a/src/backend/langflow/components/models/Ollama.py b/src/backend/langflow/components/models/OllamaModel.py similarity index 99% rename from src/backend/langflow/components/models/Ollama.py rename to src/backend/langflow/components/models/OllamaModel.py index 496dc1a15..129f96482 100644 --- a/src/backend/langflow/components/models/Ollama.py +++ b/src/backend/langflow/components/models/OllamaModel.py @@ -12,7 +12,7 @@ from langflow.field_typing import Text class ChatOllamaComponent(CustomComponent): - display_name = "ChatOllama model" + display_name = "ChatOllamaModel" description = "Generate text using Local LLM for chat with Ollama." def build_config(self) -> dict: diff --git a/src/backend/langflow/components/models/OpenAI.py b/src/backend/langflow/components/models/OpenAIModel.py similarity index 100% rename from src/backend/langflow/components/models/OpenAI.py rename to src/backend/langflow/components/models/OpenAIModel.py diff --git a/src/backend/langflow/components/models/VertexAi.py b/src/backend/langflow/components/models/VertexAiModel.py similarity index 98% rename from src/backend/langflow/components/models/VertexAi.py rename to src/backend/langflow/components/models/VertexAiModel.py index 65f64578f..eee804e02 100644 --- a/src/backend/langflow/components/models/VertexAi.py +++ b/src/backend/langflow/components/models/VertexAiModel.py @@ -7,7 +7,7 @@ from langflow.field_typing import Text class ChatVertexAIComponent(CustomComponent): - display_name = "ChatVertexAI model" + display_name = "ChatVertexAIModel" description = "Generate text using Vertex AI Chat large language models API." def build_config(self): diff --git a/src/backend/langflow/graph/vertex/types.py b/src/backend/langflow/graph/vertex/types.py index 705b5d114..cec1f6caf 100644 --- a/src/backend/langflow/graph/vertex/types.py +++ b/src/backend/langflow/graph/vertex/types.py @@ -67,7 +67,7 @@ class LLMVertex(StatelessVertex): class_built_object = None def __init__(self, data: Dict, graph, params: Optional[Dict] = None): - super().__init__(data, graph=graph, base_type="llms", params=params) + super().__init__(data, graph=graph, base_type="models", params=params) self.steps: List[Callable] = [self._custom_build] async def _custom_build(self, *args, **kwargs): diff --git a/src/backend/langflow/interface/importing/utils.py b/src/backend/langflow/interface/importing/utils.py index 62e1b5e42..d9d9198b6 100644 --- a/src/backend/langflow/interface/importing/utils.py +++ b/src/backend/langflow/interface/importing/utils.py @@ -35,7 +35,7 @@ def import_by_type(_type: str, name: str) -> Any: func_dict = { "agents": import_agent, "prompts": import_prompt, - "llms": {"llm": import_llm, "chat": import_chat_llm}, + "models": {"llm": import_llm, "chat": import_chat_llm}, "tools": import_tool, "chains": import_chain, "toolkits": import_toolkit, @@ -50,7 +50,7 @@ def import_by_type(_type: str, name: str) -> Any: "retrievers": import_retriever, "custom_components": import_custom_component, } - if _type == "llms": + if _type == "models": key = "chat" if "chat" in name.lower() else "llm" loaded_func = func_dict[_type][key] # type: ignore else: diff --git a/src/backend/langflow/interface/initialize/loading.py b/src/backend/langflow/interface/initialize/loading.py index b18f8c658..83bd67321 100644 --- a/src/backend/langflow/interface/initialize/loading.py +++ b/src/backend/langflow/interface/initialize/loading.py @@ -19,7 +19,11 @@ from langflow.interface.custom.utils import get_function from langflow.interface.custom_lists import CUSTOM_NODES from langflow.interface.importing.utils import import_by_type from langflow.interface.initialize.llm import initialize_vertexai -from langflow.interface.initialize.utils import handle_format_kwargs, handle_node_type, handle_partial_variables +from langflow.interface.initialize.utils import ( + handle_format_kwargs, + handle_node_type, + handle_partial_variables, +) from langflow.interface.initialize.vector_store import vecstore_initializer from langflow.interface.output_parsers.base import output_parser_creator from langflow.interface.retrievers.base import retriever_creator @@ -105,7 +109,7 @@ async def instantiate_based_on_type(class_object, base_type, node_type, params, return instantiate_chains(node_type, class_object, params) elif base_type == "output_parsers": return instantiate_output_parser(node_type, class_object, params) - elif base_type == "llms": + elif base_type == "models": return instantiate_llm(node_type, class_object, params) elif base_type == "retrievers": return instantiate_retriever(node_type, class_object, params) diff --git a/src/backend/langflow/interface/llms/base.py b/src/backend/langflow/interface/llms/base.py index 4b0654a1a..ba611da8d 100644 --- a/src/backend/langflow/interface/llms/base.py +++ b/src/backend/langflow/interface/llms/base.py @@ -1,16 +1,16 @@ from typing import Dict, List, Optional, Type +from loguru import logger + from langflow.interface.base import LangChainTypeCreator from langflow.interface.custom_lists import llm_type_to_cls_dict from langflow.services.deps import get_settings_service - from langflow.template.frontend_node.llms import LLMFrontendNode -from loguru import logger from langflow.utils.util import build_template_from_class class LLMCreator(LangChainTypeCreator): - type_name: str = "llms" + type_name: str = "models" @property def frontend_node_class(self) -> Type[LLMFrontendNode]: