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

webscout/Provider/freeaichat.py

@@ -1,6 +1,7 @@
+import re
 import requests
 import json
-import time
+import uuid
 from typing import Any, Dict, Optional, Generator, Union
 
 from webscout.AIutel import Optimizers
@@ -27,6 +28,12 @@ class FreeAIChat(Provider):
         "O3 Mini",
         "O3 Mini High",
         "O3 Mini Low",
+        "O4 Mini",
+        "O4 Mini High",
+        "GPT 4.1",
+        "o3",
+        "GPT 4.1 Mini",
+
 
         # Anthropic Models
         "Claude 3.5 haiku",
@@ -74,8 +81,9 @@ class FreeAIChat(Provider):
 
     def __init__(
         self,
+        api_key: str,
         is_conversation: bool = True,
-        max_tokens: int = 2049,
+        max_tokens: int = 150,
         timeout: int = 30,
         intro: str = None,
         filepath: str = None,
@@ -83,8 +91,9 @@ class FreeAIChat(Provider):
         proxies: dict = {},
         history_offset: int = 10250,
         act: str = None,
-        model: str = "GPT-4o",
+        model: str = "GPT 4o",
         system_prompt: str = "You are a helpful AI assistant.",
+        temperature: float = 0.7,
     ):
         """Initializes the FreeAIChat API client."""
         if model not in self.AVAILABLE_MODELS:
@@ -105,11 +114,13 @@ class FreeAIChat(Provider):
         self.session.proxies.update(proxies)
 
         self.is_conversation = is_conversation
-        self.max_tokens_to_sample = max_tokens
+        self.max_tokens = max_tokens
         self.timeout = timeout
         self.last_response = {}
         self.model = model
         self.system_prompt = system_prompt
+        self.temperature = temperature
+        self.api_key = api_key
 
         self.__available_optimizers = (
             method
@@ -125,10 +136,21 @@ class FreeAIChat(Provider):
         )
 
         self.conversation = Conversation(
-            is_conversation, self.max_tokens_to_sample, filepath, update_file
+            is_conversation, self.max_tokens, filepath, update_file
         )
         self.conversation.history_offset = history_offset
 
+    @staticmethod
+    def _extractor(chunk: Union[str, Dict[str, Any]]) -> Optional[str]:
+        """Extracts content from the x0gpt stream format '0:"..."'."""
+        if isinstance(chunk, str):
+            match = re.search(r'0:"(.*?)"', chunk)
+            if match:
+                # Decode potential unicode escapes like \u00e9
+                content = match.group(1).encode().decode('unicode_escape')
+                return content.replace('\\\\', '\\').replace('\\"', '"') # Handle escaped backslashes and quotes
+        return None
+
     def ask(
         self,
         prompt: str,
@@ -146,24 +168,19 @@ class FreeAIChat(Provider):
             else:
                 raise Exception(f"Optimizer is not one of {self.__available_optimizers}")
 
-        messages = [
-            {
-                "id": str(int(time.time() * 1000)),
+        payload = {
+            "id": str(uuid.uuid4()),
+            "messages": [{
                 "role": "user",
                 "content": conversation_prompt,
-                "model": {
-                    # "id": "14",
-                    "name": self.model,
-                    # "icon": "https://cdn-avatars.huggingface.co/v1/production/uploads/1620805164087-5ec0135ded25d76864d553f1.png",
-                    # "provider": "openAI",
-                    # "contextWindow": 63920
-                }
-            }
-        ]
-
-        payload = {
+                "parts": [{"type": "text", "text": conversation_prompt}]
+            }],
             "model": self.model,
-            "messages": messages
+            "config": {
+                "temperature": self.temperature,
+                "maxTokens": self.max_tokens
+            },
+            "apiKey": self.api_key
         }
 
         def for_stream():
@@ -174,28 +191,25 @@ class FreeAIChat(Provider):
                             f"Request failed with status code {response.status_code}"
                         )
                     
-                    streaming_text = ""
-                    for line in response.iter_lines(decode_unicode=True):
-                        if line:
-                            line = line.strip()
-                            if line.startswith("data: "):
-                                json_str = line[6:]  # Remove "data: " prefix
-                                if json_str == "[DONE]":
-                                    break
-                                try:
-                                    json_data = json.loads(json_str)
-                                    if 'choices' in json_data:
-                                        choice = json_data['choices'][0]
-                                        if 'delta' in choice and 'content' in choice['delta']:
-                                            content = choice['delta']['content']
-                                            streaming_text += content
-                                            resp = dict(text=content)
-                                            yield resp if raw else resp
-                                except json.JSONDecodeError:
-                                    pass
-                    
-                    self.conversation.update_chat_history(prompt, streaming_text)
-                        
+                    streaming_response = ""
+                    processed_stream = sanitize_stream(
+                        data=response.iter_lines(decode_unicode=True),
+                        intro_value=None,
+                        to_json=False,
+                        content_extractor=self._extractor,
+                        skip_markers=None
+                    )
+
+                    for content_chunk in processed_stream:
+                        if content_chunk and isinstance(content_chunk, str):
+                            streaming_response += content_chunk
+                            yield dict(text=content_chunk) if raw else dict(text=content_chunk)
+
+                    self.last_response.update(dict(text=streaming_response))
+                    self.conversation.update_chat_history(
+                        prompt, self.get_message(self.last_response)
+                    )
+
             except requests.RequestException as e:
                 raise exceptions.FailedToGenerateResponseError(f"Request failed: {e}")
 
@@ -268,4 +282,4 @@ if __name__ == "__main__":
                 display_text = "Empty or invalid response"
             print(f"\r{model:<50} {status:<10} {display_text}")
         except Exception as e:
-            print(f"\r{model:<50} {'✗':<10} {str(e)}")
+            print(f"\r{model:<50} {'✗':<10} {str(e)}")

webscout/Provider/granite.py

@@ -1,9 +1,9 @@
 from curl_cffi.requests import Session
 from curl_cffi import CurlError
 import json
-from typing import Union, Any, Dict, Generator
+from typing import Optional, Union, Any, Dict, Generator
 
-from webscout.AIutel import Optimizers, Conversation, AwesomePrompts
+from webscout.AIutel import Optimizers, Conversation, AwesomePrompts, sanitize_stream # Import sanitize_stream
 from webscout.AIbase import Provider
 from webscout import exceptions
 from webscout.litagent import LitAgent as Lit
@@ -77,6 +77,13 @@ class IBMGranite(Provider):
         self.conversation = Conversation(is_conversation, self.max_tokens_to_sample, filepath, update_file)
         self.conversation.history_offset = history_offset
 
+    @staticmethod
+    def _granite_extractor(chunk: Union[str, Dict[str, Any]]) -> Optional[str]:
+        """Extracts content from IBM Granite stream JSON lists [3, "text"]."""
+        if isinstance(chunk, list) and len(chunk) == 2 and chunk[0] == 3 and isinstance(chunk[1], str):
+            return chunk[1]
+        return None
+
     def ask(
         self,
         prompt: str,
@@ -127,25 +134,21 @@ class IBMGranite(Provider):
                 )
                 response.raise_for_status() # Check for HTTP errors
 
-                # Iterate over bytes and decode manually
-                for line_bytes in response.iter_lines():
-                    if line_bytes:
-                        try:
-                            line = line_bytes.decode('utf-8')
-                            data = json.loads(line)
-                            # Check the specific format [3, "text_chunk"]
-                            if isinstance(data, list) and len(data) == 2 and data[0] == 3 and isinstance(data[1], str):
-                                content = data[1]
-                                if content: # Ensure content is not None or empty
-                                    streaming_text += content
-                                    resp = dict(text=content)
-                                    # Yield dict or raw string chunk
-                                    yield resp if not raw else content
-                            else:
-                                # Skip unrecognized lines/formats
-                                pass
-                        except (json.JSONDecodeError, UnicodeDecodeError):
-                            continue # Ignore lines that are not valid JSON or cannot be decoded
+                # Use sanitize_stream
+                processed_stream = sanitize_stream(
+                    data=response.iter_content(chunk_size=None), # Pass byte iterator
+                    intro_value=None, # No prefix
+                    to_json=True,     # Stream sends JSON lines (which are lists)
+                    content_extractor=self._granite_extractor, # Use the specific extractor
+                    yield_raw_on_error=False # Skip non-JSON lines or lines where extractor fails
+                )
+
+                for content_chunk in processed_stream:
+                    # content_chunk is the string extracted by _granite_extractor
+                    if content_chunk and isinstance(content_chunk, str):
+                        streaming_text += content_chunk
+                        resp = dict(text=content_chunk)
+                        yield resp if not raw else content_chunk
                 
                 # Update history after stream finishes
                 self.last_response = dict(text=streaming_text)

webscout/Provider/hermes.py

@@ -4,7 +4,7 @@ import json
 from typing import Union, Any, Dict, Generator, Optional
 
 from webscout.AIutel import Optimizers
-from webscout.AIutel import Conversation
+from webscout.AIutel import Conversation, sanitize_stream # Import sanitize_stream
 from webscout.AIutel import AwesomePrompts
 from webscout.AIbase import Provider
 from webscout import exceptions
@@ -102,6 +102,13 @@ class NousHermes(Provider):
             print(f"Warning: Error loading cookies: {e}")
             return None
 
+    @staticmethod
+    def _hermes_extractor(chunk: Union[str, Dict[str, Any]]) -> Optional[str]:
+        """Extracts content from Hermes stream JSON objects."""
+        if isinstance(chunk, dict) and chunk.get('type') == 'llm_response':
+            return chunk.get('content')
+        return None
+
 
     def ask(
         self,
@@ -145,36 +152,36 @@ class NousHermes(Provider):
             "top_p": self.top_p,
         }
         def for_stream():
-            full_response = ""
+            streaming_text = "" # Initialize outside try block
             try:
                 response = self.session.post(
                     self.api_endpoint, 
                     json=payload, 
                     stream=True, 
                     timeout=self.timeout,
-                    impersonate="chrome110"
+                    impersonate="chrome110" # Keep impersonate
                 )
                 response.raise_for_status()
 
-                for line_bytes in response.iter_lines():
-                    if line_bytes:
-                        try:
-                            decoded_line = line_bytes.decode('utf-8')
-                            if decoded_line.startswith('data: '):
-                                data_str = decoded_line.replace('data: ', '', 1)
-                                data = json.loads(data_str)
-                                if data.get('type') == 'llm_response':
-                                    content = data.get('content', '')
-                                    if content:
-                                        full_response += content
-                                        resp = dict(text=content)
-                                        yield resp if not raw else content
-                        except (json.JSONDecodeError, UnicodeDecodeError):
-                            continue
+                # Use sanitize_stream
+                processed_stream = sanitize_stream(
+                    data=response.iter_content(chunk_size=None), # Pass byte iterator
+                    intro_value="data:",
+                    to_json=True,     # Stream sends JSON
+                    content_extractor=self._hermes_extractor, # Use the specific extractor
+                    yield_raw_on_error=False # Skip non-JSON lines or lines where extractor fails
+                )
+
+                for content_chunk in processed_stream:
+                    # content_chunk is the string extracted by _hermes_extractor
+                    if content_chunk and isinstance(content_chunk, str):
+                        streaming_text += content_chunk
+                        resp = dict(text=content_chunk)
+                        yield resp if not raw else content_chunk
 
-                self.last_response = dict(text=full_response)
+                self.last_response = dict(text=streaming_text) # Use streaming_text
                 self.conversation.update_chat_history(
-                    prompt, full_response
+                    prompt, streaming_text # Use streaming_text
                 )
 
             except CurlError as e:

webscout/Provider/learnfastai.py

@@ -1,12 +1,12 @@
 import os
 import json
-from typing import Optional, Union, Generator
+from typing import Any, Dict, Optional, Union, Generator
 import uuid
 from curl_cffi.requests import Session
 from curl_cffi import CurlError
 
 from webscout.AIutel import Optimizers
-from webscout.AIutel import Conversation
+from webscout.AIutel import Conversation, sanitize_stream # Import sanitize_stream
 from webscout.AIutel import AwesomePrompts
 from webscout.AIbase import Provider
 from webscout import exceptions
@@ -79,6 +79,13 @@ class LearnFast(Provider):
         )
         self.conversation.history_offset = history_offset
 
+    @staticmethod
+    def _learnfast_extractor(chunk: Union[str, Dict[str, Any]]) -> Optional[str]:
+        """Extracts message content from LearnFast stream JSON objects."""
+        if isinstance(chunk, dict) and chunk.get('code') == 200 and chunk.get('data'):
+            return chunk['data'].get('message')
+        return None
+
     def generate_unique_id(self) -> str:
         """Generate a 32-character hexadecimal unique ID."""
         return uuid.uuid4().hex
@@ -209,24 +216,22 @@ class LearnFast(Provider):
                 )
                 response.raise_for_status()  # Check for HTTP errors
 
-                # Process the streamed response
-                # Iterate over bytes and decode manually
-                for line_bytes in response.iter_lines():
-                    if line_bytes:
-                        try:
-                            line = line_bytes.decode('utf-8').strip()
-                            if line == "[DONE]":
-                                break
-                            json_response = json.loads(line)
-                            if json_response.get('code') == 200 and json_response.get('data'):
-                                message = json_response['data'].get('message', '')
-                                if message:
-                                    full_response += message
-                                    resp = {"text": message}
-                                    # Yield dict or raw string chunk
-                                    yield resp if not raw else message
-                        except (json.JSONDecodeError, UnicodeDecodeError):
-                            pass # Ignore lines that are not valid JSON or cannot be decoded
+                # Use sanitize_stream
+                processed_stream = sanitize_stream(
+                    data=response.iter_content(chunk_size=None), # Pass byte iterator
+                    intro_value=None, # No prefix
+                    to_json=True,     # Stream sends JSON lines
+                    skip_markers=["[DONE]"],
+                    content_extractor=self._learnfast_extractor, # Use the specific extractor
+                    yield_raw_on_error=False # Skip non-JSON lines or lines where extractor fails
+                )
+
+                for content_chunk in processed_stream:
+                    # content_chunk is the string extracted by _learnfast_extractor
+                    if content_chunk and isinstance(content_chunk, str):
+                        full_response += content_chunk
+                        resp = {"text": content_chunk}
+                        yield resp if not raw else content_chunk
                 
                 # Update history after stream finishes
                 self.last_response = {"text": full_response}

webscout/Provider/llmchatco.py

@@ -5,7 +5,7 @@ import uuid
 import re
 from typing import Union, Any, Dict, Optional, Generator, List
 
-from webscout.AIutel import Optimizers
+from webscout.AIutel import Optimizers, sanitize_stream # Import sanitize_stream
 from webscout.AIutel import Conversation
 from webscout.AIutel import AwesomePrompts
 from webscout.AIbase import Provider
@@ -66,15 +66,15 @@ class LLMChatCo(Provider):
         self.model = model
         self.system_prompt = system_prompt
         self.thread_id = str(uuid.uuid4())  # Generate a unique thread ID for conversations
-        
+
         # Create LitAgent instance (keep if needed for other headers)
         lit_agent = Lit()
-        
+
         # Headers based on the provided request
         self.headers = {
             "Content-Type": "application/json",
             "Accept": "text/event-stream",
-            "User-Agent": lit_agent.random(), 
+            "User-Agent": lit_agent.random(),
             "Accept-Language": "en-US,en;q=0.9",
             "Origin": "https://llmchat.co",
             "Referer": f"https://llmchat.co/chat/{self.thread_id}",
@@ -109,24 +109,16 @@ class LLMChatCo(Provider):
         # Store message history for conversation context
         self.last_assistant_response = ""
 
-    def parse_sse(self, data):
-        """Parse Server-Sent Events data"""
-        if not data or not data.strip():
-            return None
-            
-        # Check if it's an event line
-        if data.startswith('event:'):
-            return {'event': data[6:].strip()}
-            
-        # Check if it's data
-        if data.startswith('data:'):
-            data_content = data[5:].strip()
-            if data_content:
-                try:
-                    return {'data': json.loads(data_content)}
-                except json.JSONDecodeError:
-                    return {'data': data_content}
-        
+    @staticmethod
+    def _llmchatco_extractor(chunk: Union[str, Dict[str, Any]]) -> Optional[str]:
+        """Extracts text content from LLMChat.co stream JSON objects."""
+        if isinstance(chunk, dict) and "answer" in chunk:
+            answer = chunk["answer"]
+            # Prefer fullText if available and status is COMPLETED
+            if answer.get("fullText") and answer.get("status") == "COMPLETED":
+                return answer["fullText"]
+            elif "text" in answer:
+                return answer["text"]
         return None
 
     def ask(
@@ -176,62 +168,40 @@ class LLMChatCo(Provider):
             try:
                 # Use curl_cffi session post with impersonate
                 response = self.session.post(
-                    self.api_endpoint, 
-                    json=payload, 
+                    self.api_endpoint,
+                    json=payload,
                     # headers are set on the session
-                    stream=True, 
+                    stream=True,
                     timeout=self.timeout,
                     # proxies are set on the session
                     impersonate="chrome110" # Use a common impersonation profile
                 )
                 response.raise_for_status() # Check for HTTP errors
-                
-                # Process the SSE stream
-                current_event = None
-                buffer = ""
-                
-                # Iterate over bytes and decode manually
-                for chunk in response.iter_content(chunk_size=None, decode_unicode=False): # Use chunk_size=None for better SSE handling
-                    if not chunk:
-                        continue
-                    
-                    # Decode the chunk and add to buffer
-                    buffer += chunk.decode('utf-8', errors='replace') # Use replace for potential errors
-                    
-                    # Process complete lines in the buffer
-                    while '\n' in buffer:
-                        line, buffer = buffer.split('\n', 1)
-                        line = line.strip()
-                        
-                        if not line:
-                            continue
-                            
-                        if line.startswith('event:'):
-                            current_event = line[6:].strip()
-                        elif line.startswith('data:'):
-                            data_content = line[5:].strip()
-                            if data_content and current_event == 'answer':
-                                try:
-                                    json_data = json.loads(data_content)
-                                    if "answer" in json_data and "text" in json_data["answer"]:
-                                        text_chunk = json_data["answer"]["text"]
-                                        # If there's a fullText, use it as it's more complete
-                                        if json_data["answer"].get("fullText") and json_data["answer"].get("status") == "COMPLETED":
-                                            text_chunk = json_data["answer"]["fullText"]
-                                            
-                                        # Extract only new content since last chunk
-                                        new_text = text_chunk[len(full_response):]
-                                        if new_text:
-                                            full_response = text_chunk # Update full response tracker
-                                            resp = dict(text=new_text)
-                                            # Yield dict or raw string chunk
-                                            yield resp if not raw else new_text
-                                except json.JSONDecodeError:
-                                    continue # Ignore invalid JSON data
-                            elif data_content and current_event == 'done':
-                                # Handle potential final data before done event if needed
-                                break # Exit loop on 'done' event
-                
+
+                # Use sanitize_stream
+                # Note: This won't handle SSE 'event:' lines, only 'data:' lines.
+                # The original code checked for event == 'answer'. We assume relevant data is JSON after 'data:'.
+                processed_stream = sanitize_stream(
+                    data=response.iter_content(chunk_size=None), # Pass byte iterator
+                    intro_value="data:",
+                    to_json=True,     # Stream sends JSON
+                    content_extractor=self._llmchatco_extractor, # Use the specific extractor
+                    yield_raw_on_error=False # Skip non-JSON lines or lines where extractor fails
+                )
+
+                last_yielded_text = ""
+                for current_full_text in processed_stream:
+                    # current_full_text is the full text extracted by _llmchatco_extractor
+                    if current_full_text and isinstance(current_full_text, str):
+                        # Calculate the new part of the text
+                        new_text = current_full_text[len(last_yielded_text):]
+                        if new_text:
+                            full_response = current_full_text # Keep track of the latest full text
+                            last_yielded_text = current_full_text # Update tracker
+                            resp = dict(text=new_text)
+                            # Yield dict or raw string chunk
+                            yield resp if not raw else new_text
+
                 # Update history after stream finishes
                 self.last_response = dict(text=full_response)
                 self.last_assistant_response = full_response
@@ -244,7 +214,7 @@ class LLMChatCo(Provider):
             except Exception as e: # Catch other potential exceptions (like HTTPError)
                 err_text = getattr(e, 'response', None) and getattr(e.response, 'text', '')
                 raise exceptions.FailedToGenerateResponseError(f"Unexpected error ({type(e).__name__}): {str(e)} - {err_text}") from e
-        
+
         def for_non_stream():
             # Aggregate the stream using the updated for_stream logic
             full_response_text = ""
@@ -261,7 +231,7 @@ class LLMChatCo(Provider):
                 # If aggregation fails but some text was received, use it. Otherwise, re-raise.
                 if not full_response_text:
                     raise exceptions.FailedToGenerateResponseError(f"Failed to get non-stream response: {str(e)}") from e
-            
+
             # last_response and history are updated within for_stream
             # Return the final aggregated response dict or raw string
             return full_response_text if raw else self.last_response
@@ -313,17 +283,17 @@ if __name__ == "__main__":
     print("-" * 80)
     print(f"{'Model':<50} {'Status':<10} {'Response'}")
     print("-" * 80)
-    
+
     # Test all available models
     working = 0
     total = len(LLMChatCo.AVAILABLE_MODELS)
-    
+
     for model in LLMChatCo.AVAILABLE_MODELS:
         try:
             test_ai = LLMChatCo(model=model, timeout=60)
             response = test_ai.chat("Say 'Hello' in one word")
             response_text = response
-            
+
             if response_text and len(response_text.strip()) > 0:
                 status = "✓"
                 # Truncate response if too long
@@ -333,4 +303,4 @@ if __name__ == "__main__":
                 display_text = "Empty or invalid response"
             print(f"{model:<50} {status:<10} {display_text}")
         except Exception as e:
-            print(f"{model:<50} {'✗':<10} {str(e)}")
+            print(f"{model:<50} {'✗':<10} {str(e)}")

webscout/Provider/multichat.py

@@ -4,7 +4,7 @@ import json
 import uuid
 from typing import Any, Dict, Union
 from datetime import datetime
-from webscout.AIutel import Optimizers, Conversation, AwesomePrompts
+from webscout.AIutel import Optimizers, Conversation, AwesomePrompts, sanitize_stream # Import sanitize_stream
 from webscout.AIbase import Provider
 from webscout import exceptions
 from webscout.litagent import LitAgent 
@@ -279,8 +279,18 @@ class MultiChatAI(Provider):
         response = self._make_request(payload)
         try:
             # Use response.text which is already decoded
-            full_response = response.text.strip()
-            self.last_response = {"text": full_response}
+            response_text_raw = response.text # Get raw text
+
+            # Process the text using sanitize_stream (even though it's not streaming)
+            processed_stream = sanitize_stream(
+                data=response_text_raw,
+                intro_value=None, # No prefix
+                to_json=False     # It's plain text
+            )
+            # Aggregate the single result
+            full_response = "".join(list(processed_stream)).strip()
+
+            self.last_response = {"text": full_response} # Store processed text
             self.conversation.update_chat_history(prompt, full_response)
             # Return dict or raw string based on raw flag
             return full_response if raw else self.last_response