webscout 8.3__py3-none-any.whl → 8.3.2__py3-none-any.whl

webscout/Provider/OPENAI/mcpcore.py

@@ -1,6 +1,8 @@
 import time
 import uuid
 import json
+import random
+import string
 from typing import List, Dict, Optional, Union, Generator, Any
 
 # Use curl_cffi for requests
@@ -8,8 +10,8 @@ from curl_cffi.requests import Session
 from curl_cffi import CurlError
 
 # Import base classes and utility structures
-from .base import OpenAICompatibleProvider, BaseChat, BaseCompletions
-from .utils import (
+from webscout.Provider.OPENAI.base import OpenAICompatibleProvider, BaseChat, BaseCompletions
+from webscout.Provider.OPENAI.utils import (
     ChatCompletionChunk, ChatCompletion, Choice, ChoiceDelta,
     ChatCompletionMessage, CompletionUsage
 )
@@ -274,11 +276,8 @@ class MCPCore(OpenAICompatibleProvider):
     """
     OpenAI-compatible client for the MCPCore API (chat.mcpcore.xyz).
 
-    Requires cookies to be stored in a JSON file (e.g., 'cookies.json').
-    The JSON file should contain a list of cookie objects, including one named 'token'.
-
     Usage:
-        client = MCPCore(cookies_path="path/to/your/cookies.json")
+        client = MCPCore()
         response = client.chat.completions.create(
             model="google/gemma-7b-it",
             messages=[{"role": "user", "content": "Hello!"}]
@@ -286,71 +285,96 @@ class MCPCore(OpenAICompatibleProvider):
         print(response.choices[0].message.content)
     """
     AVAILABLE_MODELS = [
-        "google/gemma-7b-it",
-        "deepseek-ai/deepseek-coder-33b-instruct",
-        "deepseek-ai/DeepSeek-R1",
-        "deepseek-ai/DeepSeek-R1-Distill-Qwen-14B",
-        "deepseek-ai/DeepSeek-v3-0324",
-        "fixie-ai/ultravox-v0_4_1-llama-3_1-8b",
-        "meta-llama/Llama-3.3-70B-Instruct",
-        "meta-llama/Llama-4-Maverick-Instruct",
-        "mistralai/Mistral-7B-Instruct-v0.2",
-        "qwen-max-latest",
-        "qwen-plus-latest",
-        "qwen2.5-coder-32b-instruct",
-        "qwen-turbo-latest",
-        "qwen2.5-14b-instruct-1m",
-        "GLM-4-32B",
-        "Z1-32B",
-        "Z1-Rumination",
-        "arena-model",
-        "qvq-72b-preview-0310",
-        "qwq-32b",
-        "qwen3-235b-a22b",
-        "qwen3-30b-a3b",
-        "qwen3-32b",
-        "deepseek-flash",
-        "@cf/meta/llama-4-scout-17b-16e-instruct",
-        "任务专用",
+        "@cf/deepseek-ai/deepseek-math-7b-instruct",
+        "@cf/deepseek-ai/deepseek-r1-distill-qwen-32b",
+        "@cf/defog/sqlcoder-7b-2",
+        "@cf/fblgit/una-cybertron-7b-v2-bf16",
+        "@cf/google/gemma-3-12b-it",
+        "@cf/meta/llama-2-7b-chat-int8",
+        "@hf/thebloke/llama-2-13b-chat-awq",
+        "@hf/thebloke/llamaguard-7b-awq",
+        "@hf/thebloke/mistral-7b-instruct-v0.1-awq",
+        "@hf/thebloke/neural-chat-7b-v3-1-awq",
+        "anthropic/claude-3.5-haiku",
+        "anthropic/claude-3.5-sonnet",
+        "anthropic/claude-3.7-sonnet",
+        "anthropic/claude-3.7-sonnet:thinking",
+        "anthropic/claude-opus-4",
+        "anthropic/claude-sonnet-4",
+        "openai/chatgpt-4o-latest",
+        "openai/gpt-3.5-turbo",
+        "openai/gpt-4.1",
+        "openai/gpt-4.1-mini",
+        "openai/gpt-4.1-nano",
+        "openai/gpt-4o-mini-search-preview",
+        "openai/gpt-4o-search-preview",
+        "openai/o1-pro",
+        "openai/o3-mini",
+        "sarvam-m",
+        "x-ai/grok-3-beta",
     ]
 
+    def _auto_fetch_token(self):
+        """Automatically fetch a token from the signup endpoint."""
+        session = Session()
+        def random_string(length=8):
+            return ''.join(random.choices(string.ascii_lowercase, k=length))
+        name = random_string(6)
+        email = f"{random_string(8)}@gmail.com"
+        password = email
+        profile_image_url = "data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAGQAAABkCAYAAABw4pVUAAAAAXNSR0IArs4c6QAAAkRJREFUeF7tmDFOw0AUBdcSiIaKM3CKHIQ7UHEISq5AiUTFHYC0XADoTRsJEZFEjhFIaYAim92fjGFS736/zOTZzjavl0d98oMh0CgE4+IriEJYPhQC86EQhdAIwPL4DFEIjAAsjg1RCIwALI4NUQiMACyODVEIjAAsjg1RCIwALI4NUQiMACyODVEIjAAsjg1RCIwALI4NUQiMACyODVEIjAAsjg1RCIwALI4NUQiMACyODVEIjAAsjg2BCfkAIqwAA94KZ/EAAAAASUVORK5CYII="
+        payload = {
+            "name": name,
+            "email": email,
+            "password": password,
+            "profile_image_url": profile_image_url
+        }
+        headers = {
+            **LitAgent().generate_fingerprint(),
+            'origin': 'https://chat.mcpcore.xyz',
+            'referer': 'https://chat.mcpcore.xyz/auth',
+        }
+        try:
+            resp = session.post(
+                "https://chat.mcpcore.xyz/api/v1/auths/signup",
+                headers=headers,
+                json=payload,
+                timeout=30,
+                impersonate="chrome110"
+            )
+            if resp.ok:
+                data = resp.json()
+                token = data.get("token")
+                if token:
+                    return token
+                # fallback: try to get from set-cookie
+                set_cookie = resp.headers.get("set-cookie", "")
+                if "token=" in set_cookie:
+                    return set_cookie.split("token=")[1].split(";")[0]
+            raise RuntimeError(f"Failed to auto-fetch token: {resp.status_code} {resp.text}")
+        except Exception as e:
+            raise RuntimeError(f"Token auto-fetch failed: {e}")
+
     def __init__(
         self,
-        cookies_path: str, # Make cookies path mandatory for authentication
         timeout: int = 60,
     ):
         """
         Initializes the MCPCore OpenAI-compatible client.
 
         Args:
-            cookies_path: Path to the JSON file containing cookies (must include 'token').
             timeout: Request timeout in seconds.
-            proxies: Optional proxy configuration.
-            system_prompt: Default system prompt to use if none is provided in messages.
         """
         self.api_endpoint = "https://chat.mcpcore.xyz/api/chat/completions"
         self.timeout = timeout
-        self.cookies_path = cookies_path
-
-        try:
-            self.token = self._load_token_from_cookies()
-            if not self.token:
-                raise ValueError("Could not find 'token' cookie in the provided file.")
-        except Exception as e:
-             raise ValueError(f"Failed to load authentication token from cookies file '{cookies_path}': {e}") from e
-
+        self.token = self._auto_fetch_token()
         self.session = Session() # Use curl_cffi Session
 
         # Basic headers + Authorization
         self.headers = {
-            'authority': 'chat.mcpcore.xyz',
-            'accept': '*/*', # Accept anything, let the server decide
-            'accept-language': 'en-US,en;q=0.9',
-            'authorization': f'Bearer {self.token}',
-            'content-type': 'application/json',
+            **LitAgent().generate_fingerprint(),
             'origin': 'https://chat.mcpcore.xyz',
-            'referer': 'https://chat.mcpcore.xyz/',
-            'user-agent': LitAgent().random(), # Use LitAgent for User-Agent
+            'referer': 'https://chat.mcpcore.xyz/auth',
         }
         # Add more headers mimicking browser behavior if needed, e.g., sec-ch-ua, etc.
         # Example:
@@ -366,27 +390,42 @@ class MCPCore(OpenAICompatibleProvider):
         self.session.headers.update(self.headers)
         self.chat = Chat(self) # Initialize chat interface
 
-    def _load_token_from_cookies(self) -> Optional[str]:
-        """Load the 'token' value from a JSON cookies file."""
-        try:
-            with open(self.cookies_path, "r") as f:
-                cookies = json.load(f)
-            # Find the cookie named 'token'
-            token_cookie = next((cookie for cookie in cookies if cookie.get("name") == "token"), None)
-            return token_cookie.get("value") if token_cookie else None
-        except FileNotFoundError:
-            print(f"{RED}Error: Cookies file not found at {self.cookies_path}!{RESET}")
-            return None
-        except json.JSONDecodeError:
-            print(f"{RED}Error: Invalid JSON format in cookies file: {self.cookies_path}!{RESET}")
-            return None
-        except Exception as e:
-            print(f"{RED}An unexpected error occurred loading cookies: {e}{RESET}")
-            return None
-
     @property
     def models(self):
         class _ModelList:
             def list(inner_self):
                 return type(self).AVAILABLE_MODELS
         return _ModelList()
+
+if __name__ == "__main__":
+    print("-" * 100)
+    print(f"{'Model':<50} {'Status':<10} {'Response'}")
+    print("-" * 100)
+
+    test_prompt = "Say 'Hello' in one word"
+
+    client = MCPCore()
+    for model in client.models.list():
+        print(f"\rTesting {model}...", end="")
+        try:
+            presp = client.chat.completions.create(
+                model=model,
+                messages=[{"role": "user", "content": test_prompt}]
+            )
+            # Try to get the response text (truncate to 100 chars)
+            if hasattr(presp, "choices") and presp.choices and hasattr(presp.choices[0], "message"):
+                content = presp.choices[0].message.content or ""
+                clean_text = content.strip().encode('utf-8', errors='ignore').decode('utf-8')
+                display_text = clean_text[:100] + "..." if len(clean_text) > 100 else clean_text
+                status = "✓" if clean_text else "✗"
+                if not clean_text:
+                    display_text = "Empty or invalid response"
+            else:
+                status = "✗"
+                display_text = "Empty or invalid response"
+            print(f"\r{model:<50} {status:<10} {display_text}")
+        except Exception as e:
+            error_msg = str(e)
+            if len(error_msg) > 100:
+                error_msg = error_msg[:97] + "..."
+            print(f"\r{model:<50} {'✗':<10} Error: {error_msg}")

webscout/Provider/OPENAI/opkfc.py

@@ -1,3 +1,4 @@
+from datetime import datetime
 import time
 import uuid
 import requests
@@ -6,12 +7,12 @@ import random
 from typing import List, Dict, Optional, Union, Generator, Any
 
 # Import base classes and utility structures
-from .base import OpenAICompatibleProvider, BaseChat, BaseCompletions
-from .utils import (
+from webscout.Provider.OPENAI.base import OpenAICompatibleProvider, BaseChat, BaseCompletions
+from webscout.Provider.OPENAI.utils import (
     ChatCompletionChunk, ChatCompletion, Choice, ChoiceDelta,
     ChatCompletionMessage, CompletionUsage, count_tokens
 )
-
+from webscout.litagent import LitAgent
 # ANSI escape codes for formatting
 BOLD = "\033[1m"
 RED = "\033[91m"
@@ -466,7 +467,9 @@ class OPKFC(OpenAICompatibleProvider):
         "auto",
         "o4-mini",
         "gpt-4o-mini",
-        "gpt-4o"
+        "gpt-4o",
+        "gpt-4-1-mini",
+        
     ]
 
     def __init__(
@@ -491,10 +494,10 @@ class OPKFC(OpenAICompatibleProvider):
             self.session.proxies.update(proxies)
 
         # Set the user agent to match the original script
-        self.user_agent = "Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/135.0.0.0 Safari/537.36 Edg/135.0.0.0"
+        self.user_agent = LitAgent().random()
 
         # Set the cookie from the original script
-        self.cookie = "__vtins__KUc0LhjVWFNXQv11=%7B%22sid%22%3A%20%228fab09e3-c23e-5f60-b369-9697fbb821ce%22%2C%20%22vd%22%3A%201%2C%20%22stt%22%3A%200%2C%20%22dr%22%3A%200%2C%20%22expires%22%3A%201744896723481%2C%20%22ct%22%3A%201744894923481%7D; __51uvsct__KUc0LhjVWFNXQv11=1; __51vcke__KUc0LhjVWFNXQv11=06da852c-bb56-547c-91a8-43a0d485ffed; __51vuft__KUc0LhjVWFNXQv11=1744894923504; gfsessionid=1ochrgv17vy4sbd98xmwt6crpmkxwlqf; oai-nav-state=1; p_uv_id=ad86646801bc60d6d95f6098e4ee7450; _dd_s=rum=0&expire=1744895920821&logs=1&id=a39221c9-e8ed-44e6-a2c8-03192699c71e&created=1744894970625"
+        self.cookie = f"__vtins__KUc0LhjVWFNXQv11=%7B%22sid%22%3A%20%{uuid.uuid4().hex}%22%2C%20%22vd%22%3A%201%2C%20%22stt%22%3A%200%2C%20%22dr%22%3A%200%2C%20%22expires%22%3A%201744896723481%2C%20%22ct%22%3A%201744894923481%7D; __51uvsct__KUc0LhjVWFNXQv11=1; __51vcke__KUc0LhjVWFNXQv11=06da852c-bb56-547c-91a8-43a0d485ffed; __51vuft__KUc0LhjVWFNXQv11=1744894923504; gfsessionid=1ochrgv17vy4sbd98xmwt6crpmkxwlqf; oai-nav-state=1; p_uv_id=ad86646801bc60d6d95f6098e4ee7450; _dd_s=rum=0&expire=1744895920821&logs=1&id={uuid.uuid4().hex}&created={int(datetime.utcnow().timestamp() * 1000)}"
 
         # Initialize chat interface
         self.chat = Chat(self)
@@ -505,3 +508,12 @@ class OPKFC(OpenAICompatibleProvider):
             def list(inner_self):
                 return type(self).AVAILABLE_MODELS
         return _ModelList()
+
+if __name__ == "__main__":
+    # Example usage
+    client = OPKFC()
+    response = client.chat.completions.create(
+        model="auto",
+        messages=[{"role": "user", "content": "Hello!"}]
+    )
+    print(response.choices[0].message.content)

webscout/Provider/OPENAI/scirachat.py

@@ -6,8 +6,8 @@ import re
 from typing import List, Dict, Optional, Union, Generator, Any
 
 # Import base classes and utility structures
-from .base import OpenAICompatibleProvider, BaseChat, BaseCompletions
-from .utils import (
+from webscout.Provider.OPENAI.base import OpenAICompatibleProvider, BaseChat, BaseCompletions
+from webscout.Provider.OPENAI.utils import (
     ChatCompletionChunk, ChatCompletion, Choice, ChoiceDelta,
     ChatCompletionMessage, CompletionUsage, get_system_prompt, count_tokens
 )
@@ -16,20 +16,7 @@ from .utils import (
 try:
     from webscout.litagent import LitAgent
 except ImportError:
-    # Define a dummy LitAgent if webscout is not installed or accessible
-    class LitAgent:
-        def generate_fingerprint(self, browser: str = "chrome") -> Dict[str, Any]:
-            # Return minimal default headers if LitAgent is unavailable
-            print("Warning: LitAgent not found. Using default minimal headers.")
-            return {
-                "accept": "*/*",
-                "accept_language": "en-US,en;q=0.9",
-                "platform": "Windows",
-                "sec_ch_ua": '"Not/A)Brand";v="99", "Google Chrome";v="127", "Chromium";v="127"',
-                "user_agent": "Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/127.0.0.0 Safari/537.36",
-                "browser_type": browser,
-            }
-
+    pass
 # --- SciraChat Client ---
 
 class Completions(BaseCompletions):
@@ -334,20 +321,37 @@ class SciraChat(OpenAICompatibleProvider):
             messages=[{"role": "user", "content": "Hello!"}]
         )
     """
-    
-    AVAILABLE_MODELS = {
-        "scira-default": "Grok3-mini", # thinking model
-        "scira-grok-3": "Grok3",
-        "scira-anthropic": "Sonnet 3.7 thinking",
-        "scira-vision" : "Grok2-Vision", # vision model
-        "scira-4o": "GPT4o",
-        "scira-qwq": "QWQ-32B",
-        "scira-o4-mini": "o4-mini",
-        "scira-google": "gemini 2.5 flash",
-        "scira-google-pro": "gemini 2.5 pro",
-        "scira-llama-4": "llama 4 Maverick",
+    # List of model display names for registration (aliases)
+    AVAILABLE_MODELS = [
+        "Grok3-mini (thinking)",
+        "Grok3",
+        "Claude 4 Sonnet",
+        "Claude 4 Sonnet Thinking",
+        "Grok2-Vision (vision)",
+        "GPT4o",
+        "QWQ-32B",
+        "o4-mini",
+        "Gemini 2.5 Flash Thinking",
+        "Gemini 2.5 Pro",
+        "Llama 4 Maverick",
+    ]
+    # Mapping from display name to internal model key
+    MODEL_NAME_MAP = {
+        "Grok3-mini (thinking)": "scira-default",
+        "Grok3": "scira-grok-3",
+        "Claude 4 Sonnet": "scira-anthropic",
+        "Claude 4 Sonnet Thinking": "scira-anthropic-thinking",
+        "Grok2-Vision (vision)": "scira-vision",
+        "GPT4o": "scira-4o",
+        "QWQ-32B": "scira-qwq",
+        "o4-mini": "scira-o4-mini",
+        "Gemini 2.5 Flash Thinking": "scira-google",
+        "Gemini 2.5 Pro": "scira-google-pro",
+        "Llama 4 Maverick": "scira-llama-4",
     }
-    
+    # Optional: pretty display names for UI (reverse mapping)
+    MODEL_DISPLAY_NAMES = {v: k for k, v in MODEL_NAME_MAP.items()}
+
     def __init__(
         self, 
         timeout: Optional[int] = None, 
@@ -370,19 +374,9 @@ class SciraChat(OpenAICompatibleProvider):
         
         # Use the fingerprint for headers
         self.headers = {
-            "Accept": self.fingerprint["accept"],
-            "Accept-Encoding": "gzip, deflate, br, zstd",
-            "Accept-Language": self.fingerprint["accept_language"],
-            "Content-Type": "application/json",
+            **self.fingerprint,
             "Origin": "https://scira.ai",
             "Referer": "https://scira.ai/",
-            "Sec-CH-UA": self.fingerprint["sec_ch_ua"] or '"Not)A;Brand";v="99", "Microsoft Edge";v="127", "Chromium";v="127"',
-            "Sec-CH-UA-Mobile": "?0",
-            "Sec-CH-UA-Platform": f'"{self.fingerprint["platform"]}"',
-            "User-Agent": self.fingerprint["user_agent"],
-            "Sec-Fetch-Dest": "empty",
-            "Sec-Fetch-Mode": "cors",
-            "Sec-Fetch-Site": "same-origin"
         }
         
         self.session.headers.update(self.headers)
@@ -406,11 +400,7 @@ class SciraChat(OpenAICompatibleProvider):
         
         # Update headers with new fingerprint
         self.headers.update({
-            "Accept": self.fingerprint["accept"],
-            "Accept-Language": self.fingerprint["accept_language"],
-            "Sec-CH-UA": self.fingerprint["sec_ch_ua"] or self.headers["Sec-CH-UA"],
-            "Sec-CH-UA-Platform": f'"{self.fingerprint["platform"]}"',
-            "User-Agent": self.fingerprint["user_agent"],
+            **self.fingerprint,
         })
         
         # Update session headers
@@ -459,18 +449,20 @@ class SciraChat(OpenAICompatibleProvider):
     
     def convert_model_name(self, model: str) -> str:
         """
-        Convert model names to ones supported by SciraChat.
+        Convert model display names or internal keys to ones supported by SciraChat.
         
         Args:
-            model: Model name to convert
+            model: Model name or alias to convert
             
         Returns:
             SciraChat model name
         """
-        # If the model is already a valid SciraChat model, return it
-        if model in self.AVAILABLE_MODELS:
+        # If model is a display name (alias), map to internal key
+        if model in self.MODEL_NAME_MAP:
+            return self.MODEL_NAME_MAP[model]
+        # If model is already an internal key, return it if valid
+        if model in self.MODEL_DISPLAY_NAMES:
             return model
-        
         # Default to scira-default if model not found
         print(f"Warning: Unknown model '{model}'. Using 'scira-default' instead.")
         return "scira-default"
@@ -479,5 +471,22 @@ class SciraChat(OpenAICompatibleProvider):
     def models(self):
         class _ModelList:
             def list(inner_self):
+                # Return display names (aliases)
                 return type(self).AVAILABLE_MODELS
         return _ModelList()
+
+if __name__ == "__main__":
+    ai = SciraChat()
+    response = ai.chat.completions.create(
+        model="Gemini 2.5 Pro",
+        messages=[
+            {"role": "user", "content": "who is pm of india?"}
+        ],
+        stream=True
+    )
+    for chunk in response:
+        if hasattr(chunk, "choices") and chunk.choices and hasattr(chunk.choices[0], "delta"):
+            content = getattr(chunk.choices[0].delta, "content", None)
+            if content:
+                print(content, end="", flush=True)
+    print()

webscout/Provider/OPENAI/toolbaz.py

@@ -302,7 +302,6 @@ class Toolbaz(OpenAICompatibleProvider):
         "Llama-4-Scout",
         "Llama-3.3-70B",
         "Qwen2.5-72B",
-        "Qwen2-72B",
         "grok-2-1212",
         "grok-3-beta",
         "toolbaz_v3.5_pro",
@@ -338,18 +337,11 @@ class Toolbaz(OpenAICompatibleProvider):
         
         # Set up headers
         self.session.headers.update({
-            "user-agent": LitAgent().generate_fingerprint(browser=browser)["user_agent"],
-            "accept": "*/*",
-            "accept-language": "en-US",
-            "cache-control": "no-cache",
-            "connection": "keep-alive",
-            "content-type": "application/x-www-form-urlencoded; charset=UTF-8",
-            "origin": "https://toolbaz.com",
+            **LitAgent().generate_fingerprint(browser=browser),
             "pragma": "no-cache",
             "referer": "https://toolbaz.com/",
-            "sec-fetch-mode": "cors"
         })
-        
+
         # Initialize chat property
         self.chat = Chat(self)