From 788d40f26b0dc39d6f53db6609b9617690d7fee4 Mon Sep 17 00:00:00 2001 From: Vinod Kiran Date: Fri, 12 Apr 2024 17:16:10 +0530 Subject: [PATCH] Feature/externalize model list (#2113) * fixes * test json * test json * externalize model list * externalize model list * correcting awsChatBedRock Name * lint fixes * externalize models * externalize chat models * externalize chat models * externalize llm models * externalize llm models * lint fixes * addition of models for ChatMistral * updating version numbers for all imapacted nodes. * marketplace template updates * update embeddings, marketplaces, add chatCohere * config changes for new env variable * removal of local models.json * update models json file --------- Co-authored-by: Henry --- CONTRIBUTING-ZH.md | 1 + CONTRIBUTING.md | 1 + docker/.env.example | 6 +- docker/docker-compose.yml | 1 + .../chatmodels/AWSBedrock/AWSChatBedrock.ts | 69 ++--- .../AzureChatOpenAI/AzureChatOpenAI.ts | 39 +-- .../AzureChatOpenAI_LlamaIndex.ts | 36 +-- .../chatmodels/ChatAnthropic/ChatAnthropic.ts | 50 +--- .../ChatAnthropic/ChatAnthropic_LlamaIndex.ts | 38 +-- .../nodes/chatmodels/ChatCohere/ChatCohere.ts | 87 ++++++ .../nodes/chatmodels/ChatCohere/Cohere.svg | 1 + .../ChatGoogleGenerativeAI.ts | 21 +- .../ChatGooglePaLM/ChatGooglePaLM.ts | 24 +- .../ChatGoogleVertexAI/ChatGoogleVertexAI.ts | 36 +-- .../ChatHuggingFace/ChatHuggingFace.ts | 3 +- .../chatmodels/ChatMistral/ChatMistral.ts | 17 +- .../nodes/chatmodels/ChatOpenAI/ChatOpenAI.ts | 80 +----- .../ChatOpenAI/ChatOpenAI_LlamaIndex.ts | 72 +---- .../ChatOpenAICustom/ChatOpenAICustom.ts | 2 +- .../components/nodes/chatmodels/Groq/Groq.ts | 2 +- .../AWSBedrockEmbedding.ts | 64 ++--- .../CohereEmbedding/CohereEmbedding.ts | 55 +--- .../GoogleGenerativeAIEmbedding.ts | 21 +- .../GooglePaLMEmbedding.ts | 24 +- .../GoogleVertexAIEmbedding.ts | 32 +-- .../MistralEmbedding/MistralEmbedding.ts | 23 +- .../OpenAIEmbedding/OpenAIEmbedding.ts | 32 +-- .../OpenAIEmbedding_LlamaIndex.ts | 32 +-- .../VoyageAIEmbedding/VoyageAIEmbedding.ts | 40 +-- .../nodes/llms/AWSBedrock/AWSBedrock.ts | 68 ++--- .../nodes/llms/Azure OpenAI/AzureOpenAI.ts | 76 +----- .../components/nodes/llms/Cohere/Cohere.ts | 43 +-- .../nodes/llms/GooglePaLM/GooglePaLM.ts | 24 +- .../llms/GoogleVertexAI/GoogleVertexAI.ts | 41 +-- .../components/nodes/llms/OpenAI/OpenAI.ts | 32 +-- packages/components/src/modelLoader.ts | 43 +++ packages/server/.env.example | 6 +- .../chatflows/API Agent OpenAI.json | 144 +--------- .../marketplaces/chatflows/API Agent.json | 212 ++------------- .../Advanced Structured Output Parser.json | 68 +---- .../marketplaces/chatflows/Antonym.json | 68 +---- .../marketplaces/chatflows/AutoGPT.json | 88 +----- .../marketplaces/chatflows/BabyAGI.json | 88 +----- .../marketplaces/chatflows/CSV Agent.json | 68 +---- .../chatflows/Chat with a Podcast.json | 88 +----- .../marketplaces/chatflows/ChatGPTPlugin.json | 76 +----- .../marketplaces/chatflows/Claude LLM.json | 38 +-- .../chatflows/Context Chat Engine.json | 143 +--------- .../chatflows/Conversational Agent.json | 76 +----- .../Conversational Retrieval QA Chain.json | 88 +----- .../chatflows/Flowise Docs QnA.json | 88 +----- .../server/marketplaces/chatflows/IfElse.json | 108 +------- .../chatflows/Image Generation.json | 68 +---- .../chatflows/Input Moderation.json | 68 +---- .../chatflows/List Output Parser.json | 68 +---- .../chatflows/Long Term Memory.json | 88 +----- .../chatflows/Metadata Filter.json | 88 +----- .../chatflows/Multi Prompt Chain.json | 68 +---- .../chatflows/Multi Retrieval QA Chain.json | 88 +----- .../chatflows/Multiple VectorDB.json | 252 ++---------------- .../marketplaces/chatflows/OpenAI Agent.json | 76 +----- .../Prompt Chaining with VectorStore.json | 156 +---------- .../chatflows/Prompt Chaining.json | 40 +-- .../marketplaces/chatflows/Query Engine.json | 102 +------ .../marketplaces/chatflows/ReAct Agent.json | 76 +----- .../marketplaces/chatflows/SQL DB Chain.json | 68 +---- .../marketplaces/chatflows/SQL Prompt.json | 204 +------------- .../chatflows/Simple Chat Engine.json | 24 +- .../chatflows/Simple Conversation Chain.json | 68 +---- .../chatflows/Simple LLM Chain.json | 20 +- .../chatflows/Structured Output Parser.json | 68 +---- .../chatflows/SubQuestion Query Engine.json | 130 ++------- .../marketplaces/chatflows/Translator.json | 68 +---- .../marketplaces/chatflows/WebBrowser.json | 166 ++---------- .../marketplaces/chatflows/WebPage QnA.json | 90 +------ packages/server/src/commands/start.ts | 6 +- 76 files changed, 789 insertions(+), 4044 deletions(-) create mode 100644 packages/components/nodes/chatmodels/ChatCohere/ChatCohere.ts create mode 100644 packages/components/nodes/chatmodels/ChatCohere/Cohere.svg create mode 100644 packages/components/src/modelLoader.ts diff --git a/CONTRIBUTING-ZH.md b/CONTRIBUTING-ZH.md index 13c36ca9f43..92b89718566 100644 --- a/CONTRIBUTING-ZH.md +++ b/CONTRIBUTING-ZH.md @@ -141,6 +141,7 @@ Flowise 支持不同的环境变量来配置您的实例。您可以在 `package | SECRETKEY_PATH | 保存加密密钥（用于加密/解密凭据）的位置 | 字符串 | `your-path/Flowise/packages/server` | | FLOWISE_SECRETKEY_OVERWRITE | 加密密钥用于替代存储在 SECRETKEY_PATH 中的密钥 | 字符串 | | DISABLE_FLOWISE_TELEMETRY | 关闭遥测 | 字符串 | +| MODEL_LIST_CONFIG_JSON | 加载模型的位置 | 字符 | `/your_model_list_config_file_path` | 您也可以在使用 `npx` 时指定环境变量。例如： diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index ccf1379a171..a17d8988020 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -147,6 +147,7 @@ Flowise support different environment variables to configure your instance. You | SECRETKEY_PATH | Location where encryption key (used to encrypt/decrypt credentials) is saved | String | `your-path/Flowise/packages/server` | | FLOWISE_SECRETKEY_OVERWRITE | Encryption key to be used instead of the key stored in SECRETKEY_PATH | String | | DISABLE_FLOWISE_TELEMETRY | Turn off telemetry | Boolean | +| MODEL_LIST_CONFIG_JSON | File path to load list of models from your local config file | String | `/your_model_list_config_file_path` | You can also specify the env variables when using `npx`. For example: diff --git a/docker/.env.example b/docker/.env.example index ee972c9a7a4..dfed336c560 100644 --- a/docker/.env.example +++ b/docker/.env.example @@ -33,4 +33,8 @@ BLOB_STORAGE_PATH=/root/.flowise/storage # LANGCHAIN_API_KEY=your_api_key # LANGCHAIN_PROJECT=your_project -# DISABLE_FLOWISE_TELEMETRY=true \ No newline at end of file +# DISABLE_FLOWISE_TELEMETRY=true + +# Uncomment the following line to enable model list config, load the list of models from your local config file +# see https://raw.githubusercontent.com/FlowiseAI/Flowise/main/packages/components/models.json for the format +# MODEL_LIST_CONFIG_JSON=/your_model_list_config_file_path \ No newline at end of file diff --git a/docker/docker-compose.yml b/docker/docker-compose.yml index 4bee2e394ae..c23931d5794 100644 --- a/docker/docker-compose.yml +++ b/docker/docker-compose.yml @@ -28,6 +28,7 @@ services: - LOG_PATH=${LOG_PATH} - BLOB_STORAGE_PATH=${BLOB_STORAGE_PATH} - DISABLE_FLOWISE_TELEMETRY=${DISABLE_FLOWISE_TELEMETRY} + - MODEL_LIST_CONFIG_JSON=${MODEL_LIST_CONFIG_JSON} ports: - '${PORT}:${PORT}' volumes: diff --git a/packages/components/nodes/chatmodels/AWSBedrock/AWSChatBedrock.ts b/packages/components/nodes/chatmodels/AWSBedrock/AWSChatBedrock.ts index c4f7c04451c..81bdc091a67 100644 --- a/packages/components/nodes/chatmodels/AWSBedrock/AWSChatBedrock.ts +++ b/packages/components/nodes/chatmodels/AWSBedrock/AWSChatBedrock.ts @@ -1,9 +1,10 @@ import { BaseCache } from '@langchain/core/caches' import { BaseChatModelParams } from '@langchain/core/language_models/chat_models' import { BaseBedrockInput } from '@langchain/community/dist/utils/bedrock' -import { ICommonObject, IMultiModalOption, INode, INodeData, INodeParams } from '../../../src/Interface' +import { ICommonObject, IMultiModalOption, INode, INodeData, INodeOptionsValue, INodeParams } from '../../../src/Interface' import { getBaseClasses, getCredentialData, getCredentialParam } from '../../../src/utils' import { BedrockChat } from './FlowiseAWSChatBedrock' +import { getModels, getRegions, MODEL_TYPE } from '../../../src/modelLoader' /** * @author Michael Connor @@ -23,7 +24,7 @@ class AWSChatBedrock_ChatModels implements INode { constructor() { this.label = 'AWS ChatBedrock' this.name = 'awsChatBedrock' - this.version = 4.0 + this.version = 5.0 this.type = 'AWSChatBedrock' this.icon = 'aws.svg' this.category = 'Chat Models' @@ -46,61 +47,15 @@ class AWSChatBedrock_ChatModels implements INode { { label: 'Region', name: 'region', - type: 'options', - options: [ - { label: 'af-south-1', name: 'af-south-1' }, - { label: 'ap-east-1', name: 'ap-east-1' }, - { label: 'ap-northeast-1', name: 'ap-northeast-1' }, - { label: 'ap-northeast-2', name: 'ap-northeast-2' }, - { label: 'ap-northeast-3', name: 'ap-northeast-3' }, - { label: 'ap-south-1', name: 'ap-south-1' }, - { label: 'ap-south-2', name: 'ap-south-2' }, - { label: 'ap-southeast-1', name: 'ap-southeast-1' }, - { label: 'ap-southeast-2', name: 'ap-southeast-2' }, - { label: 'ap-southeast-3', name: 'ap-southeast-3' }, - { label: 'ap-southeast-4', name: 'ap-southeast-4' }, - { label: 'ap-southeast-5', name: 'ap-southeast-5' }, - { label: 'ap-southeast-6', name: 'ap-southeast-6' }, - { label: 'ca-central-1', name: 'ca-central-1' }, - { label: 'ca-west-1', name: 'ca-west-1' }, - { label: 'cn-north-1', name: 'cn-north-1' }, - { label: 'cn-northwest-1', name: 'cn-northwest-1' }, - { label: 'eu-central-1', name: 'eu-central-1' }, - { label: 'eu-central-2', name: 'eu-central-2' }, - { label: 'eu-north-1', name: 'eu-north-1' }, - { label: 'eu-south-1', name: 'eu-south-1' }, - { label: 'eu-south-2', name: 'eu-south-2' }, - { label: 'eu-west-1', name: 'eu-west-1' }, - { label: 'eu-west-2', name: 'eu-west-2' }, - { label: 'eu-west-3', name: 'eu-west-3' }, - { label: 'il-central-1', name: 'il-central-1' }, - { label: 'me-central-1', name: 'me-central-1' }, - { label: 'me-south-1', name: 'me-south-1' }, - { label: 'sa-east-1', name: 'sa-east-1' }, - { label: 'us-east-1', name: 'us-east-1' }, - { label: 'us-east-2', name: 'us-east-2' }, - { label: 'us-gov-east-1', name: 'us-gov-east-1' }, - { label: 'us-gov-west-1', name: 'us-gov-west-1' }, - { label: 'us-west-1', name: 'us-west-1' }, - { label: 'us-west-2', name: 'us-west-2' } - ], + type: 'asyncOptions', + loadMethod: 'listRegions', default: 'us-east-1' }, { label: 'Model Name', name: 'model', - type: 'options', - options: [ - { label: 'anthropic.claude-3-haiku', name: 'anthropic.claude-3-haiku-20240307-v1:0' }, - { label: 'anthropic.claude-3-sonnet', name: 'anthropic.claude-3-sonnet-20240229-v1:0' }, - { label: 'anthropic.claude-instant-v1', name: 'anthropic.claude-instant-v1' }, - { label: 'anthropic.claude-v2:1', name: 'anthropic.claude-v2:1' }, - { label: 'anthropic.claude-v2', name: 'anthropic.claude-v2' }, - { label: 'meta.llama2-13b-chat-v1', name: 'meta.llama2-13b-chat-v1' }, - { label: 'meta.llama2-70b-chat-v1', name: 'meta.llama2-70b-chat-v1' }, - { label: 'mistral.mistral-7b-instruct-v0:2', name: 'mistral.mistral-7b-instruct-v0:2' }, - { label: 'mistral.mixtral-8x7b-instruct-v0:1', name: 'mistral.mixtral-8x7b-instruct-v0:1' } - ], + type: 'asyncOptions', + loadMethod: 'listModels', default: 'anthropic.claude-3-haiku' }, { @@ -142,6 +97,16 @@ class AWSChatBedrock_ChatModels implements INode { ] } + //@ts-ignore + loadMethods = { + async listModels(): Promise { + return await getModels(MODEL_TYPE.CHAT, 'awsChatBedrock') + }, + async listRegions(): Promise { + return await getRegions(MODEL_TYPE.CHAT, 'awsChatBedrock') + } + } + async init(nodeData: INodeData, _: string, options: ICommonObject): Promise { const iRegion = nodeData.inputs?.region as string const iModel = nodeData.inputs?.model as string diff --git a/packages/components/nodes/chatmodels/AzureChatOpenAI/AzureChatOpenAI.ts b/packages/components/nodes/chatmodels/AzureChatOpenAI/AzureChatOpenAI.ts index 77c7643bdc3..02a522505fb 100644 --- a/packages/components/nodes/chatmodels/AzureChatOpenAI/AzureChatOpenAI.ts +++ b/packages/components/nodes/chatmodels/AzureChatOpenAI/AzureChatOpenAI.ts @@ -1,9 +1,10 @@ import { AzureOpenAIInput, ChatOpenAI as LangchainChatOpenAI, OpenAIChatInput } from '@langchain/openai' import { BaseCache } from '@langchain/core/caches' import { BaseLLMParams } from '@langchain/core/language_models/llms' -import { ICommonObject, IMultiModalOption, INode, INodeData, INodeParams } from '../../../src/Interface' +import { ICommonObject, IMultiModalOption, INode, INodeData, INodeOptionsValue, INodeParams } from '../../../src/Interface' import { getBaseClasses, getCredentialData, getCredentialParam } from '../../../src/utils' import { ChatOpenAI } from '../ChatOpenAI/FlowiseChatOpenAI' +import { getModels, MODEL_TYPE } from '../../../src/modelLoader' class AzureChatOpenAI_ChatModels implements INode { label: string @@ -20,7 +21,7 @@ class AzureChatOpenAI_ChatModels implements INode { constructor() { this.label = 'Azure ChatOpenAI' this.name = 'azureChatOpenAI' - this.version = 3.0 + this.version = 4.0 this.type = 'AzureChatOpenAI' this.icon = 'Azure.svg' this.category = 'Chat Models' @@ -42,31 +43,8 @@ class AzureChatOpenAI_ChatModels implements INode { { label: 'Model Name', name: 'modelName', - type: 'options', - options: [ - { - label: 'gpt-4', - name: 'gpt-4' - }, - { - label: 'gpt-4-32k', - name: 'gpt-4-32k' - }, - { - label: 'gpt-35-turbo', - name: 'gpt-35-turbo' - }, - { - label: 'gpt-35-turbo-16k', - name: 'gpt-35-turbo-16k' - }, - { - label: 'gpt-4-vision-preview', - name: 'gpt-4-vision-preview' - } - ], - default: 'gpt-35-turbo', - optional: true + type: 'asyncOptions', + loadMethod: 'listModels' }, { label: 'Temperature', @@ -151,6 +129,13 @@ class AzureChatOpenAI_ChatModels implements INode { ] } + //@ts-ignore + loadMethods = { + async listModels(): Promise { + return await getModels(MODEL_TYPE.CHAT, 'azureChatOpenAI') + } + } + async init(nodeData: INodeData, _: string, options: ICommonObject): Promise { const modelName = nodeData.inputs?.modelName as string const temperature = nodeData.inputs?.temperature as string diff --git a/packages/components/nodes/chatmodels/AzureChatOpenAI/AzureChatOpenAI_LlamaIndex.ts b/packages/components/nodes/chatmodels/AzureChatOpenAI/AzureChatOpenAI_LlamaIndex.ts index e570b2636ad..bfd1b7ffcf4 100644 --- a/packages/components/nodes/chatmodels/AzureChatOpenAI/AzureChatOpenAI_LlamaIndex.ts +++ b/packages/components/nodes/chatmodels/AzureChatOpenAI/AzureChatOpenAI_LlamaIndex.ts @@ -1,6 +1,7 @@ -import { ICommonObject, INode, INodeData, INodeParams } from '../../../src/Interface' +import { ICommonObject, INode, INodeData, INodeOptionsValue, INodeParams } from '../../../src/Interface' import { getBaseClasses, getCredentialData, getCredentialParam } from '../../../src/utils' import { OpenAI, ALL_AVAILABLE_OPENAI_MODELS } from 'llamaindex' +import { getModels, MODEL_TYPE } from '../../../src/modelLoader' interface AzureOpenAIConfig { apiKey?: string @@ -25,7 +26,7 @@ class AzureChatOpenAI_LlamaIndex_ChatModels implements INode { constructor() { this.label = 'AzureChatOpenAI' this.name = 'azureChatOpenAI_LlamaIndex' - this.version = 1.0 + this.version = 2.0 this.type = 'AzureChatOpenAI' this.icon = 'Azure.svg' this.category = 'Chat Models' @@ -42,27 +43,9 @@ class AzureChatOpenAI_LlamaIndex_ChatModels implements INode { { label: 'Model Name', name: 'modelName', - type: 'options', - options: [ - { - label: 'gpt-4', - name: 'gpt-4' - }, - { - label: 'gpt-4-32k', - name: 'gpt-4-32k' - }, - { - label: 'gpt-3.5-turbo', - name: 'gpt-3.5-turbo' - }, - { - label: 'gpt-3.5-turbo-16k', - name: 'gpt-3.5-turbo-16k' - } - ], - default: 'gpt-3.5-turbo-16k', - optional: true + type: 'asyncOptions', + loadMethod: 'listModels', + default: 'gpt-3.5-turbo-16k' }, { label: 'Temperature', @@ -99,6 +82,13 @@ class AzureChatOpenAI_LlamaIndex_ChatModels implements INode { ] } + //@ts-ignore + loadMethods = { + async listModels(): Promise { + return await getModels(MODEL_TYPE.CHAT, 'azureChatOpenAI_LlamaIndex') + } + } + async init(nodeData: INodeData, _: string, options: ICommonObject): Promise { const modelName = nodeData.inputs?.modelName as keyof typeof ALL_AVAILABLE_OPENAI_MODELS const temperature = nodeData.inputs?.temperature as string diff --git a/packages/components/nodes/chatmodels/ChatAnthropic/ChatAnthropic.ts b/packages/components/nodes/chatmodels/ChatAnthropic/ChatAnthropic.ts index 4c19634e0c9..31ae7af2633 100644 --- a/packages/components/nodes/chatmodels/ChatAnthropic/ChatAnthropic.ts +++ b/packages/components/nodes/chatmodels/ChatAnthropic/ChatAnthropic.ts @@ -1,9 +1,10 @@ import { AnthropicInput, ChatAnthropic as LangchainChatAnthropic } from '@langchain/anthropic' import { BaseCache } from '@langchain/core/caches' import { BaseLLMParams } from '@langchain/core/language_models/llms' -import { ICommonObject, IMultiModalOption, INode, INodeData, INodeParams } from '../../../src/Interface' +import { ICommonObject, IMultiModalOption, INode, INodeData, INodeOptionsValue, INodeParams } from '../../../src/Interface' import { getBaseClasses, getCredentialData, getCredentialParam } from '../../../src/utils' import { ChatAnthropic } from './FlowiseChatAnthropic' +import { getModels, MODEL_TYPE } from '../../../src/modelLoader' class ChatAnthropic_ChatModels implements INode { label: string @@ -20,7 +21,7 @@ class ChatAnthropic_ChatModels implements INode { constructor() { this.label = 'ChatAnthropic' this.name = 'chatAnthropic' - this.version = 5.0 + this.version = 6.0 this.type = 'ChatAnthropic' this.icon = 'Anthropic.svg' this.category = 'Chat Models' @@ -42,41 +43,9 @@ class ChatAnthropic_ChatModels implements INode { { label: 'Model Name', name: 'modelName', - type: 'options', - options: [ - { - label: 'claude-3-haiku', - name: 'claude-3-haiku-20240307', - description: 'Fastest and most compact model, designed for near-instant responsiveness' - }, - { - label: 'claude-3-opus', - name: 'claude-3-opus-20240229', - description: 'Most powerful model for highly complex tasks' - }, - { - label: 'claude-3-sonnet', - name: 'claude-3-sonnet-20240229', - description: 'Ideal balance of intelligence and speed for enterprise workloads' - }, - { - label: 'claude-2.0 (legacy)', - name: 'claude-2.0', - description: 'Claude 2 latest major version, automatically get updates to the model as they are released' - }, - { - label: 'claude-2.1 (legacy)', - name: 'claude-2.1', - description: 'Claude 2 latest full version' - }, - { - label: 'claude-instant-1.2 (legacy)', - name: 'claude-instant-1.2', - description: 'Claude Instant latest major version, automatically get updates to the model as they are released' - } - ], - default: 'claude-3-haiku', - optional: true + type: 'asyncOptions', + loadMethod: 'listModels', + default: 'claude-3-haiku' }, { label: 'Temperature', @@ -122,6 +91,13 @@ class ChatAnthropic_ChatModels implements INode { ] } + //@ts-ignore + loadMethods = { + async listModels(): Promise { + return await getModels(MODEL_TYPE.CHAT, 'chatAnthropic') + } + } + async init(nodeData: INodeData, _: string, options: ICommonObject): Promise { const temperature = nodeData.inputs?.temperature as string const modelName = nodeData.inputs?.modelName as string diff --git a/packages/components/nodes/chatmodels/ChatAnthropic/ChatAnthropic_LlamaIndex.ts b/packages/components/nodes/chatmodels/ChatAnthropic/ChatAnthropic_LlamaIndex.ts index 32605f1f730..2e0e64e5f0a 100644 --- a/packages/components/nodes/chatmodels/ChatAnthropic/ChatAnthropic_LlamaIndex.ts +++ b/packages/components/nodes/chatmodels/ChatAnthropic/ChatAnthropic_LlamaIndex.ts @@ -1,4 +1,5 @@ -import { ICommonObject, INode, INodeData, INodeParams } from '../../../src/Interface' +import { ICommonObject, INode, INodeData, INodeOptionsValue, INodeParams } from '../../../src/Interface' +import { MODEL_TYPE, getModels } from '../../../src/modelLoader' import { getBaseClasses, getCredentialData, getCredentialParam } from '../../../src/utils' import { Anthropic } from 'llamaindex' @@ -18,7 +19,7 @@ class ChatAnthropic_LlamaIndex_ChatModels implements INode { constructor() { this.label = 'ChatAnthropic' this.name = 'chatAnthropic_LlamaIndex' - this.version = 2.0 + this.version = 3.0 this.type = 'ChatAnthropic' this.icon = 'Anthropic.svg' this.category = 'Chat Models' @@ -36,30 +37,8 @@ class ChatAnthropic_LlamaIndex_ChatModels implements INode { label: 'Model Name', name: 'modelName', type: 'options', - options: [ - { - label: 'claude-3-opus', - name: 'claude-3-opus', - description: 'Most powerful model for highly complex tasks' - }, - { - label: 'claude-3-sonnet', - name: 'claude-3-sonnet', - description: 'Ideal balance of intelligence and speed for enterprise workloads' - }, - { - label: 'claude-2.1', - name: 'claude-2.1', - description: 'Claude 2 latest major version, automatically get updates to the model as they are released' - }, - { - label: 'claude-instant-1.2', - name: 'claude-instant-1.2', - description: 'Claude Instant latest major version, automatically get updates to the model as they are released' - } - ], - default: 'claude-2', - optional: true + loadMethod: 'listModels', + default: 'claude-3-haiku' }, { label: 'Temperature', @@ -88,6 +67,13 @@ class ChatAnthropic_LlamaIndex_ChatModels implements INode { ] } + //@ts-ignore + loadMethods = { + async listModels(): Promise { + return await getModels(MODEL_TYPE.CHAT, 'chatAnthropic_LlamaIndex') + } + } + async init(nodeData: INodeData, _: string, options: ICommonObject): Promise { const temperature = nodeData.inputs?.temperature as string const modelName = nodeData.inputs?.modelName as 'claude-3-opus' | 'claude-3-sonnet' | 'claude-2.1' | 'claude-instant-1.2' diff --git a/packages/components/nodes/chatmodels/ChatCohere/ChatCohere.ts b/packages/components/nodes/chatmodels/ChatCohere/ChatCohere.ts new file mode 100644 index 00000000000..8c2fc81794f --- /dev/null +++ b/packages/components/nodes/chatmodels/ChatCohere/ChatCohere.ts @@ -0,0 +1,87 @@ +import { BaseCache } from '@langchain/core/caches' +import { ChatCohere, ChatCohereInput } from '@langchain/cohere' +import { ICommonObject, INode, INodeData, INodeOptionsValue, INodeParams } from '../../../src/Interface' +import { getBaseClasses, getCredentialData, getCredentialParam } from '../../../src/utils' +import { MODEL_TYPE, getModels } from '../../../src/modelLoader' + +class ChatCohere_ChatModels implements INode { + label: string + name: string + version: number + type: string + icon: string + category: string + description: string + baseClasses: string[] + credential: INodeParams + inputs: INodeParams[] + + constructor() { + this.label = 'ChatCohere' + this.name = 'chatCohere' + this.version = 1.0 + this.type = 'ChatCohere' + this.icon = 'Cohere.svg' + this.category = 'Chat Models' + this.description = 'Wrapper around Cohere Chat Endpoints' + this.baseClasses = [this.type, ...getBaseClasses(ChatCohere)] + this.credential = { + label: 'Connect Credential', + name: 'credential', + type: 'credential', + credentialNames: ['cohereApi'] + } + this.inputs = [ + { + label: 'Cache', + name: 'cache', + type: 'BaseCache', + optional: true + }, + { + label: 'Model Name', + name: 'modelName', + type: 'asyncOptions', + loadMethod: 'listModels', + default: 'command-r' + }, + { + label: 'Temperature', + name: 'temperature', + type: 'number', + step: 0.1, + default: 0.7, + optional: true + } + ] + } + + //@ts-ignore + loadMethods = { + async listModels(): Promise { + return await getModels(MODEL_TYPE.CHAT, 'chatCohere') + } + } + + async init(nodeData: INodeData, _: string, options: ICommonObject): Promise { + const modelName = nodeData.inputs?.modelName as string + const cache = nodeData.inputs?.cache as BaseCache + const temperature = nodeData.inputs?.temperature as string + const streaming = nodeData.inputs?.streaming as boolean + const credentialData = await getCredentialData(nodeData.credential ?? '', options) + const cohereApiKey = getCredentialParam('cohereApiKey', credentialData, nodeData) + + const obj: ChatCohereInput = { + model: modelName, + apiKey: cohereApiKey, + temperature: temperature ? parseFloat(temperature) : undefined, + streaming: streaming ?? true + } + if (cache) obj.cache = cache + + const model = new ChatCohere(obj) + return model + } +} + +module.exports = { nodeClass: ChatCohere_ChatModels } diff --git a/packages/components/nodes/chatmodels/ChatCohere/Cohere.svg b/packages/components/nodes/chatmodels/ChatCohere/Cohere.svg new file mode 100644 index 00000000000..88bcabe341b --- /dev/null +++ b/packages/components/nodes/chatmodels/ChatCohere/Cohere.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/packages/components/nodes/chatmodels/ChatGoogleGenerativeAI/ChatGoogleGenerativeAI.ts b/packages/components/nodes/chatmodels/ChatGoogleGenerativeAI/ChatGoogleGenerativeAI.ts index 190294679f0..f0dd45e5d7f 100644 --- a/packages/components/nodes/chatmodels/ChatGoogleGenerativeAI/ChatGoogleGenerativeAI.ts +++ b/packages/components/nodes/chatmodels/ChatGoogleGenerativeAI/ChatGoogleGenerativeAI.ts @@ -2,8 +2,9 @@ import { HarmBlockThreshold, HarmCategory } from '@google/generative-ai' import type { SafetySetting } from '@google/generative-ai' import { ChatGoogleGenerativeAI, GoogleGenerativeAIChatInput } from '@langchain/google-genai' import { BaseCache } from '@langchain/core/caches' -import { ICommonObject, INode, INodeData, INodeParams } from '../../../src/Interface' +import { ICommonObject, INode, INodeData, INodeOptionsValue, INodeParams } from '../../../src/Interface' import { convertMultiOptionsToStringArray, getBaseClasses, getCredentialData, getCredentialParam } from '../../../src/utils' +import { getModels, MODEL_TYPE } from '../../../src/modelLoader' class GoogleGenerativeAI_ChatModels implements INode { label: string @@ -20,7 +21,7 @@ class GoogleGenerativeAI_ChatModels implements INode { constructor() { this.label = 'ChatGoogleGenerativeAI' this.name = 'chatGoogleGenerativeAI' - this.version = 1.0 + this.version = 2.0 this.type = 'ChatGoogleGenerativeAI' this.icon = 'GoogleGemini.svg' this.category = 'Chat Models' @@ -44,13 +45,8 @@ class GoogleGenerativeAI_ChatModels implements INode { { label: 'Model Name', name: 'modelName', - type: 'options', - options: [ - { - label: 'gemini-pro', - name: 'gemini-pro' - } - ], + type: 'asyncOptions', + loadMethod: 'listModels', default: 'gemini-pro' }, { @@ -147,6 +143,13 @@ class GoogleGenerativeAI_ChatModels implements INode { ] } + //@ts-ignore + loadMethods = { + async listModels(): Promise { + return await getModels(MODEL_TYPE.CHAT, 'chatGoogleGenerativeAI') + } + } + async init(nodeData: INodeData, _: string, options: ICommonObject): Promise { const credentialData = await getCredentialData(nodeData.credential ?? '', options) const apiKey = getCredentialParam('googleGenerativeAPIKey', credentialData, nodeData) diff --git a/packages/components/nodes/chatmodels/ChatGooglePaLM/ChatGooglePaLM.ts b/packages/components/nodes/chatmodels/ChatGooglePaLM/ChatGooglePaLM.ts index 5e55cfdd226..2bc6982232f 100644 --- a/packages/components/nodes/chatmodels/ChatGooglePaLM/ChatGooglePaLM.ts +++ b/packages/components/nodes/chatmodels/ChatGooglePaLM/ChatGooglePaLM.ts @@ -1,7 +1,8 @@ import { ChatGooglePaLM, GooglePaLMChatInput } from '@langchain/community/chat_models/googlepalm' import { BaseCache } from '@langchain/core/caches' -import { ICommonObject, INode, INodeData, INodeParams } from '../../../src/Interface' +import { ICommonObject, INode, INodeData, INodeOptionsValue, INodeParams } from '../../../src/Interface' import { getBaseClasses, getCredentialData, getCredentialParam } from '../../../src/utils' +import { getModels, MODEL_TYPE } from '../../../src/modelLoader' class ChatGooglePaLM_ChatModels implements INode { label: string @@ -18,7 +19,7 @@ class ChatGooglePaLM_ChatModels implements INode { constructor() { this.label = 'ChatGooglePaLM' this.name = 'chatGooglePaLM' - this.version = 2.0 + this.version = 3.0 this.type = 'ChatGooglePaLM' this.icon = 'GooglePaLM.svg' this.category = 'Chat Models' @@ -40,15 +41,9 @@ class ChatGooglePaLM_ChatModels implements INode { { label: 'Model Name', name: 'modelName', - type: 'options', - options: [ - { - label: 'models/chat-bison-001', - name: 'models/chat-bison-001' - } - ], - default: 'models/chat-bison-001', - optional: true + type: 'asyncOptions', + loadMethod: 'listModels', + default: 'models/chat-bison-001' }, { label: 'Temperature', @@ -98,6 +93,13 @@ class ChatGooglePaLM_ChatModels implements INode { ] } + //@ts-ignore + loadMethods = { + async listModels(): Promise { + return await getModels(MODEL_TYPE.CHAT, 'chatGooglePaLM') + } + } + async init(nodeData: INodeData, _: string, options: ICommonObject): Promise { const modelName = nodeData.inputs?.modelName as string const temperature = nodeData.inputs?.temperature as string diff --git a/packages/components/nodes/chatmodels/ChatGoogleVertexAI/ChatGoogleVertexAI.ts b/packages/components/nodes/chatmodels/ChatGoogleVertexAI/ChatGoogleVertexAI.ts index 782a4aec0f3..38178519568 100644 --- a/packages/components/nodes/chatmodels/ChatGoogleVertexAI/ChatGoogleVertexAI.ts +++ b/packages/components/nodes/chatmodels/ChatGoogleVertexAI/ChatGoogleVertexAI.ts @@ -1,8 +1,9 @@ import { GoogleAuthOptions } from 'google-auth-library' import { BaseCache } from '@langchain/core/caches' import { ChatGoogleVertexAI, GoogleVertexAIChatInput } from '@langchain/community/chat_models/googlevertexai' -import { ICommonObject, INode, INodeData, INodeParams } from '../../../src/Interface' +import { ICommonObject, INode, INodeData, INodeOptionsValue, INodeParams } from '../../../src/Interface' import { getBaseClasses, getCredentialData, getCredentialParam } from '../../../src/utils' +import { getModels, MODEL_TYPE } from '../../../src/modelLoader' class GoogleVertexAI_ChatModels implements INode { label: string @@ -19,7 +20,7 @@ class GoogleVertexAI_ChatModels implements INode { constructor() { this.label = 'ChatGoogleVertexAI' this.name = 'chatGoogleVertexAI' - this.version = 2.0 + this.version = 3.0 this.type = 'ChatGoogleVertexAI' this.icon = 'GoogleVertex.svg' this.category = 'Chat Models' @@ -44,27 +45,9 @@ class GoogleVertexAI_ChatModels implements INode { { label: 'Model Name', name: 'modelName', - type: 'options', - options: [ - { - label: 'chat-bison', - name: 'chat-bison' - }, - { - label: 'codechat-bison', - name: 'codechat-bison' - }, - { - label: 'chat-bison-32k', - name: 'chat-bison-32k' - }, - { - label: 'codechat-bison-32k', - name: 'codechat-bison-32k' - } - ], - default: 'chat-bison', - optional: true + type: 'asyncOptions', + loadMethod: 'listModels', + default: 'chat-bison' }, { label: 'Temperature', @@ -93,6 +76,13 @@ class GoogleVertexAI_ChatModels implements INode { ] } + //@ts-ignore + loadMethods = { + async listModels(): Promise { + return await getModels(MODEL_TYPE.CHAT, 'chatGoogleVertexAI') + } + } + async init(nodeData: INodeData, _: string, options: ICommonObject): Promise { const credentialData = await getCredentialData(nodeData.credential ?? '', options) const googleApplicationCredentialFilePath = getCredentialParam('googleApplicationCredentialFilePath', credentialData, nodeData) diff --git a/packages/components/nodes/chatmodels/ChatHuggingFace/ChatHuggingFace.ts b/packages/components/nodes/chatmodels/ChatHuggingFace/ChatHuggingFace.ts index 4d29a7db090..2729d0157e0 100644 --- a/packages/components/nodes/chatmodels/ChatHuggingFace/ChatHuggingFace.ts +++ b/packages/components/nodes/chatmodels/ChatHuggingFace/ChatHuggingFace.ts @@ -42,8 +42,7 @@ class ChatHuggingFace_ChatModels implements INode { name: 'model', type: 'string', description: 'If using own inference endpoint, leave this blank', - placeholder: 'gpt2', - optional: true + placeholder: 'gpt2' }, { label: 'Endpoint', diff --git a/packages/components/nodes/chatmodels/ChatMistral/ChatMistral.ts b/packages/components/nodes/chatmodels/ChatMistral/ChatMistral.ts index 8cae1bd0410..3c9366f0b62 100644 --- a/packages/components/nodes/chatmodels/ChatMistral/ChatMistral.ts +++ b/packages/components/nodes/chatmodels/ChatMistral/ChatMistral.ts @@ -15,8 +15,9 @@ import { ChatMessageChunk } from '@langchain/core/messages' import { ChatMistralAI as LangchainChatMistralAI, ChatMistralAIInput } from '@langchain/mistralai' -import { ICommonObject, INode, INodeData, INodeParams } from '../../../src/Interface' +import { ICommonObject, INode, INodeData, INodeOptionsValue, INodeParams } from '../../../src/Interface' import { getBaseClasses, getCredentialData, getCredentialParam } from '../../../src/utils' +import { getModels, MODEL_TYPE } from '../../../src/modelLoader' interface TokenUsage { completionTokens?: number @@ -46,7 +47,7 @@ class ChatMistral_ChatModels implements INode { constructor() { this.label = 'ChatMistralAI' this.name = 'chatMistralAI' - this.version = 2.0 + this.version = 3.0 this.type = 'ChatMistralAI' this.icon = 'MistralAI.svg' this.category = 'Chat Models' @@ -68,9 +69,8 @@ class ChatMistral_ChatModels implements INode { { label: 'Model Name', name: 'modelName', - type: 'string', - description: - 'Refer to Model Selection for more available models', + type: 'asyncOptions', + loadMethod: 'listModels', default: 'mistral-tiny' }, { @@ -129,6 +129,13 @@ class ChatMistral_ChatModels implements INode { ] } + //@ts-ignore + loadMethods = { + async listModels(): Promise { + return await getModels(MODEL_TYPE.CHAT, 'chatMistralAI') + } + } + async init(nodeData: INodeData, _: string, options: ICommonObject): Promise { const credentialData = await getCredentialData(nodeData.credential ?? '', options) const apiKey = getCredentialParam('mistralAIAPIKey', credentialData, nodeData) diff --git a/packages/components/nodes/chatmodels/ChatOpenAI/ChatOpenAI.ts b/packages/components/nodes/chatmodels/ChatOpenAI/ChatOpenAI.ts index 290947aff8b..e8378a806ca 100644 --- a/packages/components/nodes/chatmodels/ChatOpenAI/ChatOpenAI.ts +++ b/packages/components/nodes/chatmodels/ChatOpenAI/ChatOpenAI.ts @@ -2,9 +2,10 @@ import type { ClientOptions } from 'openai' import { ChatOpenAI as LangchainChatOpenAI, OpenAIChatInput, AzureOpenAIInput, LegacyOpenAIInput } from '@langchain/openai' import { BaseCache } from '@langchain/core/caches' import { BaseChatModelParams } from '@langchain/core/language_models/chat_models' -import { ICommonObject, IMultiModalOption, INode, INodeData, INodeParams } from '../../../src/Interface' +import { ICommonObject, IMultiModalOption, INode, INodeData, INodeOptionsValue, INodeParams } from '../../../src/Interface' import { getBaseClasses, getCredentialData, getCredentialParam } from '../../../src/utils' import { ChatOpenAI } from './FlowiseChatOpenAI' +import { getModels, MODEL_TYPE } from '../../../src/modelLoader' class ChatOpenAI_ChatModels implements INode { label: string @@ -21,7 +22,7 @@ class ChatOpenAI_ChatModels implements INode { constructor() { this.label = 'ChatOpenAI' this.name = 'chatOpenAI' - this.version = 5.0 + this.version = 6.0 this.type = 'ChatOpenAI' this.icon = 'openai.svg' this.category = 'Chat Models' @@ -43,71 +44,9 @@ class ChatOpenAI_ChatModels implements INode { { label: 'Model Name', name: 'modelName', - type: 'options', - options: [ - { - label: 'gpt-4', - name: 'gpt-4' - }, - { - label: 'gpt-4-turbo-preview', - name: 'gpt-4-turbo-preview' - }, - { - label: 'gpt-4-0125-preview', - name: 'gpt-4-0125-preview' - }, - { - label: 'gpt-4-1106-preview', - name: 'gpt-4-1106-preview' - }, - { - label: 'gpt-4-1106-vision-preview', - name: 'gpt-4-1106-vision-preview' - }, - { - label: 'gpt-4-vision-preview', - name: 'gpt-4-vision-preview' - }, - { - label: 'gpt-4-0613', - name: 'gpt-4-0613' - }, - { - label: 'gpt-4-32k', - name: 'gpt-4-32k' - }, - { - label: 'gpt-4-32k-0613', - name: 'gpt-4-32k-0613' - }, - { - label: 'gpt-3.5-turbo', - name: 'gpt-3.5-turbo' - }, - { - label: 'gpt-3.5-turbo-0125', - name: 'gpt-3.5-turbo-0125' - }, - { - label: 'gpt-3.5-turbo-1106', - name: 'gpt-3.5-turbo-1106' - }, - { - label: 'gpt-3.5-turbo-0613', - name: 'gpt-3.5-turbo-0613' - }, - { - label: 'gpt-3.5-turbo-16k', - name: 'gpt-3.5-turbo-16k' - }, - { - label: 'gpt-3.5-turbo-16k-0613', - name: 'gpt-3.5-turbo-16k-0613' - } - ], - default: 'gpt-3.5-turbo', - optional: true + type: 'asyncOptions', + loadMethod: 'listModels', + default: 'gpt-3.5-turbo' }, { label: 'Temperature', @@ -206,6 +145,13 @@ class ChatOpenAI_ChatModels implements INode { ] } + //@ts-ignore + loadMethods = { + async listModels(): Promise { + return await getModels(MODEL_TYPE.CHAT, 'chatOpenAI') + } + } + async init(nodeData: INodeData, _: string, options: ICommonObject): Promise { const temperature = nodeData.inputs?.temperature as string const modelName = nodeData.inputs?.modelName as string diff --git a/packages/components/nodes/chatmodels/ChatOpenAI/ChatOpenAI_LlamaIndex.ts b/packages/components/nodes/chatmodels/ChatOpenAI/ChatOpenAI_LlamaIndex.ts index 4c0ac005125..e0c8ee141b3 100644 --- a/packages/components/nodes/chatmodels/ChatOpenAI/ChatOpenAI_LlamaIndex.ts +++ b/packages/components/nodes/chatmodels/ChatOpenAI/ChatOpenAI_LlamaIndex.ts @@ -1,6 +1,7 @@ -import { ICommonObject, INode, INodeData, INodeParams } from '../../../src/Interface' +import { ICommonObject, INode, INodeData, INodeOptionsValue, INodeParams } from '../../../src/Interface' import { getBaseClasses, getCredentialData, getCredentialParam } from '../../../src/utils' import { OpenAI, ALL_AVAILABLE_OPENAI_MODELS } from 'llamaindex' +import { getModels, MODEL_TYPE } from '../../../src/modelLoader' class ChatOpenAI_LlamaIndex_LLMs implements INode { label: string @@ -18,7 +19,7 @@ class ChatOpenAI_LlamaIndex_LLMs implements INode { constructor() { this.label = 'ChatOpenAI' this.name = 'chatOpenAI_LlamaIndex' - this.version = 1.0 + this.version = 2.0 this.type = 'ChatOpenAI' this.icon = 'openai.svg' this.category = 'Chat Models' @@ -35,63 +36,9 @@ class ChatOpenAI_LlamaIndex_LLMs implements INode { { label: 'Model Name', name: 'modelName', - type: 'options', - options: [ - { - label: 'gpt-4', - name: 'gpt-4' - }, - { - label: 'gpt-4-turbo-preview', - name: 'gpt-4-turbo-preview' - }, - { - label: 'gpt-4-0125-preview', - name: 'gpt-4-0125-preview' - }, - { - label: 'gpt-4-1106-preview', - name: 'gpt-4-1106-preview' - }, - { - label: 'gpt-4-vision-preview', - name: 'gpt-4-vision-preview' - }, - { - label: 'gpt-4-0613', - name: 'gpt-4-0613' - }, - { - label: 'gpt-4-32k', - name: 'gpt-4-32k' - }, - { - label: 'gpt-4-32k-0613', - name: 'gpt-4-32k-0613' - }, - { - label: 'gpt-3.5-turbo', - name: 'gpt-3.5-turbo' - }, - { - label: 'gpt-3.5-turbo-1106', - name: 'gpt-3.5-turbo-1106' - }, - { - label: 'gpt-3.5-turbo-0613', - name: 'gpt-3.5-turbo-0613' - }, - { - label: 'gpt-3.5-turbo-16k', - name: 'gpt-3.5-turbo-16k' - }, - { - label: 'gpt-3.5-turbo-16k-0613', - name: 'gpt-3.5-turbo-16k-0613' - } - ], - default: 'gpt-3.5-turbo', - optional: true + type: 'asyncOptions', + loadMethod: 'listModels', + default: 'gpt-3.5-turbo' }, { label: 'Temperature', @@ -135,6 +82,13 @@ class ChatOpenAI_LlamaIndex_LLMs implements INode { ] } + //@ts-ignore + loadMethods = { + async listModels(): Promise { + return await getModels(MODEL_TYPE.CHAT, 'chatOpenAI_LlamaIndex') + } + } + async init(nodeData: INodeData, _: string, options: ICommonObject): Promise { const temperature = nodeData.inputs?.temperature as string const modelName = nodeData.inputs?.modelName as keyof typeof ALL_AVAILABLE_OPENAI_MODELS diff --git a/packages/components/nodes/chatmodels/ChatOpenAICustom/ChatOpenAICustom.ts b/packages/components/nodes/chatmodels/ChatOpenAICustom/ChatOpenAICustom.ts index c84f4c1e07d..b341bd122b9 100644 --- a/packages/components/nodes/chatmodels/ChatOpenAICustom/ChatOpenAICustom.ts +++ b/packages/components/nodes/chatmodels/ChatOpenAICustom/ChatOpenAICustom.ts @@ -19,7 +19,7 @@ class ChatOpenAICustom_ChatModels implements INode { constructor() { this.label = 'ChatOpenAI Custom' this.name = 'chatOpenAICustom' - this.version = 2.0 + this.version = 3.0 this.type = 'ChatOpenAI-Custom' this.icon = 'openai.svg' this.category = 'Chat Models' diff --git a/packages/components/nodes/chatmodels/Groq/Groq.ts b/packages/components/nodes/chatmodels/Groq/Groq.ts index 91e96aef114..bf89b9dd8cb 100644 --- a/packages/components/nodes/chatmodels/Groq/Groq.ts +++ b/packages/components/nodes/chatmodels/Groq/Groq.ts @@ -42,7 +42,7 @@ class Groq_ChatModels implements INode { label: 'Model Name', name: 'modelName', type: 'string', - placeholder: 'ft:gpt-3.5-turbo:my-org:custom_suffix:id' + placeholder: 'mixtral-8x7b-32768' }, { label: 'Temperature', diff --git a/packages/components/nodes/embeddings/AWSBedrockEmbedding/AWSBedrockEmbedding.ts b/packages/components/nodes/embeddings/AWSBedrockEmbedding/AWSBedrockEmbedding.ts index 21a2840c3bf..2b8fc8060ab 100644 --- a/packages/components/nodes/embeddings/AWSBedrockEmbedding/AWSBedrockEmbedding.ts +++ b/packages/components/nodes/embeddings/AWSBedrockEmbedding/AWSBedrockEmbedding.ts @@ -1,7 +1,8 @@ import { BedrockRuntimeClient, InvokeModelCommand } from '@aws-sdk/client-bedrock-runtime' import { BedrockEmbeddings, BedrockEmbeddingsParams } from '@langchain/community/embeddings/bedrock' -import { ICommonObject, INode, INodeData, INodeParams } from '../../../src/Interface' +import { ICommonObject, INode, INodeData, INodeOptionsValue, INodeParams } from '../../../src/Interface' import { getBaseClasses, getCredentialData, getCredentialParam } from '../../../src/utils' +import { MODEL_TYPE, getModels, getRegions } from '../../../src/modelLoader' class AWSBedrockEmbedding_Embeddings implements INode { label: string @@ -18,7 +19,7 @@ class AWSBedrockEmbedding_Embeddings implements INode { constructor() { this.label = 'AWS Bedrock Embeddings' this.name = 'AWSBedrockEmbeddings' - this.version = 3.0 + this.version = 4.0 this.type = 'AWSBedrockEmbeddings' this.icon = 'aws.svg' this.category = 'Embeddings' @@ -35,56 +36,15 @@ class AWSBedrockEmbedding_Embeddings implements INode { { label: 'Region', name: 'region', - type: 'options', - options: [ - { label: 'af-south-1', name: 'af-south-1' }, - { label: 'ap-east-1', name: 'ap-east-1' }, - { label: 'ap-northeast-1', name: 'ap-northeast-1' }, - { label: 'ap-northeast-2', name: 'ap-northeast-2' }, - { label: 'ap-northeast-3', name: 'ap-northeast-3' }, - { label: 'ap-south-1', name: 'ap-south-1' }, - { label: 'ap-south-2', name: 'ap-south-2' }, - { label: 'ap-southeast-1', name: 'ap-southeast-1' }, - { label: 'ap-southeast-2', name: 'ap-southeast-2' }, - { label: 'ap-southeast-3', name: 'ap-southeast-3' }, - { label: 'ap-southeast-4', name: 'ap-southeast-4' }, - { label: 'ap-southeast-5', name: 'ap-southeast-5' }, - { label: 'ap-southeast-6', name: 'ap-southeast-6' }, - { label: 'ca-central-1', name: 'ca-central-1' }, - { label: 'ca-west-1', name: 'ca-west-1' }, - { label: 'cn-north-1', name: 'cn-north-1' }, - { label: 'cn-northwest-1', name: 'cn-northwest-1' }, - { label: 'eu-central-1', name: 'eu-central-1' }, - { label: 'eu-central-2', name: 'eu-central-2' }, - { label: 'eu-north-1', name: 'eu-north-1' }, - { label: 'eu-south-1', name: 'eu-south-1' }, - { label: 'eu-south-2', name: 'eu-south-2' }, - { label: 'eu-west-1', name: 'eu-west-1' }, - { label: 'eu-west-2', name: 'eu-west-2' }, - { label: 'eu-west-3', name: 'eu-west-3' }, - { label: 'il-central-1', name: 'il-central-1' }, - { label: 'me-central-1', name: 'me-central-1' }, - { label: 'me-south-1', name: 'me-south-1' }, - { label: 'sa-east-1', name: 'sa-east-1' }, - { label: 'us-east-1', name: 'us-east-1' }, - { label: 'us-east-2', name: 'us-east-2' }, - { label: 'us-gov-east-1', name: 'us-gov-east-1' }, - { label: 'us-gov-west-1', name: 'us-gov-west-1' }, - { label: 'us-west-1', name: 'us-west-1' }, - { label: 'us-west-2', name: 'us-west-2' } - ], + type: 'asyncOptions', + loadMethod: 'listRegions', default: 'us-east-1' }, { label: 'Model Name', name: 'model', - type: 'options', - options: [ - { label: 'amazon.titan-embed-text-v1', name: 'amazon.titan-embed-text-v1' }, - { label: 'amazon.titan-embed-g1-text-02', name: 'amazon.titan-embed-g1-text-02' }, - { label: 'cohere.embed-english-v3', name: 'cohere.embed-english-v3' }, - { label: 'cohere.embed-multilingual-v3', name: 'cohere.embed-multilingual-v3' } - ], + type: 'asyncOptions', + loadMethod: 'listModels', default: 'amazon.titan-embed-text-v1' }, { @@ -97,6 +57,16 @@ class AWSBedrockEmbedding_Embeddings implements INode { ] } + //@ts-ignore + loadMethods = { + async listModels(): Promise { + return await getModels(MODEL_TYPE.EMBEDDING, 'AWSBedrockEmbeddings') + }, + async listRegions(): Promise { + return await getRegions(MODEL_TYPE.EMBEDDING, 'AWSBedrockEmbeddings') + } + } + async init(nodeData: INodeData, _: string, options: ICommonObject): Promise { const iRegion = nodeData.inputs?.region as string const iModel = nodeData.inputs?.model as string diff --git a/packages/components/nodes/embeddings/CohereEmbedding/CohereEmbedding.ts b/packages/components/nodes/embeddings/CohereEmbedding/CohereEmbedding.ts index e01492b96e8..af7fbad5b14 100644 --- a/packages/components/nodes/embeddings/CohereEmbedding/CohereEmbedding.ts +++ b/packages/components/nodes/embeddings/CohereEmbedding/CohereEmbedding.ts @@ -1,6 +1,7 @@ import { CohereEmbeddings, CohereEmbeddingsParams } from '@langchain/cohere' -import { ICommonObject, INode, INodeData, INodeParams } from '../../../src/Interface' +import { ICommonObject, INode, INodeData, INodeOptionsValue, INodeParams } from '../../../src/Interface' import { getBaseClasses, getCredentialData, getCredentialParam } from '../../../src/utils' +import { MODEL_TYPE, getModels } from '../../../src/modelLoader' class CohereEmbedding_Embeddings implements INode { label: string @@ -17,7 +18,7 @@ class CohereEmbedding_Embeddings implements INode { constructor() { this.label = 'Cohere Embeddings' this.name = 'cohereEmbeddings' - this.version = 2.0 + this.version = 3.0 this.type = 'CohereEmbeddings' this.icon = 'Cohere.svg' this.category = 'Embeddings' @@ -33,46 +34,9 @@ class CohereEmbedding_Embeddings implements INode { { label: 'Model Name', name: 'modelName', - type: 'options', - options: [ - { - label: 'embed-english-v3.0', - name: 'embed-english-v3.0', - description: 'Embedding Dimensions: 1024' - }, - { - label: 'embed-english-light-v3.0', - name: 'embed-english-light-v3.0', - description: 'Embedding Dimensions: 384' - }, - { - label: 'embed-multilingual-v3.0', - name: 'embed-multilingual-v3.0', - description: 'Embedding Dimensions: 1024' - }, - { - label: 'embed-multilingual-light-v3.0', - name: 'embed-multilingual-light-v3.0', - description: 'Embedding Dimensions: 384' - }, - { - label: 'embed-english-v2.0', - name: 'embed-english-v2.0', - description: 'Embedding Dimensions: 4096' - }, - { - label: 'embed-english-light-v2.0', - name: 'embed-english-light-v2.0', - description: 'Embedding Dimensions: 1024' - }, - { - label: 'embed-multilingual-v2.0', - name: 'embed-multilingual-v2.0', - description: 'Embedding Dimensions: 768' - } - ], - default: 'embed-english-v2.0', - optional: true + type: 'asyncOptions', + loadMethod: 'listModels', + default: 'embed-english-v2.0' }, { label: 'Type', @@ -108,6 +72,13 @@ class CohereEmbedding_Embeddings implements INode { ] } + //@ts-ignore + loadMethods = { + async listModels(): Promise { + return await getModels(MODEL_TYPE.EMBEDDING, 'cohereEmbeddings') + } + } + async init(nodeData: INodeData, _: string, options: ICommonObject): Promise { const modelName = nodeData.inputs?.modelName as string const inputType = nodeData.inputs?.inputType as string diff --git a/packages/components/nodes/embeddings/GoogleGenerativeAIEmbedding/GoogleGenerativeAIEmbedding.ts b/packages/components/nodes/embeddings/GoogleGenerativeAIEmbedding/GoogleGenerativeAIEmbedding.ts index ac84fd27e85..2aaf53d8045 100644 --- a/packages/components/nodes/embeddings/GoogleGenerativeAIEmbedding/GoogleGenerativeAIEmbedding.ts +++ b/packages/components/nodes/embeddings/GoogleGenerativeAIEmbedding/GoogleGenerativeAIEmbedding.ts @@ -1,7 +1,8 @@ -import { ICommonObject, INode, INodeData, INodeParams } from '../../../src/Interface' +import { ICommonObject, INode, INodeData, INodeOptionsValue, INodeParams } from '../../../src/Interface' import { getBaseClasses, getCredentialData, getCredentialParam } from '../../../src/utils' import { GoogleGenerativeAIEmbeddings, GoogleGenerativeAIEmbeddingsParams } from '@langchain/google-genai' import { TaskType } from '@google/generative-ai' +import { MODEL_TYPE, getModels } from '../../../src/modelLoader' class GoogleGenerativeAIEmbedding_Embeddings implements INode { label: string @@ -18,7 +19,7 @@ class GoogleGenerativeAIEmbedding_Embeddings implements INode { constructor() { this.label = 'GoogleGenerativeAI Embeddings' this.name = 'googleGenerativeAiEmbeddings' - this.version = 1.0 + this.version = 2.0 this.type = 'GoogleGenerativeAiEmbeddings' this.icon = 'GoogleGemini.svg' this.category = 'Embeddings' @@ -36,13 +37,8 @@ class GoogleGenerativeAIEmbedding_Embeddings implements INode { { label: 'Model Name', name: 'modelName', - type: 'options', - options: [ - { - label: 'embedding-001', - name: 'embedding-001' - } - ], + type: 'asyncOptions', + loadMethod: 'listModels', default: 'embedding-001' }, { @@ -63,6 +59,13 @@ class GoogleGenerativeAIEmbedding_Embeddings implements INode { ] } + //@ts-ignore + loadMethods = { + async listModels(): Promise { + return await getModels(MODEL_TYPE.EMBEDDING, 'googleGenerativeAiEmbeddings') + } + } + // eslint-disable-next-line unused-imports/no-unused-vars async init(nodeData: INodeData, _: string, options: ICommonObject): Promise { const modelName = nodeData.inputs?.modelName as string diff --git a/packages/components/nodes/embeddings/GooglePaLMEmbedding/GooglePaLMEmbedding.ts b/packages/components/nodes/embeddings/GooglePaLMEmbedding/GooglePaLMEmbedding.ts index 0108716114c..c93a56bcca9 100644 --- a/packages/components/nodes/embeddings/GooglePaLMEmbedding/GooglePaLMEmbedding.ts +++ b/packages/components/nodes/embeddings/GooglePaLMEmbedding/GooglePaLMEmbedding.ts @@ -1,6 +1,7 @@ import { GooglePaLMEmbeddings, GooglePaLMEmbeddingsParams } from '@langchain/community/embeddings/googlepalm' -import { ICommonObject, INode, INodeData, INodeParams } from '../../../src/Interface' +import { ICommonObject, INode, INodeData, INodeOptionsValue, INodeParams } from '../../../src/Interface' import { getBaseClasses, getCredentialData, getCredentialParam } from '../../../src/utils' +import { MODEL_TYPE, getModels } from '../../../src/modelLoader' class GooglePaLMEmbedding_Embeddings implements INode { label: string @@ -17,7 +18,7 @@ class GooglePaLMEmbedding_Embeddings implements INode { constructor() { this.label = 'Google PaLM Embeddings' this.name = 'googlePaLMEmbeddings' - this.version = 1.0 + this.version = 2.0 this.type = 'GooglePaLMEmbeddings' this.icon = 'GooglePaLM.svg' this.category = 'Embeddings' @@ -33,19 +34,20 @@ class GooglePaLMEmbedding_Embeddings implements INode { { label: 'Model Name', name: 'modelName', - type: 'options', - options: [ - { - label: 'models/embedding-gecko-001', - name: 'models/embedding-gecko-001' - } - ], - default: 'models/embedding-gecko-001', - optional: true + type: 'asyncOptions', + loadMethod: 'listModels', + default: 'models/embedding-gecko-001' } ] } + //@ts-ignore + loadMethods = { + async listModels(): Promise { + return await getModels(MODEL_TYPE.EMBEDDING, 'googlePaLMEmbeddings') + } + } + async init(nodeData: INodeData, _: string, options: ICommonObject): Promise { const modelName = nodeData.inputs?.modelName as string diff --git a/packages/components/nodes/embeddings/GoogleVertexAIEmbedding/GoogleVertexAIEmbedding.ts b/packages/components/nodes/embeddings/GoogleVertexAIEmbedding/GoogleVertexAIEmbedding.ts index b6da7dedf47..fb1d6104775 100644 --- a/packages/components/nodes/embeddings/GoogleVertexAIEmbedding/GoogleVertexAIEmbedding.ts +++ b/packages/components/nodes/embeddings/GoogleVertexAIEmbedding/GoogleVertexAIEmbedding.ts @@ -1,7 +1,8 @@ import { GoogleAuthOptions } from 'google-auth-library' import { GoogleVertexAIEmbeddings, GoogleVertexAIEmbeddingsParams } from '@langchain/community/embeddings/googlevertexai' -import { ICommonObject, INode, INodeData, INodeParams } from '../../../src/Interface' +import { ICommonObject, INode, INodeData, INodeOptionsValue, INodeParams } from '../../../src/Interface' import { getBaseClasses, getCredentialData, getCredentialParam } from '../../../src/utils' +import { MODEL_TYPE, getModels } from '../../../src/modelLoader' class GoogleVertexAIEmbedding_Embeddings implements INode { label: string @@ -18,7 +19,7 @@ class GoogleVertexAIEmbedding_Embeddings implements INode { constructor() { this.label = 'GoogleVertexAI Embeddings' this.name = 'googlevertexaiEmbeddings' - this.version = 1.0 + this.version = 2.0 this.type = 'GoogleVertexAIEmbeddings' this.icon = 'GoogleVertex.svg' this.category = 'Embeddings' @@ -37,27 +38,20 @@ class GoogleVertexAIEmbedding_Embeddings implements INode { { label: 'Model Name', name: 'modelName', - type: 'options', - options: [ - { - label: 'textembedding-gecko@001', - name: 'textembedding-gecko@001' - }, - { - label: 'textembedding-gecko@latest', - name: 'textembedding-gecko@latest' - }, - { - label: 'textembedding-gecko-multilingual@latest', - name: 'textembedding-gecko-multilingual@latest' - } - ], - default: 'textembedding-gecko@001', - optional: true + type: 'asyncOptions', + loadMethod: 'listModels', + default: 'textembedding-gecko@001' } ] } + //@ts-ignore + loadMethods = { + async listModels(): Promise { + return await getModels(MODEL_TYPE.EMBEDDING, 'googlevertexaiEmbeddings') + } + } + async init(nodeData: INodeData, _: string, options: ICommonObject): Promise { const credentialData = await getCredentialData(nodeData.credential ?? '', options) const modelName = nodeData.inputs?.modelName as string diff --git a/packages/components/nodes/embeddings/MistralEmbedding/MistralEmbedding.ts b/packages/components/nodes/embeddings/MistralEmbedding/MistralEmbedding.ts index a557478839e..f923e10b2c3 100644 --- a/packages/components/nodes/embeddings/MistralEmbedding/MistralEmbedding.ts +++ b/packages/components/nodes/embeddings/MistralEmbedding/MistralEmbedding.ts @@ -1,6 +1,7 @@ import { MistralAIEmbeddings, MistralAIEmbeddingsParams } from '@langchain/mistralai' -import { ICommonObject, INode, INodeData, INodeParams } from '../../../src/Interface' +import { ICommonObject, INode, INodeData, INodeOptionsValue, INodeParams } from '../../../src/Interface' import { getBaseClasses, getCredentialData, getCredentialParam } from '../../../src/utils' +import { MODEL_TYPE, getModels } from '../../../src/modelLoader' class MistralEmbedding_Embeddings implements INode { label: string @@ -16,8 +17,8 @@ class MistralEmbedding_Embeddings implements INode { constructor() { this.label = 'MistralAI Embeddings' - this.name = 'mistralAI Embeddings' - this.version = 1.0 + this.name = 'mistralAIEmbeddings' + this.version = 2.0 this.type = 'MistralAIEmbeddings' this.icon = 'MistralAI.svg' this.category = 'Embeddings' @@ -33,13 +34,8 @@ class MistralEmbedding_Embeddings implements INode { { label: 'Model Name', name: 'modelName', - type: 'options', - options: [ - { - label: 'mistral-embed', - name: 'mistral-embed' - } - ], + type: 'asyncOptions', + loadMethod: 'listModels', default: 'mistral-embed' }, { @@ -69,6 +65,13 @@ class MistralEmbedding_Embeddings implements INode { ] } + //@ts-ignore + loadMethods = { + async listModels(): Promise { + return await getModels(MODEL_TYPE.EMBEDDING, 'mistralAIEmbeddings') + } + } + async init(nodeData: INodeData, _: string, options: ICommonObject): Promise { const modelName = nodeData.inputs?.modelName as string const batchSize = nodeData.inputs?.batchSize as string diff --git a/packages/components/nodes/embeddings/OpenAIEmbedding/OpenAIEmbedding.ts b/packages/components/nodes/embeddings/OpenAIEmbedding/OpenAIEmbedding.ts index 0e1abc57606..8630c4f4f67 100644 --- a/packages/components/nodes/embeddings/OpenAIEmbedding/OpenAIEmbedding.ts +++ b/packages/components/nodes/embeddings/OpenAIEmbedding/OpenAIEmbedding.ts @@ -1,6 +1,7 @@ import { OpenAIEmbeddings, OpenAIEmbeddingsParams } from '@langchain/openai' -import { ICommonObject, INode, INodeData, INodeParams } from '../../../src/Interface' +import { ICommonObject, INode, INodeData, INodeOptionsValue, INodeParams } from '../../../src/Interface' import { getBaseClasses, getCredentialData, getCredentialParam } from '../../../src/utils' +import { MODEL_TYPE, getModels } from '../../../src/modelLoader' class OpenAIEmbedding_Embeddings implements INode { label: string @@ -17,7 +18,7 @@ class OpenAIEmbedding_Embeddings implements INode { constructor() { this.label = 'OpenAI Embeddings' this.name = 'openAIEmbeddings' - this.version = 2.0 + this.version = 3.0 this.type = 'OpenAIEmbeddings' this.icon = 'openai.svg' this.category = 'Embeddings' @@ -33,23 +34,9 @@ class OpenAIEmbedding_Embeddings implements INode { { label: 'Model Name', name: 'modelName', - type: 'options', - options: [ - { - label: 'text-embedding-3-large', - name: 'text-embedding-3-large' - }, - { - label: 'text-embedding-3-small', - name: 'text-embedding-3-small' - }, - { - label: 'text-embedding-ada-002', - name: 'text-embedding-ada-002' - } - ], - default: 'text-embedding-ada-002', - optional: true + type: 'asyncOptions', + loadMethod: 'listModels', + default: 'text-embedding-ada-002' }, { label: 'Strip New Lines', @@ -82,6 +69,13 @@ class OpenAIEmbedding_Embeddings implements INode { ] } + //@ts-ignore + loadMethods = { + async listModels(): Promise { + return await getModels(MODEL_TYPE.EMBEDDING, 'openAIEmbeddings') + } + } + async init(nodeData: INodeData, _: string, options: ICommonObject): Promise { const stripNewLines = nodeData.inputs?.stripNewLines as boolean const batchSize = nodeData.inputs?.batchSize as string diff --git a/packages/components/nodes/embeddings/OpenAIEmbedding/OpenAIEmbedding_LlamaIndex.ts b/packages/components/nodes/embeddings/OpenAIEmbedding/OpenAIEmbedding_LlamaIndex.ts index 175e426d841..7055a4df0e2 100644 --- a/packages/components/nodes/embeddings/OpenAIEmbedding/OpenAIEmbedding_LlamaIndex.ts +++ b/packages/components/nodes/embeddings/OpenAIEmbedding/OpenAIEmbedding_LlamaIndex.ts @@ -1,4 +1,5 @@ -import { ICommonObject, INode, INodeData, INodeParams } from '../../../src/Interface' +import { ICommonObject, INode, INodeData, INodeOptionsValue, INodeParams } from '../../../src/Interface' +import { MODEL_TYPE, getModels } from '../../../src/modelLoader' import { getBaseClasses, getCredentialData, getCredentialParam } from '../../../src/utils' import { OpenAIEmbedding } from 'llamaindex' @@ -18,7 +19,7 @@ class OpenAIEmbedding_LlamaIndex_Embeddings implements INode { constructor() { this.label = 'OpenAI Embedding' this.name = 'openAIEmbedding_LlamaIndex' - this.version = 1.0 + this.version = 2.0 this.type = 'OpenAIEmbedding' this.icon = 'openai.svg' this.category = 'Embeddings' @@ -35,23 +36,9 @@ class OpenAIEmbedding_LlamaIndex_Embeddings implements INode { { label: 'Model Name', name: 'modelName', - type: 'options', - options: [ - { - label: 'text-embedding-3-large', - name: 'text-embedding-3-large' - }, - { - label: 'text-embedding-3-small', - name: 'text-embedding-3-small' - }, - { - label: 'text-embedding-ada-002', - name: 'text-embedding-ada-002' - } - ], - default: 'text-embedding-ada-002', - optional: true + type: 'asyncOptions', + loadMethod: 'listModels', + default: 'text-embedding-ada-002' }, { label: 'Timeout', @@ -70,6 +57,13 @@ class OpenAIEmbedding_LlamaIndex_Embeddings implements INode { ] } + //@ts-ignore + loadMethods = { + async listModels(): Promise { + return await getModels(MODEL_TYPE.EMBEDDING, 'openAIEmbedding_LlamaIndex') + } + } + async init(nodeData: INodeData, _: string, options: ICommonObject): Promise { const timeout = nodeData.inputs?.timeout as string const modelName = nodeData.inputs?.modelName as string diff --git a/packages/components/nodes/embeddings/VoyageAIEmbedding/VoyageAIEmbedding.ts b/packages/components/nodes/embeddings/VoyageAIEmbedding/VoyageAIEmbedding.ts index 82cfcecdc5e..0d54bf15ced 100644 --- a/packages/components/nodes/embeddings/VoyageAIEmbedding/VoyageAIEmbedding.ts +++ b/packages/components/nodes/embeddings/VoyageAIEmbedding/VoyageAIEmbedding.ts @@ -1,4 +1,5 @@ -import { ICommonObject, INode, INodeData, INodeParams } from '../../../src/Interface' +import { ICommonObject, INode, INodeData, INodeOptionsValue, INodeParams } from '../../../src/Interface' +import { MODEL_TYPE, getModels } from '../../../src/modelLoader' import { getBaseClasses, getCredentialData, getCredentialParam } from '../../../src/utils' import { VoyageEmbeddings, VoyageEmbeddingsParams } from 'langchain/embeddings/voyage' @@ -17,7 +18,7 @@ class VoyageAIEmbedding_Embeddings implements INode { constructor() { this.label = 'VoyageAI Embeddings' this.name = 'voyageAIEmbeddings' - this.version = 1.0 + this.version = 2.0 this.type = 'VoyageAIEmbeddings' this.icon = 'voyageai.png' this.category = 'Embeddings' @@ -33,35 +34,20 @@ class VoyageAIEmbedding_Embeddings implements INode { { label: 'Model Name', name: 'modelName', - type: 'options', - options: [ - { - label: 'voyage-2', - name: 'voyage-2', - description: 'Base generalist embedding model optimized for both latency and quality' - }, - { - label: 'voyage-code-2', - name: 'voyage-code-2', - description: 'Optimized for code retrieval' - }, - { - label: 'voyage-large-2', - name: 'voyage-large-2', - description: 'Powerful generalist embedding model' - }, - { - label: 'voyage-lite-02-instruct', - name: 'voyage-lite-02-instruct', - description: 'Instruction-tuned for classification, clustering, and sentence textual similarity tasks' - } - ], - default: 'voyage-2', - optional: true + type: 'asyncOptions', + loadMethod: 'listModels', + default: 'voyage-2' } ] } + //@ts-ignore + loadMethods = { + async listModels(): Promise { + return await getModels(MODEL_TYPE.EMBEDDING, 'voyageAIEmbeddings') + } + } + async init(nodeData: INodeData, _: string, options: ICommonObject): Promise { const modelName = nodeData.inputs?.modelName as string diff --git a/packages/components/nodes/llms/AWSBedrock/AWSBedrock.ts b/packages/components/nodes/llms/AWSBedrock/AWSBedrock.ts index 4516e0441b7..2ad279d9605 100644 --- a/packages/components/nodes/llms/AWSBedrock/AWSBedrock.ts +++ b/packages/components/nodes/llms/AWSBedrock/AWSBedrock.ts @@ -1,9 +1,10 @@ import { Bedrock } from '@langchain/community/llms/bedrock' import { BaseCache } from '@langchain/core/caches' import { BaseLLMParams } from '@langchain/core/language_models/llms' -import { ICommonObject, INode, INodeData, INodeParams } from '../../../src/Interface' +import { ICommonObject, INode, INodeData, INodeOptionsValue, INodeParams } from '../../../src/Interface' import { getBaseClasses, getCredentialData, getCredentialParam } from '../../../src/utils' import { BaseBedrockInput } from '@langchain/community/dist/utils/bedrock' +import { getModels, getRegions, MODEL_TYPE } from '../../../src/modelLoader' /** * @author Michael Connor @@ -23,7 +24,7 @@ class AWSBedrock_LLMs implements INode { constructor() { this.label = 'AWS Bedrock' this.name = 'awsBedrock' - this.version = 3.0 + this.version = 4.0 this.type = 'AWSBedrock' this.icon = 'aws.svg' this.category = 'LLMs' @@ -46,60 +47,15 @@ class AWSBedrock_LLMs implements INode { { label: 'Region', name: 'region', - type: 'options', - options: [ - { label: 'af-south-1', name: 'af-south-1' }, - { label: 'ap-east-1', name: 'ap-east-1' }, - { label: 'ap-northeast-1', name: 'ap-northeast-1' }, - { label: 'ap-northeast-2', name: 'ap-northeast-2' }, - { label: 'ap-northeast-3', name: 'ap-northeast-3' }, - { label: 'ap-south-1', name: 'ap-south-1' }, - { label: 'ap-south-2', name: 'ap-south-2' }, - { label: 'ap-southeast-1', name: 'ap-southeast-1' }, - { label: 'ap-southeast-2', name: 'ap-southeast-2' }, - { label: 'ap-southeast-3', name: 'ap-southeast-3' }, - { label: 'ap-southeast-4', name: 'ap-southeast-4' }, - { label: 'ap-southeast-5', name: 'ap-southeast-5' }, - { label: 'ap-southeast-6', name: 'ap-southeast-6' }, - { label: 'ca-central-1', name: 'ca-central-1' }, - { label: 'ca-west-1', name: 'ca-west-1' }, - { label: 'cn-north-1', name: 'cn-north-1' }, - { label: 'cn-northwest-1', name: 'cn-northwest-1' }, - { label: 'eu-central-1', name: 'eu-central-1' }, - { label: 'eu-central-2', name: 'eu-central-2' }, - { label: 'eu-north-1', name: 'eu-north-1' }, - { label: 'eu-south-1', name: 'eu-south-1' }, - { label: 'eu-south-2', name: 'eu-south-2' }, - { label: 'eu-west-1', name: 'eu-west-1' }, - { label: 'eu-west-2', name: 'eu-west-2' }, - { label: 'eu-west-3', name: 'eu-west-3' }, - { label: 'il-central-1', name: 'il-central-1' }, - { label: 'me-central-1', name: 'me-central-1' }, - { label: 'me-south-1', name: 'me-south-1' }, - { label: 'sa-east-1', name: 'sa-east-1' }, - { label: 'us-east-1', name: 'us-east-1' }, - { label: 'us-east-2', name: 'us-east-2' }, - { label: 'us-gov-east-1', name: 'us-gov-east-1' }, - { label: 'us-gov-west-1', name: 'us-gov-west-1' }, - { label: 'us-west-1', name: 'us-west-1' }, - { label: 'us-west-2', name: 'us-west-2' } - ], + type: 'asyncOptions', + loadMethod: 'listRegions', default: 'us-east-1' }, { label: 'Model Name', name: 'model', - type: 'options', - options: [ - { label: 'amazon.titan-tg1-large', name: 'amazon.titan-tg1-large' }, - { label: 'amazon.titan-e1t-medium', name: 'amazon.titan-e1t-medium' }, - { label: 'cohere.command-text-v14', name: 'cohere.command-text-v14' }, - { label: 'cohere.command-light-text-v14', name: 'cohere.command-light-text-v14' }, - { label: 'ai21.j2-grande-instruct', name: 'ai21.j2-grande-instruct' }, - { label: 'ai21.j2-jumbo-instruct', name: 'ai21.j2-jumbo-instruct' }, - { label: 'ai21.j2-mid', name: 'ai21.j2-mid' }, - { label: 'ai21.j2-ultra', name: 'ai21.j2-ultra' } - ] + type: 'asyncOptions', + loadMethod: 'listModels' }, { label: 'Custom Model Name', @@ -131,6 +87,16 @@ class AWSBedrock_LLMs implements INode { ] } + //@ts-ignore + loadMethods = { + async listModels(): Promise { + return await getModels(MODEL_TYPE.LLM, 'awsBedrock') + }, + async listRegions(): Promise { + return await getRegions(MODEL_TYPE.LLM, 'awsBedrock') + } + } + async init(nodeData: INodeData, _: string, options: ICommonObject): Promise { const iRegion = nodeData.inputs?.region as string const iModel = nodeData.inputs?.model as string diff --git a/packages/components/nodes/llms/Azure OpenAI/AzureOpenAI.ts b/packages/components/nodes/llms/Azure OpenAI/AzureOpenAI.ts index 6badb4ec8b2..65701b057ee 100644 --- a/packages/components/nodes/llms/Azure OpenAI/AzureOpenAI.ts +++ b/packages/components/nodes/llms/Azure OpenAI/AzureOpenAI.ts @@ -1,8 +1,9 @@ import { AzureOpenAIInput, OpenAI, OpenAIInput } from '@langchain/openai' import { BaseCache } from '@langchain/core/caches' import { BaseLLMParams } from '@langchain/core/language_models/llms' -import { ICommonObject, INode, INodeData, INodeParams } from '../../../src/Interface' +import { ICommonObject, INode, INodeData, INodeOptionsValue, INodeParams } from '../../../src/Interface' import { getBaseClasses, getCredentialData, getCredentialParam } from '../../../src/utils' +import { getModels, MODEL_TYPE } from '../../../src/modelLoader' class AzureOpenAI_LLMs implements INode { label: string @@ -19,7 +20,7 @@ class AzureOpenAI_LLMs implements INode { constructor() { this.label = 'Azure OpenAI' this.name = 'azureOpenAI' - this.version = 2.1 + this.version = 3.0 this.type = 'AzureOpenAI' this.icon = 'Azure.svg' this.category = 'LLMs' @@ -41,67 +42,9 @@ class AzureOpenAI_LLMs implements INode { { label: 'Model Name', name: 'modelName', - type: 'options', - options: [ - { - label: 'text-davinci-003', - name: 'text-davinci-003' - }, - { - label: 'ada', - name: 'ada' - }, - { - label: 'text-ada-001', - name: 'text-ada-001' - }, - { - label: 'babbage', - name: 'babbage' - }, - { - label: 'text-babbage-001', - name: 'text-babbage-001' - }, - { - label: 'curie', - name: 'curie' - }, - { - label: 'text-curie-001', - name: 'text-curie-001' - }, - { - label: 'davinci', - name: 'davinci' - }, - { - label: 'text-davinci-001', - name: 'text-davinci-001' - }, - { - label: 'text-davinci-002', - name: 'text-davinci-002' - }, - { - label: 'text-davinci-fine-tune-002', - name: 'text-davinci-fine-tune-002' - }, - { - label: 'gpt-35-turbo', - name: 'gpt-35-turbo' - }, - { - label: 'gpt-4', - name: 'gpt-4' - }, - { - label: 'gpt-4-32k', - name: 'gpt-4-32k' - } - ], - default: 'text-davinci-003', - optional: true + type: 'asyncOptions', + loadMethod: 'listModels', + default: 'text-davinci-003' }, { label: 'Temperature', @@ -162,6 +105,13 @@ class AzureOpenAI_LLMs implements INode { ] } + //@ts-ignore + loadMethods = { + async listModels(): Promise { + return await getModels(MODEL_TYPE.LLM, 'azureOpenAI') + } + } + async init(nodeData: INodeData, _: string, options: ICommonObject): Promise { const temperature = nodeData.inputs?.temperature as string const modelName = nodeData.inputs?.modelName as string diff --git a/packages/components/nodes/llms/Cohere/Cohere.ts b/packages/components/nodes/llms/Cohere/Cohere.ts index d3b0dc4999e..69a8fc28eb8 100644 --- a/packages/components/nodes/llms/Cohere/Cohere.ts +++ b/packages/components/nodes/llms/Cohere/Cohere.ts @@ -1,7 +1,8 @@ import { BaseCache } from '@langchain/core/caches' -import { ICommonObject, INode, INodeData, INodeParams } from '../../../src/Interface' +import { ICommonObject, INode, INodeData, INodeOptionsValue, INodeParams } from '../../../src/Interface' import { getBaseClasses, getCredentialData, getCredentialParam } from '../../../src/utils' import { Cohere, CohereInput } from './core' +import { getModels, MODEL_TYPE } from '../../../src/modelLoader' class Cohere_LLMs implements INode { label: string @@ -18,7 +19,7 @@ class Cohere_LLMs implements INode { constructor() { this.label = 'Cohere' this.name = 'cohere' - this.version = 2.0 + this.version = 3.0 this.type = 'Cohere' this.icon = 'Cohere.svg' this.category = 'LLMs' @@ -40,35 +41,9 @@ class Cohere_LLMs implements INode { { label: 'Model Name', name: 'modelName', - type: 'options', - options: [ - { - label: 'command', - name: 'command' - }, - { - label: 'command-light', - name: 'command-light' - }, - { - label: 'command-nightly', - name: 'command-nightly' - }, - { - label: 'command-light-nightly', - name: 'command-light-nightly' - }, - { - label: 'base', - name: 'base' - }, - { - label: 'base-light', - name: 'base-light' - } - ], - default: 'command', - optional: true + type: 'asyncOptions', + loadMethod: 'listModels', + default: 'command' }, { label: 'Temperature', @@ -88,6 +63,12 @@ class Cohere_LLMs implements INode { ] } + //@ts-ignore + loadMethods = { + async listModels(): Promise { + return await getModels(MODEL_TYPE.LLM, 'cohere') + } + } async init(nodeData: INodeData, _: string, options: ICommonObject): Promise { const temperature = nodeData.inputs?.temperature as string const modelName = nodeData.inputs?.modelName as string diff --git a/packages/components/nodes/llms/GooglePaLM/GooglePaLM.ts b/packages/components/nodes/llms/GooglePaLM/GooglePaLM.ts index 4dfa626a95b..8e7198394be 100644 --- a/packages/components/nodes/llms/GooglePaLM/GooglePaLM.ts +++ b/packages/components/nodes/llms/GooglePaLM/GooglePaLM.ts @@ -1,7 +1,8 @@ import { GooglePaLM, GooglePaLMTextInput } from '@langchain/community/llms/googlepalm' import { BaseCache } from '@langchain/core/caches' -import { ICommonObject, INode, INodeData, INodeParams } from '../../../src/Interface' +import { ICommonObject, INode, INodeData, INodeOptionsValue, INodeParams } from '../../../src/Interface' import { getBaseClasses, getCredentialData, getCredentialParam } from '../../../src/utils' +import { getModels, MODEL_TYPE } from '../../../src/modelLoader' class GooglePaLM_LLMs implements INode { label: string @@ -18,7 +19,7 @@ class GooglePaLM_LLMs implements INode { constructor() { this.label = 'GooglePaLM' this.name = 'GooglePaLM' - this.version = 2.0 + this.version = 3.0 this.type = 'GooglePaLM' this.icon = 'GooglePaLM.svg' this.category = 'LLMs' @@ -40,15 +41,9 @@ class GooglePaLM_LLMs implements INode { { label: 'Model Name', name: 'modelName', - type: 'options', - options: [ - { - label: 'models/text-bison-001', - name: 'models/text-bison-001' - } - ], - default: 'models/text-bison-001', - optional: true + type: 'asyncOptions', + loadMethod: 'listModels', + default: 'models/text-bison-001' }, { label: 'Temperature', @@ -126,6 +121,13 @@ class GooglePaLM_LLMs implements INode { ] } + //@ts-ignore + loadMethods = { + async listModels(): Promise { + return await getModels(MODEL_TYPE.LLM, 'GooglePaLM') + } + } + async init(nodeData: INodeData, _: string, options: ICommonObject): Promise { const modelName = nodeData.inputs?.modelName as string const temperature = nodeData.inputs?.temperature as string diff --git a/packages/components/nodes/llms/GoogleVertexAI/GoogleVertexAI.ts b/packages/components/nodes/llms/GoogleVertexAI/GoogleVertexAI.ts index 634212d33ce..3a02a764be9 100644 --- a/packages/components/nodes/llms/GoogleVertexAI/GoogleVertexAI.ts +++ b/packages/components/nodes/llms/GoogleVertexAI/GoogleVertexAI.ts @@ -1,8 +1,9 @@ import { GoogleAuthOptions } from 'google-auth-library' import { BaseCache } from '@langchain/core/caches' import { GoogleVertexAI, GoogleVertexAITextInput } from '@langchain/community/llms/googlevertexai' -import { ICommonObject, INode, INodeData, INodeParams } from '../../../src/Interface' +import { ICommonObject, INode, INodeData, INodeOptionsValue, INodeParams } from '../../../src/Interface' import { getBaseClasses, getCredentialData, getCredentialParam } from '../../../src/utils' +import { getModels, MODEL_TYPE } from '../../../src/modelLoader' class GoogleVertexAI_LLMs implements INode { label: string @@ -19,7 +20,7 @@ class GoogleVertexAI_LLMs implements INode { constructor() { this.label = 'GoogleVertexAI' this.name = 'googlevertexai' - this.version = 2.0 + this.version = 3.0 this.type = 'GoogleVertexAI' this.icon = 'GoogleVertex.svg' this.category = 'LLMs' @@ -44,33 +45,8 @@ class GoogleVertexAI_LLMs implements INode { { label: 'Model Name', name: 'modelName', - type: 'options', - options: [ - { - label: 'text-bison', - name: 'text-bison' - }, - { - label: 'code-bison', - name: 'code-bison' - }, - { - label: 'code-gecko', - name: 'code-gecko' - }, - { - label: 'text-bison-32k', - name: 'text-bison-32k' - }, - { - label: 'code-bison-32k', - name: 'code-bison-32k' - }, - { - label: 'code-gecko-32k', - name: 'code-gecko-32k' - } - ], + type: 'asyncOptions', + loadMethod: 'listModels', default: 'text-bison' }, { @@ -100,6 +76,13 @@ class GoogleVertexAI_LLMs implements INode { ] } + //@ts-ignore + loadMethods = { + async listModels(): Promise { + return await getModels(MODEL_TYPE.LLM, 'googlevertexai') + } + } + async init(nodeData: INodeData, _: string, options: ICommonObject): Promise { const credentialData = await getCredentialData(nodeData.credential ?? '', options) const googleApplicationCredentialFilePath = getCredentialParam('googleApplicationCredentialFilePath', credentialData, nodeData) diff --git a/packages/components/nodes/llms/OpenAI/OpenAI.ts b/packages/components/nodes/llms/OpenAI/OpenAI.ts index d777e817911..4f6ad726d52 100644 --- a/packages/components/nodes/llms/OpenAI/OpenAI.ts +++ b/packages/components/nodes/llms/OpenAI/OpenAI.ts @@ -1,8 +1,9 @@ import { OpenAI, OpenAIInput } from '@langchain/openai' import { BaseCache } from '@langchain/core/caches' import { BaseLLMParams } from '@langchain/core/language_models/llms' -import { ICommonObject, INode, INodeData, INodeParams } from '../../../src/Interface' +import { ICommonObject, INode, INodeData, INodeOptionsValue, INodeParams } from '../../../src/Interface' import { getBaseClasses, getCredentialData, getCredentialParam } from '../../../src/utils' +import { getModels, MODEL_TYPE } from '../../../src/modelLoader' class OpenAI_LLMs implements INode { label: string @@ -19,7 +20,7 @@ class OpenAI_LLMs implements INode { constructor() { this.label = 'OpenAI' this.name = 'openAI' - this.version = 3.0 + this.version = 4.0 this.type = 'OpenAI' this.icon = 'openai.svg' this.category = 'LLMs' @@ -41,23 +42,9 @@ class OpenAI_LLMs implements INode { { label: 'Model Name', name: 'modelName', - type: 'options', - options: [ - { - label: 'gpt-3.5-turbo-instruct', - name: 'gpt-3.5-turbo-instruct' - }, - { - label: 'babbage-002', - name: 'babbage-002' - }, - { - label: 'davinci-002', - name: 'davinci-002' - } - ], - default: 'gpt-3.5-turbo-instruct', - optional: true + type: 'asyncOptions', + loadMethod: 'listModels', + default: 'gpt-3.5-turbo-instruct' }, { label: 'Temperature', @@ -140,6 +127,13 @@ class OpenAI_LLMs implements INode { ] } + //@ts-ignore + loadMethods = { + async listModels(): Promise { + return await getModels(MODEL_TYPE.LLM, 'openAI') + } + } + async init(nodeData: INodeData, _: string, options: ICommonObject): Promise { const temperature = nodeData.inputs?.temperature as string const modelName = nodeData.inputs?.modelName as string diff --git a/packages/components/src/modelLoader.ts b/packages/components/src/modelLoader.ts new file mode 100644 index 00000000000..e697045dd4b --- /dev/null +++ b/packages/components/src/modelLoader.ts @@ -0,0 +1,43 @@ +import { INodeOptionsValue } from './Interface' +import axios from 'axios' + +const MASTER_MODEL_LIST = 'https://raw.githubusercontent.com/FlowiseAI/Flowise/main/packages/components/models.json' + +export enum MODEL_TYPE { + CHAT = 'chat', + LLM = 'llm', + EMBEDDING = 'embedding' +} + +const getModelConfig = async (category: MODEL_TYPE, name: string) => { + const modelFile = process.env.MODEL_LIST_CONFIG_JSON || MASTER_MODEL_LIST + if (!modelFile) { + throw new Error('MODEL_LIST_CONFIG_JSON not set') + } + const resp = await axios.get(modelFile) + const models = resp.data + const categoryModels = models[category] + return categoryModels.find((model: any) => model.name === name) +} + +export const getModels = async (category: MODEL_TYPE, name: string) => { + const returnData: INodeOptionsValue[] = [] + try { + const modelConfig = await getModelConfig(category, name) + returnData.push(...modelConfig.models) + return returnData + } catch (e) { + throw new Error(`Error: getModels - ${e}`) + } +} + +export const getRegions = async (category: MODEL_TYPE, name: string) => { + const returnData: INodeOptionsValue[] = [] + try { + const modelConfig = await getModelConfig(category, name) + returnData.push(...modelConfig.regions) + return returnData + } catch (e) { + throw new Error(`Error: getRegions - ${e}`) + } +} diff --git a/packages/server/.env.example b/packages/server/.env.example index 7b188f58417..a99d38b471f 100644 --- a/packages/server/.env.example +++ b/packages/server/.env.example @@ -32,4 +32,8 @@ PORT=3000 # LANGCHAIN_API_KEY=your_api_key # LANGCHAIN_PROJECT=your_project -# DISABLE_FLOWISE_TELEMETRY=true \ No newline at end of file +# DISABLE_FLOWISE_TELEMETRY=true + +# Uncomment the following line to enable model list config, load the list of models from your local config file +# see https://raw.githubusercontent.com/FlowiseAI/Flowise/main/packages/components/models.json for the format +# MODEL_LIST_CONFIG_JSON=/your_model_list_config_file_path diff --git a/packages/server/marketplaces/chatflows/API Agent OpenAI.json b/packages/server/marketplaces/chatflows/API Agent OpenAI.json index 694ba2e800c..d992e3d7e5c 100644 --- a/packages/server/marketplaces/chatflows/API Agent OpenAI.json +++ b/packages/server/marketplaces/chatflows/API Agent OpenAI.json @@ -100,7 +100,7 @@ "data": { "id": "chatOpenAI_1", "label": "ChatOpenAI", - "version": 5, + "version": 6.0, "name": "chatOpenAI", "type": "ChatOpenAI", "baseClasses": ["ChatOpenAI", "BaseChatModel", "BaseLanguageModel"], @@ -117,71 +117,9 @@ { "label": "Model Name", "name": "modelName", - "type": "options", - "options": [ - { - "label": "gpt-4", - "name": "gpt-4" - }, - { - "label": "gpt-4-turbo-preview", - "name": "gpt-4-turbo-preview" - }, - { - "label": "gpt-4-0125-preview", - "name": "gpt-4-0125-preview" - }, - { - "label": "gpt-4-1106-preview", - "name": "gpt-4-1106-preview" - }, - { - "label": "gpt-4-1106-vision-preview", - "name": "gpt-4-1106-vision-preview" - }, - { - "label": "gpt-4-vision-preview", - "name": "gpt-4-vision-preview" - }, - { - "label": "gpt-4-0613", - "name": "gpt-4-0613" - }, - { - "label": "gpt-4-32k", - "name": "gpt-4-32k" - }, - { - "label": "gpt-4-32k-0613", - "name": "gpt-4-32k-0613" - }, - { - "label": "gpt-3.5-turbo", - "name": "gpt-3.5-turbo" - }, - { - "label": "gpt-3.5-turbo-0125", - "name": "gpt-3.5-turbo-0125" - }, - { - "label": "gpt-3.5-turbo-1106", - "name": "gpt-3.5-turbo-1106" - }, - { - "label": "gpt-3.5-turbo-0613", - "name": "gpt-3.5-turbo-0613" - }, - { - "label": "gpt-3.5-turbo-16k", - "name": "gpt-3.5-turbo-16k" - }, - { - "label": "gpt-3.5-turbo-16k-0613", - "name": "gpt-3.5-turbo-16k-0613" - } - ], + "type": "asyncOptions", + "loadMethod": "listModels", "default": "gpt-3.5-turbo", - "optional": true, "id": "chatOpenAI_1-input-modelName-options" }, { @@ -408,7 +346,7 @@ "data": { "id": "chatOpenAI_2", "label": "ChatOpenAI", - "version": 5, + "version": 6.0, "name": "chatOpenAI", "type": "ChatOpenAI", "baseClasses": ["ChatOpenAI", "BaseChatModel", "BaseLanguageModel"], @@ -425,71 +363,9 @@ { "label": "Model Name", "name": "modelName", - "type": "options", - "options": [ - { - "label": "gpt-4", - "name": "gpt-4" - }, - { - "label": "gpt-4-turbo-preview", - "name": "gpt-4-turbo-preview" - }, - { - "label": "gpt-4-0125-preview", - "name": "gpt-4-0125-preview" - }, - { - "label": "gpt-4-1106-preview", - "name": "gpt-4-1106-preview" - }, - { - "label": "gpt-4-1106-vision-preview", - "name": "gpt-4-1106-vision-preview" - }, - { - "label": "gpt-4-vision-preview", - "name": "gpt-4-vision-preview" - }, - { - "label": "gpt-4-0613", - "name": "gpt-4-0613" - }, - { - "label": "gpt-4-32k", - "name": "gpt-4-32k" - }, - { - "label": "gpt-4-32k-0613", - "name": "gpt-4-32k-0613" - }, - { - "label": "gpt-3.5-turbo", - "name": "gpt-3.5-turbo" - }, - { - "label": "gpt-3.5-turbo-0125", - "name": "gpt-3.5-turbo-0125" - }, - { - "label": "gpt-3.5-turbo-1106", - "name": "gpt-3.5-turbo-1106" - }, - { - "label": "gpt-3.5-turbo-0613", - "name": "gpt-3.5-turbo-0613" - }, - { - "label": "gpt-3.5-turbo-16k", - "name": "gpt-3.5-turbo-16k" - }, - { - "label": "gpt-3.5-turbo-16k-0613", - "name": "gpt-3.5-turbo-16k-0613" - } - ], + "type": "asyncOptions", + "loadMethod": "listModels", "default": "gpt-3.5-turbo", - "optional": true, "id": "chatOpenAI_2-input-modelName-options" }, { @@ -715,6 +591,14 @@ "optional": true, "additionalParams": true, "id": "openAIToolAgent_0-input-systemMessage-string" + }, + { + "label": "Max Iterations", + "name": "maxIterations", + "type": "number", + "optional": true, + "additionalParams": true, + "id": "openAIToolAgent_0-input-maxIterations-number" } ], "inputAnchors": [ diff --git a/packages/server/marketplaces/chatflows/API Agent.json b/packages/server/marketplaces/chatflows/API Agent.json index 5c361f64514..7a51cf036c2 100644 --- a/packages/server/marketplaces/chatflows/API Agent.json +++ b/packages/server/marketplaces/chatflows/API Agent.json @@ -402,7 +402,7 @@ "data": { "id": "chatOpenAI_2", "label": "ChatOpenAI", - "version": 5, + "version": 6.0, "name": "chatOpenAI", "type": "ChatOpenAI", "baseClasses": ["ChatOpenAI", "BaseChatModel", "BaseLanguageModel"], @@ -419,71 +419,9 @@ { "label": "Model Name", "name": "modelName", - "type": "options", - "options": [ - { - "label": "gpt-4", - "name": "gpt-4" - }, - { - "label": "gpt-4-turbo-preview", - "name": "gpt-4-turbo-preview" - }, - { - "label": "gpt-4-0125-preview", - "name": "gpt-4-0125-preview" - }, - { - "label": "gpt-4-1106-preview", - "name": "gpt-4-1106-preview" - }, - { - "label": "gpt-4-1106-vision-preview", - "name": "gpt-4-1106-vision-preview" - }, - { - "label": "gpt-4-vision-preview", - "name": "gpt-4-vision-preview" - }, - { - "label": "gpt-4-0613", - "name": "gpt-4-0613" - }, - { - "label": "gpt-4-32k", - "name": "gpt-4-32k" - }, - { - "label": "gpt-4-32k-0613", - "name": "gpt-4-32k-0613" - }, - { - "label": "gpt-3.5-turbo", - "name": "gpt-3.5-turbo" - }, - { - "label": "gpt-3.5-turbo-0125", - "name": "gpt-3.5-turbo-0125" - }, - { - "label": "gpt-3.5-turbo-1106", - "name": "gpt-3.5-turbo-1106" - }, - { - "label": "gpt-3.5-turbo-0613", - "name": "gpt-3.5-turbo-0613" - }, - { - "label": "gpt-3.5-turbo-16k", - "name": "gpt-3.5-turbo-16k" - }, - { - "label": "gpt-3.5-turbo-16k-0613", - "name": "gpt-3.5-turbo-16k-0613" - } - ], + "type": "asyncOptions", + "loadMethod": "listModels", "default": "gpt-3.5-turbo", - "optional": true, "id": "chatOpenAI_2-input-modelName-options" }, { @@ -636,7 +574,7 @@ "data": { "id": "chatOpenAI_1", "label": "ChatOpenAI", - "version": 5, + "version": 6.0, "name": "chatOpenAI", "type": "ChatOpenAI", "baseClasses": ["ChatOpenAI", "BaseChatModel", "BaseLanguageModel"], @@ -653,71 +591,9 @@ { "label": "Model Name", "name": "modelName", - "type": "options", - "options": [ - { - "label": "gpt-4", - "name": "gpt-4" - }, - { - "label": "gpt-4-turbo-preview", - "name": "gpt-4-turbo-preview" - }, - { - "label": "gpt-4-0125-preview", - "name": "gpt-4-0125-preview" - }, - { - "label": "gpt-4-1106-preview", - "name": "gpt-4-1106-preview" - }, - { - "label": "gpt-4-1106-vision-preview", - "name": "gpt-4-1106-vision-preview" - }, - { - "label": "gpt-4-vision-preview", - "name": "gpt-4-vision-preview" - }, - { - "label": "gpt-4-0613", - "name": "gpt-4-0613" - }, - { - "label": "gpt-4-32k", - "name": "gpt-4-32k" - }, - { - "label": "gpt-4-32k-0613", - "name": "gpt-4-32k-0613" - }, - { - "label": "gpt-3.5-turbo", - "name": "gpt-3.5-turbo" - }, - { - "label": "gpt-3.5-turbo-0125", - "name": "gpt-3.5-turbo-0125" - }, - { - "label": "gpt-3.5-turbo-1106", - "name": "gpt-3.5-turbo-1106" - }, - { - "label": "gpt-3.5-turbo-0613", - "name": "gpt-3.5-turbo-0613" - }, - { - "label": "gpt-3.5-turbo-16k", - "name": "gpt-3.5-turbo-16k" - }, - { - "label": "gpt-3.5-turbo-16k-0613", - "name": "gpt-3.5-turbo-16k-0613" - } - ], + "type": "asyncOptions", + "loadMethod": "listModels", "default": "gpt-3.5-turbo", - "optional": true, "id": "chatOpenAI_1-input-modelName-options" }, { @@ -870,7 +746,7 @@ "data": { "id": "chatOpenAI_3", "label": "ChatOpenAI", - "version": 5, + "version": 6.0, "name": "chatOpenAI", "type": "ChatOpenAI", "baseClasses": ["ChatOpenAI", "BaseChatModel", "BaseLanguageModel"], @@ -887,71 +763,9 @@ { "label": "Model Name", "name": "modelName", - "type": "options", - "options": [ - { - "label": "gpt-4", - "name": "gpt-4" - }, - { - "label": "gpt-4-turbo-preview", - "name": "gpt-4-turbo-preview" - }, - { - "label": "gpt-4-0125-preview", - "name": "gpt-4-0125-preview" - }, - { - "label": "gpt-4-1106-preview", - "name": "gpt-4-1106-preview" - }, - { - "label": "gpt-4-1106-vision-preview", - "name": "gpt-4-1106-vision-preview" - }, - { - "label": "gpt-4-vision-preview", - "name": "gpt-4-vision-preview" - }, - { - "label": "gpt-4-0613", - "name": "gpt-4-0613" - }, - { - "label": "gpt-4-32k", - "name": "gpt-4-32k" - }, - { - "label": "gpt-4-32k-0613", - "name": "gpt-4-32k-0613" - }, - { - "label": "gpt-3.5-turbo", - "name": "gpt-3.5-turbo" - }, - { - "label": "gpt-3.5-turbo-0125", - "name": "gpt-3.5-turbo-0125" - }, - { - "label": "gpt-3.5-turbo-1106", - "name": "gpt-3.5-turbo-1106" - }, - { - "label": "gpt-3.5-turbo-0613", - "name": "gpt-3.5-turbo-0613" - }, - { - "label": "gpt-3.5-turbo-16k", - "name": "gpt-3.5-turbo-16k" - }, - { - "label": "gpt-3.5-turbo-16k-0613", - "name": "gpt-3.5-turbo-16k-0613" - } - ], + "type": "asyncOptions", + "loadMethod": "listModels", "default": "gpt-3.5-turbo", - "optional": true, "id": "chatOpenAI_3-input-modelName-options" }, { @@ -1120,6 +934,14 @@ "optional": true, "additionalParams": true, "id": "conversationalAgent_0-input-systemMessage-string" + }, + { + "label": "Max Iterations", + "name": "maxIterations", + "type": "number", + "optional": true, + "additionalParams": true, + "id": "conversationalAgent_0-input-maxIterations-number" } ], "inputAnchors": [ diff --git a/packages/server/marketplaces/chatflows/Advanced Structured Output Parser.json b/packages/server/marketplaces/chatflows/Advanced Structured Output Parser.json index 8618bf866ec..a7e765caf9e 100644 --- a/packages/server/marketplaces/chatflows/Advanced Structured Output Parser.json +++ b/packages/server/marketplaces/chatflows/Advanced Structured Output Parser.json @@ -181,7 +181,7 @@ "data": { "id": "chatOpenAI_0", "label": "ChatOpenAI", - "version": 5, + "version": 6.0, "name": "chatOpenAI", "type": "ChatOpenAI", "baseClasses": ["ChatOpenAI", "BaseChatModel", "BaseLanguageModel", "Runnable"], @@ -198,71 +198,9 @@ { "label": "Model Name", "name": "modelName", - "type": "options", - "options": [ - { - "label": "gpt-4", - "name": "gpt-4" - }, - { - "label": "gpt-4-turbo-preview", - "name": "gpt-4-turbo-preview" - }, - { - "label": "gpt-4-0125-preview", - "name": "gpt-4-0125-preview" - }, - { - "label": "gpt-4-1106-preview", - "name": "gpt-4-1106-preview" - }, - { - "label": "gpt-4-1106-vision-preview", - "name": "gpt-4-1106-vision-preview" - }, - { - "label": "gpt-4-vision-preview", - "name": "gpt-4-vision-preview" - }, - { - "label": "gpt-4-0613", - "name": "gpt-4-0613" - }, - { - "label": "gpt-4-32k", - "name": "gpt-4-32k" - }, - { - "label": "gpt-4-32k-0613", - "name": "gpt-4-32k-0613" - }, - { - "label": "gpt-3.5-turbo", - "name": "gpt-3.5-turbo" - }, - { - "label": "gpt-3.5-turbo-0125", - "name": "gpt-3.5-turbo-0125" - }, - { - "label": "gpt-3.5-turbo-1106", - "name": "gpt-3.5-turbo-1106" - }, - { - "label": "gpt-3.5-turbo-0613", - "name": "gpt-3.5-turbo-0613" - }, - { - "label": "gpt-3.5-turbo-16k", - "name": "gpt-3.5-turbo-16k" - }, - { - "label": "gpt-3.5-turbo-16k-0613", - "name": "gpt-3.5-turbo-16k-0613" - } - ], + "type": "asyncOptions", + "loadMethod": "listModels", "default": "gpt-3.5-turbo", - "optional": true, "id": "chatOpenAI_0-input-modelName-options" }, { diff --git a/packages/server/marketplaces/chatflows/Antonym.json b/packages/server/marketplaces/chatflows/Antonym.json index 101d04308c2..49ee7dbb9fd 100644 --- a/packages/server/marketplaces/chatflows/Antonym.json +++ b/packages/server/marketplaces/chatflows/Antonym.json @@ -177,7 +177,7 @@ "data": { "id": "chatOpenAI_0", "label": "ChatOpenAI", - "version": 5, + "version": 6.0, "name": "chatOpenAI", "type": "ChatOpenAI", "baseClasses": ["ChatOpenAI", "BaseChatModel", "BaseLanguageModel"], @@ -194,71 +194,9 @@ { "label": "Model Name", "name": "modelName", - "type": "options", - "options": [ - { - "label": "gpt-4", - "name": "gpt-4" - }, - { - "label": "gpt-4-turbo-preview", - "name": "gpt-4-turbo-preview" - }, - { - "label": "gpt-4-0125-preview", - "name": "gpt-4-0125-preview" - }, - { - "label": "gpt-4-1106-preview", - "name": "gpt-4-1106-preview" - }, - { - "label": "gpt-4-1106-vision-preview", - "name": "gpt-4-1106-vision-preview" - }, - { - "label": "gpt-4-vision-preview", - "name": "gpt-4-vision-preview" - }, - { - "label": "gpt-4-0613", - "name": "gpt-4-0613" - }, - { - "label": "gpt-4-32k", - "name": "gpt-4-32k" - }, - { - "label": "gpt-4-32k-0613", - "name": "gpt-4-32k-0613" - }, - { - "label": "gpt-3.5-turbo", - "name": "gpt-3.5-turbo" - }, - { - "label": "gpt-3.5-turbo-0125", - "name": "gpt-3.5-turbo-0125" - }, - { - "label": "gpt-3.5-turbo-1106", - "name": "gpt-3.5-turbo-1106" - }, - { - "label": "gpt-3.5-turbo-0613", - "name": "gpt-3.5-turbo-0613" - }, - { - "label": "gpt-3.5-turbo-16k", - "name": "gpt-3.5-turbo-16k" - }, - { - "label": "gpt-3.5-turbo-16k-0613", - "name": "gpt-3.5-turbo-16k-0613" - } - ], + "type": "asyncOptions", + "loadMethod": "listModels", "default": "gpt-3.5-turbo", - "optional": true, "id": "chatOpenAI_0-input-modelName-options" }, { diff --git a/packages/server/marketplaces/chatflows/AutoGPT.json b/packages/server/marketplaces/chatflows/AutoGPT.json index fd6ffc904d3..de69d7b87fa 100644 --- a/packages/server/marketplaces/chatflows/AutoGPT.json +++ b/packages/server/marketplaces/chatflows/AutoGPT.json @@ -263,7 +263,7 @@ "data": { "id": "chatOpenAI_0", "label": "ChatOpenAI", - "version": 5, + "version": 6.0, "name": "chatOpenAI", "type": "ChatOpenAI", "baseClasses": ["ChatOpenAI", "BaseChatModel", "BaseLanguageModel"], @@ -280,71 +280,9 @@ { "label": "Model Name", "name": "modelName", - "type": "options", - "options": [ - { - "label": "gpt-4", - "name": "gpt-4" - }, - { - "label": "gpt-4-turbo-preview", - "name": "gpt-4-turbo-preview" - }, - { - "label": "gpt-4-0125-preview", - "name": "gpt-4-0125-preview" - }, - { - "label": "gpt-4-1106-preview", - "name": "gpt-4-1106-preview" - }, - { - "label": "gpt-4-1106-vision-preview", - "name": "gpt-4-1106-vision-preview" - }, - { - "label": "gpt-4-vision-preview", - "name": "gpt-4-vision-preview" - }, - { - "label": "gpt-4-0613", - "name": "gpt-4-0613" - }, - { - "label": "gpt-4-32k", - "name": "gpt-4-32k" - }, - { - "label": "gpt-4-32k-0613", - "name": "gpt-4-32k-0613" - }, - { - "label": "gpt-3.5-turbo", - "name": "gpt-3.5-turbo" - }, - { - "label": "gpt-3.5-turbo-0125", - "name": "gpt-3.5-turbo-0125" - }, - { - "label": "gpt-3.5-turbo-1106", - "name": "gpt-3.5-turbo-1106" - }, - { - "label": "gpt-3.5-turbo-0613", - "name": "gpt-3.5-turbo-0613" - }, - { - "label": "gpt-3.5-turbo-16k", - "name": "gpt-3.5-turbo-16k" - }, - { - "label": "gpt-3.5-turbo-16k-0613", - "name": "gpt-3.5-turbo-16k-0613" - } - ], + "type": "asyncOptions", + "loadMethod": "listModels", "default": "gpt-3.5-turbo", - "optional": true, "id": "chatOpenAI_0-input-modelName-options" }, { @@ -497,7 +435,7 @@ "data": { "id": "openAIEmbeddings_0", "label": "OpenAI Embeddings", - "version": 2, + "version": 3, "name": "openAIEmbeddings", "type": "OpenAIEmbeddings", "baseClasses": ["OpenAIEmbeddings", "Embeddings"], @@ -514,23 +452,9 @@ { "label": "Model Name", "name": "modelName", - "type": "options", - "options": [ - { - "label": "text-embedding-3-large", - "name": "text-embedding-3-large" - }, - { - "label": "text-embedding-3-small", - "name": "text-embedding-3-small" - }, - { - "label": "text-embedding-ada-002", - "name": "text-embedding-ada-002" - } - ], + "type": "asyncOptions", + "loadMethod": "listModels", "default": "text-embedding-ada-002", - "optional": true, "id": "openAIEmbeddings_0-input-modelName-options" }, { diff --git a/packages/server/marketplaces/chatflows/BabyAGI.json b/packages/server/marketplaces/chatflows/BabyAGI.json index a93e719346c..cd2e79be748 100644 --- a/packages/server/marketplaces/chatflows/BabyAGI.json +++ b/packages/server/marketplaces/chatflows/BabyAGI.json @@ -89,7 +89,7 @@ "data": { "id": "openAIEmbeddings_0", "label": "OpenAI Embeddings", - "version": 2, + "version": 3, "name": "openAIEmbeddings", "type": "OpenAIEmbeddings", "baseClasses": ["OpenAIEmbeddings", "Embeddings"], @@ -106,23 +106,9 @@ { "label": "Model Name", "name": "modelName", - "type": "options", - "options": [ - { - "label": "text-embedding-3-large", - "name": "text-embedding-3-large" - }, - { - "label": "text-embedding-3-small", - "name": "text-embedding-3-small" - }, - { - "label": "text-embedding-ada-002", - "name": "text-embedding-ada-002" - } - ], + "type": "asyncOptions", + "loadMethod": "listModels", "default": "text-embedding-ada-002", - "optional": true, "id": "openAIEmbeddings_0-input-modelName-options" }, { @@ -356,7 +342,7 @@ "data": { "id": "chatOpenAI_0", "label": "ChatOpenAI", - "version": 5, + "version": 6.0, "name": "chatOpenAI", "type": "ChatOpenAI", "baseClasses": ["ChatOpenAI", "BaseChatModel", "BaseLanguageModel", "Runnable"], @@ -373,71 +359,9 @@ { "label": "Model Name", "name": "modelName", - "type": "options", - "options": [ - { - "label": "gpt-4", - "name": "gpt-4" - }, - { - "label": "gpt-4-turbo-preview", - "name": "gpt-4-turbo-preview" - }, - { - "label": "gpt-4-0125-preview", - "name": "gpt-4-0125-preview" - }, - { - "label": "gpt-4-1106-preview", - "name": "gpt-4-1106-preview" - }, - { - "label": "gpt-4-1106-vision-preview", - "name": "gpt-4-1106-vision-preview" - }, - { - "label": "gpt-4-vision-preview", - "name": "gpt-4-vision-preview" - }, - { - "label": "gpt-4-0613", - "name": "gpt-4-0613" - }, - { - "label": "gpt-4-32k", - "name": "gpt-4-32k" - }, - { - "label": "gpt-4-32k-0613", - "name": "gpt-4-32k-0613" - }, - { - "label": "gpt-3.5-turbo", - "name": "gpt-3.5-turbo" - }, - { - "label": "gpt-3.5-turbo-0125", - "name": "gpt-3.5-turbo-0125" - }, - { - "label": "gpt-3.5-turbo-1106", - "name": "gpt-3.5-turbo-1106" - }, - { - "label": "gpt-3.5-turbo-0613", - "name": "gpt-3.5-turbo-0613" - }, - { - "label": "gpt-3.5-turbo-16k", - "name": "gpt-3.5-turbo-16k" - }, - { - "label": "gpt-3.5-turbo-16k-0613", - "name": "gpt-3.5-turbo-16k-0613" - } - ], + "type": "asyncOptions", + "loadMethod": "listModels", "default": "gpt-3.5-turbo", - "optional": true, "id": "chatOpenAI_0-input-modelName-options" }, { diff --git a/packages/server/marketplaces/chatflows/CSV Agent.json b/packages/server/marketplaces/chatflows/CSV Agent.json index 2ab6644d65c..c79283e7d73 100644 --- a/packages/server/marketplaces/chatflows/CSV Agent.json +++ b/packages/server/marketplaces/chatflows/CSV Agent.json @@ -92,7 +92,7 @@ "id": "chatOpenAI_0", "label": "ChatOpenAI", "name": "chatOpenAI", - "version": 5, + "version": 6.0, "type": "ChatOpenAI", "baseClasses": ["ChatOpenAI", "BaseChatModel", "BaseLanguageModel"], "category": "Chat Models", @@ -108,71 +108,9 @@ { "label": "Model Name", "name": "modelName", - "type": "options", - "options": [ - { - "label": "gpt-4", - "name": "gpt-4" - }, - { - "label": "gpt-4-turbo-preview", - "name": "gpt-4-turbo-preview" - }, - { - "label": "gpt-4-0125-preview", - "name": "gpt-4-0125-preview" - }, - { - "label": "gpt-4-1106-preview", - "name": "gpt-4-1106-preview" - }, - { - "label": "gpt-4-1106-vision-preview", - "name": "gpt-4-1106-vision-preview" - }, - { - "label": "gpt-4-vision-preview", - "name": "gpt-4-vision-preview" - }, - { - "label": "gpt-4-0613", - "name": "gpt-4-0613" - }, - { - "label": "gpt-4-32k", - "name": "gpt-4-32k" - }, - { - "label": "gpt-4-32k-0613", - "name": "gpt-4-32k-0613" - }, - { - "label": "gpt-3.5-turbo", - "name": "gpt-3.5-turbo" - }, - { - "label": "gpt-3.5-turbo-0125", - "name": "gpt-3.5-turbo-0125" - }, - { - "label": "gpt-3.5-turbo-1106", - "name": "gpt-3.5-turbo-1106" - }, - { - "label": "gpt-3.5-turbo-0613", - "name": "gpt-3.5-turbo-0613" - }, - { - "label": "gpt-3.5-turbo-16k", - "name": "gpt-3.5-turbo-16k" - }, - { - "label": "gpt-3.5-turbo-16k-0613", - "name": "gpt-3.5-turbo-16k-0613" - } - ], + "type": "asyncOptions", + "loadMethod": "listModels", "default": "gpt-3.5-turbo", - "optional": true, "id": "chatOpenAI_0-input-modelName-options" }, { diff --git a/packages/server/marketplaces/chatflows/Chat with a Podcast.json b/packages/server/marketplaces/chatflows/Chat with a Podcast.json index 526a85f60fb..5569d472ce9 100644 --- a/packages/server/marketplaces/chatflows/Chat with a Podcast.json +++ b/packages/server/marketplaces/chatflows/Chat with a Podcast.json @@ -206,7 +206,7 @@ "data": { "id": "chatOpenAI_0", "label": "ChatOpenAI", - "version": 5, + "version": 6.0, "name": "chatOpenAI", "type": "ChatOpenAI", "baseClasses": ["ChatOpenAI", "BaseChatModel", "BaseLanguageModel", "Runnable"], @@ -223,71 +223,9 @@ { "label": "Model Name", "name": "modelName", - "type": "options", - "options": [ - { - "label": "gpt-4", - "name": "gpt-4" - }, - { - "label": "gpt-4-turbo-preview", - "name": "gpt-4-turbo-preview" - }, - { - "label": "gpt-4-0125-preview", - "name": "gpt-4-0125-preview" - }, - { - "label": "gpt-4-1106-preview", - "name": "gpt-4-1106-preview" - }, - { - "label": "gpt-4-1106-vision-preview", - "name": "gpt-4-1106-vision-preview" - }, - { - "label": "gpt-4-vision-preview", - "name": "gpt-4-vision-preview" - }, - { - "label": "gpt-4-0613", - "name": "gpt-4-0613" - }, - { - "label": "gpt-4-32k", - "name": "gpt-4-32k" - }, - { - "label": "gpt-4-32k-0613", - "name": "gpt-4-32k-0613" - }, - { - "label": "gpt-3.5-turbo", - "name": "gpt-3.5-turbo" - }, - { - "label": "gpt-3.5-turbo-0125", - "name": "gpt-3.5-turbo-0125" - }, - { - "label": "gpt-3.5-turbo-1106", - "name": "gpt-3.5-turbo-1106" - }, - { - "label": "gpt-3.5-turbo-0613", - "name": "gpt-3.5-turbo-0613" - }, - { - "label": "gpt-3.5-turbo-16k", - "name": "gpt-3.5-turbo-16k" - }, - { - "label": "gpt-3.5-turbo-16k-0613", - "name": "gpt-3.5-turbo-16k-0613" - } - ], + "type": "asyncOptions", + "loadMethod": "listModels", "default": "gpt-3.5-turbo", - "optional": true, "id": "chatOpenAI_0-input-modelName-options" }, { @@ -515,7 +453,7 @@ "data": { "id": "openAIEmbeddings_0", "label": "OpenAI Embeddings", - "version": 2, + "version": 3, "name": "openAIEmbeddings", "type": "OpenAIEmbeddings", "baseClasses": ["OpenAIEmbeddings", "Embeddings"], @@ -532,23 +470,9 @@ { "label": "Model Name", "name": "modelName", - "type": "options", - "options": [ - { - "label": "text-embedding-3-large", - "name": "text-embedding-3-large" - }, - { - "label": "text-embedding-3-small", - "name": "text-embedding-3-small" - }, - { - "label": "text-embedding-ada-002", - "name": "text-embedding-ada-002" - } - ], + "type": "asyncOptions", + "loadMethod": "listModels", "default": "text-embedding-ada-002", - "optional": true, "id": "openAIEmbeddings_0-input-modelName-options" }, { diff --git a/packages/server/marketplaces/chatflows/ChatGPTPlugin.json b/packages/server/marketplaces/chatflows/ChatGPTPlugin.json index e7f27080fc9..b7dbdb00bde 100644 --- a/packages/server/marketplaces/chatflows/ChatGPTPlugin.json +++ b/packages/server/marketplaces/chatflows/ChatGPTPlugin.json @@ -217,7 +217,7 @@ "id": "chatOpenAI_0", "label": "ChatOpenAI", "name": "chatOpenAI", - "version": 5, + "version": 6.0, "type": "ChatOpenAI", "baseClasses": ["ChatOpenAI", "BaseChatModel", "BaseLanguageModel"], "category": "Chat Models", @@ -233,71 +233,9 @@ { "label": "Model Name", "name": "modelName", - "type": "options", - "options": [ - { - "label": "gpt-4", - "name": "gpt-4" - }, - { - "label": "gpt-4-turbo-preview", - "name": "gpt-4-turbo-preview" - }, - { - "label": "gpt-4-0125-preview", - "name": "gpt-4-0125-preview" - }, - { - "label": "gpt-4-1106-preview", - "name": "gpt-4-1106-preview" - }, - { - "label": "gpt-4-1106-vision-preview", - "name": "gpt-4-1106-vision-preview" - }, - { - "label": "gpt-4-vision-preview", - "name": "gpt-4-vision-preview" - }, - { - "label": "gpt-4-0613", - "name": "gpt-4-0613" - }, - { - "label": "gpt-4-32k", - "name": "gpt-4-32k" - }, - { - "label": "gpt-4-32k-0613", - "name": "gpt-4-32k-0613" - }, - { - "label": "gpt-3.5-turbo", - "name": "gpt-3.5-turbo" - }, - { - "label": "gpt-3.5-turbo-0125", - "name": "gpt-3.5-turbo-0125" - }, - { - "label": "gpt-3.5-turbo-1106", - "name": "gpt-3.5-turbo-1106" - }, - { - "label": "gpt-3.5-turbo-0613", - "name": "gpt-3.5-turbo-0613" - }, - { - "label": "gpt-3.5-turbo-16k", - "name": "gpt-3.5-turbo-16k" - }, - { - "label": "gpt-3.5-turbo-16k-0613", - "name": "gpt-3.5-turbo-16k-0613" - } - ], + "type": "asyncOptions", + "loadMethod": "listModels", "default": "gpt-3.5-turbo", - "optional": true, "id": "chatOpenAI_0-input-modelName-options" }, { @@ -479,6 +417,14 @@ "optional": true, "list": true, "id": "mrklAgentChat_0-input-inputModeration-Moderation" + }, + { + "label": "Max Iterations", + "name": "maxIterations", + "type": "number", + "optional": true, + "additionalParams": true, + "id": "mrklAgentChat_0-input-maxIterations-number" } ], "inputs": { diff --git a/packages/server/marketplaces/chatflows/Claude LLM.json b/packages/server/marketplaces/chatflows/Claude LLM.json index 80b52d04fc3..336fa5036e1 100644 --- a/packages/server/marketplaces/chatflows/Claude LLM.json +++ b/packages/server/marketplaces/chatflows/Claude LLM.json @@ -164,7 +164,7 @@ "data": { "id": "chatAnthropic_0", "label": "ChatAnthropic", - "version": 4, + "version": 6.0, "name": "chatAnthropic", "type": "ChatAnthropic", "baseClasses": ["ChatAnthropic", "BaseChatModel", "BaseLanguageModel", "Runnable"], @@ -181,41 +181,9 @@ { "label": "Model Name", "name": "modelName", - "type": "options", - "options": [ - { - "label": "claude-3-haiku", - "name": "claude-3-haiku-20240307", - "description": "Fastest and most compact model, designed for near-instant responsiveness" - }, - { - "label": "claude-3-opus", - "name": "claude-3-opus-20240229", - "description": "Most powerful model for highly complex tasks" - }, - { - "label": "claude-3-sonnet", - "name": "claude-3-sonnet-20240229", - "description": "Ideal balance of intelligence and speed for enterprise workloads" - }, - { - "label": "claude-2.0 (legacy)", - "name": "claude-2.0", - "description": "Claude 2 latest major version, automatically get updates to the model as they are released" - }, - { - "label": "claude-2.1 (legacy)", - "name": "claude-2.1", - "description": "Claude 2 latest full version" - }, - { - "label": "claude-instant-1.2 (legacy)", - "name": "claude-instant-1.2", - "description": "Claude Instant latest major version, automatically get updates to the model as they are released" - } - ], + "type": "asyncOptions", + "loadMethod": "listModels", "default": "claude-3-haiku", - "optional": true, "id": "chatAnthropic_0-input-modelName-options" }, { diff --git a/packages/server/marketplaces/chatflows/Context Chat Engine.json b/packages/server/marketplaces/chatflows/Context Chat Engine.json index 3f1152f295e..82780597fb9 100644 --- a/packages/server/marketplaces/chatflows/Context Chat Engine.json +++ b/packages/server/marketplaces/chatflows/Context Chat Engine.json @@ -168,7 +168,7 @@ "data": { "id": "openAIEmbedding_LlamaIndex_0", "label": "OpenAI Embedding", - "version": 1, + "version": 2, "name": "openAIEmbedding_LlamaIndex", "type": "OpenAIEmbedding", "baseClasses": ["OpenAIEmbedding", "BaseEmbedding_LlamaIndex", "BaseEmbedding"], @@ -186,23 +186,9 @@ { "label": "Model Name", "name": "modelName", - "type": "options", - "options": [ - { - "label": "text-embedding-3-large", - "name": "text-embedding-3-large" - }, - { - "label": "text-embedding-3-small", - "name": "text-embedding-3-small" - }, - { - "label": "text-embedding-ada-002", - "name": "text-embedding-ada-002" - } - ], + "type": "asyncOptions", + "loadMethod": "listModels", "default": "text-embedding-ada-002", - "optional": true, "id": "openAIEmbedding_LlamaIndex_0-input-modelName-options" }, { @@ -225,7 +211,8 @@ "inputAnchors": [], "inputs": { "timeout": "", - "basepath": "" + "basepath": "", + "modelName": "text-embedding-ada-002" }, "outputAnchors": [ { @@ -383,7 +370,7 @@ "data": { "id": "chatOpenAI_LlamaIndex_1", "label": "ChatOpenAI", - "version": 1, + "version": 2.0, "name": "chatOpenAI_LlamaIndex", "type": "ChatOpenAI", "baseClasses": ["ChatOpenAI", "BaseChatModel_LlamaIndex"], @@ -401,63 +388,9 @@ { "label": "Model Name", "name": "modelName", - "type": "options", - "options": [ - { - "label": "gpt-4", - "name": "gpt-4" - }, - { - "label": "gpt-4-turbo-preview", - "name": "gpt-4-turbo-preview" - }, - { - "label": "gpt-4-0125-preview", - "name": "gpt-4-0125-preview" - }, - { - "label": "gpt-4-1106-preview", - "name": "gpt-4-1106-preview" - }, - { - "label": "gpt-4-vision-preview", - "name": "gpt-4-vision-preview" - }, - { - "label": "gpt-4-0613", - "name": "gpt-4-0613" - }, - { - "label": "gpt-4-32k", - "name": "gpt-4-32k" - }, - { - "label": "gpt-4-32k-0613", - "name": "gpt-4-32k-0613" - }, - { - "label": "gpt-3.5-turbo", - "name": "gpt-3.5-turbo" - }, - { - "label": "gpt-3.5-turbo-1106", - "name": "gpt-3.5-turbo-1106" - }, - { - "label": "gpt-3.5-turbo-0613", - "name": "gpt-3.5-turbo-0613" - }, - { - "label": "gpt-3.5-turbo-16k", - "name": "gpt-3.5-turbo-16k" - }, - { - "label": "gpt-3.5-turbo-16k-0613", - "name": "gpt-3.5-turbo-16k-0613" - } - ], + "type": "asyncOptions", + "loadMethod": "listModels", "default": "gpt-3.5-turbo", - "optional": true, "id": "chatOpenAI_LlamaIndex_1-input-modelName-options" }, { @@ -696,7 +629,7 @@ "data": { "id": "chatOpenAI_LlamaIndex_2", "label": "ChatOpenAI", - "version": 1, + "version": 2.0, "name": "chatOpenAI_LlamaIndex", "type": "ChatOpenAI", "baseClasses": ["ChatOpenAI", "BaseChatModel_LlamaIndex"], @@ -714,63 +647,9 @@ { "label": "Model Name", "name": "modelName", - "type": "options", - "options": [ - { - "label": "gpt-4", - "name": "gpt-4" - }, - { - "label": "gpt-4-turbo-preview", - "name": "gpt-4-turbo-preview" - }, - { - "label": "gpt-4-0125-preview", - "name": "gpt-4-0125-preview" - }, - { - "label": "gpt-4-1106-preview", - "name": "gpt-4-1106-preview" - }, - { - "label": "gpt-4-vision-preview", - "name": "gpt-4-vision-preview" - }, - { - "label": "gpt-4-0613", - "name": "gpt-4-0613" - }, - { - "label": "gpt-4-32k", - "name": "gpt-4-32k" - }, - { - "label": "gpt-4-32k-0613", - "name": "gpt-4-32k-0613" - }, - { - "label": "gpt-3.5-turbo", - "name": "gpt-3.5-turbo" - }, - { - "label": "gpt-3.5-turbo-1106", - "name": "gpt-3.5-turbo-1106" - }, - { - "label": "gpt-3.5-turbo-0613", - "name": "gpt-3.5-turbo-0613" - }, - { - "label": "gpt-3.5-turbo-16k", - "name": "gpt-3.5-turbo-16k" - }, - { - "label": "gpt-3.5-turbo-16k-0613", - "name": "gpt-3.5-turbo-16k-0613" - } - ], + "type": "asyncOptions", + "loadMethod": "listModels", "default": "gpt-3.5-turbo", - "optional": true, "id": "chatOpenAI_LlamaIndex_2-input-modelName-options" }, { diff --git a/packages/server/marketplaces/chatflows/Conversational Agent.json b/packages/server/marketplaces/chatflows/Conversational Agent.json index bb7dac0354d..47ae76bd190 100644 --- a/packages/server/marketplaces/chatflows/Conversational Agent.json +++ b/packages/server/marketplaces/chatflows/Conversational Agent.json @@ -162,7 +162,7 @@ "data": { "id": "chatOpenAI_0", "label": "ChatOpenAI", - "version": 5, + "version": 6.0, "name": "chatOpenAI", "type": "ChatOpenAI", "baseClasses": ["ChatOpenAI", "BaseChatModel", "BaseLanguageModel"], @@ -179,71 +179,9 @@ { "label": "Model Name", "name": "modelName", - "type": "options", - "options": [ - { - "label": "gpt-4", - "name": "gpt-4" - }, - { - "label": "gpt-4-turbo-preview", - "name": "gpt-4-turbo-preview" - }, - { - "label": "gpt-4-0125-preview", - "name": "gpt-4-0125-preview" - }, - { - "label": "gpt-4-1106-preview", - "name": "gpt-4-1106-preview" - }, - { - "label": "gpt-4-1106-vision-preview", - "name": "gpt-4-1106-vision-preview" - }, - { - "label": "gpt-4-vision-preview", - "name": "gpt-4-vision-preview" - }, - { - "label": "gpt-4-0613", - "name": "gpt-4-0613" - }, - { - "label": "gpt-4-32k", - "name": "gpt-4-32k" - }, - { - "label": "gpt-4-32k-0613", - "name": "gpt-4-32k-0613" - }, - { - "label": "gpt-3.5-turbo", - "name": "gpt-3.5-turbo" - }, - { - "label": "gpt-3.5-turbo-0125", - "name": "gpt-3.5-turbo-0125" - }, - { - "label": "gpt-3.5-turbo-1106", - "name": "gpt-3.5-turbo-1106" - }, - { - "label": "gpt-3.5-turbo-0613", - "name": "gpt-3.5-turbo-0613" - }, - { - "label": "gpt-3.5-turbo-16k", - "name": "gpt-3.5-turbo-16k" - }, - { - "label": "gpt-3.5-turbo-16k-0613", - "name": "gpt-3.5-turbo-16k-0613" - } - ], + "type": "asyncOptions", + "loadMethod": "listModels", "default": "gpt-3.5-turbo", - "optional": true, "id": "chatOpenAI_0-input-modelName-options" }, { @@ -412,6 +350,14 @@ "optional": true, "additionalParams": true, "id": "conversationalAgent_0-input-systemMessage-string" + }, + { + "label": "Max Iterations", + "name": "maxIterations", + "type": "number", + "optional": true, + "additionalParams": true, + "id": "conversationalAgent_0-input-maxIterations-number" } ], "inputAnchors": [ diff --git a/packages/server/marketplaces/chatflows/Conversational Retrieval QA Chain.json b/packages/server/marketplaces/chatflows/Conversational Retrieval QA Chain.json index 0b6559ff111..ae6318fe542 100644 --- a/packages/server/marketplaces/chatflows/Conversational Retrieval QA Chain.json +++ b/packages/server/marketplaces/chatflows/Conversational Retrieval QA Chain.json @@ -16,7 +16,7 @@ "data": { "id": "openAIEmbeddings_0", "label": "OpenAI Embeddings", - "version": 2, + "version": 3, "name": "openAIEmbeddings", "type": "OpenAIEmbeddings", "baseClasses": ["OpenAIEmbeddings", "Embeddings"], @@ -33,23 +33,9 @@ { "label": "Model Name", "name": "modelName", - "type": "options", - "options": [ - { - "label": "text-embedding-3-large", - "name": "text-embedding-3-large" - }, - { - "label": "text-embedding-3-small", - "name": "text-embedding-3-small" - }, - { - "label": "text-embedding-ada-002", - "name": "text-embedding-ada-002" - } - ], + "type": "asyncOptions", + "loadMethod": "listModels", "default": "text-embedding-ada-002", - "optional": true, "id": "openAIEmbeddings_0-input-modelName-options" }, { @@ -381,7 +367,7 @@ "data": { "id": "chatOpenAI_0", "label": "ChatOpenAI", - "version": 5, + "version": 6.0, "name": "chatOpenAI", "type": "ChatOpenAI", "baseClasses": ["ChatOpenAI", "BaseChatModel", "BaseLanguageModel", "Runnable"], @@ -398,71 +384,9 @@ { "label": "Model Name", "name": "modelName", - "type": "options", - "options": [ - { - "label": "gpt-4", - "name": "gpt-4" - }, - { - "label": "gpt-4-turbo-preview", - "name": "gpt-4-turbo-preview" - }, - { - "label": "gpt-4-0125-preview", - "name": "gpt-4-0125-preview" - }, - { - "label": "gpt-4-1106-preview", - "name": "gpt-4-1106-preview" - }, - { - "label": "gpt-4-1106-vision-preview", - "name": "gpt-4-1106-vision-preview" - }, - { - "label": "gpt-4-vision-preview", - "name": "gpt-4-vision-preview" - }, - { - "label": "gpt-4-0613", - "name": "gpt-4-0613" - }, - { - "label": "gpt-4-32k", - "name": "gpt-4-32k" - }, - { - "label": "gpt-4-32k-0613", - "name": "gpt-4-32k-0613" - }, - { - "label": "gpt-3.5-turbo", - "name": "gpt-3.5-turbo" - }, - { - "label": "gpt-3.5-turbo-0125", - "name": "gpt-3.5-turbo-0125" - }, - { - "label": "gpt-3.5-turbo-1106", - "name": "gpt-3.5-turbo-1106" - }, - { - "label": "gpt-3.5-turbo-0613", - "name": "gpt-3.5-turbo-0613" - }, - { - "label": "gpt-3.5-turbo-16k", - "name": "gpt-3.5-turbo-16k" - }, - { - "label": "gpt-3.5-turbo-16k-0613", - "name": "gpt-3.5-turbo-16k-0613" - } - ], + "type": "asyncOptions", + "loadMethod": "listModels", "default": "gpt-3.5-turbo", - "optional": true, "id": "chatOpenAI_0-input-modelName-options" }, { diff --git a/packages/server/marketplaces/chatflows/Flowise Docs QnA.json b/packages/server/marketplaces/chatflows/Flowise Docs QnA.json index c3db081b40d..143b2cbc547 100644 --- a/packages/server/marketplaces/chatflows/Flowise Docs QnA.json +++ b/packages/server/marketplaces/chatflows/Flowise Docs QnA.json @@ -388,7 +388,7 @@ "id": "chatOpenAI_0", "label": "ChatOpenAI", "name": "chatOpenAI", - "version": 5, + "version": 6.0, "type": "ChatOpenAI", "baseClasses": ["ChatOpenAI", "BaseChatModel", "BaseLanguageModel"], "category": "Chat Models", @@ -404,71 +404,9 @@ { "label": "Model Name", "name": "modelName", - "type": "options", - "options": [ - { - "label": "gpt-4", - "name": "gpt-4" - }, - { - "label": "gpt-4-turbo-preview", - "name": "gpt-4-turbo-preview" - }, - { - "label": "gpt-4-0125-preview", - "name": "gpt-4-0125-preview" - }, - { - "label": "gpt-4-1106-preview", - "name": "gpt-4-1106-preview" - }, - { - "label": "gpt-4-1106-vision-preview", - "name": "gpt-4-1106-vision-preview" - }, - { - "label": "gpt-4-vision-preview", - "name": "gpt-4-vision-preview" - }, - { - "label": "gpt-4-0613", - "name": "gpt-4-0613" - }, - { - "label": "gpt-4-32k", - "name": "gpt-4-32k" - }, - { - "label": "gpt-4-32k-0613", - "name": "gpt-4-32k-0613" - }, - { - "label": "gpt-3.5-turbo", - "name": "gpt-3.5-turbo" - }, - { - "label": "gpt-3.5-turbo-0125", - "name": "gpt-3.5-turbo-0125" - }, - { - "label": "gpt-3.5-turbo-1106", - "name": "gpt-3.5-turbo-1106" - }, - { - "label": "gpt-3.5-turbo-0613", - "name": "gpt-3.5-turbo-0613" - }, - { - "label": "gpt-3.5-turbo-16k", - "name": "gpt-3.5-turbo-16k" - }, - { - "label": "gpt-3.5-turbo-16k-0613", - "name": "gpt-3.5-turbo-16k-0613" - } - ], + "type": "asyncOptions", + "loadMethod": "listModels", "default": "gpt-3.5-turbo", - "optional": true, "id": "chatOpenAI_0-input-modelName-options" }, { @@ -622,7 +560,7 @@ "id": "openAIEmbeddings_0", "label": "OpenAI Embeddings", "name": "openAIEmbeddings", - "version": 2, + "version": 3, "type": "OpenAIEmbeddings", "baseClasses": ["OpenAIEmbeddings", "Embeddings"], "category": "Embeddings", @@ -638,23 +576,9 @@ { "label": "Model Name", "name": "modelName", - "type": "options", - "options": [ - { - "label": "text-embedding-3-large", - "name": "text-embedding-3-large" - }, - { - "label": "text-embedding-3-small", - "name": "text-embedding-3-small" - }, - { - "label": "text-embedding-ada-002", - "name": "text-embedding-ada-002" - } - ], + "type": "asyncOptions", + "loadMethod": "listModels", "default": "text-embedding-ada-002", - "optional": true, "id": "openAIEmbeddings_0-input-modelName-options" }, { diff --git a/packages/server/marketplaces/chatflows/IfElse.json b/packages/server/marketplaces/chatflows/IfElse.json index cdee6d1d9e4..4ca2add4b58 100644 --- a/packages/server/marketplaces/chatflows/IfElse.json +++ b/packages/server/marketplaces/chatflows/IfElse.json @@ -136,7 +136,7 @@ "data": { "id": "openAI_1", "label": "OpenAI", - "version": 3, + "version": 4.0, "name": "openAI", "type": "OpenAI", "baseClasses": ["OpenAI", "BaseLLM", "BaseLanguageModel"], @@ -153,23 +153,9 @@ { "label": "Model Name", "name": "modelName", - "type": "options", - "options": [ - { - "label": "gpt-3.5-turbo-instruct", - "name": "gpt-3.5-turbo-instruct" - }, - { - "label": "babbage-002", - "name": "babbage-002" - }, - { - "label": "davinci-002", - "name": "davinci-002" - } - ], + "type": "asyncOptions", + "loadMethod": "listModels", "default": "gpt-3.5-turbo-instruct", - "optional": true, "id": "openAI_1-input-modelName-options" }, { @@ -296,7 +282,7 @@ "data": { "id": "openAI_2", "label": "OpenAI", - "version": 3, + "version": 4.0, "name": "openAI", "type": "OpenAI", "baseClasses": ["OpenAI", "BaseLLM", "BaseLanguageModel"], @@ -313,23 +299,9 @@ { "label": "Model Name", "name": "modelName", - "type": "options", - "options": [ - { - "label": "gpt-3.5-turbo-instruct", - "name": "gpt-3.5-turbo-instruct" - }, - { - "label": "babbage-002", - "name": "babbage-002" - }, - { - "label": "davinci-002", - "name": "davinci-002" - } - ], + "type": "asyncOptions", + "loadMethod": "listModels", "default": "gpt-3.5-turbo-instruct", - "optional": true, "id": "openAI_2-input-modelName-options" }, { @@ -910,7 +882,7 @@ "data": { "id": "chatOpenAI_0", "label": "ChatOpenAI", - "version": 5, + "version": 6.0, "name": "chatOpenAI", "type": "ChatOpenAI", "baseClasses": ["ChatOpenAI", "BaseChatModel", "BaseLanguageModel", "Runnable"], @@ -927,71 +899,9 @@ { "label": "Model Name", "name": "modelName", - "type": "options", - "options": [ - { - "label": "gpt-4", - "name": "gpt-4" - }, - { - "label": "gpt-4-turbo-preview", - "name": "gpt-4-turbo-preview" - }, - { - "label": "gpt-4-0125-preview", - "name": "gpt-4-0125-preview" - }, - { - "label": "gpt-4-1106-preview", - "name": "gpt-4-1106-preview" - }, - { - "label": "gpt-4-1106-vision-preview", - "name": "gpt-4-1106-vision-preview" - }, - { - "label": "gpt-4-vision-preview", - "name": "gpt-4-vision-preview" - }, - { - "label": "gpt-4-0613", - "name": "gpt-4-0613" - }, - { - "label": "gpt-4-32k", - "name": "gpt-4-32k" - }, - { - "label": "gpt-4-32k-0613", - "name": "gpt-4-32k-0613" - }, - { - "label": "gpt-3.5-turbo", - "name": "gpt-3.5-turbo" - }, - { - "label": "gpt-3.5-turbo-0125", - "name": "gpt-3.5-turbo-0125" - }, - { - "label": "gpt-3.5-turbo-1106", - "name": "gpt-3.5-turbo-1106" - }, - { - "label": "gpt-3.5-turbo-0613", - "name": "gpt-3.5-turbo-0613" - }, - { - "label": "gpt-3.5-turbo-16k", - "name": "gpt-3.5-turbo-16k" - }, - { - "label": "gpt-3.5-turbo-16k-0613", - "name": "gpt-3.5-turbo-16k-0613" - } - ], + "type": "asyncOptions", + "loadMethod": "listModels", "default": "gpt-3.5-turbo", - "optional": true, "id": "chatOpenAI_0-input-modelName-options" }, { diff --git a/packages/server/marketplaces/chatflows/Image Generation.json b/packages/server/marketplaces/chatflows/Image Generation.json index f798b5a3fa4..9b3450a1837 100644 --- a/packages/server/marketplaces/chatflows/Image Generation.json +++ b/packages/server/marketplaces/chatflows/Image Generation.json @@ -454,7 +454,7 @@ "data": { "id": "chatOpenAI_0", "label": "ChatOpenAI", - "version": 5, + "version": 6.0, "name": "chatOpenAI", "type": "ChatOpenAI", "baseClasses": ["ChatOpenAI", "BaseChatModel", "BaseLanguageModel", "Runnable"], @@ -471,71 +471,9 @@ { "label": "Model Name", "name": "modelName", - "type": "options", - "options": [ - { - "label": "gpt-4", - "name": "gpt-4" - }, - { - "label": "gpt-4-turbo-preview", - "name": "gpt-4-turbo-preview" - }, - { - "label": "gpt-4-0125-preview", - "name": "gpt-4-0125-preview" - }, - { - "label": "gpt-4-1106-preview", - "name": "gpt-4-1106-preview" - }, - { - "label": "gpt-4-1106-vision-preview", - "name": "gpt-4-1106-vision-preview" - }, - { - "label": "gpt-4-vision-preview", - "name": "gpt-4-vision-preview" - }, - { - "label": "gpt-4-0613", - "name": "gpt-4-0613" - }, - { - "label": "gpt-4-32k", - "name": "gpt-4-32k" - }, - { - "label": "gpt-4-32k-0613", - "name": "gpt-4-32k-0613" - }, - { - "label": "gpt-3.5-turbo", - "name": "gpt-3.5-turbo" - }, - { - "label": "gpt-3.5-turbo-0125", - "name": "gpt-3.5-turbo-0125" - }, - { - "label": "gpt-3.5-turbo-1106", - "name": "gpt-3.5-turbo-1106" - }, - { - "label": "gpt-3.5-turbo-0613", - "name": "gpt-3.5-turbo-0613" - }, - { - "label": "gpt-3.5-turbo-16k", - "name": "gpt-3.5-turbo-16k" - }, - { - "label": "gpt-3.5-turbo-16k-0613", - "name": "gpt-3.5-turbo-16k-0613" - } - ], + "type": "asyncOptions", + "loadMethod": "listModels", "default": "gpt-3.5-turbo", - "optional": true, "id": "chatOpenAI_0-input-modelName-options" }, { diff --git a/packages/server/marketplaces/chatflows/Input Moderation.json b/packages/server/marketplaces/chatflows/Input Moderation.json index e35a481daf4..173ce93b2e8 100644 --- a/packages/server/marketplaces/chatflows/Input Moderation.json +++ b/packages/server/marketplaces/chatflows/Input Moderation.json @@ -166,7 +166,7 @@ "data": { "id": "chatOpenAI_0", "label": "ChatOpenAI", - "version": 5, + "version": 6.0, "name": "chatOpenAI", "type": "ChatOpenAI", "baseClasses": ["ChatOpenAI", "BaseChatModel", "BaseLanguageModel", "Runnable"], @@ -183,71 +183,9 @@ { "label": "Model Name", "name": "modelName", - "type": "options", - "options": [ - { - "label": "gpt-4", - "name": "gpt-4" - }, - { - "label": "gpt-4-turbo-preview", - "name": "gpt-4-turbo-preview" - }, - { - "label": "gpt-4-0125-preview", - "name": "gpt-4-0125-preview" - }, - { - "label": "gpt-4-1106-preview", - "name": "gpt-4-1106-preview" - }, - { - "label": "gpt-4-1106-vision-preview", - "name": "gpt-4-1106-vision-preview" - }, - { - "label": "gpt-4-vision-preview", - "name": "gpt-4-vision-preview" - }, - { - "label": "gpt-4-0613", - "name": "gpt-4-0613" - }, - { - "label": "gpt-4-32k", - "name": "gpt-4-32k" - }, - { - "label": "gpt-4-32k-0613", - "name": "gpt-4-32k-0613" - }, - { - "label": "gpt-3.5-turbo", - "name": "gpt-3.5-turbo" - }, - { - "label": "gpt-3.5-turbo-0125", - "name": "gpt-3.5-turbo-0125" - }, - { - "label": "gpt-3.5-turbo-1106", - "name": "gpt-3.5-turbo-1106" - }, - { - "label": "gpt-3.5-turbo-0613", - "name": "gpt-3.5-turbo-0613" - }, - { - "label": "gpt-3.5-turbo-16k", - "name": "gpt-3.5-turbo-16k" - }, - { - "label": "gpt-3.5-turbo-16k-0613", - "name": "gpt-3.5-turbo-16k-0613" - } - ], + "type": "asyncOptions", + "loadMethod": "listModels", "default": "gpt-3.5-turbo", - "optional": true, "id": "chatOpenAI_0-input-modelName-options" }, { diff --git a/packages/server/marketplaces/chatflows/List Output Parser.json b/packages/server/marketplaces/chatflows/List Output Parser.json index 5e8602f0dd7..86d831fcdf7 100644 --- a/packages/server/marketplaces/chatflows/List Output Parser.json +++ b/packages/server/marketplaces/chatflows/List Output Parser.json @@ -225,7 +225,7 @@ "data": { "id": "chatOpenAI_0", "label": "ChatOpenAI", - "version": 5, + "version": 6.0, "name": "chatOpenAI", "type": "ChatOpenAI", "baseClasses": ["ChatOpenAI", "BaseChatModel", "BaseLanguageModel", "Runnable"], @@ -242,71 +242,9 @@ { "label": "Model Name", "name": "modelName", - "type": "options", - "options": [ - { - "label": "gpt-4", - "name": "gpt-4" - }, - { - "label": "gpt-4-turbo-preview", - "name": "gpt-4-turbo-preview" - }, - { - "label": "gpt-4-0125-preview", - "name": "gpt-4-0125-preview" - }, - { - "label": "gpt-4-1106-preview", - "name": "gpt-4-1106-preview" - }, - { - "label": "gpt-4-1106-vision-preview", - "name": "gpt-4-1106-vision-preview" - }, - { - "label": "gpt-4-vision-preview", - "name": "gpt-4-vision-preview" - }, - { - "label": "gpt-4-0613", - "name": "gpt-4-0613" - }, - { - "label": "gpt-4-32k", - "name": "gpt-4-32k" - }, - { - "label": "gpt-4-32k-0613", - "name": "gpt-4-32k-0613" - }, - { - "label": "gpt-3.5-turbo", - "name": "gpt-3.5-turbo" - }, - { - "label": "gpt-3.5-turbo-0125", - "name": "gpt-3.5-turbo-0125" - }, - { - "label": "gpt-3.5-turbo-1106", - "name": "gpt-3.5-turbo-1106" - }, - { - "label": "gpt-3.5-turbo-0613", - "name": "gpt-3.5-turbo-0613" - }, - { - "label": "gpt-3.5-turbo-16k", - "name": "gpt-3.5-turbo-16k" - }, - { - "label": "gpt-3.5-turbo-16k-0613", - "name": "gpt-3.5-turbo-16k-0613" - } - ], + "type": "asyncOptions", + "loadMethod": "listModels", "default": "gpt-3.5-turbo", - "optional": true, "id": "chatOpenAI_0-input-modelName-options" }, { diff --git a/packages/server/marketplaces/chatflows/Long Term Memory.json b/packages/server/marketplaces/chatflows/Long Term Memory.json index f6a642cb639..be684afb3b1 100644 --- a/packages/server/marketplaces/chatflows/Long Term Memory.json +++ b/packages/server/marketplaces/chatflows/Long Term Memory.json @@ -124,7 +124,7 @@ "data": { "id": "openAIEmbeddings_0", "label": "OpenAI Embeddings", - "version": 2, + "version": 3, "name": "openAIEmbeddings", "type": "OpenAIEmbeddings", "baseClasses": ["OpenAIEmbeddings", "Embeddings"], @@ -141,23 +141,9 @@ { "label": "Model Name", "name": "modelName", - "type": "options", - "options": [ - { - "label": "text-embedding-3-large", - "name": "text-embedding-3-large" - }, - { - "label": "text-embedding-3-small", - "name": "text-embedding-3-small" - }, - { - "label": "text-embedding-ada-002", - "name": "text-embedding-ada-002" - } - ], + "type": "asyncOptions", + "loadMethod": "listModels", "default": "text-embedding-ada-002", - "optional": true, "id": "openAIEmbeddings_0-input-modelName-options" }, { @@ -518,7 +504,7 @@ "data": { "id": "chatOpenAI_0", "label": "ChatOpenAI", - "version": 5, + "version": 6.0, "name": "chatOpenAI", "type": "ChatOpenAI", "baseClasses": ["ChatOpenAI", "BaseChatModel", "BaseLanguageModel", "Runnable"], @@ -535,71 +521,9 @@ { "label": "Model Name", "name": "modelName", - "type": "options", - "options": [ - { - "label": "gpt-4", - "name": "gpt-4" - }, - { - "label": "gpt-4-turbo-preview", - "name": "gpt-4-turbo-preview" - }, - { - "label": "gpt-4-0125-preview", - "name": "gpt-4-0125-preview" - }, - { - "label": "gpt-4-1106-preview", - "name": "gpt-4-1106-preview" - }, - { - "label": "gpt-4-1106-vision-preview", - "name": "gpt-4-1106-vision-preview" - }, - { - "label": "gpt-4-vision-preview", - "name": "gpt-4-vision-preview" - }, - { - "label": "gpt-4-0613", - "name": "gpt-4-0613" - }, - { - "label": "gpt-4-32k", - "name": "gpt-4-32k" - }, - { - "label": "gpt-4-32k-0613", - "name": "gpt-4-32k-0613" - }, - { - "label": "gpt-3.5-turbo", - "name": "gpt-3.5-turbo" - }, - { - "label": "gpt-3.5-turbo-0125", - "name": "gpt-3.5-turbo-0125" - }, - { - "label": "gpt-3.5-turbo-1106", - "name": "gpt-3.5-turbo-1106" - }, - { - "label": "gpt-3.5-turbo-0613", - "name": "gpt-3.5-turbo-0613" - }, - { - "label": "gpt-3.5-turbo-16k", - "name": "gpt-3.5-turbo-16k" - }, - { - "label": "gpt-3.5-turbo-16k-0613", - "name": "gpt-3.5-turbo-16k-0613" - } - ], + "type": "asyncOptions", + "loadMethod": "listModels", "default": "gpt-3.5-turbo", - "optional": true, "id": "chatOpenAI_0-input-modelName-options" }, { diff --git a/packages/server/marketplaces/chatflows/Metadata Filter.json b/packages/server/marketplaces/chatflows/Metadata Filter.json index 2caefe5d435..d396ea5e0d0 100644 --- a/packages/server/marketplaces/chatflows/Metadata Filter.json +++ b/packages/server/marketplaces/chatflows/Metadata Filter.json @@ -358,7 +358,7 @@ "data": { "id": "openAIEmbeddings_0", "label": "OpenAI Embeddings", - "version": 2, + "version": 3, "name": "openAIEmbeddings", "type": "OpenAIEmbeddings", "baseClasses": ["OpenAIEmbeddings", "Embeddings"], @@ -375,23 +375,9 @@ { "label": "Model Name", "name": "modelName", - "type": "options", - "options": [ - { - "label": "text-embedding-3-large", - "name": "text-embedding-3-large" - }, - { - "label": "text-embedding-3-small", - "name": "text-embedding-3-small" - }, - { - "label": "text-embedding-ada-002", - "name": "text-embedding-ada-002" - } - ], + "type": "asyncOptions", + "loadMethod": "listModels", "default": "text-embedding-ada-002", - "optional": true, "id": "openAIEmbeddings_0-input-modelName-options" }, { @@ -465,7 +451,7 @@ "data": { "id": "chatOpenAI_0", "label": "ChatOpenAI", - "version": 5, + "version": 6.0, "name": "chatOpenAI", "type": "ChatOpenAI", "baseClasses": ["ChatOpenAI", "BaseChatModel", "BaseLanguageModel", "Runnable"], @@ -482,71 +468,9 @@ { "label": "Model Name", "name": "modelName", - "type": "options", - "options": [ - { - "label": "gpt-4", - "name": "gpt-4" - }, - { - "label": "gpt-4-turbo-preview", - "name": "gpt-4-turbo-preview" - }, - { - "label": "gpt-4-0125-preview", - "name": "gpt-4-0125-preview" - }, - { - "label": "gpt-4-1106-preview", - "name": "gpt-4-1106-preview" - }, - { - "label": "gpt-4-1106-vision-preview", - "name": "gpt-4-1106-vision-preview" - }, - { - "label": "gpt-4-vision-preview", - "name": "gpt-4-vision-preview" - }, - { - "label": "gpt-4-0613", - "name": "gpt-4-0613" - }, - { - "label": "gpt-4-32k", - "name": "gpt-4-32k" - }, - { - "label": "gpt-4-32k-0613", - "name": "gpt-4-32k-0613" - }, - { - "label": "gpt-3.5-turbo", - "name": "gpt-3.5-turbo" - }, - { - "label": "gpt-3.5-turbo-0125", - "name": "gpt-3.5-turbo-0125" - }, - { - "label": "gpt-3.5-turbo-1106", - "name": "gpt-3.5-turbo-1106" - }, - { - "label": "gpt-3.5-turbo-0613", - "name": "gpt-3.5-turbo-0613" - }, - { - "label": "gpt-3.5-turbo-16k", - "name": "gpt-3.5-turbo-16k" - }, - { - "label": "gpt-3.5-turbo-16k-0613", - "name": "gpt-3.5-turbo-16k-0613" - } - ], + "type": "asyncOptions", + "loadMethod": "listModels", "default": "gpt-3.5-turbo", - "optional": true, "id": "chatOpenAI_0-input-modelName-options" }, { diff --git a/packages/server/marketplaces/chatflows/Multi Prompt Chain.json b/packages/server/marketplaces/chatflows/Multi Prompt Chain.json index 171cce0ba6a..cd6c8d2102b 100644 --- a/packages/server/marketplaces/chatflows/Multi Prompt Chain.json +++ b/packages/server/marketplaces/chatflows/Multi Prompt Chain.json @@ -290,7 +290,7 @@ "id": "chatOpenAI_0", "label": "ChatOpenAI", "name": "chatOpenAI", - "version": 5, + "version": 6.0, "type": "ChatOpenAI", "baseClasses": ["ChatOpenAI", "BaseChatModel", "BaseLanguageModel"], "category": "Chat Models", @@ -306,71 +306,9 @@ { "label": "Model Name", "name": "modelName", - "type": "options", - "options": [ - { - "label": "gpt-4", - "name": "gpt-4" - }, - { - "label": "gpt-4-turbo-preview", - "name": "gpt-4-turbo-preview" - }, - { - "label": "gpt-4-0125-preview", - "name": "gpt-4-0125-preview" - }, - { - "label": "gpt-4-1106-preview", - "name": "gpt-4-1106-preview" - }, - { - "label": "gpt-4-1106-vision-preview", - "name": "gpt-4-1106-vision-preview" - }, - { - "label": "gpt-4-vision-preview", - "name": "gpt-4-vision-preview" - }, - { - "label": "gpt-4-0613", - "name": "gpt-4-0613" - }, - { - "label": "gpt-4-32k", - "name": "gpt-4-32k" - }, - { - "label": "gpt-4-32k-0613", - "name": "gpt-4-32k-0613" - }, - { - "label": "gpt-3.5-turbo", - "name": "gpt-3.5-turbo" - }, - { - "label": "gpt-3.5-turbo-0125", - "name": "gpt-3.5-turbo-0125" - }, - { - "label": "gpt-3.5-turbo-1106", - "name": "gpt-3.5-turbo-1106" - }, - { - "label": "gpt-3.5-turbo-0613", - "name": "gpt-3.5-turbo-0613" - }, - { - "label": "gpt-3.5-turbo-16k", - "name": "gpt-3.5-turbo-16k" - }, - { - "label": "gpt-3.5-turbo-16k-0613", - "name": "gpt-3.5-turbo-16k-0613" - } - ], + "type": "asyncOptions", + "loadMethod": "listModels", "default": "gpt-3.5-turbo", - "optional": true, "id": "chatOpenAI_0-input-modelName-options" }, { diff --git a/packages/server/marketplaces/chatflows/Multi Retrieval QA Chain.json b/packages/server/marketplaces/chatflows/Multi Retrieval QA Chain.json index 70ecbcf831f..baa26bd1454 100644 --- a/packages/server/marketplaces/chatflows/Multi Retrieval QA Chain.json +++ b/packages/server/marketplaces/chatflows/Multi Retrieval QA Chain.json @@ -293,7 +293,7 @@ "data": { "id": "openAIEmbeddings_0", "label": "OpenAI Embeddings", - "version": 2, + "version": 3, "name": "openAIEmbeddings", "type": "OpenAIEmbeddings", "baseClasses": ["OpenAIEmbeddings", "Embeddings"], @@ -310,23 +310,9 @@ { "label": "Model Name", "name": "modelName", - "type": "options", - "options": [ - { - "label": "text-embedding-3-large", - "name": "text-embedding-3-large" - }, - { - "label": "text-embedding-3-small", - "name": "text-embedding-3-small" - }, - { - "label": "text-embedding-ada-002", - "name": "text-embedding-ada-002" - } - ], + "type": "asyncOptions", + "loadMethod": "listModels", "default": "text-embedding-ada-002", - "optional": true, "id": "openAIEmbeddings_0-input-modelName-options" }, { @@ -400,7 +386,7 @@ "data": { "id": "chatOpenAI_0", "label": "ChatOpenAI", - "version": 5, + "version": 6.0, "name": "chatOpenAI", "type": "ChatOpenAI", "baseClasses": ["ChatOpenAI", "BaseChatModel", "BaseLanguageModel", "Runnable"], @@ -417,71 +403,9 @@ { "label": "Model Name", "name": "modelName", - "type": "options", - "options": [ - { - "label": "gpt-4", - "name": "gpt-4" - }, - { - "label": "gpt-4-turbo-preview", - "name": "gpt-4-turbo-preview" - }, - { - "label": "gpt-4-0125-preview", - "name": "gpt-4-0125-preview" - }, - { - "label": "gpt-4-1106-preview", - "name": "gpt-4-1106-preview" - }, - { - "label": "gpt-4-1106-vision-preview", - "name": "gpt-4-1106-vision-preview" - }, - { - "label": "gpt-4-vision-preview", - "name": "gpt-4-vision-preview" - }, - { - "label": "gpt-4-0613", - "name": "gpt-4-0613" - }, - { - "label": "gpt-4-32k", - "name": "gpt-4-32k" - }, - { - "label": "gpt-4-32k-0613", - "name": "gpt-4-32k-0613" - }, - { - "label": "gpt-3.5-turbo", - "name": "gpt-3.5-turbo" - }, - { - "label": "gpt-3.5-turbo-0125", - "name": "gpt-3.5-turbo-0125" - }, - { - "label": "gpt-3.5-turbo-1106", - "name": "gpt-3.5-turbo-1106" - }, - { - "label": "gpt-3.5-turbo-0613", - "name": "gpt-3.5-turbo-0613" - }, - { - "label": "gpt-3.5-turbo-16k", - "name": "gpt-3.5-turbo-16k" - }, - { - "label": "gpt-3.5-turbo-16k-0613", - "name": "gpt-3.5-turbo-16k-0613" - } - ], + "type": "asyncOptions", + "loadMethod": "listModels", "default": "gpt-3.5-turbo", - "optional": true, "id": "chatOpenAI_0-input-modelName-options" }, { diff --git a/packages/server/marketplaces/chatflows/Multiple VectorDB.json b/packages/server/marketplaces/chatflows/Multiple VectorDB.json index 6d8cfa804f5..4e1d4b5c330 100644 --- a/packages/server/marketplaces/chatflows/Multiple VectorDB.json +++ b/packages/server/marketplaces/chatflows/Multiple VectorDB.json @@ -293,7 +293,7 @@ "data": { "id": "openAIEmbeddings_1", "label": "OpenAI Embeddings", - "version": 2, + "version": 3, "name": "openAIEmbeddings", "type": "OpenAIEmbeddings", "baseClasses": ["OpenAIEmbeddings", "Embeddings"], @@ -310,23 +310,9 @@ { "label": "Model Name", "name": "modelName", - "type": "options", - "options": [ - { - "label": "text-embedding-3-large", - "name": "text-embedding-3-large" - }, - { - "label": "text-embedding-3-small", - "name": "text-embedding-3-small" - }, - { - "label": "text-embedding-ada-002", - "name": "text-embedding-ada-002" - } - ], + "type": "asyncOptions", + "loadMethod": "listModels", "default": "text-embedding-ada-002", - "optional": true, "id": "openAIEmbeddings_1-input-modelName-options" }, { @@ -400,7 +386,7 @@ "data": { "id": "openAIEmbeddings_2", "label": "OpenAI Embeddings", - "version": 2, + "version": 3, "name": "openAIEmbeddings", "type": "OpenAIEmbeddings", "baseClasses": ["OpenAIEmbeddings", "Embeddings"], @@ -417,23 +403,9 @@ { "label": "Model Name", "name": "modelName", - "type": "options", - "options": [ - { - "label": "text-embedding-3-large", - "name": "text-embedding-3-large" - }, - { - "label": "text-embedding-3-small", - "name": "text-embedding-3-small" - }, - { - "label": "text-embedding-ada-002", - "name": "text-embedding-ada-002" - } - ], + "type": "asyncOptions", + "loadMethod": "listModels", "default": "text-embedding-ada-002", - "optional": true, "id": "openAIEmbeddings_2-input-modelName-options" }, { @@ -507,7 +479,7 @@ "data": { "id": "chatOpenAI_0", "label": "ChatOpenAI", - "version": 5, + "version": 6.0, "name": "chatOpenAI", "type": "ChatOpenAI", "baseClasses": ["ChatOpenAI", "BaseChatModel", "BaseLanguageModel", "Runnable"], @@ -524,71 +496,9 @@ { "label": "Model Name", "name": "modelName", - "type": "options", - "options": [ - { - "label": "gpt-4", - "name": "gpt-4" - }, - { - "label": "gpt-4-turbo-preview", - "name": "gpt-4-turbo-preview" - }, - { - "label": "gpt-4-0125-preview", - "name": "gpt-4-0125-preview" - }, - { - "label": "gpt-4-1106-preview", - "name": "gpt-4-1106-preview" - }, - { - "label": "gpt-4-1106-vision-preview", - "name": "gpt-4-1106-vision-preview" - }, - { - "label": "gpt-4-vision-preview", - "name": "gpt-4-vision-preview" - }, - { - "label": "gpt-4-0613", - "name": "gpt-4-0613" - }, - { - "label": "gpt-4-32k", - "name": "gpt-4-32k" - }, - { - "label": "gpt-4-32k-0613", - "name": "gpt-4-32k-0613" - }, - { - "label": "gpt-3.5-turbo", - "name": "gpt-3.5-turbo" - }, - { - "label": "gpt-3.5-turbo-0125", - "name": "gpt-3.5-turbo-0125" - }, - { - "label": "gpt-3.5-turbo-1106", - "name": "gpt-3.5-turbo-1106" - }, - { - "label": "gpt-3.5-turbo-0613", - "name": "gpt-3.5-turbo-0613" - }, - { - "label": "gpt-3.5-turbo-16k", - "name": "gpt-3.5-turbo-16k" - }, - { - "label": "gpt-3.5-turbo-16k-0613", - "name": "gpt-3.5-turbo-16k-0613" - } - ], + "type": "asyncOptions", + "loadMethod": "listModels", "default": "gpt-3.5-turbo", - "optional": true, "id": "chatOpenAI_0-input-modelName-options" }, { @@ -1068,7 +978,7 @@ "data": { "id": "chatOpenAI_1", "label": "ChatOpenAI", - "version": 5, + "version": 6.0, "name": "chatOpenAI", "type": "ChatOpenAI", "baseClasses": ["ChatOpenAI", "BaseChatModel", "BaseLanguageModel", "Runnable"], @@ -1085,71 +995,9 @@ { "label": "Model Name", "name": "modelName", - "type": "options", - "options": [ - { - "label": "gpt-4", - "name": "gpt-4" - }, - { - "label": "gpt-4-turbo-preview", - "name": "gpt-4-turbo-preview" - }, - { - "label": "gpt-4-0125-preview", - "name": "gpt-4-0125-preview" - }, - { - "label": "gpt-4-1106-preview", - "name": "gpt-4-1106-preview" - }, - { - "label": "gpt-4-1106-vision-preview", - "name": "gpt-4-1106-vision-preview" - }, - { - "label": "gpt-4-vision-preview", - "name": "gpt-4-vision-preview" - }, - { - "label": "gpt-4-0613", - "name": "gpt-4-0613" - }, - { - "label": "gpt-4-32k", - "name": "gpt-4-32k" - }, - { - "label": "gpt-4-32k-0613", - "name": "gpt-4-32k-0613" - }, - { - "label": "gpt-3.5-turbo", - "name": "gpt-3.5-turbo" - }, - { - "label": "gpt-3.5-turbo-0125", - "name": "gpt-3.5-turbo-0125" - }, - { - "label": "gpt-3.5-turbo-1106", - "name": "gpt-3.5-turbo-1106" - }, - { - "label": "gpt-3.5-turbo-0613", - "name": "gpt-3.5-turbo-0613" - }, - { - "label": "gpt-3.5-turbo-16k", - "name": "gpt-3.5-turbo-16k" - }, - { - "label": "gpt-3.5-turbo-16k-0613", - "name": "gpt-3.5-turbo-16k-0613" - } - ], + "type": "asyncOptions", + "loadMethod": "listModels", "default": "gpt-3.5-turbo", - "optional": true, "id": "chatOpenAI_1-input-modelName-options" }, { @@ -1309,7 +1157,7 @@ "data": { "id": "chatOpenAI_2", "label": "ChatOpenAI", - "version": 5, + "version": 6.0, "name": "chatOpenAI", "type": "ChatOpenAI", "baseClasses": ["ChatOpenAI", "BaseChatModel", "BaseLanguageModel", "Runnable"], @@ -1326,71 +1174,9 @@ { "label": "Model Name", "name": "modelName", - "type": "options", - "options": [ - { - "label": "gpt-4", - "name": "gpt-4" - }, - { - "label": "gpt-4-turbo-preview", - "name": "gpt-4-turbo-preview" - }, - { - "label": "gpt-4-0125-preview", - "name": "gpt-4-0125-preview" - }, - { - "label": "gpt-4-1106-preview", - "name": "gpt-4-1106-preview" - }, - { - "label": "gpt-4-1106-vision-preview", - "name": "gpt-4-1106-vision-preview" - }, - { - "label": "gpt-4-vision-preview", - "name": "gpt-4-vision-preview" - }, - { - "label": "gpt-4-0613", - "name": "gpt-4-0613" - }, - { - "label": "gpt-4-32k", - "name": "gpt-4-32k" - }, - { - "label": "gpt-4-32k-0613", - "name": "gpt-4-32k-0613" - }, - { - "label": "gpt-3.5-turbo", - "name": "gpt-3.5-turbo" - }, - { - "label": "gpt-3.5-turbo-0125", - "name": "gpt-3.5-turbo-0125" - }, - { - "label": "gpt-3.5-turbo-1106", - "name": "gpt-3.5-turbo-1106" - }, - { - "label": "gpt-3.5-turbo-0613", - "name": "gpt-3.5-turbo-0613" - }, - { - "label": "gpt-3.5-turbo-16k", - "name": "gpt-3.5-turbo-16k" - }, - { - "label": "gpt-3.5-turbo-16k-0613", - "name": "gpt-3.5-turbo-16k-0613" - } - ], + "type": "asyncOptions", + "loadMethod": "listModels", "default": "gpt-3.5-turbo", - "optional": true, "id": "chatOpenAI_2-input-modelName-options" }, { @@ -1781,6 +1567,14 @@ "optional": true, "additionalParams": true, "id": "conversationalAgent_0-input-systemMessage-string" + }, + { + "label": "Max Iterations", + "name": "maxIterations", + "type": "number", + "optional": true, + "additionalParams": true, + "id": "conversationalAgent_0-input-maxIterations-number" } ], "inputAnchors": [ diff --git a/packages/server/marketplaces/chatflows/OpenAI Agent.json b/packages/server/marketplaces/chatflows/OpenAI Agent.json index 79096b0ef5a..023e065320b 100644 --- a/packages/server/marketplaces/chatflows/OpenAI Agent.json +++ b/packages/server/marketplaces/chatflows/OpenAI Agent.json @@ -211,7 +211,7 @@ "data": { "id": "chatOpenAI_0", "label": "ChatOpenAI", - "version": 5, + "version": 6.0, "name": "chatOpenAI", "type": "ChatOpenAI", "baseClasses": ["ChatOpenAI", "BaseChatModel", "BaseLanguageModel"], @@ -228,71 +228,9 @@ { "label": "Model Name", "name": "modelName", - "type": "options", - "options": [ - { - "label": "gpt-4", - "name": "gpt-4" - }, - { - "label": "gpt-4-turbo-preview", - "name": "gpt-4-turbo-preview" - }, - { - "label": "gpt-4-0125-preview", - "name": "gpt-4-0125-preview" - }, - { - "label": "gpt-4-1106-preview", - "name": "gpt-4-1106-preview" - }, - { - "label": "gpt-4-1106-vision-preview", - "name": "gpt-4-1106-vision-preview" - }, - { - "label": "gpt-4-vision-preview", - "name": "gpt-4-vision-preview" - }, - { - "label": "gpt-4-0613", - "name": "gpt-4-0613" - }, - { - "label": "gpt-4-32k", - "name": "gpt-4-32k" - }, - { - "label": "gpt-4-32k-0613", - "name": "gpt-4-32k-0613" - }, - { - "label": "gpt-3.5-turbo", - "name": "gpt-3.5-turbo" - }, - { - "label": "gpt-3.5-turbo-0125", - "name": "gpt-3.5-turbo-0125" - }, - { - "label": "gpt-3.5-turbo-1106", - "name": "gpt-3.5-turbo-1106" - }, - { - "label": "gpt-3.5-turbo-0613", - "name": "gpt-3.5-turbo-0613" - }, - { - "label": "gpt-3.5-turbo-16k", - "name": "gpt-3.5-turbo-16k" - }, - { - "label": "gpt-3.5-turbo-16k-0613", - "name": "gpt-3.5-turbo-16k-0613" - } - ], + "type": "asyncOptions", + "loadMethod": "listModels", "default": "gpt-3.5-turbo", - "optional": true, "id": "chatOpenAI_0-input-modelName-options" }, { @@ -458,6 +396,14 @@ "optional": true, "additionalParams": true, "id": "openAIToolAgent_0-input-systemMessage-string" + }, + { + "label": "Max Iterations", + "name": "maxIterations", + "type": "number", + "optional": true, + "additionalParams": true, + "id": "openAIToolAgent_0-input-maxIterations-number" } ], "inputAnchors": [ diff --git a/packages/server/marketplaces/chatflows/Prompt Chaining with VectorStore.json b/packages/server/marketplaces/chatflows/Prompt Chaining with VectorStore.json index bb0c284f358..c7c80aeb41e 100644 --- a/packages/server/marketplaces/chatflows/Prompt Chaining with VectorStore.json +++ b/packages/server/marketplaces/chatflows/Prompt Chaining with VectorStore.json @@ -429,7 +429,7 @@ "data": { "id": "chatOpenAI_0", "label": "ChatOpenAI", - "version": 5, + "version": 6.0, "name": "chatOpenAI", "type": "ChatOpenAI", "baseClasses": ["ChatOpenAI", "BaseChatModel", "BaseLanguageModel", "Runnable"], @@ -446,71 +446,9 @@ { "label": "Model Name", "name": "modelName", - "type": "options", - "options": [ - { - "label": "gpt-4", - "name": "gpt-4" - }, - { - "label": "gpt-4-turbo-preview", - "name": "gpt-4-turbo-preview" - }, - { - "label": "gpt-4-0125-preview", - "name": "gpt-4-0125-preview" - }, - { - "label": "gpt-4-1106-preview", - "name": "gpt-4-1106-preview" - }, - { - "label": "gpt-4-1106-vision-preview", - "name": "gpt-4-1106-vision-preview" - }, - { - "label": "gpt-4-vision-preview", - "name": "gpt-4-vision-preview" - }, - { - "label": "gpt-4-0613", - "name": "gpt-4-0613" - }, - { - "label": "gpt-4-32k", - "name": "gpt-4-32k" - }, - { - "label": "gpt-4-32k-0613", - "name": "gpt-4-32k-0613" - }, - { - "label": "gpt-3.5-turbo", - "name": "gpt-3.5-turbo" - }, - { - "label": "gpt-3.5-turbo-0125", - "name": "gpt-3.5-turbo-0125" - }, - { - "label": "gpt-3.5-turbo-1106", - "name": "gpt-3.5-turbo-1106" - }, - { - "label": "gpt-3.5-turbo-0613", - "name": "gpt-3.5-turbo-0613" - }, - { - "label": "gpt-3.5-turbo-16k", - "name": "gpt-3.5-turbo-16k" - }, - { - "label": "gpt-3.5-turbo-16k-0613", - "name": "gpt-3.5-turbo-16k-0613" - } - ], + "type": "asyncOptions", + "loadMethod": "listModels", "default": "gpt-3.5-turbo", - "optional": true, "id": "chatOpenAI_0-input-modelName-options" }, { @@ -670,7 +608,7 @@ "data": { "id": "chatOpenAI_1", "label": "ChatOpenAI", - "version": 5, + "version": 6.0, "name": "chatOpenAI", "type": "ChatOpenAI", "baseClasses": ["ChatOpenAI", "BaseChatModel", "BaseLanguageModel", "Runnable"], @@ -687,71 +625,9 @@ { "label": "Model Name", "name": "modelName", - "type": "options", - "options": [ - { - "label": "gpt-4", - "name": "gpt-4" - }, - { - "label": "gpt-4-turbo-preview", - "name": "gpt-4-turbo-preview" - }, - { - "label": "gpt-4-0125-preview", - "name": "gpt-4-0125-preview" - }, - { - "label": "gpt-4-1106-preview", - "name": "gpt-4-1106-preview" - }, - { - "label": "gpt-4-1106-vision-preview", - "name": "gpt-4-1106-vision-preview" - }, - { - "label": "gpt-4-vision-preview", - "name": "gpt-4-vision-preview" - }, - { - "label": "gpt-4-0613", - "name": "gpt-4-0613" - }, - { - "label": "gpt-4-32k", - "name": "gpt-4-32k" - }, - { - "label": "gpt-4-32k-0613", - "name": "gpt-4-32k-0613" - }, - { - "label": "gpt-3.5-turbo", - "name": "gpt-3.5-turbo" - }, - { - "label": "gpt-3.5-turbo-0125", - "name": "gpt-3.5-turbo-0125" - }, - { - "label": "gpt-3.5-turbo-1106", - "name": "gpt-3.5-turbo-1106" - }, - { - "label": "gpt-3.5-turbo-0613", - "name": "gpt-3.5-turbo-0613" - }, - { - "label": "gpt-3.5-turbo-16k", - "name": "gpt-3.5-turbo-16k" - }, - { - "label": "gpt-3.5-turbo-16k-0613", - "name": "gpt-3.5-turbo-16k-0613" - } - ], + "type": "asyncOptions", + "loadMethod": "listModels", "default": "gpt-3.5-turbo", - "optional": true, "id": "chatOpenAI_1-input-modelName-options" }, { @@ -1058,7 +934,7 @@ "data": { "id": "openAIEmbeddings_0", "label": "OpenAI Embeddings", - "version": 2, + "version": 3, "name": "openAIEmbeddings", "type": "OpenAIEmbeddings", "baseClasses": ["OpenAIEmbeddings", "Embeddings"], @@ -1075,23 +951,9 @@ { "label": "Model Name", "name": "modelName", - "type": "options", - "options": [ - { - "label": "text-embedding-3-large", - "name": "text-embedding-3-large" - }, - { - "label": "text-embedding-3-small", - "name": "text-embedding-3-small" - }, - { - "label": "text-embedding-ada-002", - "name": "text-embedding-ada-002" - } - ], + "type": "asyncOptions", + "loadMethod": "listModels", "default": "text-embedding-ada-002", - "optional": true, "id": "openAIEmbeddings_0-input-modelName-options" }, { diff --git a/packages/server/marketplaces/chatflows/Prompt Chaining.json b/packages/server/marketplaces/chatflows/Prompt Chaining.json index 42debac8e48..1960fff9fd3 100644 --- a/packages/server/marketplaces/chatflows/Prompt Chaining.json +++ b/packages/server/marketplaces/chatflows/Prompt Chaining.json @@ -135,7 +135,7 @@ "data": { "id": "openAI_1", "label": "OpenAI", - "version": 3, + "version": 4.0, "name": "openAI", "type": "OpenAI", "baseClasses": ["OpenAI", "BaseLLM", "BaseLanguageModel"], @@ -152,23 +152,9 @@ { "label": "Model Name", "name": "modelName", - "type": "options", - "options": [ - { - "label": "gpt-3.5-turbo-instruct", - "name": "gpt-3.5-turbo-instruct" - }, - { - "label": "babbage-002", - "name": "babbage-002" - }, - { - "label": "davinci-002", - "name": "davinci-002" - } - ], + "type": "asyncOptions", + "loadMethod": "listModels", "default": "gpt-3.5-turbo-instruct", - "optional": true, "id": "openAI_1-input-modelName-options" }, { @@ -295,7 +281,7 @@ "data": { "id": "openAI_2", "label": "OpenAI", - "version": 3, + "version": 4.0, "name": "openAI", "type": "OpenAI", "baseClasses": ["OpenAI", "BaseLLM", "BaseLanguageModel"], @@ -312,23 +298,9 @@ { "label": "Model Name", "name": "modelName", - "type": "options", - "options": [ - { - "label": "gpt-3.5-turbo-instruct", - "name": "gpt-3.5-turbo-instruct" - }, - { - "label": "babbage-002", - "name": "babbage-002" - }, - { - "label": "davinci-002", - "name": "davinci-002" - } - ], + "type": "asyncOptions", + "loadMethod": "listModels", "default": "gpt-3.5-turbo-instruct", - "optional": true, "id": "openAI_2-input-modelName-options" }, { diff --git a/packages/server/marketplaces/chatflows/Query Engine.json b/packages/server/marketplaces/chatflows/Query Engine.json index 10809cb3fcd..89be4bdbb02 100644 --- a/packages/server/marketplaces/chatflows/Query Engine.json +++ b/packages/server/marketplaces/chatflows/Query Engine.json @@ -209,7 +209,7 @@ "data": { "id": "openAIEmbedding_LlamaIndex_0", "label": "OpenAI Embedding", - "version": 1, + "version": 2, "name": "openAIEmbedding_LlamaIndex", "type": "OpenAIEmbedding", "baseClasses": ["OpenAIEmbedding", "BaseEmbedding_LlamaIndex", "BaseEmbedding"], @@ -227,23 +227,9 @@ { "label": "Model Name", "name": "modelName", - "type": "options", - "options": [ - { - "label": "text-embedding-3-large", - "name": "text-embedding-3-large" - }, - { - "label": "text-embedding-3-small", - "name": "text-embedding-3-small" - }, - { - "label": "text-embedding-ada-002", - "name": "text-embedding-ada-002" - } - ], + "type": "asyncOptions", + "loadMethod": "listModels", "default": "text-embedding-ada-002", - "optional": true, "id": "openAIEmbedding_LlamaIndex_0-input-modelName-options" }, { @@ -266,7 +252,8 @@ "inputAnchors": [], "inputs": { "timeout": "", - "basepath": "" + "basepath": "", + "modelName": "text-embedding-ada-002" }, "outputAnchors": [ { @@ -362,7 +349,7 @@ "data": { "id": "chatAnthropic_LlamaIndex_0", "label": "ChatAnthropic", - "version": 1, + "version": 3.0, "name": "chatAnthropic_LlamaIndex", "type": "ChatAnthropic", "baseClasses": ["ChatAnthropic", "BaseChatModel_LlamaIndex"], @@ -380,80 +367,9 @@ { "label": "Model Name", "name": "modelName", - "type": "options", - "options": [ - { - "label": "claude-3-opus", - "name": "claude-3-opus-20240229", - "description": "Most powerful model for highly complex tasks" - }, - { - "label": "claude-3-sonnet", - "name": "claude-3-sonnet-20240229", - "description": "Ideal balance of intelligence and speed for enterprise workloads" - }, - { - "label": "claude-2", - "name": "claude-2", - "description": "Claude 2 latest major version, automatically get updates to the model as they are released" - }, - { - "label": "claude-2.1", - "name": "claude-2.1", - "description": "Claude 2 latest full version" - }, - { - "label": "claude-instant-1", - "name": "claude-instant-1", - "description": "Claude Instant latest major version, automatically get updates to the model as they are released" - }, - { - "label": "claude-v1", - "name": "claude-v1" - }, - { - "label": "claude-v1-100k", - "name": "claude-v1-100k" - }, - { - "label": "claude-v1.0", - "name": "claude-v1.0" - }, - { - "label": "claude-v1.2", - "name": "claude-v1.2" - }, - { - "label": "claude-v1.3", - "name": "claude-v1.3" - }, - { - "label": "claude-v1.3-100k", - "name": "claude-v1.3-100k" - }, - { - "label": "claude-instant-v1", - "name": "claude-instant-v1" - }, - { - "label": "claude-instant-v1-100k", - "name": "claude-instant-v1-100k" - }, - { - "label": "claude-instant-v1.0", - "name": "claude-instant-v1.0" - }, - { - "label": "claude-instant-v1.1", - "name": "claude-instant-v1.1" - }, - { - "label": "claude-instant-v1.1-100k", - "name": "claude-instant-v1.1-100k" - } - ], - "default": "claude-2", - "optional": true, + "type": "asyncOptions", + "loadMethod": "listModels", + "default": "claude-3-haiku", "id": "chatAnthropic_LlamaIndex_0-input-modelName-options" }, { diff --git a/packages/server/marketplaces/chatflows/ReAct Agent.json b/packages/server/marketplaces/chatflows/ReAct Agent.json index 7bc2c33fdef..9a5a9a8229a 100644 --- a/packages/server/marketplaces/chatflows/ReAct Agent.json +++ b/packages/server/marketplaces/chatflows/ReAct Agent.json @@ -87,6 +87,14 @@ "optional": true, "list": true, "id": "mrklAgentChat_0-input-inputModeration-Moderation" + }, + { + "label": "Max Iterations", + "name": "maxIterations", + "type": "number", + "optional": true, + "additionalParams": true, + "id": "mrklAgentChat_0-input-maxIterations-number" } ], "inputs": { @@ -216,7 +224,7 @@ "data": { "id": "chatOpenAI_0", "label": "ChatOpenAI", - "version": 5, + "version": 6.0, "name": "chatOpenAI", "type": "ChatOpenAI", "baseClasses": ["ChatOpenAI", "BaseChatModel", "BaseLanguageModel", "Runnable"], @@ -233,71 +241,9 @@ { "label": "Model Name", "name": "modelName", - "type": "options", - "options": [ - { - "label": "gpt-4", - "name": "gpt-4" - }, - { - "label": "gpt-4-turbo-preview", - "name": "gpt-4-turbo-preview" - }, - { - "label": "gpt-4-0125-preview", - "name": "gpt-4-0125-preview" - }, - { - "label": "gpt-4-1106-preview", - "name": "gpt-4-1106-preview" - }, - { - "label": "gpt-4-1106-vision-preview", - "name": "gpt-4-1106-vision-preview" - }, - { - "label": "gpt-4-vision-preview", - "name": "gpt-4-vision-preview" - }, - { - "label": "gpt-4-0613", - "name": "gpt-4-0613" - }, - { - "label": "gpt-4-32k", - "name": "gpt-4-32k" - }, - { - "label": "gpt-4-32k-0613", - "name": "gpt-4-32k-0613" - }, - { - "label": "gpt-3.5-turbo", - "name": "gpt-3.5-turbo" - }, - { - "label": "gpt-3.5-turbo-0125", - "name": "gpt-3.5-turbo-0125" - }, - { - "label": "gpt-3.5-turbo-1106", - "name": "gpt-3.5-turbo-1106" - }, - { - "label": "gpt-3.5-turbo-0613", - "name": "gpt-3.5-turbo-0613" - }, - { - "label": "gpt-3.5-turbo-16k", - "name": "gpt-3.5-turbo-16k" - }, - { - "label": "gpt-3.5-turbo-16k-0613", - "name": "gpt-3.5-turbo-16k-0613" - } - ], + "type": "asyncOptions", + "loadMethod": "listModels", "default": "gpt-3.5-turbo", - "optional": true, "id": "chatOpenAI_0-input-modelName-options" }, { diff --git a/packages/server/marketplaces/chatflows/SQL DB Chain.json b/packages/server/marketplaces/chatflows/SQL DB Chain.json index 855f9b1f492..aad2a0819b9 100644 --- a/packages/server/marketplaces/chatflows/SQL DB Chain.json +++ b/packages/server/marketplaces/chatflows/SQL DB Chain.json @@ -15,7 +15,7 @@ "data": { "id": "chatOpenAI_0", "label": "ChatOpenAI", - "version": 5, + "version": 6.0, "name": "chatOpenAI", "type": "ChatOpenAI", "baseClasses": ["ChatOpenAI", "BaseChatModel", "BaseLanguageModel"], @@ -32,71 +32,9 @@ { "label": "Model Name", "name": "modelName", - "type": "options", - "options": [ - { - "label": "gpt-4", - "name": "gpt-4" - }, - { - "label": "gpt-4-turbo-preview", - "name": "gpt-4-turbo-preview" - }, - { - "label": "gpt-4-0125-preview", - "name": "gpt-4-0125-preview" - }, - { - "label": "gpt-4-1106-preview", - "name": "gpt-4-1106-preview" - }, - { - "label": "gpt-4-1106-vision-preview", - "name": "gpt-4-1106-vision-preview" - }, - { - "label": "gpt-4-vision-preview", - "name": "gpt-4-vision-preview" - }, - { - "label": "gpt-4-0613", - "name": "gpt-4-0613" - }, - { - "label": "gpt-4-32k", - "name": "gpt-4-32k" - }, - { - "label": "gpt-4-32k-0613", - "name": "gpt-4-32k-0613" - }, - { - "label": "gpt-3.5-turbo", - "name": "gpt-3.5-turbo" - }, - { - "label": "gpt-3.5-turbo-0125", - "name": "gpt-3.5-turbo-0125" - }, - { - "label": "gpt-3.5-turbo-1106", - "name": "gpt-3.5-turbo-1106" - }, - { - "label": "gpt-3.5-turbo-0613", - "name": "gpt-3.5-turbo-0613" - }, - { - "label": "gpt-3.5-turbo-16k", - "name": "gpt-3.5-turbo-16k" - }, - { - "label": "gpt-3.5-turbo-16k-0613", - "name": "gpt-3.5-turbo-16k-0613" - } - ], + "type": "asyncOptions", + "loadMethod": "listModels", "default": "gpt-3.5-turbo", - "optional": true, "id": "chatOpenAI_0-input-modelName-options" }, { diff --git a/packages/server/marketplaces/chatflows/SQL Prompt.json b/packages/server/marketplaces/chatflows/SQL Prompt.json index cfdb317ad92..be9e1afe2e1 100644 --- a/packages/server/marketplaces/chatflows/SQL Prompt.json +++ b/packages/server/marketplaces/chatflows/SQL Prompt.json @@ -175,7 +175,7 @@ "data": { "id": "chatOpenAI_0", "label": "ChatOpenAI", - "version": 5, + "version": 6.0, "name": "chatOpenAI", "type": "ChatOpenAI", "baseClasses": ["ChatOpenAI", "BaseChatModel", "BaseLanguageModel", "Runnable"], @@ -192,71 +192,9 @@ { "label": "Model Name", "name": "modelName", - "type": "options", - "options": [ - { - "label": "gpt-4", - "name": "gpt-4" - }, - { - "label": "gpt-4-turbo-preview", - "name": "gpt-4-turbo-preview" - }, - { - "label": "gpt-4-0125-preview", - "name": "gpt-4-0125-preview" - }, - { - "label": "gpt-4-1106-preview", - "name": "gpt-4-1106-preview" - }, - { - "label": "gpt-4-1106-vision-preview", - "name": "gpt-4-1106-vision-preview" - }, - { - "label": "gpt-4-vision-preview", - "name": "gpt-4-vision-preview" - }, - { - "label": "gpt-4-0613", - "name": "gpt-4-0613" - }, - { - "label": "gpt-4-32k", - "name": "gpt-4-32k" - }, - { - "label": "gpt-4-32k-0613", - "name": "gpt-4-32k-0613" - }, - { - "label": "gpt-3.5-turbo", - "name": "gpt-3.5-turbo" - }, - { - "label": "gpt-3.5-turbo-0125", - "name": "gpt-3.5-turbo-0125" - }, - { - "label": "gpt-3.5-turbo-1106", - "name": "gpt-3.5-turbo-1106" - }, - { - "label": "gpt-3.5-turbo-0613", - "name": "gpt-3.5-turbo-0613" - }, - { - "label": "gpt-3.5-turbo-16k", - "name": "gpt-3.5-turbo-16k" - }, - { - "label": "gpt-3.5-turbo-16k-0613", - "name": "gpt-3.5-turbo-16k-0613" - } - ], + "type": "asyncOptions", + "loadMethod": "listModels", "default": "gpt-3.5-turbo", - "optional": true, "id": "chatOpenAI_0-input-modelName-options" }, { @@ -416,7 +354,7 @@ "data": { "id": "chatOpenAI_1", "label": "ChatOpenAI", - "version": 5, + "version": 6.0, "name": "chatOpenAI", "type": "ChatOpenAI", "baseClasses": ["ChatOpenAI", "BaseChatModel", "BaseLanguageModel", "Runnable"], @@ -433,71 +371,9 @@ { "label": "Model Name", "name": "modelName", - "type": "options", - "options": [ - { - "label": "gpt-4", - "name": "gpt-4" - }, - { - "label": "gpt-4-turbo-preview", - "name": "gpt-4-turbo-preview" - }, - { - "label": "gpt-4-0125-preview", - "name": "gpt-4-0125-preview" - }, - { - "label": "gpt-4-1106-preview", - "name": "gpt-4-1106-preview" - }, - { - "label": "gpt-4-1106-vision-preview", - "name": "gpt-4-1106-vision-preview" - }, - { - "label": "gpt-4-vision-preview", - "name": "gpt-4-vision-preview" - }, - { - "label": "gpt-4-0613", - "name": "gpt-4-0613" - }, - { - "label": "gpt-4-32k", - "name": "gpt-4-32k" - }, - { - "label": "gpt-4-32k-0613", - "name": "gpt-4-32k-0613" - }, - { - "label": "gpt-3.5-turbo", - "name": "gpt-3.5-turbo" - }, - { - "label": "gpt-3.5-turbo-0125", - "name": "gpt-3.5-turbo-0125" - }, - { - "label": "gpt-3.5-turbo-1106", - "name": "gpt-3.5-turbo-1106" - }, - { - "label": "gpt-3.5-turbo-0613", - "name": "gpt-3.5-turbo-0613" - }, - { - "label": "gpt-3.5-turbo-16k", - "name": "gpt-3.5-turbo-16k" - }, - { - "label": "gpt-3.5-turbo-16k-0613", - "name": "gpt-3.5-turbo-16k-0613" - } - ], + "type": "asyncOptions", + "loadMethod": "listModels", "default": "gpt-3.5-turbo", - "optional": true, "id": "chatOpenAI_1-input-modelName-options" }, { @@ -1383,7 +1259,7 @@ "data": { "id": "chatOpenAI_2", "label": "ChatOpenAI", - "version": 5, + "version": 6.0, "name": "chatOpenAI", "type": "ChatOpenAI", "baseClasses": ["ChatOpenAI", "BaseChatModel", "BaseLanguageModel", "Runnable"], @@ -1400,71 +1276,9 @@ { "label": "Model Name", "name": "modelName", - "type": "options", - "options": [ - { - "label": "gpt-4", - "name": "gpt-4" - }, - { - "label": "gpt-4-turbo-preview", - "name": "gpt-4-turbo-preview" - }, - { - "label": "gpt-4-0125-preview", - "name": "gpt-4-0125-preview" - }, - { - "label": "gpt-4-1106-preview", - "name": "gpt-4-1106-preview" - }, - { - "label": "gpt-4-1106-vision-preview", - "name": "gpt-4-1106-vision-preview" - }, - { - "label": "gpt-4-vision-preview", - "name": "gpt-4-vision-preview" - }, - { - "label": "gpt-4-0613", - "name": "gpt-4-0613" - }, - { - "label": "gpt-4-32k", - "name": "gpt-4-32k" - }, - { - "label": "gpt-4-32k-0613", - "name": "gpt-4-32k-0613" - }, - { - "label": "gpt-3.5-turbo", - "name": "gpt-3.5-turbo" - }, - { - "label": "gpt-3.5-turbo-0125", - "name": "gpt-3.5-turbo-0125" - }, - { - "label": "gpt-3.5-turbo-1106", - "name": "gpt-3.5-turbo-1106" - }, - { - "label": "gpt-3.5-turbo-0613", - "name": "gpt-3.5-turbo-0613" - }, - { - "label": "gpt-3.5-turbo-16k", - "name": "gpt-3.5-turbo-16k" - }, - { - "label": "gpt-3.5-turbo-16k-0613", - "name": "gpt-3.5-turbo-16k-0613" - } - ], + "type": "asyncOptions", + "loadMethod": "listModels", "default": "gpt-3.5-turbo", - "optional": true, "id": "chatOpenAI_2-input-modelName-options" }, { diff --git a/packages/server/marketplaces/chatflows/Simple Chat Engine.json b/packages/server/marketplaces/chatflows/Simple Chat Engine.json index 81749697dd7..b44314a484e 100644 --- a/packages/server/marketplaces/chatflows/Simple Chat Engine.json +++ b/packages/server/marketplaces/chatflows/Simple Chat Engine.json @@ -144,7 +144,7 @@ "data": { "id": "azureChatOpenAI_LlamaIndex_0", "label": "AzureChatOpenAI", - "version": 1, + "version": 2.0, "name": "azureChatOpenAI_LlamaIndex", "type": "AzureChatOpenAI", "baseClasses": ["AzureChatOpenAI", "BaseChatModel_LlamaIndex"], @@ -162,27 +162,9 @@ { "label": "Model Name", "name": "modelName", - "type": "options", - "options": [ - { - "label": "gpt-4", - "name": "gpt-4" - }, - { - "label": "gpt-4-32k", - "name": "gpt-4-32k" - }, - { - "label": "gpt-3.5-turbo", - "name": "gpt-3.5-turbo" - }, - { - "label": "gpt-3.5-turbo-16k", - "name": "gpt-3.5-turbo-16k" - } - ], + "type": "asyncOptions", + "loadMethod": "listModels", "default": "gpt-3.5-turbo-16k", - "optional": true, "id": "azureChatOpenAI_LlamaIndex_0-input-modelName-options" }, { diff --git a/packages/server/marketplaces/chatflows/Simple Conversation Chain.json b/packages/server/marketplaces/chatflows/Simple Conversation Chain.json index 1a2cb25f126..8b2397e32f7 100644 --- a/packages/server/marketplaces/chatflows/Simple Conversation Chain.json +++ b/packages/server/marketplaces/chatflows/Simple Conversation Chain.json @@ -16,7 +16,7 @@ "data": { "id": "chatOpenAI_0", "label": "ChatOpenAI", - "version": 5, + "version": 6.0, "name": "chatOpenAI", "type": "ChatOpenAI", "baseClasses": ["ChatOpenAI", "BaseChatModel", "BaseLanguageModel", "Runnable"], @@ -33,71 +33,9 @@ { "label": "Model Name", "name": "modelName", - "type": "options", - "options": [ - { - "label": "gpt-4", - "name": "gpt-4" - }, - { - "label": "gpt-4-turbo-preview", - "name": "gpt-4-turbo-preview" - }, - { - "label": "gpt-4-0125-preview", - "name": "gpt-4-0125-preview" - }, - { - "label": "gpt-4-1106-preview", - "name": "gpt-4-1106-preview" - }, - { - "label": "gpt-4-1106-vision-preview", - "name": "gpt-4-1106-vision-preview" - }, - { - "label": "gpt-4-vision-preview", - "name": "gpt-4-vision-preview" - }, - { - "label": "gpt-4-0613", - "name": "gpt-4-0613" - }, - { - "label": "gpt-4-32k", - "name": "gpt-4-32k" - }, - { - "label": "gpt-4-32k-0613", - "name": "gpt-4-32k-0613" - }, - { - "label": "gpt-3.5-turbo", - "name": "gpt-3.5-turbo" - }, - { - "label": "gpt-3.5-turbo-0125", - "name": "gpt-3.5-turbo-0125" - }, - { - "label": "gpt-3.5-turbo-1106", - "name": "gpt-3.5-turbo-1106" - }, - { - "label": "gpt-3.5-turbo-0613", - "name": "gpt-3.5-turbo-0613" - }, - { - "label": "gpt-3.5-turbo-16k", - "name": "gpt-3.5-turbo-16k" - }, - { - "label": "gpt-3.5-turbo-16k-0613", - "name": "gpt-3.5-turbo-16k-0613" - } - ], + "type": "asyncOptions", + "loadMethod": "listModels", "default": "gpt-3.5-turbo", - "optional": true, "id": "chatOpenAI_0-input-modelName-options" }, { diff --git a/packages/server/marketplaces/chatflows/Simple LLM Chain.json b/packages/server/marketplaces/chatflows/Simple LLM Chain.json index 36a5a8d84ee..7f9a39b12e3 100644 --- a/packages/server/marketplaces/chatflows/Simple LLM Chain.json +++ b/packages/server/marketplaces/chatflows/Simple LLM Chain.json @@ -75,7 +75,7 @@ "data": { "id": "openAI_0", "label": "OpenAI", - "version": 3, + "version": 4.0, "name": "openAI", "type": "OpenAI", "baseClasses": ["OpenAI", "BaseLLM", "BaseLanguageModel"], @@ -92,23 +92,9 @@ { "label": "Model Name", "name": "modelName", - "type": "options", - "options": [ - { - "label": "gpt-3.5-turbo-instruct", - "name": "gpt-3.5-turbo-instruct" - }, - { - "label": "babbage-002", - "name": "babbage-002" - }, - { - "label": "davinci-002", - "name": "davinci-002" - } - ], + "type": "asyncOptions", + "loadMethod": "listModels", "default": "gpt-3.5-turbo-instruct", - "optional": true, "id": "openAI_0-input-modelName-options" }, { diff --git a/packages/server/marketplaces/chatflows/Structured Output Parser.json b/packages/server/marketplaces/chatflows/Structured Output Parser.json index b1978cc1ceb..a94d059b8ad 100644 --- a/packages/server/marketplaces/chatflows/Structured Output Parser.json +++ b/packages/server/marketplaces/chatflows/Structured Output Parser.json @@ -16,7 +16,7 @@ "data": { "id": "chatOpenAI_0", "label": "ChatOpenAI", - "version": 5, + "version": 6.0, "name": "chatOpenAI", "type": "ChatOpenAI", "baseClasses": ["ChatOpenAI", "BaseChatModel", "BaseLanguageModel", "Runnable"], @@ -33,71 +33,9 @@ { "label": "Model Name", "name": "modelName", - "type": "options", - "options": [ - { - "label": "gpt-4", - "name": "gpt-4" - }, - { - "label": "gpt-4-turbo-preview", - "name": "gpt-4-turbo-preview" - }, - { - "label": "gpt-4-0125-preview", - "name": "gpt-4-0125-preview" - }, - { - "label": "gpt-4-1106-preview", - "name": "gpt-4-1106-preview" - }, - { - "label": "gpt-4-1106-vision-preview", - "name": "gpt-4-1106-vision-preview" - }, - { - "label": "gpt-4-vision-preview", - "name": "gpt-4-vision-preview" - }, - { - "label": "gpt-4-0613", - "name": "gpt-4-0613" - }, - { - "label": "gpt-4-32k", - "name": "gpt-4-32k" - }, - { - "label": "gpt-4-32k-0613", - "name": "gpt-4-32k-0613" - }, - { - "label": "gpt-3.5-turbo", - "name": "gpt-3.5-turbo" - }, - { - "label": "gpt-3.5-turbo-0125", - "name": "gpt-3.5-turbo-0125" - }, - { - "label": "gpt-3.5-turbo-1106", - "name": "gpt-3.5-turbo-1106" - }, - { - "label": "gpt-3.5-turbo-0613", - "name": "gpt-3.5-turbo-0613" - }, - { - "label": "gpt-3.5-turbo-16k", - "name": "gpt-3.5-turbo-16k" - }, - { - "label": "gpt-3.5-turbo-16k-0613", - "name": "gpt-3.5-turbo-16k-0613" - } - ], + "type": "asyncOptions", + "loadMethod": "listModels", "default": "gpt-3.5-turbo", - "optional": true, "id": "chatOpenAI_0-input-modelName-options" }, { diff --git a/packages/server/marketplaces/chatflows/SubQuestion Query Engine.json b/packages/server/marketplaces/chatflows/SubQuestion Query Engine.json index f8f6f430a4e..c5c1d713995 100644 --- a/packages/server/marketplaces/chatflows/SubQuestion Query Engine.json +++ b/packages/server/marketplaces/chatflows/SubQuestion Query Engine.json @@ -206,7 +206,7 @@ "data": { "id": "chatOpenAI_LlamaIndex_0", "label": "ChatOpenAI", - "version": 1, + "version": 2.0, "name": "chatOpenAI_LlamaIndex", "type": "ChatOpenAI", "baseClasses": ["ChatOpenAI", "BaseChatModel_LlamaIndex", "BaseLLM"], @@ -224,55 +224,9 @@ { "label": "Model Name", "name": "modelName", - "type": "options", - "options": [ - { - "label": "gpt-4", - "name": "gpt-4" - }, - { - "label": "gpt-4-1106-preview", - "name": "gpt-4-1106-preview" - }, - { - "label": "gpt-4-vision-preview", - "name": "gpt-4-vision-preview" - }, - { - "label": "gpt-4-0613", - "name": "gpt-4-0613" - }, - { - "label": "gpt-4-32k", - "name": "gpt-4-32k" - }, - { - "label": "gpt-4-32k-0613", - "name": "gpt-4-32k-0613" - }, - { - "label": "gpt-3.5-turbo", - "name": "gpt-3.5-turbo" - }, - { - "label": "gpt-3.5-turbo-1106", - "name": "gpt-3.5-turbo-1106" - }, - { - "label": "gpt-3.5-turbo-0613", - "name": "gpt-3.5-turbo-0613" - }, - { - "label": "gpt-3.5-turbo-16k", - "name": "gpt-3.5-turbo-16k" - }, - { - "label": "gpt-3.5-turbo-16k-0613", - "name": "gpt-3.5-turbo-16k-0613" - } - ], + "type": "asyncOptions", + "loadMethod": "listModels", "default": "gpt-3.5-turbo", - "optional": true, "id": "chatOpenAI_LlamaIndex_0-input-modelName-options" }, { @@ -350,7 +304,7 @@ "data": { "id": "openAIEmbedding_LlamaIndex_0", "label": "OpenAI Embedding", - "version": 1, + "version": 2, "name": "openAIEmbedding_LlamaIndex", "type": "OpenAIEmbedding", "baseClasses": ["OpenAIEmbedding", "BaseEmbedding_LlamaIndex", "BaseEmbedding"], @@ -365,6 +319,14 @@ "credentialNames": ["openAIApi"], "id": "openAIEmbedding_LlamaIndex_0-input-credential-credential" }, + { + "label": "Model Name", + "name": "modelName", + "type": "asyncOptions", + "loadMethod": "listModels", + "default": "text-embedding-ada-002", + "id": "openAIEmbedding_LlamaIndex_0-input-modelName-options" + }, { "label": "Timeout", "name": "timeout", @@ -385,7 +347,8 @@ "inputAnchors": [], "inputs": { "timeout": "", - "basepath": "" + "basepath": "", + "modelName": "text-embedding-ada-002" }, "outputAnchors": [ { @@ -543,7 +506,7 @@ "data": { "id": "chatOpenAI_LlamaIndex_1", "label": "ChatOpenAI", - "version": 1, + "version": 2.0, "name": "chatOpenAI_LlamaIndex", "type": "ChatOpenAI", "baseClasses": ["ChatOpenAI", "BaseChatModel_LlamaIndex", "BaseLLM"], @@ -561,55 +524,9 @@ { "label": "Model Name", "name": "modelName", - "type": "options", - "options": [ - { - "label": "gpt-4", - "name": "gpt-4" - }, - { - "label": "gpt-4-1106-preview", - "name": "gpt-4-1106-preview" - }, - { - "label": "gpt-4-vision-preview", - "name": "gpt-4-vision-preview" - }, - { - "label": "gpt-4-0613", - "name": "gpt-4-0613" - }, - { - "label": "gpt-4-32k", - "name": "gpt-4-32k" - }, - { - "label": "gpt-4-32k-0613", - "name": "gpt-4-32k-0613" - }, - { - "label": "gpt-3.5-turbo", - "name": "gpt-3.5-turbo" - }, - { - "label": "gpt-3.5-turbo-1106", - "name": "gpt-3.5-turbo-1106" - }, - { - "label": "gpt-3.5-turbo-0613", - "name": "gpt-3.5-turbo-0613" - }, - { - "label": "gpt-3.5-turbo-16k", - "name": "gpt-3.5-turbo-16k" - }, - { - "label": "gpt-3.5-turbo-16k-0613", - "name": "gpt-3.5-turbo-16k-0613" - } - ], + "type": "asyncOptions", + "loadMethod": "listModels", "default": "gpt-3.5-turbo", - "optional": true, "id": "chatOpenAI_LlamaIndex_1-input-modelName-options" }, { @@ -687,7 +604,7 @@ "data": { "id": "openAIEmbedding_LlamaIndex_1", "label": "OpenAI Embedding", - "version": 1, + "version": 2, "name": "openAIEmbedding_LlamaIndex", "type": "OpenAIEmbedding", "baseClasses": ["OpenAIEmbedding", "BaseEmbedding_LlamaIndex", "BaseEmbedding"], @@ -702,6 +619,14 @@ "credentialNames": ["openAIApi"], "id": "openAIEmbedding_LlamaIndex_1-input-credential-credential" }, + { + "label": "Model Name", + "name": "modelName", + "type": "asyncOptions", + "loadMethod": "listModels", + "default": "text-embedding-ada-002", + "id": "openAIEmbedding_LlamaIndex_1-input-modelName-options" + }, { "label": "Timeout", "name": "timeout", @@ -722,7 +647,8 @@ "inputAnchors": [], "inputs": { "timeout": "", - "basepath": "" + "basepath": "", + "modelName": "text-embedding-ada-002" }, "outputAnchors": [ { diff --git a/packages/server/marketplaces/chatflows/Translator.json b/packages/server/marketplaces/chatflows/Translator.json index 0155ca46564..16b8e1ddd51 100644 --- a/packages/server/marketplaces/chatflows/Translator.json +++ b/packages/server/marketplaces/chatflows/Translator.json @@ -84,7 +84,7 @@ "data": { "id": "chatOpenAI_0", "label": "ChatOpenAI", - "version": 5, + "version": 6.0, "name": "chatOpenAI", "type": "ChatOpenAI", "baseClasses": ["ChatOpenAI", "BaseChatModel", "BaseLanguageModel"], @@ -101,71 +101,9 @@ { "label": "Model Name", "name": "modelName", - "type": "options", - "options": [ - { - "label": "gpt-4", - "name": "gpt-4" - }, - { - "label": "gpt-4-turbo-preview", - "name": "gpt-4-turbo-preview" - }, - { - "label": "gpt-4-0125-preview", - "name": "gpt-4-0125-preview" - }, - { - "label": "gpt-4-1106-preview", - "name": "gpt-4-1106-preview" - }, - { - "label": "gpt-4-1106-vision-preview", - "name": "gpt-4-1106-vision-preview" - }, - { - "label": "gpt-4-vision-preview", - "name": "gpt-4-vision-preview" - }, - { - "label": "gpt-4-0613", - "name": "gpt-4-0613" - }, - { - "label": "gpt-4-32k", - "name": "gpt-4-32k" - }, - { - "label": "gpt-4-32k-0613", - "name": "gpt-4-32k-0613" - }, - { - "label": "gpt-3.5-turbo", - "name": "gpt-3.5-turbo" - }, - { - "label": "gpt-3.5-turbo-0125", - "name": "gpt-3.5-turbo-0125" - }, - { - "label": "gpt-3.5-turbo-1106", - "name": "gpt-3.5-turbo-1106" - }, - { - "label": "gpt-3.5-turbo-0613", - "name": "gpt-3.5-turbo-0613" - }, - { - "label": "gpt-3.5-turbo-16k", - "name": "gpt-3.5-turbo-16k" - }, - { - "label": "gpt-3.5-turbo-16k-0613", - "name": "gpt-3.5-turbo-16k-0613" - } - ], + "type": "asyncOptions", + "loadMethod": "listModels", "default": "gpt-3.5-turbo", - "optional": true, "id": "chatOpenAI_0-input-modelName-options" }, { diff --git a/packages/server/marketplaces/chatflows/WebBrowser.json b/packages/server/marketplaces/chatflows/WebBrowser.json index c3e2de6709d..9f930b2bbd9 100644 --- a/packages/server/marketplaces/chatflows/WebBrowser.json +++ b/packages/server/marketplaces/chatflows/WebBrowser.json @@ -131,7 +131,7 @@ "data": { "id": "chatOpenAI_0", "label": "ChatOpenAI", - "version": 5, + "version": 6.0, "name": "chatOpenAI", "type": "ChatOpenAI", "baseClasses": ["ChatOpenAI", "BaseChatModel", "BaseLanguageModel"], @@ -148,71 +148,9 @@ { "label": "Model Name", "name": "modelName", - "type": "options", - "options": [ - { - "label": "gpt-4", - "name": "gpt-4" - }, - { - "label": "gpt-4-turbo-preview", - "name": "gpt-4-turbo-preview" - }, - { - "label": "gpt-4-0125-preview", - "name": "gpt-4-0125-preview" - }, - { - "label": "gpt-4-1106-preview", - "name": "gpt-4-1106-preview" - }, - { - "label": "gpt-4-1106-vision-preview", - "name": "gpt-4-1106-vision-preview" - }, - { - "label": "gpt-4-vision-preview", - "name": "gpt-4-vision-preview" - }, - { - "label": "gpt-4-0613", - "name": "gpt-4-0613" - }, - { - "label": "gpt-4-32k", - "name": "gpt-4-32k" - }, - { - "label": "gpt-4-32k-0613", - "name": "gpt-4-32k-0613" - }, - { - "label": "gpt-3.5-turbo", - "name": "gpt-3.5-turbo" - }, - { - "label": "gpt-3.5-turbo-0125", - "name": "gpt-3.5-turbo-0125" - }, - { - "label": "gpt-3.5-turbo-1106", - "name": "gpt-3.5-turbo-1106" - }, - { - "label": "gpt-3.5-turbo-0613", - "name": "gpt-3.5-turbo-0613" - }, - { - "label": "gpt-3.5-turbo-16k", - "name": "gpt-3.5-turbo-16k" - }, - { - "label": "gpt-3.5-turbo-16k-0613", - "name": "gpt-3.5-turbo-16k-0613" - } - ], + "type": "asyncOptions", + "loadMethod": "listModels", "default": "gpt-3.5-turbo", - "optional": true, "id": "chatOpenAI_0-input-modelName-options" }, { @@ -365,7 +303,7 @@ "data": { "id": "openAIEmbeddings_0", "label": "OpenAI Embeddings", - "version": 2, + "version": 3, "name": "openAIEmbeddings", "type": "OpenAIEmbeddings", "baseClasses": ["OpenAIEmbeddings", "Embeddings"], @@ -382,24 +320,10 @@ { "label": "Model Name", "name": "modelName", - "type": "options", - "options": [ - { - "label": "text-embedding-3-large", - "name": "text-embedding-3-large" - }, - { - "label": "text-embedding-3-small", - "name": "text-embedding-3-small" - }, - { - "label": "text-embedding-ada-002", - "name": "text-embedding-ada-002" - } - ], + "type": "asyncOptions", + "loadMethod": "listModels", "default": "text-embedding-ada-002", - "optional": true, - "id": "openAIEmbeddings_0-input-modelName-options" + "id": "openAIEmbeddings_2-input-modelName-options" }, { "label": "Strip New Lines", @@ -472,7 +396,7 @@ "data": { "id": "chatOpenAI_1", "label": "ChatOpenAI", - "version": 5, + "version": 6.0, "name": "chatOpenAI", "type": "ChatOpenAI", "baseClasses": ["ChatOpenAI", "BaseChatModel", "BaseLanguageModel"], @@ -489,71 +413,9 @@ { "label": "Model Name", "name": "modelName", - "type": "options", - "options": [ - { - "label": "gpt-4", - "name": "gpt-4" - }, - { - "label": "gpt-4-turbo-preview", - "name": "gpt-4-turbo-preview" - }, - { - "label": "gpt-4-0125-preview", - "name": "gpt-4-0125-preview" - }, - { - "label": "gpt-4-1106-preview", - "name": "gpt-4-1106-preview" - }, - { - "label": "gpt-4-1106-vision-preview", - "name": "gpt-4-1106-vision-preview" - }, - { - "label": "gpt-4-vision-preview", - "name": "gpt-4-vision-preview" - }, - { - "label": "gpt-4-0613", - "name": "gpt-4-0613" - }, - { - "label": "gpt-4-32k", - "name": "gpt-4-32k" - }, - { - "label": "gpt-4-32k-0613", - "name": "gpt-4-32k-0613" - }, - { - "label": "gpt-3.5-turbo", - "name": "gpt-3.5-turbo" - }, - { - "label": "gpt-3.5-turbo-0125", - "name": "gpt-3.5-turbo-0125" - }, - { - "label": "gpt-3.5-turbo-1106", - "name": "gpt-3.5-turbo-1106" - }, - { - "label": "gpt-3.5-turbo-0613", - "name": "gpt-3.5-turbo-0613" - }, - { - "label": "gpt-3.5-turbo-16k", - "name": "gpt-3.5-turbo-16k" - }, - { - "label": "gpt-3.5-turbo-16k-0613", - "name": "gpt-3.5-turbo-16k-0613" - } - ], + "type": "asyncOptions", + "loadMethod": "listModels", "default": "gpt-3.5-turbo", - "optional": true, "id": "chatOpenAI_1-input-modelName-options" }, { @@ -722,6 +584,14 @@ "optional": true, "additionalParams": true, "id": "conversationalAgent_0-input-systemMessage-string" + }, + { + "label": "Max Iterations", + "name": "maxIterations", + "type": "number", + "optional": true, + "additionalParams": true, + "id": "conversationalAgent_0-input-maxIterations-number" } ], "inputAnchors": [ diff --git a/packages/server/marketplaces/chatflows/WebPage QnA.json b/packages/server/marketplaces/chatflows/WebPage QnA.json index a913e5f96b6..c185dd46514 100644 --- a/packages/server/marketplaces/chatflows/WebPage QnA.json +++ b/packages/server/marketplaces/chatflows/WebPage QnA.json @@ -16,7 +16,7 @@ "data": { "id": "openAIEmbeddings_0", "label": "OpenAI Embeddings", - "version": 2, + "version": 3, "name": "openAIEmbeddings", "type": "OpenAIEmbeddings", "baseClasses": ["OpenAIEmbeddings", "Embeddings"], @@ -33,24 +33,10 @@ { "label": "Model Name", "name": "modelName", - "type": "options", - "options": [ - { - "label": "text-embedding-3-large", - "name": "text-embedding-3-large" - }, - { - "label": "text-embedding-3-small", - "name": "text-embedding-3-small" - }, - { - "label": "text-embedding-ada-002", - "name": "text-embedding-ada-002" - } - ], + "type": "asyncOptions", + "loadMethod": "listModels", "default": "text-embedding-ada-002", - "optional": true, - "id": "openAIEmbeddings_0-input-modelName-options" + "id": "openAIEmbeddings_2-input-modelName-options" }, { "label": "Strip New Lines", @@ -404,7 +390,7 @@ "data": { "id": "chatOpenAI_0", "label": "ChatOpenAI", - "version": 5, + "version": 6.0, "name": "chatOpenAI", "type": "ChatOpenAI", "baseClasses": ["ChatOpenAI", "BaseChatModel", "BaseLanguageModel", "Runnable"], @@ -421,71 +407,9 @@ { "label": "Model Name", "name": "modelName", - "type": "options", - "options": [ - { - "label": "gpt-4", - "name": "gpt-4" - }, - { - "label": "gpt-4-turbo-preview", - "name": "gpt-4-turbo-preview" - }, - { - "label": "gpt-4-0125-preview", - "name": "gpt-4-0125-preview" - }, - { - "label": "gpt-4-1106-preview", - "name": "gpt-4-1106-preview" - }, - { - "label": "gpt-4-1106-vision-preview", - "name": "gpt-4-1106-vision-preview" - }, - { - "label": "gpt-4-vision-preview", - "name": "gpt-4-vision-preview" - }, - { - "label": "gpt-4-0613", - "name": "gpt-4-0613" - }, - { - "label": "gpt-4-32k", - "name": "gpt-4-32k" - }, - { - "label": "gpt-4-32k-0613", - "name": "gpt-4-32k-0613" - }, - { - "label": "gpt-3.5-turbo", - "name": "gpt-3.5-turbo" - }, - { - "label": "gpt-3.5-turbo-0125", - "name": "gpt-3.5-turbo-0125" - }, - { - "label": "gpt-3.5-turbo-1106", - "name": "gpt-3.5-turbo-1106" - }, - { - "label": "gpt-3.5-turbo-0613", - "name": "gpt-3.5-turbo-0613" - }, - { - "label": "gpt-3.5-turbo-16k", - "name": "gpt-3.5-turbo-16k" - }, - { - "label": "gpt-3.5-turbo-16k-0613", - "name": "gpt-3.5-turbo-16k-0613" - } - ], + "type": "asyncOptions", + "loadMethod": "listModels", "default": "gpt-3.5-turbo", - "optional": true, "id": "chatOpenAI_0-input-modelName-options" }, { diff --git a/packages/server/src/commands/start.ts b/packages/server/src/commands/start.ts index f8877e26425..d884e317d8d 100644 --- a/packages/server/src/commands/start.ts +++ b/packages/server/src/commands/start.ts @@ -45,7 +45,8 @@ export default class Start extends Command { LANGCHAIN_ENDPOINT: Flags.string(), LANGCHAIN_API_KEY: Flags.string(), LANGCHAIN_PROJECT: Flags.string(), - DISABLE_FLOWISE_TELEMETRY: Flags.string() + DISABLE_FLOWISE_TELEMETRY: Flags.string(), + MODEL_LIST_CONFIG_JSON: Flags.string() } async stopProcess() { @@ -134,6 +135,9 @@ export default class Start extends Command { // Disable langchain warnings process.env.LANGCHAIN_SUPPRESS_MIGRATION_WARNINGS = 'true' + // Model list config + if (flags.MODEL_LIST_CONFIG_JSON) process.env.MODEL_LIST_CONFIG_JSON = flags.MODEL_LIST_CONFIG_JSON + await (async () => { try { logger.info('Starting Flowise...')