From 28c2585415ee19d5218b5eee5c7178f6edfe39dd Mon Sep 17 00:00:00 2001 From: Gabriel Luiz Freitas Almeida Date: Tue, 7 May 2024 22:47:21 -0300 Subject: [PATCH] =?UTF-8?q?=E2=9C=A8=20(openai=5Fconstants.py):=20add=20a?= =?UTF-8?q?=20new=20file=20to=20define=20constant=20MODEL=5FNAMES=20for=20?= =?UTF-8?q?OpenAI=20models=20(#1858)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * ✨ (openai_constants.py): add a new file to define constant MODEL_NAMES for OpenAI models ♻️ (ChatOpenAISpecs.py, OpenAIModel.py): refactor to use MODEL_NAMES constant from openai_constants.py for consistency and easier maintenance * ✨ (IDGenerator.py): update key name from 'real_time_refresh' to 'refresh_button' for better clarity and consistency --- .../langflow/base/models/openai_constants.py | 1 + .../langflow/components/helpers/IDGenerator.py | 2 +- .../components/model_specs/ChatOpenAISpecs.py | 18 +++--------------- .../langflow/components/models/OpenAIModel.py | 12 ++---------- 4 files changed, 7 insertions(+), 26 deletions(-) create mode 100644 src/backend/base/langflow/base/models/openai_constants.py diff --git a/src/backend/base/langflow/base/models/openai_constants.py b/src/backend/base/langflow/base/models/openai_constants.py new file mode 100644 index 000000000..89ad8425e --- /dev/null +++ b/src/backend/base/langflow/base/models/openai_constants.py @@ -0,0 +1 @@ +MODEL_NAMES = ["gpt-4-turbo", "gpt-4-turbo-preview", "gpt-3.5-turbo", "gpt-3.5-turbo-0125"] diff --git a/src/backend/base/langflow/components/helpers/IDGenerator.py b/src/backend/base/langflow/components/helpers/IDGenerator.py index 5778c4c22..d10574eef 100644 --- a/src/backend/base/langflow/components/helpers/IDGenerator.py +++ b/src/backend/base/langflow/components/helpers/IDGenerator.py @@ -23,7 +23,7 @@ class UUIDGeneratorComponent(CustomComponent): return { "unique_id": { "display_name": "Value", - "real_time_refresh": True, + "refresh_button": True, } } diff --git a/src/backend/base/langflow/components/model_specs/ChatOpenAISpecs.py b/src/backend/base/langflow/components/model_specs/ChatOpenAISpecs.py index 704090620..e37eacc77 100644 --- a/src/backend/base/langflow/components/model_specs/ChatOpenAISpecs.py +++ b/src/backend/base/langflow/components/model_specs/ChatOpenAISpecs.py @@ -1,9 +1,9 @@ from typing import Optional -from langflow.field_typing import BaseLanguageModel from langchain_community.chat_models.openai import ChatOpenAI -from langflow.field_typing import NestedDict +from langflow.base.models.openai_constants import MODEL_NAMES +from langflow.field_typing import BaseLanguageModel, NestedDict from langflow.interface.custom.custom_component import CustomComponent @@ -24,19 +24,7 @@ class ChatOpenAIComponent(CustomComponent): "advanced": True, "required": False, }, - "model_name": { - "display_name": "Model Name", - "advanced": False, - "required": False, - "options": [ - "gpt-4-turbo-preview", - "gpt-4-0125-preview", - "gpt-4-1106-preview", - "gpt-4-vision-preview", - "gpt-3.5-turbo-0125", - "gpt-3.5-turbo-1106", - ], - }, + "model_name": {"display_name": "Model Name", "advanced": False, "options": MODEL_NAMES}, "openai_api_base": { "display_name": "OpenAI API Base", "advanced": False, diff --git a/src/backend/base/langflow/components/models/OpenAIModel.py b/src/backend/base/langflow/components/models/OpenAIModel.py index 641eeb755..a37caefc3 100644 --- a/src/backend/base/langflow/components/models/OpenAIModel.py +++ b/src/backend/base/langflow/components/models/OpenAIModel.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.base.models.openai_constants import MODEL_NAMES from langflow.field_typing import NestedDict, Text @@ -39,16 +40,7 @@ class OpenAIModelComponent(LCModelComponent): "model_name": { "display_name": "Model Name", "advanced": False, - "options": [ - "gpt-4-turbo-2024-04-09", - "gpt-4-turbo-preview", - "gpt-3.5-turbo", - "gpt-4-0125-preview", - "gpt-4-1106-preview", - "gpt-4-vision-preview", - "gpt-3.5-turbo-0125", - "gpt-3.5-turbo-1106", - ], + "options": MODEL_NAMES, "value": "gpt-4-turbo-preview", }, "openai_api_base": {