3 files changed, 65 insertions, 70 deletions

diff --git a/g4f/Provider/Aivvm.py b/g4f/Provider/Aivvm.py
index b2d7c139..f7f74f50 100644
--- a/g4f/Provider/Aivvm.py
+++ b/g4f/Provider/Aivvm.py
@@ -1,78 +1,71 @@
 from __future__ import annotations
+import requests
 
-from aiohttp import ClientSession
-
-from .base_provider import AsyncGeneratorProvider
-from ..typing import AsyncGenerator
+from .base_provider import BaseProvider
+from ..typing import Any, CreateResult
 
 models = {
-    "gpt-4": {
-        "id": "gpt-4",
-        "name": "GPT-4",
-    },
-    "gpt-3.5-turbo": {
-        "id": "gpt-3.5-turbo",
-        "name": "GPT-3.5",
-    },
-    "gpt-3.5-turbo-16k": {
-        "id": "gpt-3.5-turbo-16k",
-        "name": "GPT-3.5-16k",
-    },
+    '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'},
+    'gpt-3.5-turbo-16k': {'id': 'gpt-3.5-turbo-16k', 'name': 'GPT-3.5-16K'},
+    'gpt-3.5-turbo-16k-0613': {'id': 'gpt-3.5-turbo-16k-0613', 'name': 'GPT-3.5-16K-0613'},
+    'gpt-4': {'id': 'gpt-4', 'name': 'GPT-4'},
+    'gpt-4-0613': {'id': 'gpt-4-0613', 'name': 'GPT-4-0613'},
+    'gpt-4-32k': {'id': 'gpt-4-32k', 'name': 'GPT-4-32K'},
+    'gpt-4-32k-0613': {'id': 'gpt-4-32k-0613', 'name': 'GPT-4-32K-0613'},
 }
 
-class Aivvm(AsyncGeneratorProvider):
-    url                   = "https://chat.aivvm.com"
+class Aivvm(BaseProvider):
+    url                   = 'https://chat.aivvm.com'
+    supports_stream       = True
     working               = True
     supports_gpt_35_turbo = True
     supports_gpt_4        = True
 
-
     @classmethod
-    async def create_async_generator(
-        cls,
+    def create_completion(cls,
         model: str,
         messages: list[dict[str, str]],
-        proxy: str = None,
-        **kwargs
-    ) -> AsyncGenerator:
-        model = model if model else "gpt-3.5-turbo"
-        if model not in models:
-            raise ValueError(f"Model are not supported: {model}")
+        stream: bool, **kwargs: Any) -> CreateResult:
+        
         headers = {
-            "User-Agent"         : "Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/116.0.0.0 Safari/537.36",
-            "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",
-            "Origin"             : cls.url,
-            "Referer"            : cls.url + "/",
-            "Sec-Fetch-Dest"     : "empty",
-            "Sec-Fetch-Mode"     : "cors",
-            "Sec-Fetch-Site"     : "same-origin",
+            "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",
         }
-        async with ClientSession(
-            headers=headers
-        ) as session:
-            data = {
-                "temperature": 1,
-                "key": "",
-                "messages": messages,
-                "model": models[model],
-                "prompt": "",
-                **kwargs
-            }
-            async with session.post(cls.url + "/api/chat", json=data, proxy=proxy) as response:
-                response.raise_for_status()
-                async for stream in response.content.iter_any():
-                    yield stream.decode()
 
+        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.",
+            "temperature" : kwargs.get("temperature", 0.7)
+        }
+
+        response = requests.post(
+            "https://chat.aivvm.com/api/chat", headers=headers, json=json_data, stream=True)
+
+        for line in response.iter_content(chunk_size=1048):
+            yield line
 
     @classmethod
     @property
     def params(cls):
         params = [
-            ("model", "str"),
-            ("messages", "list[dict[str, str]]"),
-            ("stream", "bool"),
-            ("temperature", "float"),
+            ('model', 'str'),
+            ('messages', 'list[dict[str, str]]'),
+            ('stream', 'bool'),
+            ('temperature', 'float'),
         ]
-        param = ", ".join([": ".join(p) for p in params])
-        return f"g4f.provider.{cls.__name__} supports: ({param})"
\ No newline at end of file
+        param = ', '.join([': '.join(p) for p in params])
+        return f'g4f.provider.{cls.__name__} supports: ({param})'
\ No newline at end of file
diff --git a/g4f/Provider/Vercel.py b/g4f/Provider/Vercel.py
index 43f7d741..9835cdc0 100644
--- a/g4f/Provider/Vercel.py
+++ b/g4f/Provider/Vercel.py
@@ -1,6 +1,4 @@
-from __future__ import annotations
-
-import base64, json, uuid, quickjs, random
+from __future__         import annotations
 from curl_cffi.requests import AsyncSession
 
 from ..typing       import Any, TypedDict
diff --git a/g4f/models.py b/g4f/models.py
index 9889f0d5..12de4db5 100644
--- a/g4f/models.py
+++ b/g4f/models.py
@@ -52,7 +52,11 @@ gpt_35_turbo = Model(
 
 gpt_4 = Model(
     name          = 'gpt-4',
-    base_provider = 'openai')
+    base_provider = 'openai',
+    best_provider = RetryProvider([
+            Aivvm
+    ])
+)
 
 # Bard
 palm = Model(
@@ -133,52 +137,52 @@ flan_t5_xxl = Model(
     best_provider = Vercel)
 
 code_davinci_002 = Model(
-    name          = 'openai:code-davinci-002',
+    name          = 'code-davinci-002',
     base_provider = 'openai',
     best_provider = Vercel)
 
 gpt_35_turbo_16k = Model(
-    name          = 'openai:gpt-3.5-turbo-16k',
+    name          = 'gpt-3.5-turbo-16k',
     base_provider = 'openai',
     best_provider = Vercel)
 
 gpt_35_turbo_16k_0613 = Model(
-    name          = 'openai:gpt-3.5-turbo-16k-0613',
+    name          = 'gpt-3.5-turbo-16k-0613',
     base_provider = 'openai')
 
 gpt_35_turbo_0613 = Model(
-    name          = 'openai:gpt-3.5-turbo-0613',
+    name          = 'gpt-3.5-turbo-0613',
     base_provider = 'openai',
     best_provider = [
         Aivvm, ChatgptLogin])
 
 gpt_4_0613 = Model(
-    name          = 'openai:gpt-4-0613',
+    name          = 'gpt-4-0613',
     base_provider = 'openai',
     best_provider = Vercel)
 
 text_ada_001 = Model(
-    name          = 'openai:text-ada-001',
+    name          = 'text-ada-001',
     base_provider = 'openai',
     best_provider = Vercel)
 
 text_babbage_001 = Model(
-    name          = 'openai:text-babbage-001',
+    name          = 'text-babbage-001',
     base_provider = 'openai',
     best_provider = Vercel)
 
 text_curie_001 = Model(
-    name          = 'openai:text-curie-001',
+    name          = 'text-curie-001',
     base_provider = 'openai',
     best_provider = Vercel)
 
 text_davinci_002 = Model(
-    name          = 'openai:text-davinci-002',
+    name          = 'text-davinci-002',
     base_provider = 'openai',
     best_provider = Vercel)
 
 text_davinci_003 = Model(
-    name          = 'openai:text-davinci-003',
+    name          = 'text-davinci-003',
     base_provider = 'openai',
     best_provider = Vercel)