From eb0e2c6a93c3f21937457d13220ce2b7fca1f04a Mon Sep 17 00:00:00 2001 From: Heiner Lohaus Date: Mon, 2 Oct 2023 02:04:22 +0200 Subject: +Curl +Async +Stream Requests Update Model List --- g4f/models.py | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) (limited to 'g4f/models.py') diff --git a/g4f/models.py b/g4f/models.py index cca9e850..6b27645a 100644 --- a/g4f/models.py +++ b/g4f/models.py @@ -8,16 +8,19 @@ from .Provider import ( PerplexityAi, ChatgptDuo, ChatgptAi, + ChatForAi, ChatBase, AItianhu, Wewordle, Yqcloud, Myshell, + FreeGpt, Vercel, DeepAi, Aichat, Aivvm, GptGo, + Ylokh, Bard, Aibn, Bing, @@ -42,7 +45,7 @@ default = Model( Yqcloud, # Answers short questions in chinese ChatBase, # Don't want to answer creatively ChatgptDuo, # Include search results - DeepAi, ChatgptLogin, ChatgptAi, Aivvm, GptGo, AItianhu, AItianhuSpace, Aichat, Myshell, Aibn, + DeepAi, ChatgptLogin, ChatgptAi, Aivvm, GptGo, AItianhu, AItianhuSpace, Aichat, Myshell, Aibn, ChatForAi, FreeGpt, Ylokh, ]) ) @@ -51,7 +54,7 @@ gpt_35_turbo = Model( name = 'gpt-3.5-turbo', base_provider = 'openai', best_provider = RetryProvider([ - DeepAi, ChatgptLogin, ChatgptAi, Aivvm, GptGo, AItianhu, Aichat, AItianhuSpace, Myshell, Aibn, + DeepAi, ChatgptLogin, ChatgptAi, Aivvm, GptGo, AItianhu, Aichat, AItianhuSpace, Myshell, Aibn, ChatForAi, FreeGpt, Ylokh, ]) ) @@ -59,7 +62,7 @@ gpt_4 = Model( name = 'gpt-4', base_provider = 'openai', best_provider = RetryProvider([ - Myshell, AItianhuSpace, + Myshell, Ylokh, ]) ) -- cgit v1.2.3 From 6a61cf811655fa87dbcb196025cc0b6040502293 Mon Sep 17 00:00:00 2001 From: Heiner Lohaus Date: Wed, 4 Oct 2023 07:20:51 +0200 Subject: Sort providers in new dirs --- g4f/models.py | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) (limited to 'g4f/models.py') diff --git a/g4f/models.py b/g4f/models.py index 6b27645a..4a6c9faf 100644 --- a/g4f/models.py +++ b/g4f/models.py @@ -61,9 +61,7 @@ gpt_35_turbo = Model( gpt_4 = Model( name = 'gpt-4', base_provider = 'openai', - best_provider = RetryProvider([ - Myshell, Ylokh, - ]) + best_provider = Bing ) # Bard -- cgit v1.2.3 From 307767147003fe8559aff0f95cf781dfac77ae5e Mon Sep 17 00:00:00 2001 From: Hexye <65314629+HexyeDEV@users.noreply.github.com> Date: Wed, 4 Oct 2023 22:59:09 +0200 Subject: Update models.py --- g4f/models.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'g4f/models.py') diff --git a/g4f/models.py b/g4f/models.py index 4a6c9faf..07a9b423 100644 --- a/g4f/models.py +++ b/g4f/models.py @@ -25,6 +25,7 @@ from .Provider import ( Aibn, Bing, H2o, + Cromicle, ) @dataclass(unsafe_hash=True) @@ -54,7 +55,7 @@ gpt_35_turbo = Model( name = 'gpt-3.5-turbo', base_provider = 'openai', best_provider = RetryProvider([ - DeepAi, ChatgptLogin, ChatgptAi, Aivvm, GptGo, AItianhu, Aichat, AItianhuSpace, Myshell, Aibn, ChatForAi, FreeGpt, Ylokh, + DeepAi, ChatgptLogin, ChatgptAi, Aivvm, GptGo, AItianhu, Aichat, AItianhuSpace, Myshell, Aibn, ChatForAi, FreeGpt, Ylokh, Cromicle ]) ) -- cgit v1.2.3 From 88d2cbff099df00944ed6dfb6c73b1b5e8dfc7f9 Mon Sep 17 00:00:00 2001 From: Heiner Lohaus Date: Thu, 5 Oct 2023 05:13:37 +0200 Subject: Add AiAsk, Chatgpt4Online, ChatgptDemo and ChatgptX Provider Fix Bing, Liaobots and ChatgptAi Provider Add "gpt_35_long" model and custom timeout --- g4f/models.py | 31 +++++++++++++++++++------------ 1 file changed, 19 insertions(+), 12 deletions(-) (limited to 'g4f/models.py') diff --git a/g4f/models.py b/g4f/models.py index 4a6c9faf..48c19f9b 100644 --- a/g4f/models.py +++ b/g4f/models.py @@ -3,27 +3,28 @@ from dataclasses import dataclass from .typing import Union from .Provider import BaseProvider, RetryProvider from .Provider import ( - AItianhuSpace, ChatgptLogin, - PerplexityAi, + ChatgptDemo, ChatgptDuo, + Vitalentum, ChatgptAi, ChatForAi, - ChatBase, - AItianhu, - Wewordle, + ChatBase, + Liaobots, Yqcloud, Myshell, FreeGpt, Vercel, - DeepAi, + DeepAi, Aichat, + AiAsk, Aivvm, GptGo, Ylokh, Bard, Aibn, Bing, + You, H2o, ) @@ -33,19 +34,25 @@ class Model: base_provider: str best_provider: Union[type[BaseProvider], RetryProvider] = None -# Config for HuggingChat, OpenAssistant -# Works for Liaobots, H2o, OpenaiChat, Yqcloud, You default = Model( name = "", base_provider = "", best_provider = RetryProvider([ Bing, # Not fully GPT 3 or 4 - PerplexityAi, # Adds references to sources - Wewordle, # Responds with markdown Yqcloud, # Answers short questions in chinese ChatBase, # Don't want to answer creatively ChatgptDuo, # Include search results - DeepAi, ChatgptLogin, ChatgptAi, Aivvm, GptGo, AItianhu, AItianhuSpace, Aichat, Myshell, Aibn, ChatForAi, FreeGpt, Ylokh, + Aibn, Aichat, Aivvm, ChatForAi, ChatgptAi, ChatgptLogin, DeepAi, FreeGpt, GptGo, Myshell, Ylokh, + ]) +) + +# GPT-3.5 too, but all providers supports long responses and a custom timeouts +gpt_35_long = Model( + name = 'gpt-3.5-turbo', + base_provider = 'openai', + best_provider = RetryProvider([ + AiAsk, Aibn, Aichat, Aivvm, ChatForAi, ChatgptAi, ChatgptDemo, ChatgptDuo, + FreeGpt, GptGo, Liaobots, Myshell, Vitalentum, Ylokh, You, Yqcloud ]) ) @@ -54,7 +61,7 @@ gpt_35_turbo = Model( name = 'gpt-3.5-turbo', base_provider = 'openai', best_provider = RetryProvider([ - DeepAi, ChatgptLogin, ChatgptAi, Aivvm, GptGo, AItianhu, Aichat, AItianhuSpace, Myshell, Aibn, ChatForAi, FreeGpt, Ylokh, + Aibn, Aichat, Aivvm, ChatForAi, ChatgptAi, ChatgptLogin, DeepAi, FreeGpt, GptGo, Myshell, Ylokh, ]) ) -- cgit v1.2.3 From 5f509e4545f2345f07dcc392fce79eb3ca4572cd Mon Sep 17 00:00:00 2001 From: ostix360 Date: Thu, 5 Oct 2023 22:50:16 +0200 Subject: import fixed --- g4f/models.py | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'g4f/models.py') diff --git a/g4f/models.py b/g4f/models.py index 6dd18a92..b4e282f3 100644 --- a/g4f/models.py +++ b/g4f/models.py @@ -1,7 +1,7 @@ from __future__ import annotations from dataclasses import dataclass from .typing import Union -from .Provider import BaseProvider, RetryProvider +from .Provider import BaseProvider, RetryProvider from .Provider import ( ChatgptLogin, ChatgptDemo, @@ -9,6 +9,8 @@ from .Provider import ( Vitalentum, ChatgptAi, ChatForAi, + AItianhu, + AItianhuSpace, ChatBase, Liaobots, Yqcloud, -- cgit v1.2.3 From a4b5f5a6fd99ea3e934fe81a299527b4a3878151 Mon Sep 17 00:00:00 2001 From: abc <98614666+xtekky@users.noreply.github.com> Date: Fri, 6 Oct 2023 11:24:41 +0100 Subject: ~ | fix gpt-3.5-turbo models --- g4f/models.py | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) (limited to 'g4f/models.py') diff --git a/g4f/models.py b/g4f/models.py index b4e282f3..eaf81cf7 100644 --- a/g4f/models.py +++ b/g4f/models.py @@ -1,8 +1,9 @@ from __future__ import annotations from dataclasses import dataclass from .typing import Union -from .Provider import BaseProvider, RetryProvider +from .Provider import BaseProvider, RetryProvider from .Provider import ( + AItianhuSpace, ChatgptLogin, ChatgptDemo, ChatgptDuo, @@ -10,7 +11,6 @@ from .Provider import ( ChatgptAi, ChatForAi, AItianhu, - AItianhuSpace, ChatBase, Liaobots, Yqcloud, @@ -27,8 +27,7 @@ from .Provider import ( Aibn, Bing, You, - H2o, - Cromicle, + H2o ) @dataclass(unsafe_hash=True) @@ -64,7 +63,7 @@ gpt_35_turbo = Model( name = 'gpt-3.5-turbo', base_provider = 'openai', best_provider = RetryProvider([ - DeepAi, ChatgptLogin, ChatgptAi, Aivvm, GptGo, AItianhu, Aichat, AItianhuSpace, Myshell, Aibn, ChatForAi, FreeGpt, Ylokh, Cromicle + DeepAi, ChatgptLogin, ChatgptAi, Aivvm, GptGo, AItianhu, Aichat, AItianhuSpace, Myshell, Aibn, ChatForAi, FreeGpt, Ylokh ]) ) -- cgit v1.2.3 From d862dbf85fd7d9ff29256b24fbb7da50eced526e Mon Sep 17 00:00:00 2001 From: abc <98614666+xtekky@users.noreply.github.com> Date: Fri, 6 Oct 2023 19:53:17 +0100 Subject: ~ | gpt-3.5-turbo-0613 --- g4f/models.py | 1 + 1 file changed, 1 insertion(+) (limited to 'g4f/models.py') diff --git a/g4f/models.py b/g4f/models.py index eaf81cf7..a91a3df4 100644 --- a/g4f/models.py +++ b/g4f/models.py @@ -228,6 +228,7 @@ class ModelUtils: convert: dict[str, Model] = { # gpt-3.5 'gpt-3.5-turbo' : gpt_35_turbo, + 'gpt-3.5-turbo-0613' : gpt_35_turbo_0613, 'gpt-3.5-turbo-16k' : gpt_35_turbo_16k, 'gpt-3.5-turbo-16k-0613' : gpt_35_turbo_16k_0613, -- cgit v1.2.3 From 3430b04f870d982d7fba34e3b9d6e5cf3bd3b847 Mon Sep 17 00:00:00 2001 From: Heiner Lohaus Date: Sat, 7 Oct 2023 19:10:26 +0200 Subject: Remove Aivvm from working providers --- g4f/models.py | 24 ++++++++++-------------- 1 file changed, 10 insertions(+), 14 deletions(-) (limited to 'g4f/models.py') diff --git a/g4f/models.py b/g4f/models.py index a91a3df4..ddd39993 100644 --- a/g4f/models.py +++ b/g4f/models.py @@ -20,7 +20,6 @@ from .Provider import ( DeepAi, Aichat, AiAsk, - Aivvm, GptGo, Ylokh, Bard, @@ -44,7 +43,7 @@ default = Model( Yqcloud, # Answers short questions in chinese ChatBase, # Don't want to answer creatively ChatgptDuo, # Include search results - Aibn, Aichat, Aivvm, ChatForAi, ChatgptAi, ChatgptLogin, DeepAi, FreeGpt, GptGo, Myshell, Ylokh, + Aibn, Aichat, ChatForAi, ChatgptAi, ChatgptLogin, DeepAi, FreeGpt, GptGo, Myshell, Ylokh, ]) ) @@ -53,7 +52,7 @@ gpt_35_long = Model( name = 'gpt-3.5-turbo', base_provider = 'openai', best_provider = RetryProvider([ - AiAsk, Aibn, Aichat, Aivvm, ChatForAi, ChatgptAi, ChatgptDemo, ChatgptDuo, + AiAsk, Aibn, Aichat, ChatForAi, ChatgptAi, ChatgptDemo, ChatgptDuo, FreeGpt, GptGo, Liaobots, Myshell, Vitalentum, Ylokh, You, Yqcloud ]) ) @@ -63,7 +62,7 @@ gpt_35_turbo = Model( name = 'gpt-3.5-turbo', base_provider = 'openai', best_provider = RetryProvider([ - DeepAi, ChatgptLogin, ChatgptAi, Aivvm, GptGo, AItianhu, Aichat, AItianhuSpace, Myshell, Aibn, ChatForAi, FreeGpt, Ylokh + DeepAi, ChatgptLogin, ChatgptAi, GptGo, AItianhu, Aichat, AItianhuSpace, Myshell, Aibn, ChatForAi, FreeGpt, Ylokh ]) ) @@ -167,26 +166,23 @@ gpt_35_turbo_16k_0613 = Model( gpt_35_turbo_0613 = Model( name = 'gpt-3.5-turbo-0613', - base_provider = 'openai', - best_provider = RetryProvider([ - Aivvm, ChatgptLogin - ]) + base_provider = 'openai' ) gpt_4_0613 = Model( name = 'gpt-4-0613', - base_provider = 'openai', - best_provider = Aivvm) + base_provider = 'openai' +) gpt_4_32k = Model( name = 'gpt-4-32k', - base_provider = 'openai', - best_provider = Aivvm) + base_provider = 'openai' +) gpt_4_32k_0613 = Model( name = 'gpt-4-32k-0613', - base_provider = 'openai', - best_provider = Aivvm) + base_provider = 'openai' +) text_ada_001 = Model( name = 'text-ada-001', -- cgit v1.2.3 From 4a9d7714adab375beda9db2a16bb34d139efef90 Mon Sep 17 00:00:00 2001 From: Heiner Lohaus Date: Sun, 8 Oct 2023 11:39:19 +0200 Subject: Add Cromicle to provider list --- g4f/models.py | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) (limited to 'g4f/models.py') diff --git a/g4f/models.py b/g4f/models.py index ddd39993..b4247703 100644 --- a/g4f/models.py +++ b/g4f/models.py @@ -19,6 +19,8 @@ from .Provider import ( Vercel, DeepAi, Aichat, + GPTalk, + GptGod, AiAsk, GptGo, Ylokh, @@ -53,7 +55,8 @@ gpt_35_long = Model( base_provider = 'openai', best_provider = RetryProvider([ AiAsk, Aibn, Aichat, ChatForAi, ChatgptAi, ChatgptDemo, ChatgptDuo, - FreeGpt, GptGo, Liaobots, Myshell, Vitalentum, Ylokh, You, Yqcloud + FreeGpt, GptGo, Liaobots, Myshell, Vitalentum, Ylokh, You, Yqcloud, + GPTalk, GptGod ]) ) -- cgit v1.2.3