feat: gpt-3.5 supported

Zero6992 · Mar 25, 2024 · 6ec3831 · 6ec3831
1 parent fb7eeff
commit 6ec3831
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 6 deletions.
diff --git a/src/aclient.py b/src/aclient.py
@@ -4,7 +4,7 @@
 
 from src import personas
 from src.log import logger
-from utils.message_utils import send_split_message, send_response_with_images
+from utils.message_utils import send_split_message
 
 from dotenv import load_dotenv
 from discord import app_commands
@@ -14,6 +14,7 @@
 from g4f.client import Client
 from g4f.stubs import ChatCompletion
 from g4f.Provider import RetryProvider, OpenaiChat, Bing, You
+from g4f.Provider import  FreeGpt, ChatgptNext, AItianhuSpace
 
 g4f.debug.logging = True
 
@@ -26,9 +27,9 @@ def __init__(self) -> None:
         super().__init__(intents=intents)
         self.tree = app_commands.CommandTree(self)
         self.chatBot = Client(
-            provider = RetryProvider([You, Bing, OpenaiChat], shuffle=False),
+            provider = RetryProvider([FreeGpt, ChatgptNext, AItianhuSpace, OpenaiChat, Bing, You], shuffle=False),
         )
-        self.chatModel = 'gpt-4'
+        self.chatModel = os.getenv("MODEL")
         self.conversation_history = []
         self.current_channel = None
         self.activity = discord.Activity(type=discord.ActivityType.listening, name="/chat | /help")

diff --git a/src/bot.py b/src/bot.py
@@ -2,10 +2,11 @@
 import asyncio
 import discord
 from src.log import logger
-from random import randrange
 
 from g4f.client import Client
-from g4f.Provider import RetryProvider, OpenaiChat, FreeChatgpt, Gemini, Liaobots, Bing, Gemini
+from g4f.Provider import (RetryProvider, FreeGpt, ChatgptNext, AItianhuSpace,
+                        You, OpenaiChat, FreeChatgpt, Liaobots,
+                        Gemini, Bing)
 
 from src.aclient import discordClient
 from discord import app_commands
@@ -88,6 +89,7 @@ async def replyall(interaction: discord.Interaction):
     @app_commands.choices(model=[
         app_commands.Choice(name="gemeni", value="gemeni"),
         app_commands.Choice(name="gpt-4", value="gpt-4"),
+        app_commands.Choice(name="gpt-3.5-turbo", value="gpt-3.5-turbo"),
     ])
     async def chat_model(interaction: discord.Interaction, model: app_commands.Choice[str]):
         await interaction.response.defer(ephemeral=True)
@@ -98,7 +100,11 @@ async def chat_model(interaction: discord.Interaction, model: app_commands.Choic
                 discordClient.chatModel = model.value
             elif model.value == "gpt-4":
                 discordClient.reset_conversation_history()
-                discordClient.chatBot = Client(provider=RetryProvider([Liaobots, OpenaiChat, Bing], shuffle=False))
+                discordClient.chatBot = Client(provider=RetryProvider([Liaobots, You, OpenaiChat, Bing], shuffle=False))
+                discordClient.chatModel = model.value
+            elif model.value == "gpt-3.5-turbo":
+                discordClient.reset_conversation_history()
+                discordClient.chatBot = Client(provider=RetryProvider([FreeGpt, ChatgptNext, AItianhuSpace], shuffle=False))
                 discordClient.chatModel = model.value
 
             await interaction.followup.send(f"> **INFO: Chat model switched to {model.name}.**")