Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Feature/Claude 3 Haiku #1958

Merged
merged 6 commits into from
Mar 15, 2024
Merged

Feature/Claude 3 Haiku #1958

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
fa081ac
Merge branch 'main' into feature/Indexing
HenryHengZJ Mar 15, 2024
134ecb8
update lock file
HenryHengZJ Mar 15, 2024
5d14d0a
Merge branch 'main' into feature/Anthropic
HenryHengZJ Mar 15, 2024
3ff5a5e
update lock file
HenryHengZJ Mar 15, 2024
39e380e
Update lockFileVersion
ocflowiseai Mar 15, 2024
536da36
Update pnpm-lock.yaml
ocflowiseai Mar 15, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
37 changes: 29 additions & 8 deletions packages/components/nodes/chatmodels/AWSBedrock/AWSChatBedrock.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
import { BedrockChat } from '@langchain/community/chat_models/bedrock'
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, INode, INodeData, INodeParams } from '../../../src/Interface'
import { ICommonObject, IMultiModalOption, INode, INodeData, INodeParams } from '../../../src/Interface'
import { getBaseClasses, getCredentialData, getCredentialParam } from '../../../src/utils'
import { BedrockChat } from './FlowiseAWSChatBedrock'

/**
* @author Michael Connor <mlconnor@yahoo.com>
Expand All @@ -23,7 +23,7 @@ class AWSChatBedrock_ChatModels implements INode {
constructor() {
this.label = 'AWS ChatBedrock'
this.name = 'awsChatBedrock'
this.version = 3.0
this.version = 4.0
this.type = 'AWSChatBedrock'
this.icon = 'aws.svg'
this.category = 'Chat Models'
Expand Down Expand Up @@ -91,14 +91,17 @@ class AWSChatBedrock_ChatModels implements INode {
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-instant-v1', name: 'anthropic.claude-instant-v1' },
{ label: 'anthropic.claude-v1', name: 'anthropic.claude-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-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' }
],
default: 'anthropic.claude-v2'
default: 'anthropic.claude-3-haiku'
},
{
label: 'Custom Model Name',
Expand Down Expand Up @@ -126,6 +129,15 @@ class AWSChatBedrock_ChatModels implements INode {
optional: true,
additionalParams: true,
default: 200
},
{
label: 'Allow Image Uploads',
name: 'allowImageUploads',
type: 'boolean',
description:
'Only works with claude-3-* models when image is being uploaded from chat. Compatible with LLMChain, Conversation Chain, ReAct Agent, and Conversational Agent',
default: false,
optional: true
}
]
}
Expand Down Expand Up @@ -168,7 +180,16 @@ class AWSChatBedrock_ChatModels implements INode {
}
if (cache) obj.cache = cache

const amazonBedrock = new BedrockChat(obj)
const allowImageUploads = nodeData.inputs?.allowImageUploads as boolean

const multiModalOption: IMultiModalOption = {
image: {
allowImageUploads: allowImageUploads ?? false
}
}

const amazonBedrock = new BedrockChat(nodeData.id, obj)
if (obj.model.includes('anthropic.claude-3')) amazonBedrock.setMultiModalOption(multiModalOption)
return amazonBedrock
}
}
Expand Down
34 changes: 34 additions & 0 deletions packages/components/nodes/chatmodels/AWSBedrock/FlowiseAWSChatBedrock.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,34 @@
import { BaseChatModelParams } from '@langchain/core/language_models/chat_models'
import { BedrockChat as LCBedrockChat } from '@langchain/community/chat_models/bedrock'
import { BaseBedrockInput } from '@langchain/community/dist/utils/bedrock'
import { IVisionChatModal, IMultiModalOption } from '../../../src'

export class BedrockChat extends LCBedrockChat implements IVisionChatModal {
configuredModel: string
configuredMaxToken: number
multiModalOption: IMultiModalOption
id: string

constructor(id: string, fields: BaseBedrockInput & BaseChatModelParams) {
super(fields)
this.id = id
this.configuredModel = fields?.model || 'anthropic.claude-3-haiku-20240307-v1:0'
this.configuredMaxToken = fields?.maxTokens ?? 256
}

revertToOriginalModel(): void {
super.model = this.configuredModel
super.maxTokens = this.configuredMaxToken
}

setMultiModalOption(multiModalOption: IMultiModalOption): void {
this.multiModalOption = multiModalOption
}

setVisionModel(): void {
if (!this.model.startsWith('claude-3')) {
super.model = 'anthropic.claude-3-haiku-20240307-v1:0'
super.maxTokens = 1024
}
}
}
65 changes: 13 additions & 52 deletions packages/components/nodes/chatmodels/ChatAnthropic/ChatAnthropic.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ import { BaseCache } from '@langchain/core/caches'
import { BaseLLMParams } from '@langchain/core/language_models/llms'
import { ICommonObject, IMultiModalOption, INode, INodeData, INodeParams } from '../../../src/Interface'
import { getBaseClasses, getCredentialData, getCredentialParam } from '../../../src/utils'
import { ChatAnthropic } from './FlowiseChatAntrhopic'
import { ChatAnthropic } from './FlowiseChatAnthropic'

class ChatAnthropic_ChatModels implements INode {
label: string
Expand All @@ -20,7 +20,7 @@ class ChatAnthropic_ChatModels implements INode {
constructor() {
this.label = 'ChatAnthropic'
this.name = 'chatAnthropic'
this.version = 4.0
this.version = 5.0
this.type = 'ChatAnthropic'
this.icon = 'Anthropic.svg'
this.category = 'Chat Models'
Expand All @@ -44,6 +44,11 @@ class ChatAnthropic_ChatModels implements INode {
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',
Expand All @@ -55,66 +60,22 @@ class ChatAnthropic_ChatModels implements INode {
description: 'Ideal balance of intelligence and speed for enterprise workloads'
},
{
label: 'claude-2',
name: 'claude-2',
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',
label: 'claude-2.1 (legacy)',
name: 'claude-2.1',
description: 'Claude 2 latest full version'
},
{
label: 'claude-instant-1',
name: 'claude-instant-1',
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'
},
{
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',
default: 'claude-3-haiku',
optional: true
},
{
Expand Down
6 changes: 3 additions & 3 deletions ...els/ChatAnthropic/FlowiseChatAntrhopic.ts → ...els/ChatAnthropic/FlowiseChatAnthropic.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import { AnthropicInput, ChatAnthropic as LangchainChatAnthropic } from '@langchain/anthropic'
import { IVisionChatModal, IMultiModalOption } from '../../../src'
import { BaseLLMParams } from '@langchain/core/language_models/llms'
import { IVisionChatModal, IMultiModalOption } from '../../../src'

export class ChatAnthropic extends LangchainChatAnthropic implements IVisionChatModal {
configuredModel: string
Expand All @@ -11,7 +11,7 @@ export class ChatAnthropic extends LangchainChatAnthropic implements IVisionChat
constructor(id: string, fields: Partial<AnthropicInput> & BaseLLMParams & { anthropicApiKey?: string }) {
super(fields)
this.id = id
this.configuredModel = fields?.modelName || 'claude-3-opus-20240229'
this.configuredModel = fields?.modelName || 'claude-3-haiku-20240307'
this.configuredMaxToken = fields?.maxTokens ?? 256
}

Expand All @@ -26,7 +26,7 @@ export class ChatAnthropic extends LangchainChatAnthropic implements IVisionChat

setVisionModel(): void {
if (!this.modelName.startsWith('claude-3')) {
super.modelName = 'claude-3-opus-20240229'
super.modelName = 'claude-3-haiku-20240307'
super.maxTokens = 1024
}
}
Expand Down
2 changes: 1 addition & 1 deletion packages/components/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@
"@huggingface/inference": "^2.6.1",
"@langchain/anthropic": "^0.1.4",
"@langchain/cohere": "^0.0.5",
"@langchain/community": "^0.0.30",
"@langchain/community": "^0.0.39",
"@langchain/google-genai": "^0.0.10",
"@langchain/groq": "^0.0.2",
"@langchain/mistralai": "^0.0.7",
Expand Down
63 changes: 12 additions & 51 deletions packages/server/marketplaces/chatflows/Claude LLM.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -179,6 +179,11 @@
"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",
Expand All @@ -190,66 +195,22 @@
"description": "Ideal balance of intelligence and speed for enterprise workloads"
},
{
"label": "claude-2",
"name": "claude-2",
"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",
"label": "claude-2.1 (legacy)",
"name": "claude-2.1",
"description": "Claude 2 latest full version"
},
{
"label": "claude-instant-1",
"name": "claude-instant-1",
"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"
},
{
"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",
"default": "claude-3-haiku",
"optional": true,
"id": "chatAnthropic_0-input-modelName-options"
},
Expand Down Expand Up @@ -310,7 +271,7 @@
],
"inputs": {
"cache": "",
"modelName": "claude-2.1",
"modelName": "claude-3-haiku",
"temperature": 0.9,
"maxTokensToSample": "",
"topP": "",
Expand Down
2 changes: 1 addition & 1 deletion packages/server/src/index.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1675,7 +1675,7 @@ export class App {
if (!chatflow) return `Chatflow ${chatflowid} not found`

const uploadAllowedNodes = ['llmChain', 'conversationChain', 'mrklAgentChat', 'conversationalAgent']
const uploadProcessingNodes = ['chatOpenAI', 'chatAnthropic']
const uploadProcessingNodes = ['chatOpenAI', 'chatAnthropic', 'awsChatBedrock']

const flowObj = JSON.parse(chatflow.flowData)
const imgUploadSizeAndTypes: IUploadFileSizeAndTypes[] = []
Expand Down
Loading
Loading