Skip to content

Commit 171c765

Browse files
HenryHengZJHenryHengZJ
authored
Merge pull request #946 from FlowiseAI/feature/OpenAI
Feature/Update OpenAI models
2 parents c0d9484 + 096451f commit 171c765

File tree

7 files changed

+74
-105
lines changed

7 files changed

+74
-105
lines changed

‎packages/components/nodes/chatmodels/ChatGoogleVertexAI/ChatGoogleVertexAI.ts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -114,7 +114,7 @@ class GoogleVertexAI_ChatModels implements INode {
114114
const maxOutputTokens = nodeData.inputs?.maxOutputTokens as string
115115
const topP = nodeData.inputs?.topP as string
116116

117-
const obj: Partial<GoogleVertexAIChatInput> = {
117+
const obj: GoogleVertexAIChatInput<GoogleAuthOptions> = {
118118
temperature: parseFloat(temperature),
119119
model: modelName
120120
}

‎packages/components/nodes/llms/OpenAI/OpenAI.ts‎

Lines changed: 8 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ class OpenAI_LLMs implements INode {
1717
constructor() {
1818
this.label = 'OpenAI'
1919
this.name = 'openAI'
20-
this.version = 1.0
20+
this.version = 2.0
2121
this.type = 'OpenAI'
2222
this.icon = 'openai.png'
2323
this.category = 'LLMs'
@@ -36,23 +36,19 @@ class OpenAI_LLMs implements INode {
3636
type: 'options',
3737
options: [
3838
{
39-
label: 'text-davinci-003',
40-
name: 'text-davinci-003'
39+
label: 'gpt-3.5-turbo-instruct',
40+
name: 'gpt-3.5-turbo-instruct'
4141
},
4242
{
43-
label: 'text-davinci-002',
44-
name: 'text-davinci-002'
43+
label: 'babbage-002',
44+
name: 'babbage-002'
4545
},
4646
{
47-
label: 'text-curie-001',
48-
name: 'text-curie-001'
49-
},
50-
{
51-
label: 'text-babbage-001',
52-
name: 'text-babbage-001'
47+
label: 'davinci-002',
48+
name: 'davinci-002'
5349
}
5450
],
55-
default: 'text-davinci-003',
51+
default: 'gpt-3.5-turbo-instruct',
5652
optional: true
5753
},
5854
{

‎packages/components/package.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@
4242
"google-auth-library": "^9.0.0",
4343
"graphql": "^16.6.0",
4444
"html-to-text": "^9.0.5",
45-
"langchain": "^0.0.147",
45+
"langchain": "^0.0.152",
4646
"langfuse-langchain": "^1.0.14-alpha.0",
4747
"langsmith": "^0.0.32",
4848
"linkifyjs": "^4.1.1",

‎packages/server/marketplaces/chatflows/Multiple VectorDB.json‎

Lines changed: 27 additions & 39 deletions
Original file line numberDiff line numberDiff line change
@@ -328,7 +328,7 @@
328328
"id": "openAI_2",
329329
"label": "OpenAI",
330330
"name": "openAI",
331-
"version": 1,
331+
"version": 2,
332332
"type": "OpenAI",
333333
"baseClasses": ["OpenAI", "BaseLLM", "BaseLanguageModel"],
334334
"category": "LLMs",
@@ -347,23 +347,19 @@
347347
"type": "options",
348348
"options": [
349349
{
350-
"label": "text-davinci-003",
351-
"name": "text-davinci-003"
352-
},
353-
{
354-
"label": "text-davinci-002",
355-
"name": "text-davinci-002"
350+
"label": "gpt-3.5-turbo-instruct",
351+
"name": "gpt-3.5-turbo-instruct"
356352
},
357353
{
358-
"label": "text-curie-001",
359-
"name": "text-curie-001"
354+
"label": "babbage-002",
355+
"name": "babbage-002"
360356
},
361357
{
362-
"label": "text-babbage-001",
363-
"name": "text-babbage-001"
358+
"label": "davinci-002",
359+
"name": "davinci-002"
364360
}
365361
],
366-
"default": "text-davinci-003",
362+
"default": "gpt-3.5-turbo-instruct",
367363
"optional": true,
368364
"id": "openAI_2-input-modelName-options"
369365
},
@@ -442,7 +438,7 @@
442438
],
443439
"inputAnchors": [],
444440
"inputs": {
445-
"modelName": "text-davinci-003",
441+
"modelName": "gpt-3.5-turbo-instruct",
446442
"temperature": 0.7,
447443
"maxTokens": "",
448444
"topP": "",
@@ -743,7 +739,7 @@
743739
"id": "openAI_3",
744740
"label": "OpenAI",
745741
"name": "openAI",
746-
"version": 1,
742+
"version": 2,
747743
"type": "OpenAI",
748744
"baseClasses": ["OpenAI", "BaseLLM", "BaseLanguageModel"],
749745
"category": "LLMs",
@@ -762,23 +758,19 @@
762758
"type": "options",
763759
"options": [
764760
{
765-
"label": "text-davinci-003",
766-
"name": "text-davinci-003"
761+
"label": "gpt-3.5-turbo-instruct",
762+
"name": "gpt-3.5-turbo-instruct"
767763
},
768764
{
769-
"label": "text-davinci-002",
770-
"name": "text-davinci-002"
765+
"label": "babbage-002",
766+
"name": "babbage-002"
771767
},
772768
{
773-
"label": "text-curie-001",
774-
"name": "text-curie-001"
775-
},
776-
{
777-
"label": "text-babbage-001",
778-
"name": "text-babbage-001"
769+
"label": "davinci-002",
770+
"name": "davinci-002"
779771
}
780772
],
781-
"default": "text-davinci-003",
773+
"default": "gpt-3.5-turbo-instruct",
782774
"optional": true,
783775
"id": "openAI_3-input-modelName-options"
784776
},
@@ -857,7 +849,7 @@
857849
],
858850
"inputAnchors": [],
859851
"inputs": {
860-
"modelName": "text-davinci-003",
852+
"modelName": "gpt-3.5-turbo-instruct",
861853
"temperature": 0.7,
862854
"maxTokens": "",
863855
"topP": "",
@@ -1008,7 +1000,7 @@
10081000
"id": "openAI_4",
10091001
"label": "OpenAI",
10101002
"name": "openAI",
1011-
"version": 1,
1003+
"version": 2,
10121004
"type": "OpenAI",
10131005
"baseClasses": ["OpenAI", "BaseLLM", "BaseLanguageModel"],
10141006
"category": "LLMs",
@@ -1027,23 +1019,19 @@
10271019
"type": "options",
10281020
"options": [
10291021
{
1030-
"label": "text-davinci-003",
1031-
"name": "text-davinci-003"
1032-
},
1033-
{
1034-
"label": "text-davinci-002",
1035-
"name": "text-davinci-002"
1022+
"label": "gpt-3.5-turbo-instruct",
1023+
"name": "gpt-3.5-turbo-instruct"
10361024
},
10371025
{
1038-
"label": "text-curie-001",
1039-
"name": "text-curie-001"
1026+
"label": "babbage-002",
1027+
"name": "babbage-002"
10401028
},
10411029
{
1042-
"label": "text-babbage-001",
1043-
"name": "text-babbage-001"
1030+
"label": "davinci-002",
1031+
"name": "davinci-002"
10441032
}
10451033
],
1046-
"default": "text-davinci-003",
1034+
"default": "gpt-3.5-turbo-instruct",
10471035
"optional": true,
10481036
"id": "openAI_4-input-modelName-options"
10491037
},
@@ -1122,7 +1110,7 @@
11221110
],
11231111
"inputAnchors": [],
11241112
"inputs": {
1125-
"modelName": "text-davinci-003",
1113+
"modelName": "gpt-3.5-turbo-instruct",
11261114
"temperature": 0.7,
11271115
"maxTokens": "",
11281116
"topP": "",

‎packages/server/marketplaces/chatflows/Prompt Chaining.json‎

Lines changed: 19 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -296,7 +296,7 @@
296296
"id": "openAI_1",
297297
"label": "OpenAI",
298298
"name": "openAI",
299-
"version": 1,
299+
"version": 2,
300300
"type": "OpenAI",
301301
"baseClasses": ["OpenAI", "BaseLLM", "BaseLanguageModel"],
302302
"category": "LLMs",
@@ -315,23 +315,19 @@
315315
"type": "options",
316316
"options": [
317317
{
318-
"label": "text-davinci-003",
319-
"name": "text-davinci-003"
320-
},
321-
{
322-
"label": "text-davinci-002",
323-
"name": "text-davinci-002"
318+
"label": "gpt-3.5-turbo-instruct",
319+
"name": "gpt-3.5-turbo-instruct"
324320
},
325321
{
326-
"label": "text-curie-001",
327-
"name": "text-curie-001"
322+
"label": "babbage-002",
323+
"name": "babbage-002"
328324
},
329325
{
330-
"label": "text-babbage-001",
331-
"name": "text-babbage-001"
326+
"label": "davinci-002",
327+
"name": "davinci-002"
332328
}
333329
],
334-
"default": "text-davinci-003",
330+
"default": "gpt-3.5-turbo-instruct",
335331
"optional": true,
336332
"id": "openAI_1-input-modelName-options"
337333
},
@@ -410,7 +406,7 @@
410406
],
411407
"inputAnchors": [],
412408
"inputs": {
413-
"modelName": "text-davinci-003",
409+
"modelName": "gpt-3.5-turbo-instruct",
414410
"temperature": 0.7,
415411
"maxTokens": "",
416412
"topP": "",
@@ -452,7 +448,7 @@
452448
"id": "openAI_2",
453449
"label": "OpenAI",
454450
"name": "openAI",
455-
"version": 1,
451+
"version": 2,
456452
"type": "OpenAI",
457453
"baseClasses": ["OpenAI", "BaseLLM", "BaseLanguageModel"],
458454
"category": "LLMs",
@@ -471,23 +467,19 @@
471467
"type": "options",
472468
"options": [
473469
{
474-
"label": "text-davinci-003",
475-
"name": "text-davinci-003"
476-
},
477-
{
478-
"label": "text-davinci-002",
479-
"name": "text-davinci-002"
470+
"label": "gpt-3.5-turbo-instruct",
471+
"name": "gpt-3.5-turbo-instruct"
480472
},
481473
{
482-
"label": "text-curie-001",
483-
"name": "text-curie-001"
474+
"label": "babbage-002",
475+
"name": "babbage-002"
484476
},
485477
{
486-
"label": "text-babbage-001",
487-
"name": "text-babbage-001"
478+
"label": "davinci-002",
479+
"name": "davinci-002"
488480
}
489481
],
490-
"default": "text-davinci-003",
482+
"default": "gpt-3.5-turbo-instruct",
491483
"optional": true,
492484
"id": "openAI_2-input-modelName-options"
493485
},
@@ -565,8 +557,9 @@
565557
}
566558
],
567559
"inputAnchors": [],
560+
"default": "gpt-3.5-turbo-instruct",
568561
"inputs": {
569-
"modelName": "text-davinci-003",
562+
"modelName": "gpt-3.5-turbo-instruct",
570563
"temperature": 0.7,
571564
"maxTokens": "",
572565
"topP": "",

‎packages/server/marketplaces/chatflows/Simple LLM Chain.json‎

Lines changed: 9 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -155,7 +155,7 @@
155155
"id": "openAI_0",
156156
"label": "OpenAI",
157157
"name": "openAI",
158-
"version": 1,
158+
"version": 2,
159159
"type": "OpenAI",
160160
"baseClasses": ["OpenAI", "BaseLLM", "BaseLanguageModel"],
161161
"category": "LLMs",
@@ -174,23 +174,19 @@
174174
"type": "options",
175175
"options": [
176176
{
177-
"label": "text-davinci-003",
178-
"name": "text-davinci-003"
179-
},
180-
{
181-
"label": "text-davinci-002",
182-
"name": "text-davinci-002"
177+
"label": "gpt-3.5-turbo-instruct",
178+
"name": "gpt-3.5-turbo-instruct"
183179
},
184180
{
185-
"label": "text-curie-001",
186-
"name": "text-curie-001"
181+
"label": "babbage-002",
182+
"name": "babbage-002"
187183
},
188184
{
189-
"label": "text-babbage-001",
190-
"name": "text-babbage-001"
185+
"label": "davinci-002",
186+
"name": "davinci-002"
191187
}
192188
],
193-
"default": "text-davinci-003",
189+
"default": "gpt-3.5-turbo-instruct",
194190
"optional": true,
195191
"id": "openAI_0-input-modelName-options"
196192
},
@@ -269,7 +265,7 @@
269265
],
270266
"inputAnchors": [],
271267
"inputs": {
272-
"modelName": "text-davinci-003",
268+
"modelName": "gpt-3.5-turbo-instruct",
273269
"temperature": 0.7,
274270
"maxTokens": "",
275271
"topP": "",

0 commit comments

Comments
 (0)