Merge branch 'FlowiseAI:main' into main

packages/components/nodes/chatmodels/ChatGoogleGenerativeAI/ChatGoogleGenerativeAI.ts

@@ -1,7 +1,9 @@
 import { ICommonObject, INode, INodeData, INodeParams } from '../../../src/Interface'
-import { getBaseClasses, getCredentialData, getCredentialParam } from '../../../src/utils'
+import { convertMultiOptionsToStringArray, getBaseClasses, getCredentialData, getCredentialParam } from '../../../src/utils'
 import { BaseCache } from 'langchain/schema'
-import { ChatGoogleGenerativeAI } from '@langchain/google-genai'
+import { ChatGoogleGenerativeAI, GoogleGenerativeAIChatInput } from '@langchain/google-genai'
+import { HarmBlockThreshold, HarmCategory } from '@google/generative-ai'
+import type { SafetySetting } from '@google/generative-ai'
 
 class GoogleGenerativeAI_ChatModels implements INode {
     label: string
@@ -74,6 +76,73 @@ class GoogleGenerativeAI_ChatModels implements INode {
                 step: 0.1,
                 optional: true,
                 additionalParams: true
+            },
+            {
+                label: 'Top Next Highest Probability Tokens',
+                name: 'topK',
+                type: 'number',
+                description: `Decode using top-k sampling: consider the set of top_k most probable tokens. Must be positive`,
+                step: 1,
+                optional: true,
+                additionalParams: true
+            },
+            {
+                label: 'Harm Category',
+                name: 'harmCategory',
+                type: 'multiOptions',
+                description:
+                    'Refer to <a target="_blank" href="https://cloud.google.com/vertex-ai/docs/generative-ai/multimodal/configure-safety-attributes#safety_attribute_definitions">official guide</a> on how to use Harm Category',
+                options: [
+                    {
+                        label: 'Dangerous',
+                        name: HarmCategory.HARM_CATEGORY_DANGEROUS_CONTENT
+                    },
+                    {
+                        label: 'Harassment',
+                        name: HarmCategory.HARM_CATEGORY_HARASSMENT
+                    },
+                    {
+                        label: 'Hate Speech',
+                        name: HarmCategory.HARM_CATEGORY_HATE_SPEECH
+                    },
+                    {
+                        label: 'Sexually Explicit',
+                        name: HarmCategory.HARM_CATEGORY_SEXUALLY_EXPLICIT
+                    }
+                ],
+                optional: true,
+                additionalParams: true
+            },
+            {
+                label: 'Harm Block Threshold',
+                name: 'harmBlockThreshold',
+                type: 'multiOptions',
+                description:
+                    'Refer to <a target="_blank" href="https://cloud.google.com/vertex-ai/docs/generative-ai/multimodal/configure-safety-attributes#safety_setting_thresholds">official guide</a> on how to use Harm Block Threshold',
+                options: [
+                    {
+                        label: 'Low and Above',
+                        name: HarmBlockThreshold.BLOCK_LOW_AND_ABOVE
+                    },
+                    {
+                        label: 'Medium and Above',
+                        name: HarmBlockThreshold.BLOCK_MEDIUM_AND_ABOVE
+                    },
+                    {
+                        label: 'None',
+                        name: HarmBlockThreshold.BLOCK_NONE
+                    },
+                    {
+                        label: 'Only High',
+                        name: HarmBlockThreshold.BLOCK_ONLY_HIGH
+                    },
+                    {
+                        label: 'Threshold Unspecified',
+                        name: HarmBlockThreshold.HARM_BLOCK_THRESHOLD_UNSPECIFIED
+                    }
+                ],
+                optional: true,
+                additionalParams: true
             }
         ]
     }
@@ -86,9 +155,12 @@ class GoogleGenerativeAI_ChatModels implements INode {
         const modelName = nodeData.inputs?.modelName as string
         const maxOutputTokens = nodeData.inputs?.maxOutputTokens as string
         const topP = nodeData.inputs?.topP as string
+        const topK = nodeData.inputs?.topK as string
+        const harmCategory = nodeData.inputs?.harmCategory as string
+        const harmBlockThreshold = nodeData.inputs?.harmBlockThreshold as string
         const cache = nodeData.inputs?.cache as BaseCache
 
-        const obj = {
+        const obj: Partial<GoogleGenerativeAIChatInput> = {
             apiKey: apiKey,
             modelName: modelName,
             maxOutputTokens: 2048
@@ -98,8 +170,23 @@ class GoogleGenerativeAI_ChatModels implements INode {
 
         const model = new ChatGoogleGenerativeAI(obj)
         if (topP) model.topP = parseFloat(topP)
+        if (topK) model.topK = parseFloat(topK)
         if (cache) model.cache = cache
         if (temperature) model.temperature = parseFloat(temperature)
+
+        // Safety Settings
+        let harmCategories: string[] = convertMultiOptionsToStringArray(harmCategory)
+        let harmBlockThresholds: string[] = convertMultiOptionsToStringArray(harmBlockThreshold)
+        if (harmCategories.length != harmBlockThresholds.length)
+            throw new Error(`Harm Category & Harm Block Threshold are not the same length`)
+        const safetySettings: SafetySetting[] = harmCategories.map((harmCategory, index) => {
+            return {
+                category: harmCategory as HarmCategory,
+                threshold: harmBlockThresholds[index] as HarmBlockThreshold
+            }
+        })
+        if (safetySettings.length > 0) model.safetySettings = safetySettings
+
         return model
     }
 }

packages/components/nodes/chatmodels/ChatLocalAI/ChatLocalAI.ts

@@ -1,5 +1,5 @@
-import { INode, INodeData, INodeParams } from '../../../src/Interface'
-import { getBaseClasses } from '../../../src/utils'
+import { ICommonObject, INode, INodeData, INodeParams } from '../../../src/Interface'
+import { getBaseClasses, getCredentialData, getCredentialParam } from '../../../src/utils'
 import { OpenAIChat } from 'langchain/llms/openai'
 import { OpenAIChatInput } from 'langchain/chat_models/openai'
 import { BaseCache } from 'langchain/schema'
@@ -14,6 +14,7 @@ class ChatLocalAI_ChatModels implements INode {
     category: string
     description: string
     baseClasses: string[]
+    credential: INodeParams
     inputs: INodeParams[]
 
     constructor() {
@@ -25,6 +26,13 @@ class ChatLocalAI_ChatModels implements INode {
         this.category = 'Chat Models'
         this.description = 'Use local LLMs like llama.cpp, gpt4all using LocalAI'
         this.baseClasses = [this.type, 'BaseChatModel', ...getBaseClasses(OpenAIChat)]
+        this.credential = {
+            label: 'Connect Credential',
+            name: 'credential',
+            type: 'credential',
+            credentialNames: ['localAIApi'],
+            optional: true
+        }
         this.inputs = [
             {
                 label: 'Cache',
@@ -79,13 +87,16 @@ class ChatLocalAI_ChatModels implements INode {
         ]
     }
 
-    async init(nodeData: INodeData): Promise<any> {
+    async init(nodeData: INodeData, _: string, options: ICommonObject): Promise<any> {
         const temperature = nodeData.inputs?.temperature as string
         const modelName = nodeData.inputs?.modelName as string
         const maxTokens = nodeData.inputs?.maxTokens as string
         const topP = nodeData.inputs?.topP as string
         const timeout = nodeData.inputs?.timeout as string
         const basePath = nodeData.inputs?.basePath as string
+        const credentialData = await getCredentialData(nodeData.credential ?? '', options)
+        const localAIApiKey = getCredentialParam('localAIApiKey', credentialData, nodeData)
+
         const cache = nodeData.inputs?.cache as BaseCache
 
         const obj: Partial<OpenAIChatInput> & BaseLLMParams & { openAIApiKey?: string } = {
@@ -98,6 +109,7 @@ class ChatLocalAI_ChatModels implements INode {
         if (topP) obj.topP = parseFloat(topP)
         if (timeout) obj.timeout = parseInt(timeout, 10)
         if (cache) obj.cache = cache
+        if (localAIApiKey) obj.openAIApiKey = localAIApiKey
 
         const model = new OpenAIChat(obj, { basePath })