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

webscout/Provider/HeckAI.py

@@ -13,11 +13,31 @@ from webscout.litagent import LitAgent
 
 class HeckAI(Provider):
     """
-    A class to interact with the HeckAI API with LitAgent user-agent.
+    Provides an interface to interact with the HeckAI API using a LitAgent user-agent.
+
+    This class supports conversational AI interactions with multiple available models,
+    manages session state, handles streaming and non-streaming responses, and integrates
+    with conversation history and prompt optimizers.
+
+    Attributes:
+        AVAILABLE_MODELS (list): List of supported model identifiers.
+        url (str): API endpoint URL.
+        session_id (str): Unique session identifier for the conversation.
+        language (str): Language for the conversation.
+        headers (dict): HTTP headers used for API requests.
+        session (Session): curl_cffi session for HTTP requests.
+        is_conversation (bool): Whether to maintain conversation history.
+        max_tokens_to_sample (int): Maximum tokens to sample (not used by API).
+        timeout (int): Request timeout in seconds.
+        last_response (dict): Stores the last API response.
+        model (str): Model identifier in use.
+        previous_question (str): Last question sent to the API.
+        previous_answer (str): Last answer received from the API.
+        conversation (Conversation): Conversation history manager.
     """
 
     AVAILABLE_MODELS = [
-        "google/gemini-2.0-flash-001",
+        "google/gemini-2.5-flash-preview",
         "deepseek/deepseek-chat",
         "deepseek/deepseek-r1",
         "openai/gpt-4o-mini",
@@ -29,7 +49,7 @@ class HeckAI(Provider):
     def __init__(
         self,
         is_conversation: bool = True,
-        max_tokens: int = 2049, # Note: max_tokens is not used by this API
+        max_tokens: int = 2049,
         timeout: int = 30,
         intro: str = None,
         filepath: str = None,
@@ -40,7 +60,25 @@ class HeckAI(Provider):
         model: str = "google/gemini-2.0-flash-001",
         language: str = "English"
     ):
-        """Initializes the HeckAI API client."""
+        """
+        Initializes the HeckAI API client.
+
+        Args:
+            is_conversation (bool): Whether to maintain conversation history.
+            max_tokens (int): Maximum tokens to sample (not used by this API).
+            timeout (int): Timeout for API requests in seconds.
+            intro (str, optional): Introductory prompt for the conversation.
+            filepath (str, optional): File path for storing conversation history.
+            update_file (bool): Whether to update the conversation file.
+            proxies (dict): Proxy settings for HTTP requests.
+            history_offset (int): Offset for conversation history truncation.
+            act (str, optional): Role or act for the conversation.
+            model (str): Model identifier to use.
+            language (str): Language for the conversation.
+
+        Raises:
+            ValueError: If the provided model is not in AVAILABLE_MODELS.
+        """
         if model not in self.AVAILABLE_MODELS:
             raise ValueError(f"Invalid model: {model}. Choose from: {self.AVAILABLE_MODELS}")
             
@@ -53,6 +91,7 @@ class HeckAI(Provider):
             'Content-Type': 'application/json',
             'Origin': 'https://heck.ai', # Keep Origin
             'Referer': 'https://heck.ai/', # Keep Referer
+            'User-Agent': LitAgent().random(), # Use random user agent
         }
         
         # Initialize curl_cffi Session
@@ -90,11 +129,29 @@ class HeckAI(Provider):
     def ask(
         self,
         prompt: str,
-        stream: bool = False, # API supports streaming
+        stream: bool = False,
         raw: bool = False,
         optimizer: str = None,
         conversationally: bool = False,
     ) -> Union[Dict[str, Any], Generator]:
+        """
+        Sends a prompt to the HeckAI API and returns the response.
+
+        Args:
+            prompt (str): The prompt or question to send to the API.
+            stream (bool): If True, yields streaming responses as they arrive.
+            raw (bool): If True, yields raw string chunks instead of dicts.
+            optimizer (str, optional): Name of the optimizer to apply to the prompt.
+            conversationally (bool): If True, optimizer is applied to the full conversation prompt.
+
+        Returns:
+            Union[Dict[str, Any], Generator]: If stream is False, returns a dict with the response text.
+            If stream is True, yields response chunks as dicts or strings.
+
+        Raises:
+            Exception: If the optimizer is not available.
+            exceptions.FailedToGenerateResponseError: On API or network errors.
+        """
         conversation_prompt = self.conversation.gen_complete_prompt(prompt)
         if optimizer:
             if optimizer in self.__available_optimizers:
@@ -132,16 +189,16 @@ class HeckAI(Provider):
                 response.raise_for_status() # Check for HTTP errors
 
                 # Use sanitize_stream to process the stream
-                processed_stream = sanitize_stream(
-                data=response.iter_content(chunk_size=1024), # Pass byte iterator
-                intro_value="data: ",  # Prefix to remove (note the space)
-                to_json=False,        # Content is text
-                start_marker="data: [ANSWER_START]",
-                end_marker="data: [ANSWER_DONE]",
-                skip_markers=["data: [RELATE_Q_START]", "data: [RELATE_Q_DONE]", "data: [REASON_START]", "data: [REASON_DONE]"],
-                yield_raw_on_error=True,
-                strip_chars=" \n\r\t"  # Strip whitespace characters from chunks
-                )
+                processed_stream = sanitize_stream(
+                data=response.iter_content(chunk_size=1024), # Pass byte iterator
+                intro_value="data: ",  # Prefix to remove (note the space)
+                to_json=False,        # Content is text
+                start_marker="data: [ANSWER_START]",
+                end_marker="data: [ANSWER_DONE]",
+                skip_markers=["data: [RELATE_Q_START]", "data: [RELATE_Q_DONE]", "data: [REASON_START]", "data: [REASON_DONE]"],
+                yield_raw_on_error=True,
+                strip_chars=" \n\r\t"  # Strip whitespace characters from chunks
+                )
 
                 for content_chunk in processed_stream:
                     # content_chunk is the text between ANSWER_START and ANSWER_DONE
@@ -151,19 +208,19 @@ class HeckAI(Provider):
                 
                 # Only update history if we received a valid response
                 if streaming_text:
-                    # Update history and previous answer after stream finishes
-                    self.previous_answer = streaming_text
-                    # Convert to simple text before updating conversation
-                    try:
-                        # Ensure content is valid before updating conversation
-                        if streaming_text and isinstance(streaming_text, str):
-                            # Sanitize the content to ensure it's valid
-                            sanitized_text = streaming_text.strip()
-                            if sanitized_text:  # Only update if we have non-empty content
-                                self.conversation.update_chat_history(prompt, sanitized_text)
-                    except Exception as e:
-                        # If conversation update fails, log but don't crash
-                        print(f"Warning: Failed to update conversation history: {str(e)}")
+                    # Update history and previous answer after stream finishes
+                    self.previous_answer = streaming_text
+                    # Convert to simple text before updating conversation
+                    try:
+                        # Ensure content is valid before updating conversation
+                        if streaming_text and isinstance(streaming_text, str):
+                            # Sanitize the content to ensure it's valid
+                            sanitized_text = streaming_text.strip()
+                            if sanitized_text:  # Only update if we have non-empty content
+                                self.conversation.update_chat_history(prompt, sanitized_text)
+                    except Exception as e:
+                        # If conversation update fails, log but don't crash
+                        print(f"Warning: Failed to update conversation history: {str(e)}")
                     
             except CurlError as e: # Catch CurlError
                 raise exceptions.FailedToGenerateResponseError(f"Request failed (CurlError): {str(e)}") from e
@@ -197,6 +254,15 @@ class HeckAI(Provider):
 
     @staticmethod
     def fix_encoding(text):
+        """
+        Fixes encoding issues in the response text.
+
+        Args:
+            text (Union[str, dict]): The text or response dict to fix encoding for.
+
+        Returns:
+            Union[str, dict]: The text or dict with encoding corrected if possible.
+        """
         if isinstance(text, dict) and "text" in text:
             try:
                 text["text"] = text["text"].encode("latin1").decode("utf-8")
@@ -210,13 +276,25 @@ class HeckAI(Provider):
                 return text
         return text
 
-    def chat(
-        self,
-        prompt: str,
-        stream: bool = False,
-        optimizer: str = None,
-        conversationally: bool = False,
-    ) -> Union[str, Generator[str, None, None]]: # Corrected return type hint
+    def chat(
+        self,
+        prompt: str,
+        stream: bool = False,
+        optimizer: str = None,
+        conversationally: bool = False,
+    ) -> Union[str, Generator[str, None, None]]:
+        """
+        Sends a prompt to the HeckAI API and returns only the message text.
+
+        Args:
+            prompt (str): The prompt or question to send to the API.
+            stream (bool): If True, yields streaming response text.
+            optimizer (str, optional): Name of the optimizer to apply to the prompt.
+            conversationally (bool): If True, optimizer is applied to the full conversation prompt.
+
+        Returns:
+            Union[str, Generator[str, None, None]]: The response text, or a generator yielding text chunks.
+        """
         def for_stream_chat():
             # ask() yields dicts or strings when streaming
             gen = self.ask(
@@ -236,50 +314,62 @@ class HeckAI(Provider):
             
         return for_stream_chat() if stream else for_non_stream_chat()
 
-    def get_message(self, response: dict) -> str:
-        # Validate response format
-        if not isinstance(response, dict):
-            raise TypeError(f"Expected dict response, got {type(response).__name__}")
-        
-        # Handle missing text key gracefully
-        if "text" not in response:
-            return ""
-        
-        # Ensure text is a string
-        text = response["text"]
-        if not isinstance(text, str):
-            return str(text)
-            
-        return text
-
-if __name__ == "__main__":
-    # Ensure curl_cffi is installed
-    print("-" * 80)
-    print(f"{'Model':<50} {'Status':<10} {'Response'}")
-    print("-" * 80)
-
-    for model in HeckAI.AVAILABLE_MODELS:
-        try:
-            test_ai = HeckAI(model=model, timeout=60)
-            # Use non-streaming mode first to avoid potential streaming issues
-            try:
-                response_text = test_ai.chat("Say 'Hello' in one word", stream=False)
-                print(f"\r{model:<50} {'✓':<10} {response_text.strip()[:50]}")
-            except Exception as e1:
-                # Fall back to streaming if non-streaming fails
-                print(f"\r{model:<50} {'Testing stream...':<10}", end="", flush=True)
-                response = test_ai.chat("Say 'Hello' in one word", stream=True)
-                response_text = ""
-                for chunk in response:
-                    if chunk and isinstance(chunk, str):
-                        response_text += chunk
-                
-                if response_text and len(response_text.strip()) > 0:
-                    status = "✓"
-                    # Truncate response if too long
-                    display_text = response_text.strip()[:50] + "..." if len(response_text.strip()) > 50 else response_text.strip()
-                    print(f"\r{model:<50} {status:<10} {display_text}")
-                else:
-                    raise ValueError("Empty or invalid response")
-        except Exception as e:
-            print(f"\r{model:<50} {'✗':<10} {str(e)}")
+    def get_message(self, response: dict) -> str:
+        """
+        Extracts the message text from the API response.
+
+        Args:
+            response (dict): The API response dictionary.
+
+        Returns:
+            str: The extracted message text. Returns an empty string if not found.
+
+        Raises:
+            TypeError: If the response is not a dictionary.
+        """
+        # Validate response format
+        if not isinstance(response, dict):
+            raise TypeError(f"Expected dict response, got {type(response).__name__}")
+
+        # Handle missing text key gracefully
+        if "text" not in response:
+            return ""
+
+        # Ensure text is a string
+        text = response["text"]
+        if not isinstance(text, str):
+            return str(text)
+
+        return text
+
+if __name__ == "__main__":
+    # Ensure curl_cffi is installed
+    print("-" * 80)
+    print(f"{'Model':<50} {'Status':<10} {'Response'}")
+    print("-" * 80)
+
+    for model in HeckAI.AVAILABLE_MODELS:
+        try:
+            test_ai = HeckAI(model=model, timeout=60)
+            # Use non-streaming mode first to avoid potential streaming issues
+            try:
+                response_text = test_ai.chat("Say 'Hello' in one word", stream=False)
+                print(f"\r{model:<50} {'✓':<10} {response_text.strip()[:50]}")
+            except Exception as e1:
+                # Fall back to streaming if non-streaming fails
+                print(f"\r{model:<50} {'Testing stream...':<10}", end="", flush=True)
+                response = test_ai.chat("Say 'Hello' in one word", stream=True)
+                response_text = ""
+                for chunk in response:
+                    if chunk and isinstance(chunk, str):
+                        response_text += chunk
+                
+                if response_text and len(response_text.strip()) > 0:
+                    status = "✓"
+                    # Truncate response if too long
+                    display_text = response_text.strip()[:50] + "..." if len(response_text.strip()) > 50 else response_text.strip()
+                    print(f"\r{model:<50} {status:<10} {display_text}")
+                else:
+                    raise ValueError("Empty or invalid response")
+        except Exception as e:
+            print(f"\r{model:<50} {'✗':<10} {str(e)}")

webscout/Provider/LambdaChat.py

@@ -21,6 +21,7 @@ class LambdaChat(Provider):
 
     AVAILABLE_MODELS = [
         "deepseek-llama3.3-70b",
+        "apriel-5b-instruct",
         "deepseek-r1",
         "hermes-3-llama-3.1-405b-fp8",
         "llama3.1-nemotron-70b-instruct",

webscout/Provider/MCPCore.py

@@ -66,9 +66,13 @@ class MCPCore(Provider):
     ):
         """Initializes the MCPCore API client."""
         if model not in self.AVAILABLE_MODELS:
-            print(f"Warning: Model '{model}' not in known AVAILABLE_MODELS. Attempting to use anyway.")
+            print(f"Warning: Model '{model}' is not listed in AVAILABLE_MODELS. Proceeding with the provided model.")
 
         self.api_endpoint = "https://chat.mcpcore.xyz/api/chat/completions"
+        
+        # Cache the user-agent at the class level
+        if not hasattr(MCPCore, '_cached_user_agent'):
+            MCPCore._cached_user_agent = LitAgent().random()
         self.model = model
         self.system_prompt = system_prompt
         self.cookies_path = cookies_path
@@ -82,7 +86,7 @@ class MCPCore(Provider):
             'authority': 'chat.mcpcore.xyz',
             'accept': '*/*',
             'accept-language': 'en-US,en;q=0.9,en-IN;q=0.8',
-            'authorization': f'Bearer {self.token}' if self.token else '',
+            **({'authorization': f'Bearer {self.token}'} if self.token else {}),
             'content-type': 'application/json',
             'dnt': '1',
             'origin': 'https://chat.mcpcore.xyz',
@@ -95,7 +99,7 @@ class MCPCore(Provider):
             'sec-fetch-mode': 'cors',
             'sec-fetch-site': 'same-origin',
             'sec-gpc': '1',
-            'user-agent': LitAgent().random(),
+            'user-agent': self._cached_user_agent,
         }
 
         # Apply headers, proxies, and cookies to the session