From 7181f2897be05de1c42fbeb651a952e84f2be82c Mon Sep 17 00:00:00 2001
From: Commenter123321 <36051603+Commenter123321@users.noreply.github.com>
Date: Fri, 29 Sep 2023 16:21:18 +0200
Subject: Fix Aivvm and add new models in models.py

---
 g4f/Provider/Aivvm.py | 31 +++++++++++++++----------------
 g4f/models.py         | 16 +++++++++++++---
 2 files changed, 28 insertions(+), 19 deletions(-)

(limited to 'g4f')

diff --git a/g4f/Provider/Aivvm.py b/g4f/Provider/Aivvm.py
index 7a3d57bd..1ba6d6f1 100644
--- a/g4f/Provider/Aivvm.py
+++ b/g4f/Provider/Aivvm.py
@@ -4,6 +4,7 @@ import requests
 from .base_provider import BaseProvider
 from ..typing import CreateResult
 
+# to recreate this easily, send a post request to https://chat.aivvm.com/api/models
 models = {
     'gpt-3.5-turbo': {'id': 'gpt-3.5-turbo', 'name': 'GPT-3.5'},
     'gpt-3.5-turbo-0613': {'id': 'gpt-3.5-turbo-0613', 'name': 'GPT-3.5-0613'},
@@ -32,29 +33,27 @@ class Aivvm(BaseProvider):
         if not model:
             model = "gpt-3.5-turbo"
         elif model not in models:
-            raise ValueError(f"Model are not supported: {model}")
-    
+            raise ValueError(f"Model is not supported: {model}")
+
         headers = {
-            "authority"          : "chat.aivvm.com",
-            "accept"             : "*/*",
-            "accept-language"    : "en,fr-FR;q=0.9,fr;q=0.8,es-ES;q=0.7,es;q=0.6,en-US;q=0.5,am;q=0.4,de;q=0.3",
-            "content-type"       : "application/json",
-            "origin"             : "https://chat.aivvm.com",
-            "referer"            : "https://chat.aivvm.com/",
-            "sec-ch-ua"          : '"Google Chrome";v="117", "Not;A=Brand";v="8", "Chromium";v="117"',
-            "sec-ch-ua-mobile"   : "?0",
-            "sec-ch-ua-platform" : '"macOS"',
-            "sec-fetch-dest"     : "empty",
-            "sec-fetch-mode"     : "cors",
-            "sec-fetch-site"     : "same-origin",
-            "user-agent"         : "Mozilla/5.0 (Macintosh; Intel Mac OS X 10_15_7) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/117.0.0.0 Safari/537.36",
+            "accept"            : "*/*",
+            "accept-language"   : "hu-HU,hu;q=0.9,en-US;q=0.8,en;q=0.7",
+            "content-type"      : "application/json",
+            "sec-ch-ua"         : "\"Kuki\";v=\"116\", \"Not)A;Brand\";v=\"24\", \"Pici Pocoro\";v=\"102\"",
+            "sec-ch-ua-mobile"  : "?0",
+            "sec-ch-ua-platform": "\"Bandóz\"",
+            "sec-fetch-dest"    : "empty",
+            "sec-fetch-mode"    : "cors",
+            "sec-fetch-site"    : "same-origin",
+            "Referer"           : "https://chat.aivvm.com/",
+            "Referrer-Policy"   : "same-origin",
         }
 
         json_data = {
             "model"       : models[model],
             "messages"    : messages,
             "key"         : "",
-            "prompt"      : "You are ChatGPT, a large language model trained by OpenAI. Follow the user's instructions carefully. Respond using markdown.",
+            "prompt"      : kwargs.get("system_message", "You are ChatGPT, a large language model trained by OpenAI. Follow the user's instructions carefully. Respond using markdown."),
             "temperature" : kwargs.get("temperature", 0.7)
         }
 
diff --git a/g4f/models.py b/g4f/models.py
index 7c2d6822..74d938b4 100644
--- a/g4f/models.py
+++ b/g4f/models.py
@@ -59,7 +59,7 @@ gpt_4 = Model(
     name          = 'gpt-4',
     base_provider = 'openai',
     best_provider = RetryProvider([
-        Myshell, AItianhuSpace,
+        Myshell, AItianhuSpace, Aivvm
     ])
 )
 
@@ -149,7 +149,7 @@ code_davinci_002 = Model(
 gpt_35_turbo_16k = Model(
     name          = 'gpt-3.5-turbo-16k',
     base_provider = 'openai',
-    best_provider = Vercel)
+    best_provider = Aivvm)
 
 gpt_35_turbo_16k_0613 = Model(
     name          = 'gpt-3.5-turbo-16k-0613',
@@ -166,7 +166,17 @@ gpt_35_turbo_0613 = Model(
 gpt_4_0613 = Model(
     name          = 'gpt-4-0613',
     base_provider = 'openai',
-    best_provider = Vercel)
+    best_provider = Aivvm)
+
+gpt_4_32k = Model(
+    name          = 'gpt-4-32k',
+    base_provider = 'openai',
+    best_provider = Aivvm)
+
+gpt_4_32k_0613 = Model(
+    name          = 'gpt-4-32k-0613',
+    base_provider = 'openai',
+    best_provider = Aivvm)
 
 text_ada_001 = Model(
     name          = 'text-ada-001',
-- 
cgit v1.2.3