From 7cd2b8cd14965cc9b03478f77c3e6f111cb0f769 Mon Sep 17 00:00:00 2001 From: kqlio67 Date: Sun, 20 Oct 2024 12:44:17 +0300 Subject: refactor(g4f/Provider/Airforce.py): update image generation prompt and models --- g4f/models.py | 8 -------- 1 file changed, 8 deletions(-) (limited to 'g4f/models.py') diff --git a/g4f/models.py b/g4f/models.py index e84f9103..3998027e 100644 --- a/g4f/models.py +++ b/g4f/models.py @@ -1,4 +1,3 @@ -# g4f/models.py from __future__ import annotations from dataclasses import dataclass @@ -828,12 +827,6 @@ dalle_2 = Model( base_provider = 'OpenAI', best_provider = NexraDallE2 -) -dalle_3 = Model( - name = 'dalle-3', - base_provider = 'OpenAI', - best_provider = Airforce - ) dalle = Model( @@ -1124,7 +1117,6 @@ class ModelUtils: ### OpenAI ### 'dalle': dalle, 'dalle-2': dalle_2, -'dalle-3': dalle_3, 'dalle-mini': dalle_mini, -- cgit v1.2.3 From 6c629fd2c6ebb69d547d159b977b5f67cf76b409 Mon Sep 17 00:00:00 2001 From: kqlio67 Date: Sun, 20 Oct 2024 14:28:28 +0300 Subject: Update (g4f/models.py) --- g4f/models.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'g4f/models.py') diff --git a/g4f/models.py b/g4f/models.py index 3998027e..9b73d475 100644 --- a/g4f/models.py +++ b/g4f/models.py @@ -151,7 +151,7 @@ gpt_4_turbo = Model( gpt_4 = Model( name = 'gpt-4', base_provider = 'OpenAI', - best_provider = IterListProvider([NexraChatGPT, NexraChatGptV2, NexraChatGptWeb, Ai4Chat, Airforce, Chatgpt4Online, Bing, OpenaiChat]) + best_provider = IterListProvider([NexraChatGPT, NexraChatGptV2, NexraChatGptWeb, Ai4Chat, Airforce, Chatgpt4Online, Bing, OpenaiChat, gpt_4_turbo.best_provider, gpt_4o.best_provider, gpt_4o_mini.best_provider]) ) # o1 -- cgit v1.2.3 From 8f85553a5949d35e9e3a0f0fe77d9d131c825b23 Mon Sep 17 00:00:00 2001 From: kqlio67 Date: Sun, 20 Oct 2024 20:33:14 +0300 Subject: update g4f/models.py g4f/Provider/Ai4Chat.py g4f/Provider/Chatgpt4Online.py --- g4f/models.py | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) (limited to 'g4f/models.py') diff --git a/g4f/models.py b/g4f/models.py index 9b73d475..d7800c76 100644 --- a/g4f/models.py +++ b/g4f/models.py @@ -104,7 +104,6 @@ default = Model( AmigoChat, ChatifyAI, Cloudflare, - Ai4Chat, Editee, AiMathGPT, ]) @@ -151,7 +150,7 @@ gpt_4_turbo = Model( gpt_4 = Model( name = 'gpt-4', base_provider = 'OpenAI', - best_provider = IterListProvider([NexraChatGPT, NexraChatGptV2, NexraChatGptWeb, Ai4Chat, Airforce, Chatgpt4Online, Bing, OpenaiChat, gpt_4_turbo.best_provider, gpt_4o.best_provider, gpt_4o_mini.best_provider]) + best_provider = IterListProvider([Chatgpt4Online, Ai4Chat, NexraChatGPT, NexraChatGptV2, NexraChatGptWeb, Airforce, Bing, OpenaiChat, gpt_4_turbo.best_provider, gpt_4o.best_provider, gpt_4o_mini.best_provider]) ) # o1 -- cgit v1.2.3 From ac783e505b9f0bc7c459ab4e57aa7bed6458b949 Mon Sep 17 00:00:00 2001 From: kqlio67 Date: Sun, 20 Oct 2024 23:39:21 +0300 Subject: Restore the provider (g4f/Provider/nexra/NexraBlackbox.py) --- g4f/models.py | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'g4f/models.py') diff --git a/g4f/models.py b/g4f/models.py index d7800c76..ecea56bd 100644 --- a/g4f/models.py +++ b/g4f/models.py @@ -443,7 +443,8 @@ reka_core = Model( blackboxai = Model( name = 'blackboxai', base_provider = 'Blackbox AI', - best_provider = IterListProvider([Blackbox, NexraBlackbox]) + #best_provider = IterListProvider([Blackbox, NexraBlackbox]) + best_provider = IterListProvider([NexraBlackbox]) ) blackboxai_pro = Model( @@ -766,7 +767,7 @@ flux = Model( flux_pro = Model( name = 'flux-pro', base_provider = 'Flux AI', - best_provider = IterListProvider([NexraFluxPro, AmigoChat]) + best_provider = IterListProvider([AmigoChat, NexraFluxPro]) ) -- cgit v1.2.3 From d1a28b53523bc475bf6a0d031c298ca7fc404b43 Mon Sep 17 00:00:00 2001 From: kqlio67 Date: Sun, 20 Oct 2024 23:49:24 +0300 Subject: Temporarily disconnected provider (g4f/Provider/nexra/NexraBlackbox.py) --- g4f/models.py | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) (limited to 'g4f/models.py') diff --git a/g4f/models.py b/g4f/models.py index ecea56bd..99778f0b 100644 --- a/g4f/models.py +++ b/g4f/models.py @@ -443,8 +443,7 @@ reka_core = Model( blackboxai = Model( name = 'blackboxai', base_provider = 'Blackbox AI', - #best_provider = IterListProvider([Blackbox, NexraBlackbox]) - best_provider = IterListProvider([NexraBlackbox]) + best_provider = IterListProvider([Blackbox, NexraBlackbox]) ) blackboxai_pro = Model( -- cgit v1.2.3 From d10f5d6b4d21409398bd8a816b7b1e29002bb4c0 Mon Sep 17 00:00:00 2001 From: kqlio67 Date: Mon, 21 Oct 2024 10:32:32 +0300 Subject: 1 --- 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 99778f0b..ecea56bd 100644 --- a/g4f/models.py +++ b/g4f/models.py @@ -443,7 +443,8 @@ reka_core = Model( blackboxai = Model( name = 'blackboxai', base_provider = 'Blackbox AI', - best_provider = IterListProvider([Blackbox, NexraBlackbox]) + #best_provider = IterListProvider([Blackbox, NexraBlackbox]) + best_provider = IterListProvider([NexraBlackbox]) ) blackboxai_pro = Model( -- cgit v1.2.3 From fe5717878fe9dc7d2f05ef11c6f645b6fccbb977 Mon Sep 17 00:00:00 2001 From: kqlio67 Date: Mon, 21 Oct 2024 10:42:39 +0300 Subject: Update (main.py g4f/models.py) --- g4f/models.py | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) (limited to 'g4f/models.py') diff --git a/g4f/models.py b/g4f/models.py index ecea56bd..99778f0b 100644 --- a/g4f/models.py +++ b/g4f/models.py @@ -443,8 +443,7 @@ reka_core = Model( blackboxai = Model( name = 'blackboxai', base_provider = 'Blackbox AI', - #best_provider = IterListProvider([Blackbox, NexraBlackbox]) - best_provider = IterListProvider([NexraBlackbox]) + best_provider = IterListProvider([Blackbox, NexraBlackbox]) ) blackboxai_pro = Model( -- cgit v1.2.3 From 6a3684a7b21c2275a5ba38ed98fc904aced2a5fc Mon Sep 17 00:00:00 2001 From: kqlio67 Date: Mon, 21 Oct 2024 20:01:10 +0300 Subject: Restored provider (g4f/Provider/nexra/NexraBing.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 99778f0b..493e1c70 100644 --- a/g4f/models.py +++ b/g4f/models.py @@ -39,6 +39,7 @@ from .Provider import ( Liaobots, MagickPen, MetaAI, + NexraBing, NexraBlackbox, NexraChatGPT, NexraChatGPT4o, @@ -150,7 +151,7 @@ gpt_4_turbo = Model( gpt_4 = Model( name = 'gpt-4', base_provider = 'OpenAI', - best_provider = IterListProvider([Chatgpt4Online, Ai4Chat, NexraChatGPT, NexraChatGptV2, NexraChatGptWeb, Airforce, Bing, OpenaiChat, gpt_4_turbo.best_provider, gpt_4o.best_provider, gpt_4o_mini.best_provider]) + best_provider = IterListProvider([Chatgpt4Online, Ai4Chat, NexraBing, NexraChatGPT, NexraChatGptV2, NexraChatGptWeb, Airforce, Bing, OpenaiChat, gpt_4_turbo.best_provider, gpt_4o.best_provider, gpt_4o_mini.best_provider]) ) # o1 -- cgit v1.2.3 From af86a44c964a0588412162b0cd8233589be50b9c Mon Sep 17 00:00:00 2001 From: kqlio67 Date: Mon, 21 Oct 2024 22:03:26 +0300 Subject: Updated (g4f/models.py) --- g4f/models.py | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'g4f/models.py') diff --git a/g4f/models.py b/g4f/models.py index 493e1c70..4dbd460b 100644 --- a/g4f/models.py +++ b/g4f/models.py @@ -50,6 +50,7 @@ from .Provider import ( NexraDalleMini, NexraEmi, NexraFluxPro, + NexraGeminiPro, NexraLLaMA31, NexraQwen, OpenaiChat, @@ -213,7 +214,7 @@ llama_3_70b = Model( llama_3_1_8b = Model( name = "llama-3.1-8b", base_provider = "Meta Llama", - best_provider = IterListProvider([Blackbox, DeepInfraChat, ChatHub, Cloudflare, NexraLLaMA31, Airforce, PerplexityLabs]) + best_provider = IterListProvider([Blackbox, DeepInfraChat, ChatHub, Cloudflare, Airforce, PerplexityLabs]) ) llama_3_1_70b = Model( @@ -344,7 +345,7 @@ phi_3_5_mini = Model( gemini_pro = Model( name = 'gemini-pro', base_provider = 'Google DeepMind', - best_provider = IterListProvider([GeminiPro, Blackbox, AIChatFree, GPROChat, AmigoChat, Editee, Liaobots, Airforce]) + best_provider = IterListProvider([GeminiPro, Blackbox, AIChatFree, GPROChat, NexraGeminiPro, AmigoChat, Editee, Liaobots, Airforce]) ) gemini_flash = Model( -- cgit v1.2.3 From f939bbfa1acfe25ef01ed414abf11bd10f1a89d6 Mon Sep 17 00:00:00 2001 From: kqlio67 Date: Tue, 22 Oct 2024 12:51:01 +0300 Subject: Updated (g4f/models.py) --- g4f/models.py | 11 ----------- 1 file changed, 11 deletions(-) (limited to 'g4f/models.py') diff --git a/g4f/models.py b/g4f/models.py index 4dbd460b..8aece1ec 100644 --- a/g4f/models.py +++ b/g4f/models.py @@ -47,11 +47,9 @@ from .Provider import ( NexraChatGptWeb, NexraDallE, NexraDallE2, - NexraDalleMini, NexraEmi, NexraFluxPro, NexraGeminiPro, - NexraLLaMA31, NexraQwen, OpenaiChat, PerplexityLabs, @@ -837,14 +835,6 @@ dalle = Model( ) -dalle_mini = Model( - name = 'dalle-mini', - base_provider = 'OpenAI', - best_provider = NexraDalleMini - -) - - ### Other ### emi = Model( name = 'emi', @@ -1118,7 +1108,6 @@ class ModelUtils: ### OpenAI ### 'dalle': dalle, 'dalle-2': dalle_2, -'dalle-mini': dalle_mini, ### Other ### -- cgit v1.2.3 From 3e7bee6741dc8b6ee8013a4aec3606fc315976b9 Mon Sep 17 00:00:00 2001 From: kqlio67 Date: Tue, 22 Oct 2024 13:25:34 +0300 Subject: Updated (g4f/models.py) --- g4f/models.py | 12 ++++++++++++ 1 file changed, 12 insertions(+) (limited to 'g4f/models.py') diff --git a/g4f/models.py b/g4f/models.py index 8aece1ec..6fa2fca1 100644 --- a/g4f/models.py +++ b/g4f/models.py @@ -50,6 +50,7 @@ from .Provider import ( NexraEmi, NexraFluxPro, NexraGeminiPro, + NexraMidjourney, NexraQwen, OpenaiChat, PerplexityLabs, @@ -835,6 +836,14 @@ dalle = Model( ) +### Midjourney ### +midjourney = Model( + name = 'midjourney', + base_provider = 'Midjourney', + best_provider = NexraMidjourney + +) + ### Other ### emi = Model( name = 'emi', @@ -1109,6 +1118,9 @@ class ModelUtils: 'dalle': dalle, 'dalle-2': dalle_2, +### Midjourney ### +'midjourney': midjourney, + ### Other ### 'emi': emi, -- cgit v1.2.3 From 144c7b492256083990b06a70d8b0bc9562ec230c Mon Sep 17 00:00:00 2001 From: kqlio67 Date: Tue, 22 Oct 2024 14:50:33 +0300 Subject: Restored provider (g4f/Provider/nexra/NexraSD15.py) --- g4f/models.py | 9 +++++++++ 1 file changed, 9 insertions(+) (limited to 'g4f/models.py') diff --git a/g4f/models.py b/g4f/models.py index 6fa2fca1..6f36892c 100644 --- a/g4f/models.py +++ b/g4f/models.py @@ -52,6 +52,7 @@ from .Provider import ( NexraGeminiPro, NexraMidjourney, NexraQwen, + NexraSD15, OpenaiChat, PerplexityLabs, Pi, @@ -740,6 +741,13 @@ sdxl = Model( ) +sd_1_5 = Model( + name = 'sd-1.5', + base_provider = 'Stability AI', + best_provider = NexraSD15 + +) + sd_3 = Model( name = 'sd-3', base_provider = 'Stability AI', @@ -1095,6 +1103,7 @@ class ModelUtils: ### Stability AI ### 'sdxl': sdxl, +'sd-1.5': sd_1_5, 'sd-3': sd_3, -- cgit v1.2.3 From b08249ecd579ab4123578b7b5de74553e31a2ff3 Mon Sep 17 00:00:00 2001 From: kqlio67 Date: Tue, 22 Oct 2024 15:09:03 +0300 Subject: Restored provider (g4f/Provider/nexra/NexraSDTurbo.py) --- g4f/models.py | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) (limited to 'g4f/models.py') diff --git a/g4f/models.py b/g4f/models.py index 6f36892c..542967f2 100644 --- a/g4f/models.py +++ b/g4f/models.py @@ -53,6 +53,7 @@ from .Provider import ( NexraMidjourney, NexraQwen, NexraSD15, + NexraSDTurbo, OpenaiChat, PerplexityLabs, Pi, @@ -734,10 +735,17 @@ nemotron_70b = Model( ############# ### Stability AI ### +sdxl_turbo = Model( + name = 'sdxl-turbo', + base_provider = 'Stability AI', + best_provider = NexraSDTurbo + +) + sdxl = Model( name = 'sdxl', base_provider = 'Stability AI', - best_provider = IterListProvider([ReplicateHome, DeepInfraImage]) + best_provider = IterListProvider([ReplicateHome, DeepInfraImage, sdxl_turbo.best_provider]) ) @@ -1103,6 +1111,7 @@ class ModelUtils: ### Stability AI ### 'sdxl': sdxl, +'sdxl-turbo': sdxl_turbo, 'sd-1.5': sd_1_5, 'sd-3': sd_3, -- cgit v1.2.3 From 5a79d8cbd7d99510c9f7f504e876f5197a64927b Mon Sep 17 00:00:00 2001 From: kqlio67 Date: Tue, 22 Oct 2024 15:27:01 +0300 Subject: Restored provider (g4f/Provider/nexra/NexraSDLora.py) --- g4f/models.py | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) (limited to 'g4f/models.py') diff --git a/g4f/models.py b/g4f/models.py index 542967f2..bfc68096 100644 --- a/g4f/models.py +++ b/g4f/models.py @@ -53,6 +53,7 @@ from .Provider import ( NexraMidjourney, NexraQwen, NexraSD15, + NexraSDLora, NexraSDTurbo, OpenaiChat, PerplexityLabs, @@ -742,10 +743,17 @@ sdxl_turbo = Model( ) +sdxl_lora = Model( + name = 'sdxl-lora', + base_provider = 'Stability AI', + best_provider = NexraSDLora + +) + sdxl = Model( name = 'sdxl', base_provider = 'Stability AI', - best_provider = IterListProvider([ReplicateHome, DeepInfraImage, sdxl_turbo.best_provider]) + best_provider = IterListProvider([ReplicateHome, DeepInfraImage, sdxl_turbo.best_provider, sdxl_lora.best_provider]) ) @@ -1111,6 +1119,7 @@ class ModelUtils: ### Stability AI ### 'sdxl': sdxl, +'sdxl-lora': sdxl_lora, 'sdxl-turbo': sdxl_turbo, 'sd-1.5': sd_1_5, 'sd-3': sd_3, -- cgit v1.2.3 From e10d5ed557017e4050fba53a72f3e3cdea52db39 Mon Sep 17 00:00:00 2001 From: kqlio67 Date: Tue, 22 Oct 2024 17:13:25 +0300 Subject: Updated docs/providers-and-models.md g4f/models.py --- g4f/models.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'g4f/models.py') diff --git a/g4f/models.py b/g4f/models.py index bfc68096..b3d59a40 100644 --- a/g4f/models.py +++ b/g4f/models.py @@ -753,7 +753,7 @@ sdxl_lora = Model( sdxl = Model( name = 'sdxl', base_provider = 'Stability AI', - best_provider = IterListProvider([ReplicateHome, DeepInfraImage, sdxl_turbo.best_provider, sdxl_lora.best_provider]) + best_provider = IterListProvider([ReplicateHome, DeepInfraImage]) ) -- cgit v1.2.3 From 51a413538845402695a88f08abee898bb50e116d Mon Sep 17 00:00:00 2001 From: kqlio67 Date: Tue, 22 Oct 2024 17:19:46 +0300 Subject: Updated docs/providers-and-models.md g4f/models.py g4f/Provider/Upstage.py --- g4f/models.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'g4f/models.py') diff --git a/g4f/models.py b/g4f/models.py index b3d59a40..1cea6447 100644 --- a/g4f/models.py +++ b/g4f/models.py @@ -1036,7 +1036,7 @@ class ModelUtils: ### Upstage ### -'solar-1-mini': solar_1_mini, +'solar-mini': solar_1_mini, 'solar-10-7b': solar_10_7b, 'solar-pro': solar_pro, -- cgit v1.2.3