webscout 8.2.3__py3-none-any.whl → 8.2.4__py3-none-any.whl

webscout/Provider/OPENAI/deepinfra.py

@@ -222,23 +222,60 @@ class Chat(BaseChat):
 
 class DeepInfra(OpenAICompatibleProvider):
     AVAILABLE_MODELS = [
+        # "anthropic/claude-3-7-sonnet-latest",  # >>>> NOT WORKING
+
+        "deepseek-ai/DeepSeek-R1",
+        "deepseek-ai/DeepSeek-R1-Distill-Llama-70B",
+        "deepseek-ai/DeepSeek-R1-Distill-Qwen-32B",
+        "deepseek-ai/DeepSeek-R1-Turbo",
         "deepseek-ai/DeepSeek-V3",
+
         "google/gemma-2-27b-it",
         "google/gemma-2-9b-it",
+        "google/gemma-3-27b-it",
+        "google/gemma-3-12b-it",
+        "google/gemma-3-4b-it",
+        # "google/gemini-1.5-flash",  # >>>> NOT WORKING
+        # "google/gemini-1.5-flash-8b",  # >>>> NOT WORKING
+        # "google/gemini-2.0-flash-001",  # >>>> NOT WORKING
+
+        # "Gryphe/MythoMax-L2-13b",  # >>>> NOT WORKING
+
+        # "meta-llama/Llama-3.2-1B-Instruct",  # >>>> NOT WORKING
+        # "meta-llama/Llama-3.2-3B-Instruct",  # >>>> NOT WORKING
         "meta-llama/Llama-4-Maverick-17B-128E-Instruct-FP8",
         "meta-llama/Llama-4-Scout-17B-16E-Instruct",
+        # "meta-llama/Llama-3.2-90B-Vision-Instruct",  # >>>> NOT WORKING
+        # "meta-llama/Llama-3.2-11B-Vision-Instruct",  # >>>> NOT WORKING
         "meta-llama/Llama-3.3-70B-Instruct",
         "meta-llama/Llama-3.3-70B-Instruct-Turbo",
+        # "meta-llama/Meta-Llama-3-70B-Instruct",  # >>>> NOT WORKING
+        # "meta-llama/Meta-Llama-3-8B-Instruct",  # >>>> NOT WORKING
+        # "meta-llama/Meta-Llama-3.1-70B-Instruct",  # >>>> NOT WORKING
+        # "meta-llama/Meta-Llama-3.1-70B-Instruct-Turbo",  # >>>> NOT WORKING
         "meta-llama/Meta-Llama-3.1-8B-Instruct",
         "meta-llama/Meta-Llama-3.1-8B-Instruct-Turbo",
+        # "meta-llama/Meta-Llama-3.1-405B-Instruct",  # >>>> NOT WORKING
+
         "microsoft/phi-4",
         "microsoft/Phi-4-multimodal-instruct",
         "microsoft/WizardLM-2-8x22B",
+        # "mistralai/Mixtral-8x7B-Instruct-v0.1",  # >>>> NOT WORKING
+        # "mistralai/Mistral-7B-Instruct-v0.3",  # >>>> NOT WORKING
+        # "mistralai/Mistral-Nemo-Instruct-2407",  # >>>> NOT WORKING
         "mistralai/Mistral-Small-24B-Instruct-2501",
         "nvidia/Llama-3.1-Nemotron-70B-Instruct",
+        # "NousResearch/Hermes-3-Llama-3.1-405B",  # >>>> NOT WORKING
+        # "NovaSky-AI/Sky-T1-32B-Preview",  # >>>> NOT WORKING
         "Qwen/QwQ-32B",
+        # "Qwen/Qwen2.5-7B-Instruct",  # >>>> NOT WORKING
         "Qwen/Qwen2.5-72B-Instruct",
         "Qwen/Qwen2.5-Coder-32B-Instruct",
+        "Qwen/Qwen3-14B",
+        "Qwen/Qwen3-30B-A3B",
+        "Qwen/Qwen3-32B",
+        # "Sao10K/L3.1-70B-Euryale-v2.2",  # >>>> NOT WORKING
+        # "Sao10K/L3.3-70B-Euryale-v2.3",  # >>>> NOT WORKING
     ]
 
     def __init__(self, timeout: Optional[int] = None, browser: str = "chrome"):

webscout/Provider/OPENAI/groq.py

@@ -0,0 +1,354 @@
+import requests
+import json
+import time
+import uuid
+from typing import List, Dict, Optional, Union, Generator, Any
+
+# Import curl_cffi for improved request handling
+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 (
+    ChatCompletionChunk, ChatCompletion, Choice, ChoiceDelta,
+    ChatCompletionMessage, CompletionUsage
+)
+
+# Attempt to import LitAgent, fallback if not available
+try:
+    from webscout.litagent import LitAgent
+except ImportError:
+    pass
+
+# --- Groq Client ---
+
+class Completions(BaseCompletions):
+    def __init__(self, client: 'Groq'):
+        self._client = client
+
+    def create(
+        self,
+        *,
+        model: str,
+        messages: List[Dict[str, str]],
+        max_tokens: Optional[int] = 2049,
+        stream: bool = False,
+        temperature: Optional[float] = None,
+        top_p: Optional[float] = None,
+        **kwargs: Any
+    ) -> Union[ChatCompletion, Generator[ChatCompletionChunk, None, None]]:
+        """
+        Creates a model response for the given chat conversation.
+        Mimics openai.chat.completions.create
+        """
+        payload = {
+            "model": model,
+            "messages": messages,
+            "max_tokens": max_tokens,
+            "stream": stream,
+        }
+        if temperature is not None:
+            payload["temperature"] = temperature
+        if top_p is not None:
+            payload["top_p"] = top_p
+
+        # Add frequency_penalty and presence_penalty if provided
+        if "frequency_penalty" in kwargs:
+            payload["frequency_penalty"] = kwargs.pop("frequency_penalty")
+        if "presence_penalty" in kwargs:
+            payload["presence_penalty"] = kwargs.pop("presence_penalty")
+        
+        # Add any tools if provided
+        if "tools" in kwargs and kwargs["tools"]:
+            payload["tools"] = kwargs.pop("tools")
+
+        payload.update(kwargs)
+
+        request_id = f"chatcmpl-{uuid.uuid4()}"
+        created_time = int(time.time())
+
+        if stream:
+            return self._create_stream(request_id, created_time, model, payload)
+        else:
+            return self._create_non_stream(request_id, created_time, model, payload)
+
+    def _create_stream(
+        self, request_id: str, created_time: int, model: str, payload: Dict[str, Any]
+    ) -> Generator[ChatCompletionChunk, None, None]:
+        try:
+            response = self._client.session.post(
+                self._client.base_url,
+                json=payload,
+                stream=True,
+                timeout=self._client.timeout,
+                impersonate="chrome110"  # Use impersonate for better compatibility
+            )
+            
+            if response.status_code != 200:
+                raise IOError(f"Groq request failed with status code {response.status_code}: {response.text}")
+
+            # Track token usage across chunks
+            prompt_tokens = 0
+            completion_tokens = 0
+            total_tokens = 0
+
+            for line in response.iter_lines(decode_unicode=True):
+                if line:
+                    if line.startswith("data: "):
+                        json_str = line[6:]
+                        if json_str == "[DONE]":
+                            break
+
+                        try:
+                            data = json.loads(json_str)
+                            choice_data = data.get('choices', [{}])[0]
+                            delta_data = choice_data.get('delta', {})
+                            finish_reason = choice_data.get('finish_reason')
+
+                            # Update token counts if available
+                            usage_data = data.get('usage', {})
+                            if usage_data:
+                                prompt_tokens = usage_data.get('prompt_tokens', prompt_tokens)
+                                completion_tokens = usage_data.get('completion_tokens', completion_tokens)
+                                total_tokens = usage_data.get('total_tokens', total_tokens)
+
+                            # Create the delta object
+                            delta = ChoiceDelta(
+                                content=delta_data.get('content'),
+                                role=delta_data.get('role'),
+                                tool_calls=delta_data.get('tool_calls')
+                            )
+
+                            # Create the choice object
+                            choice = Choice(
+                                index=choice_data.get('index', 0),
+                                delta=delta,
+                                finish_reason=finish_reason,
+                                logprobs=choice_data.get('logprobs')
+                            )
+
+                            # Create the chunk object
+                            chunk = ChatCompletionChunk(
+                                id=request_id,
+                                choices=[choice],
+                                created=created_time,
+                                model=model,
+                                system_fingerprint=data.get('system_fingerprint')
+                            )
+
+                            # Convert to dict for proper formatting
+                            chunk_dict = chunk.to_dict()
+
+                            # Add usage information to match OpenAI format
+                            usage_dict = {
+                                "prompt_tokens": prompt_tokens or 10,
+                                "completion_tokens": completion_tokens or (len(delta_data.get('content', '')) if delta_data.get('content') else 0),
+                                "total_tokens": total_tokens or (10 + (len(delta_data.get('content', '')) if delta_data.get('content') else 0)),
+                                "estimated_cost": None
+                            }
+
+                            # Update completion_tokens and total_tokens as we receive more content
+                            if delta_data.get('content'):
+                                completion_tokens += 1
+                                total_tokens = prompt_tokens + completion_tokens
+                                usage_dict["completion_tokens"] = completion_tokens
+                                usage_dict["total_tokens"] = total_tokens
+
+                            chunk_dict["usage"] = usage_dict
+
+                            yield chunk
+                        except json.JSONDecodeError:
+                            print(f"Warning: Could not decode JSON line: {json_str}")
+                            continue
+        except CurlError as e:
+            print(f"Error during Groq stream request: {e}")
+            raise IOError(f"Groq request failed: {e}") from e
+        except Exception as e:
+            print(f"Error processing Groq stream: {e}")
+            raise
+
+    def _create_non_stream(
+        self, request_id: str, created_time: int, model: str, payload: Dict[str, Any]
+    ) -> ChatCompletion:
+        try:
+            response = self._client.session.post(
+                self._client.base_url,
+                json=payload,
+                timeout=self._client.timeout,
+                impersonate="chrome110"  # Use impersonate for better compatibility
+            )
+            
+            if response.status_code != 200:
+                raise IOError(f"Groq request failed with status code {response.status_code}: {response.text}")
+                
+            data = response.json()
+
+            choices_data = data.get('choices', [])
+            usage_data = data.get('usage', {})
+
+            choices = []
+            for choice_d in choices_data:
+                message_d = choice_d.get('message', {})
+                
+                # Handle tool calls if present
+                tool_calls = message_d.get('tool_calls')
+                
+                message = ChatCompletionMessage(
+                    role=message_d.get('role', 'assistant'),
+                    content=message_d.get('content', ''),
+                    tool_calls=tool_calls
+                )
+                choice = Choice(
+                    index=choice_d.get('index', 0),
+                    message=message,
+                    finish_reason=choice_d.get('finish_reason', 'stop')
+                )
+                choices.append(choice)
+
+            usage = CompletionUsage(
+                prompt_tokens=usage_data.get('prompt_tokens', 0),
+                completion_tokens=usage_data.get('completion_tokens', 0),
+                total_tokens=usage_data.get('total_tokens', 0)
+            )
+
+            completion = ChatCompletion(
+                id=request_id,
+                choices=choices,
+                created=created_time,
+                model=data.get('model', model),
+                usage=usage,
+            )
+            return completion
+
+        except CurlError as e:
+            print(f"Error during Groq non-stream request: {e}")
+            raise IOError(f"Groq request failed: {e}") from e
+        except Exception as e:
+            print(f"Error processing Groq response: {e}")
+            raise
+
+class Chat(BaseChat):
+    def __init__(self, client: 'Groq'):
+        self.completions = Completions(client)
+
+class Groq(OpenAICompatibleProvider):
+    AVAILABLE_MODELS = [
+        "distil-whisper-large-v3-en",
+        "gemma2-9b-it",
+        "llama-3.3-70b-versatile",
+        "llama-3.1-8b-instant",
+        "llama-guard-3-8b",
+        "llama3-70b-8192",
+        "llama3-8b-8192",
+        "whisper-large-v3",
+        "whisper-large-v3-turbo",
+        "meta-llama/llama-4-scout-17b-16e-instruct",
+        "meta-llama/llama-4-maverick-17b-128e-instruct",
+        "playai-tts",
+        "playai-tts-arabic",
+        "qwen-qwq-32b",
+        "mistral-saba-24b",
+        "qwen-2.5-coder-32b",
+        "qwen-2.5-32b",
+        "deepseek-r1-distill-qwen-32b",
+        "deepseek-r1-distill-llama-70b",
+        "llama-3.3-70b-specdec",
+        "llama-3.2-1b-preview",
+        "llama-3.2-3b-preview",
+        "llama-3.2-11b-vision-preview",
+        "llama-3.2-90b-vision-preview",
+        "mixtral-8x7b-32768"
+    ]
+
+    def __init__(self, api_key: str = None, timeout: Optional[int] = 30, browser: str = "chrome"):
+        self.timeout = timeout
+        self.base_url = "https://api.groq.com/openai/v1/chat/completions"
+        self.api_key = api_key
+        
+        # Initialize curl_cffi Session
+        self.session = Session()
+        
+        # Set up headers with API key if provided
+        self.headers = {
+            "Content-Type": "application/json",
+        }
+        
+        if api_key:
+            self.headers["Authorization"] = f"Bearer {api_key}"
+        
+        # Try to use LitAgent for browser fingerprinting
+        try:
+            agent = LitAgent()
+            fingerprint = agent.generate_fingerprint(browser)
+            
+            self.headers.update({
+                "Accept": fingerprint["accept"],
+                "Accept-Encoding": "gzip, deflate, br, zstd",
+                "Accept-Language": fingerprint["accept_language"],
+                "Cache-Control": "no-cache",
+                "Connection": "keep-alive",
+                "Origin": "https://console.groq.com",
+                "Pragma": "no-cache",
+                "Referer": "https://console.groq.com/",
+                "Sec-Fetch-Dest": "empty",
+                "Sec-Fetch-Mode": "cors",
+                "Sec-Fetch-Site": "same-site",
+                "Sec-CH-UA": 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'"{fingerprint["platform"]}"',
+                "User-Agent": fingerprint["user_agent"],
+            })
+        except (NameError, Exception):
+            # Fallback to basic headers if LitAgent is not available
+            self.headers.update({
+                "Accept": "application/json",
+                "Accept-Encoding": "gzip, deflate, br",
+                "Accept-Language": "en-US,en;q=0.9",
+                "User-Agent": "Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/120.0.0.0 Safari/537.36",
+            })
+        
+        # Update session headers
+        self.session.headers.update(self.headers)
+        
+        # Initialize chat interface
+        self.chat = Chat(self)
+    
+    @classmethod
+    def get_models(cls, api_key: str = None):
+        """Fetch available models from Groq API.
+        
+        Args:
+            api_key (str, optional): Groq API key. If not provided, returns default models.
+            
+        Returns:
+            list: List of available model IDs
+        """
+        if not api_key:
+            return cls.AVAILABLE_MODELS
+            
+        try:
+            # Use a temporary curl_cffi session for this class method
+            temp_session = Session()
+            headers = {
+                "Content-Type": "application/json",
+                "Authorization": f"Bearer {api_key}",
+            }
+            
+            response = temp_session.get(
+                "https://api.groq.com/openai/v1/models",
+                headers=headers,
+                impersonate="chrome110"  # Use impersonate for fetching
+            )
+            
+            if response.status_code != 200:
+                return cls.AVAILABLE_MODELS
+                
+            data = response.json()
+            if "data" in data and isinstance(data["data"], list):
+                return [model["id"] for model in data["data"]]
+            return cls.AVAILABLE_MODELS
+            
+        except (CurlError, Exception):
+            # Fallback to default models list if fetching fails
+            return cls.AVAILABLE_MODELS

webscout/Provider/OPENAI/heckai.py

@@ -249,10 +249,14 @@ class HeckAI(OpenAICompatibleProvider):
     """
 
     AVAILABLE_MODELS = [
+        "google/gemini-2.0-flash-001",
         "deepseek/deepseek-chat",
-        "openai/gpt-4o-mini",
         "deepseek/deepseek-r1",
-        "google/gemini-2.0-flash-001"
+        "openai/gpt-4o-mini",
+        "openai/gpt-4.1-mini",
+        "x-ai/grok-3-mini-beta",
+        "meta-llama/llama-4-scout"
+
     ]
 
     def __init__(