2 files changed, 123 insertions, 85 deletions

diff --git a/g4f/Provider/Raycast.py b/g4f/Provider/Raycast.py
index 1704b4e8..1f13c9fa 100644
--- a/g4f/Provider/Raycast.py
+++ b/g4f/Provider/Raycast.py
@@ -1,50 +1,69 @@
 import json
-import os
-
 import requests
-from g4f.typing import get_type_hints
-
-url = "https://backend.raycast.com/api/v1/ai/chat_completions"
-model = ['gpt-3.5-turbo', 'gpt-4']
-supports_stream = True
-needs_auth = True
-working = True
+from ..typing import Any, CreateResult
+from .base_provider import BaseProvider
 
 
-def _create_completion(model: str, messages: list, stream: bool, **kwargs):
-    auth = kwargs.get('auth')
-    headers = {
-        'Accept': 'application/json',
-        'Accept-Language': 'en-US,en;q=0.9',
-        'Authorization': f'Bearer {auth}',
-        'Content-Type': 'application/json',
-        'User-Agent': 'Raycast/0 CFNetwork/1410.0.3 Darwin/22.6.0',
-    }
-    parsed_messages = []
-    for message in messages:
-        parsed_messages.append({
-            'author': message['role'],
-            'content': {'text': message['content']}
-        })
-    data = {
-        "debug": False,
-        "locale": "en-CN",
-        "messages": parsed_messages,
-        "model": model,
-        "provider": "openai",
-        "source": "ai_chat",
-        "system_instruction": "markdown",
-        "temperature": 0.5
-    }
-    response = requests.post(url, headers=headers, json=data, stream=True)
-    for token in response.iter_lines():
-        if b'data: ' not in token:
-            continue
-        completion_chunk = json.loads(token.decode().replace('data: ', ''))
-        token = completion_chunk['text']
-        if token != None:
-            yield token
+class Raycast(BaseProvider):
+    url = "https://raycast.com"
+    # model = ['gpt-3.5-turbo', 'gpt-4']
+    supports_gpt_35_turbo = True
+    supports_gpt_4 = True
+    supports_stream = True
+    needs_auth = True
+    working = True
 
+    @staticmethod
+    def create_completion(
+        model: str,
+        messages: list[dict[str, str]],
+        stream: bool,
+        **kwargs: Any,
+    ) -> CreateResult:
+        auth = kwargs.get('auth')
+        headers = {
+            'Accept': 'application/json',
+            'Accept-Language': 'en-US,en;q=0.9',
+            'Authorization': f'Bearer {auth}',
+            'Content-Type': 'application/json',
+            'User-Agent': 'Raycast/0 CFNetwork/1410.0.3 Darwin/22.6.0',
+        }
+        parsed_messages = []
+        for message in messages:
+            parsed_messages.append({
+                'author': message['role'],
+                'content': {'text': message['content']}
+            })
+        data = {
+            "debug": False,
+            "locale": "en-CN",
+            "messages": parsed_messages,
+            "model": model,
+            "provider": "openai",
+            "source": "ai_chat",
+            "system_instruction": "markdown",
+            "temperature": 0.5
+        }
+        response = requests.post("https://backend.raycast.com/api/v1/ai/chat_completions", headers=headers, json=data, stream=True)
+        for token in response.iter_lines():
+            if b'data: ' not in token:
+                continue
+            completion_chunk = json.loads(token.decode().replace('data: ', ''))
+            token = completion_chunk['text']
+            if token != None:
+                yield token
 
-params = f'g4f.Providers.{os.path.basename(__file__)[:-3]} supports: ' + \
-         '(%s)' % ', '.join([f"{name}: {get_type_hints(_create_completion)[name].__name__}" for name in _create_completion.__code__.co_varnames[:_create_completion.__code__.co_argcount]])
+    @classmethod
+    @property
+    def params(cls):
+        params = [
+            ("model", "str"),
+            ("messages", "list[dict[str, str]]"),
+            ("stream", "bool"),
+            ("temperature", "float"),
+            ("top_p", "int"),
+            ("model", "str"),
+            ("auth", "str"),
+        ]
+        param = ", ".join([": ".join(p) for p in params])
+        return f"g4f.provider.{cls.__name__} supports: ({param})"
diff --git a/g4f/Provider/V50.py b/g4f/Provider/V50.py
index 02ae18d6..125dd7c5 100644
--- a/g4f/Provider/V50.py
+++ b/g4f/Provider/V50.py
@@ -1,43 +1,62 @@
-import os, uuid, requests
-from ..typing import get_type_hints
-url = 'https://p5.v50.ltd'
-model = ['gpt-3.5-turbo','gpt-3.5-turbo-16k']
-supports_stream = False
-needs_auth = False
-working = True
+import uuid, requests
+from ..typing import Any, CreateResult
+from .base_provider import BaseProvider
 
-def _create_completion(model: str, messages: list, stream: bool, temperature: float = 0.7, **kwargs):
 
-    conversation = ''
-    for message in messages:
-        conversation += '%s: %s\n' % (message['role'], message['content'])
-    
-    conversation += 'assistant: '
-    payload = {
-        "prompt": conversation,
-        "options": {},
-        "systemMessage": ".",
-        "temperature": temperature,
-        "top_p": 1,
-        "model": model,
-        "user": str(uuid.uuid4())
-    }
-    headers = {
-        'authority': 'p5.v50.ltd',
-        'accept': 'application/json, text/plain, */*',
-        'accept-language': 'id-ID,id;q=0.9,en-US;q=0.8,en;q=0.7',
-        'content-type': 'application/json',
-        'origin': 'https://p5.v50.ltd',
-        'referer': 'https://p5.v50.ltd/',
-        'sec-ch-ua-platform': '"Windows"',
-        'sec-fetch-dest': 'empty',
-        'sec-fetch-mode': 'cors',
-        'sec-fetch-site': 'same-origin',
-        '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'
-    }
-    response = requests.post("https://p5.v50.ltd/api/chat-process", 
-                            json=payload, headers=headers, proxies=kwargs['proxy'] if 'proxy' in kwargs else {})
-    yield response.text
-            
-params = f'g4f.Providers.{os.path.basename(__file__)[:-3]} supports: ' + \
-    '(%s)' % ', '.join([f"{name}: {get_type_hints(_create_completion)[name].__name__}" for name in _create_completion.__code__.co_varnames[:_create_completion.__code__.co_argcount]])
\ No newline at end of file
+class V50(BaseProvider):
+    url = 'https://p5.v50.ltd'
+    supports_gpt_35_turbo = True
+    supports_stream = False
+    needs_auth = False
+    working = True
+
+    @staticmethod
+    def create_completion(
+        model: str,
+        messages: list[dict[str, str]],
+        stream: bool,
+        **kwargs: Any,
+    ) -> CreateResult:
+        conversation = ''
+        for message in messages:
+            conversation += '%s: %s\n' % (message['role'], message['content'])
+        
+        conversation += 'assistant: '
+        payload = {
+            "prompt": conversation,
+            "options": {},
+            "systemMessage": ".",
+            "temperature": kwargs.get("temperature", 0.4),
+            "top_p": kwargs.get("top_p", 0.4),
+            "model": model,
+            "user": str(uuid.uuid4())
+        }
+        headers = {
+            'authority': 'p5.v50.ltd',
+            'accept': 'application/json, text/plain, */*',
+            'accept-language': 'id-ID,id;q=0.9,en-US;q=0.8,en;q=0.7',
+            'content-type': 'application/json',
+            'origin': 'https://p5.v50.ltd',
+            'referer': 'https://p5.v50.ltd/',
+            'sec-ch-ua-platform': '"Windows"',
+            'sec-fetch-dest': 'empty',
+            'sec-fetch-mode': 'cors',
+            'sec-fetch-site': 'same-origin',
+            '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'
+        }
+        response = requests.post("https://p5.v50.ltd/api/chat-process", 
+                                json=payload, headers=headers, proxies=kwargs['proxy'] if 'proxy' in kwargs else {})
+        yield response.text
+
+    @classmethod
+    @property
+    def params(cls):
+        params = [
+            ("model", "str"),
+            ("messages", "list[dict[str, str]]"),
+            ("stream", "bool"),
+            ("temperature", "float"),
+            ("top_p", "int"),
+        ]
+        param = ", ".join([": ".join(p) for p in params])
+        return f"g4f.provider.{cls.__name__} supports: ({param})"
\ No newline at end of file