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

webscout/Provider/OPENAI/autoproxy.py

@@ -1,39 +1,332 @@
-# # ProxyFox integration for OpenAI-compatible providers
-# # This module provides a singleton proxy pool for all providers
-
-# import proxyfox
-
-# def get_auto_proxy(protocol='https', country=None, max_speed_ms=1000):
-#     """
-#     Returns a single proxy string (e.g. '11.22.33.44:8080') using proxyfox.
-#     You can specify protocol, country, and max_speed_ms for filtering.
-#     """
-#     kwargs = {'protocol': protocol, 'max_speed_ms': max_speed_ms}
-#     if country:
-#         kwargs['country'] = country
-#     return proxyfox.get_one(**kwargs)
-
-# # Optionally: pool support for advanced usage
-# _pool = None
-
-# def get_proxy_pool(size=10, refresh_interval=300, protocol='https', max_speed_ms=1000):
-#     global _pool
-#     if _pool is None:
-#         _pool = proxyfox.create_pool(
-#             size=size,
-#             refresh_interval=refresh_interval,
-#             protocol=protocol,
-#             max_speed_ms=max_speed_ms
-#         )
-#     return _pool
-
-# def get_pool_proxy():
-#     pool = get_proxy_pool()
-#     return pool.get()
-
-# def get_all_pool_proxies():
-#     pool = get_proxy_pool()
-#     return pool.all()
-
-# if __name__ == "__main__":
-#     print(get_auto_proxy())
+"""
+Auto-proxy module for OpenAI-compatible providers.
+This module provides automatic proxy injection for HTTP sessions using a remote proxy list.
+"""
+
+import random
+import time
+from abc import ABCMeta
+from typing import Dict, List, Optional, Any
+import requests
+
+# Optional imports for different HTTP clients
+try:
+    import httpx
+except ImportError:
+    httpx = None
+
+try:
+    from curl_cffi.requests import Session as CurlSession
+    from curl_cffi.requests import AsyncSession as CurlAsyncSession
+except ImportError:
+    CurlSession = None
+    CurlAsyncSession = None
+
+# Global proxy cache
+_proxy_cache = {
+    'proxies': [],
+    'last_updated': 0,
+    'cache_duration': 300  # 5 minutes
+}
+
+PROXY_SOURCE_URL = "http://207.180.209.185:5000/ips.txt"
+
+
+def fetch_proxies() -> List[str]:
+    """
+    Fetch proxy list from the remote source.
+
+    Returns:
+        List[str]: List of proxy URLs in format 'http://user:pass@host:port'
+    """
+    try:
+        response = requests.get(PROXY_SOURCE_URL, timeout=10)
+        response.raise_for_status()
+
+        proxies = []
+        for line in response.text.strip().split('\n'):
+            line = line.strip()
+            if line and line.startswith('http://'):
+                proxies.append(line)
+
+        return proxies
+
+    except Exception:
+        return []
+
+
+def get_cached_proxies() -> List[str]:
+    """
+    Get proxies from cache or fetch new ones if cache is expired.
+
+    Returns:
+        List[str]: List of proxy URLs
+    """
+    current_time = time.time()
+
+    # Check if cache is expired or empty
+    if (current_time - _proxy_cache['last_updated'] > _proxy_cache['cache_duration'] or
+        not _proxy_cache['proxies']):
+
+        new_proxies = fetch_proxies()
+        if new_proxies:
+            _proxy_cache['proxies'] = new_proxies
+            _proxy_cache['last_updated'] = current_time
+        else:
+            pass
+
+    return _proxy_cache['proxies']
+
+
+def get_auto_proxy() -> Optional[str]:
+    """
+    Get a random proxy from the cached proxy list.
+
+    Returns:
+        Optional[str]: A proxy URL or None if no proxies available
+    """
+    proxies = get_cached_proxies()
+    if not proxies:
+        return None
+
+    proxy = random.choice(proxies)
+    return proxy
+
+
+def get_proxy_dict(proxy_url: Optional[str] = None) -> Dict[str, str]:
+    """
+    Convert a proxy URL to a dictionary format suitable for requests/httpx.
+
+    Args:
+        proxy_url: Proxy URL, if None will get one automatically
+
+    Returns:
+        Dict[str, str]: Proxy dictionary with 'http' and 'https' keys
+    """
+    if proxy_url is None:
+        proxy_url = get_auto_proxy()
+
+    if proxy_url is None:
+        return {}
+
+    return {
+        'http': proxy_url,
+        'https': proxy_url
+    }
+
+
+def test_proxy(proxy_url: str, timeout: int = 10) -> bool:
+    """
+    Test if a proxy is working by making a request to a test URL.
+
+    Args:
+        proxy_url: The proxy URL to test
+        timeout: Request timeout in seconds
+
+    Returns:
+        bool: True if proxy is working, False otherwise
+    """
+    try:
+        test_url = "https://httpbin.org/ip"
+        proxies = {'http': proxy_url, 'https': proxy_url}
+
+        response = requests.get(test_url, proxies=proxies, timeout=timeout)
+        return response.status_code == 200
+
+    except Exception:
+        return False
+
+
+class ProxyAutoMeta(ABCMeta):
+    """
+    Metaclass to ensure all OpenAICompatibleProvider subclasses automatically get proxy support.
+    This will inject proxies into any requests.Session, httpx.Client, or curl_cffi session attributes found on the instance.
+
+    To disable automatic proxy injection, set disable_auto_proxy=True in the constructor or
+    set the class attribute DISABLE_AUTO_PROXY = True.
+    """
+
+    def __call__(cls, *args, **kwargs):
+        instance = super().__call__(*args, **kwargs)
+
+        # Check if auto proxy is disabled
+        disable_auto_proxy = kwargs.get('disable_auto_proxy', False) or getattr(cls, 'DISABLE_AUTO_PROXY', False)
+
+        # Get proxies from various sources
+        proxies = getattr(instance, 'proxies', None) or kwargs.get('proxies', None)
+
+        if proxies is None and not disable_auto_proxy:
+            try:
+                proxy_url = get_auto_proxy()
+                if proxy_url:
+                    proxies = get_proxy_dict(proxy_url)
+                else:
+                    proxies = {}
+            except Exception:
+                proxies = {}
+        elif proxies is None:
+            proxies = {}
+
+        instance.proxies = proxies
+
+        # Patch existing sessions if we have valid proxies
+        if proxies:
+            _patch_instance_sessions(instance, proxies)
+
+        # Provide helper methods for creating proxied sessions
+        _add_proxy_helpers(instance, proxies)
+
+        return instance
+
+
+def _patch_instance_sessions(instance: Any, proxies: Dict[str, str]) -> None:
+    """
+    Patch existing session objects on the instance with proxy configuration.
+
+    Args:
+        instance: The class instance to patch
+        proxies: Proxy dictionary to apply
+    """
+    for attr_name in dir(instance):
+        if attr_name.startswith('_'):
+            continue
+
+        try:
+            attr_obj = getattr(instance, attr_name)
+
+            # Patch requests.Session objects
+            if isinstance(attr_obj, requests.Session):
+                attr_obj.proxies.update(proxies)
+
+            # Patch httpx.Client objects
+            elif httpx and isinstance(attr_obj, httpx.Client):
+                try:
+                    # httpx uses different proxy format
+                    attr_obj._proxies = proxies
+                except Exception:
+                    pass
+
+            # Patch curl_cffi Session objects
+            elif CurlSession and isinstance(attr_obj, CurlSession):
+                try:
+                    attr_obj.proxies.update(proxies)
+                except Exception:
+                    pass
+
+            # Patch curl_cffi AsyncSession objects
+            elif CurlAsyncSession and isinstance(attr_obj, CurlAsyncSession):
+                try:
+                    attr_obj.proxies.update(proxies)
+                except Exception:
+                    pass
+
+        except Exception:
+            continue
+
+
+def _add_proxy_helpers(instance: Any, proxies: Dict[str, str]) -> None:
+    """
+    Add helper methods to the instance for creating proxied sessions.
+
+    Args:
+        instance: The class instance to add methods to
+        proxies: Proxy dictionary to use in helper methods
+    """
+
+    def get_proxied_session():
+        """Get a requests.Session with proxies configured"""
+        session = requests.Session()
+        session.proxies.update(proxies)
+        return session
+
+    def get_proxied_httpx_client(**kwargs):
+        """Get an httpx.Client with proxies configured"""
+        if httpx:
+            return httpx.Client(proxies=proxies, **kwargs)
+        else:
+            raise ImportError("httpx is not installed")
+
+    def get_proxied_curl_session(impersonate="chrome120", **kwargs):
+        """Get a curl_cffi Session with proxies configured"""
+        if CurlSession:
+            return CurlSession(proxies=proxies, impersonate=impersonate, **kwargs)
+        else:
+            raise ImportError("curl_cffi is not installed")
+
+    def get_proxied_curl_async_session(impersonate="chrome120", **kwargs):
+        """Get a curl_cffi AsyncSession with proxies configured"""
+        if CurlAsyncSession:
+            return CurlAsyncSession(proxies=proxies, impersonate=impersonate, **kwargs)
+        else:
+            raise ImportError("curl_cffi is not installed")
+
+    # Add methods to instance
+    instance.get_proxied_session = get_proxied_session
+    instance.get_proxied_httpx_client = get_proxied_httpx_client
+    instance.get_proxied_curl_session = get_proxied_curl_session
+    instance.get_proxied_curl_async_session = get_proxied_curl_async_session
+
+
+def get_working_proxy(max_attempts: int = 5, timeout: int = 10) -> Optional[str]:
+    """
+    Get a working proxy by testing multiple proxies from the list.
+
+    Args:
+        max_attempts: Maximum number of proxies to test
+        timeout: Timeout for each proxy test
+
+    Returns:
+        Optional[str]: A working proxy URL or None if none found
+    """
+    proxies = get_cached_proxies()
+    if not proxies:
+        return None
+
+    # Shuffle to avoid always testing the same proxies first
+    test_proxies = random.sample(proxies, min(max_attempts, len(proxies)))
+
+    for proxy in test_proxies:
+        if test_proxy(proxy, timeout):
+            return proxy
+
+    return None
+
+
+def refresh_proxy_cache() -> int:
+    """
+    Force refresh the proxy cache.
+
+    Returns:
+        int: Number of proxies loaded
+    """
+    global _proxy_cache
+    _proxy_cache['last_updated'] = 0  # Force refresh
+    proxies = get_cached_proxies()
+    return len(proxies)
+
+
+def get_proxy_stats() -> Dict[str, Any]:
+    """
+    Get statistics about the proxy cache.
+
+    Returns:
+        Dict[str, Any]: Statistics including count, last update time, etc.
+    """
+    return {
+        'proxy_count': len(_proxy_cache['proxies']),
+        'last_updated': _proxy_cache['last_updated'],
+        'cache_duration': _proxy_cache['cache_duration'],
+        'cache_age_seconds': time.time() - _proxy_cache['last_updated'],
+        'source_url': PROXY_SOURCE_URL
+    }
+
+
+def set_proxy_cache_duration(duration: int) -> None:
+    """
+    Set the proxy cache duration.
+
+    Args:
+        duration: Cache duration in seconds
+    """
+    global _proxy_cache
+    _proxy_cache['cache_duration'] = duration

webscout/Provider/OPENAI/base.py

@@ -1,9 +1,19 @@
 from abc import ABC, abstractmethod
 from typing import List, Dict, Optional, Union, Generator, Any, TypedDict, Callable
 import json
-import logging
 from dataclasses import dataclass
-logger = logging.getLogger(__name__)
+
+# Import WebScout Litlogger instead of standard logging
+from webscout.Litlogger import Logger, LogLevel
+
+logger = Logger(name="OpenAIBase", level=LogLevel.INFO)
+
+# Import the ProxyAutoMeta metaclass
+try:
+    from .autoproxy import ProxyAutoMeta
+except ImportError:
+    # Fallback if autoproxy is not available
+    ProxyAutoMeta = type
 
 
 # Import the utils for response structures
@@ -243,8 +253,7 @@ class BaseChat(ABC):
 #         instance.get_proxied_curl_async_session = get_proxied_curl_async_session
 
 #         return instance
-# class OPENAICompatibleMeta(ABC, metaclass=ProxyAutoMeta):
-class OpenAICompatibleProvider(ABC):
+class OpenAICompatibleProvider(ABC, metaclass=ProxyAutoMeta):
     """
     Abstract Base Class for providers mimicking the OpenAI Python client structure.
     Requires a nested 'chat.completions' structure with tool support.
@@ -267,13 +276,14 @@ class OpenAICompatibleProvider(ABC):
     supports_tool_choice: bool = False  # Whether the provider supports tool_choice
 
     @abstractmethod
-    def __init__(self, api_key: Optional[str] = None, tools: Optional[List[Tool]] = None, proxies: Optional[dict] = None, **kwargs: Any):
+    def __init__(self, api_key: Optional[str] = None, tools: Optional[List[Tool]] = None, proxies: Optional[dict] = None, disable_auto_proxy: bool = False, **kwargs: Any):
         self.available_tools = {}
         if tools:
             self.register_tools(tools)
         # self.proxies is set by ProxyAutoMeta
         # Subclasses should use self.proxies for all network requests
         # Optionally, use self.get_proxied_session() for a requests.Session with proxies
+        # The disable_auto_proxy parameter is handled by ProxyAutoMeta
         # raise NotImplementedError  # <-- Commented out for metaclass test
 
     @property

webscout/Provider/OPENAI/e2b.py

@@ -1609,6 +1609,5 @@ if __name__ == "__main__":
         print("\n--- End of Stream ---")
         if not full_stream_response:
              print(f"{RED}Stream test failed: No content received.{RESET}")
-
     except Exception as e:
         print(f"{RED}Streaming Test Failed: {e}{RESET}")

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}")