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

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

webscout/Provider/scira_chat.py

@@ -1,11 +1,12 @@
 from os import system
-import requests
+from curl_cffi import CurlError
+from curl_cffi.requests import Session
 import json
 import uuid
 import re
-from typing import Any, Dict, Optional, Union
+from typing import Any, Dict, Optional, Union, List
 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
@@ -17,15 +18,13 @@ class SciraAI(Provider):
     """
 
     AVAILABLE_MODELS = {
-        "scira-default": "Grok3",
-        "scira-grok-3-mini": "Grok3-mini", # thinking model
+        "scira-default": "Grok3-mini", # thinking model
+        "scira-grok-3": "Grok3", 
         "scira-vision" : "Grok2-Vision", # vision model
         "scira-4.1-mini": "GPT4.1-mini",
         "scira-qwq": "QWQ-32B",
         "scira-o4-mini": "o4-mini",
         "scira-google": "gemini 2.5 flash"
-
-
     }
 
     def __init__(
@@ -92,9 +91,9 @@ class SciraAI(Provider):
             "Sec-Fetch-Site": "same-origin"
         }
 
-        self.session = requests.Session()
+        self.session = Session() # Use curl_cffi Session
         self.session.headers.update(self.headers)
-        self.session.proxies.update(proxies)
+        self.session.proxies = proxies # Assign proxies directly
 
         self.is_conversation = is_conversation
         self.max_tokens_to_sample = max_tokens
@@ -150,12 +149,23 @@ class SciraAI(Provider):
 
         return self.fingerprint
 
+    @staticmethod
+    def _scira_extractor(chunk: Union[str, Dict[str, Any]]) -> Optional[str]:
+        """Extracts content from the Scira stream format '0:"..."'."""
+        if isinstance(chunk, str):
+            match = re.search(r'0:"(.*?)"(?=,|$)', chunk) # Look for 0:"...", possibly followed by comma or end of string
+            if match:
+                # Decode potential unicode escapes like \u00e9 and handle escaped quotes/backslashes
+                content = match.group(1).encode().decode('unicode_escape')
+                return content.replace('\\\\', '\\').replace('\\"', '"')
+        return None
+
     def ask(
         self,
         prompt: str,
         optimizer: str = None,
         conversationally: bool = False,
-    ) -> Dict[str, Any]:
+    ) -> Dict[str, Any]: # Note: Stream parameter removed as API doesn't seem to support it
         conversation_prompt = self.conversation.gen_complete_prompt(prompt)
         if optimizer:
             if optimizer in self.__available_optimizers:
@@ -181,10 +191,16 @@ class SciraAI(Provider):
         }
 
         try:
-            response = self.session.post(self.url, json=payload, timeout=self.timeout)
+            # Use curl_cffi post with impersonate
+            response = self.session.post(
+                self.url,
+                json=payload,
+                timeout=self.timeout,
+                impersonate="chrome120" # Add impersonate
+            )
             if response.status_code != 200:
                 # Try to get response content for better error messages
-                try:
+                try: # Use try-except for reading response content
                     error_content = response.text
                 except:
                     error_content = "<could not read response content>"
@@ -192,7 +208,10 @@ class SciraAI(Provider):
                 if response.status_code in [403, 429]:
                     print(f"Received status code {response.status_code}, refreshing identity...")
                     self.refresh_identity()
-                    response = self.session.post(self.url, json=payload, timeout=self.timeout)
+                    response = self.session.post(
+                        self.url, json=payload, timeout=self.timeout,
+                        impersonate="chrome120" # Add impersonate to retry
+                    )
                     if not response.ok:
                         raise exceptions.FailedToGenerateResponseError(
                             f"Failed to generate response after identity refresh - ({response.status_code}, {response.reason}) - {error_content}"
@@ -203,28 +222,27 @@ class SciraAI(Provider):
                         f"Request failed with status code {response.status_code}. Response: {error_content}"
                     )
 
-            full_response = ""
-            debug_lines = []
-
-            # Collect the first few lines for debugging
-            for i, line in enumerate(response.iter_lines()):
-                if line:
-                    try:
-                        line_str = line.decode('utf-8')
-                        debug_lines.append(line_str)
+            response_text_raw = response.text # Get raw response text
 
-                        # Format 2: 0:"content" (quoted format)
-                        match = re.search(r'0:"(.*?)"', line_str)
-                        if match:
-                            content = match.group(1)
-                            full_response += content
-                            continue
+            # Process the text using sanitize_stream line by line
+            processed_stream = sanitize_stream(
+                data=response_text_raw.splitlines(), # Split into lines
+                intro_value=None, # No simple prefix
+                to_json=False,    # Content is not JSON
+                content_extractor=self._scira_extractor # Use the specific extractor
+            )
 
+            # Aggregate the results from the generator
+            full_response = ""
+            for content in processed_stream:
+                if content and isinstance(content, str):
+                    full_response += content
 
-                    except: pass
             self.last_response = {"text": full_response}
             self.conversation.update_chat_history(prompt, full_response)
             return {"text": full_response}
+        except CurlError as e: # Catch CurlError
+            raise exceptions.FailedToGenerateResponseError(f"Request failed (CurlError): {e}") from e
         except Exception as e:
             raise exceptions.FailedToGenerateResponseError(f"Request failed: {e}")
 
@@ -242,7 +260,8 @@ class SciraAI(Provider):
 
     def get_message(self, response: dict) -> str:
         assert isinstance(response, dict), "Response should be of dict data-type only"
-        return response["text"].replace('\\n', '\n').replace('\\n\\n', '\n\n')
+        # Extractor handles formatting
+        return response.get("text", "").replace('\\n', '\n').replace('\\n\\n', '\n\n')
 
 if __name__ == "__main__":
     print("-" * 100)

webscout/Provider/scnet.py

@@ -4,7 +4,7 @@ import json
 import secrets
 from typing import Any, Dict, Optional, Generator, Union
 
-from webscout.AIutel import Optimizers, Conversation, AwesomePrompts
+from webscout.AIutel import Optimizers, Conversation, AwesomePrompts, sanitize_stream
 from webscout.AIbase import Provider
 from webscout import exceptions
 
@@ -86,6 +86,13 @@ class SCNet(Provider):
         self.conversation = Conversation(is_conversation, max_tokens, filepath, update_file)
         self.conversation.history_offset = history_offset
 
+    @staticmethod
+    def _scnet_extractor(chunk: Union[str, Dict[str, Any]]) -> Optional[str]:
+        """Extracts content from SCNet stream JSON objects."""
+        if isinstance(chunk, dict):
+            return chunk.get("content")
+        return None
+
     def ask(
         self,
         prompt: str,
@@ -126,25 +133,21 @@ class SCNet(Provider):
                 response.raise_for_status() # Check for HTTP errors
 
                 streaming_text = ""
-                # Iterate over bytes and decode manually
-                for line_bytes in response.iter_lines():
-                    if line_bytes:
-                        line = line_bytes.decode('utf-8') # Decode bytes
-                        if line.startswith("data:"):
-                            data = line[5:].strip()
-                            if data and data != "[done]":
-                                try:
-                                    obj = json.loads(data)
-                                    content = obj.get("content", "")
-                                    streaming_text += content
-                                    resp = {"text": content}
-                                    # Yield dict or raw string
-                                    yield resp if not raw else content
-                                except (json.JSONDecodeError, UnicodeDecodeError):
-                                    continue
-                            elif data == "[done]":
-                                break
-                
+                # 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
+                    skip_markers=["[done]"],
+                    content_extractor=self._scnet_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 _scnet_extractor
+                    if content_chunk and isinstance(content_chunk, str):
+                        streaming_text += content_chunk
+                        yield {"text": content_chunk} if not raw else content_chunk
                 # Update history and last response after stream finishes
                 self.last_response = {"text": streaming_text}
                 self.conversation.update_chat_history(prompt, streaming_text)

webscout/Provider/searchchat.py

@@ -6,7 +6,7 @@ from typing import Any, Dict, Optional, Generator, Union
 
 from webscout.AIutel import Optimizers
 from webscout.AIutel import Conversation
-from webscout.AIutel import AwesomePrompts
+from webscout.AIutel import AwesomePrompts, sanitize_stream # Import sanitize_stream
 from webscout.AIbase import Provider
 from webscout import exceptions
 from webscout.litagent import LitAgent
@@ -183,33 +183,25 @@ class SearchChatAI(Provider):
                         )
                     
                 streaming_text = ""
-                # Iterate over bytes and decode manually
-                for line_bytes in response.iter_lines():
-                    if line_bytes:
-                        line = line_bytes.decode('utf-8')
-                        if line.startswith('data: '):
-                            data_str = line[6:]  # Remove 'data: ' prefix
-                            
-                            if data_str == '[DONE]':
-                                break
-                                
-                            try:
-                                data = json.loads(data_str)
-                                if "choices" in data and len(data["choices"]) > 0:
-                                    delta = data["choices"][0].get("delta", {})
-                                    if "content" in delta and delta["content"] is not None:
-                                        content = delta["content"]
-                                        streaming_text += content
-                                        resp = dict(text=content)
-                                        # Yield dict or raw string
-                                        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
+                    skip_markers=["[DONE]"],
+                    content_extractor=lambda chunk: chunk.get('choices', [{}])[0].get('delta', {}).get('content') if isinstance(chunk, dict) else None,
+                    yield_raw_on_error=False # Skip non-JSON or lines where extractor fails
+                )
+
+                for content_chunk in processed_stream:
+                    # content_chunk is the string extracted by the content_extractor
+                    if content_chunk and isinstance(content_chunk, str):
+                        streaming_text += content_chunk
+                        yield dict(text=content_chunk) if not raw else content_chunk
                 
                 # Update history and last response after stream finishes
                 self.last_response = {"text": streaming_text}
                 self.conversation.update_chat_history(prompt, streaming_text)
-                    
             except CurlError as e: # Catch CurlError
                 raise exceptions.FailedToGenerateResponseError(f"Request failed (CurlError): {str(e)}") from e
             except Exception as e: # Catch other potential exceptions

webscout/Provider/sonus.py

@@ -4,7 +4,7 @@ import json
 from typing import Any, Dict, Optional, Generator, Union
 from webscout.AIutel import Optimizers
 from webscout.AIutel import Conversation
-from webscout.AIutel import AwesomePrompts
+from webscout.AIutel import AwesomePrompts, sanitize_stream # Import sanitize_stream
 from webscout.AIbase import Provider
 from webscout import exceptions
 from webscout.litagent import LitAgent
@@ -78,6 +78,13 @@ class SonusAI(Provider):
         )
         self.conversation.history_offset = history_offset
 
+    @staticmethod
+    def _sonus_extractor(chunk: Union[str, Dict[str, Any]]) -> Optional[str]:
+        """Extracts content from Sonus stream JSON objects."""
+        if isinstance(chunk, dict) and "content" in chunk:
+            return chunk.get("content")
+        return None
+
     def ask(
         self,
         prompt: str,
@@ -124,30 +131,22 @@ class SonusAI(Provider):
                     raise exceptions.FailedToGenerateResponseError(
                         f"Request failed with status code {response.status_code} - {response.text}"
                     )
-                    
+
                 streaming_text = ""
-                # Iterate over bytes and decode manually
-                for line_bytes in response.iter_lines():
-                    if line_bytes:
-                        try:
-                            # Decode the line and remove 'data: ' prefix if present
-                            line = line_bytes.decode('utf-8')
-                            if line.startswith('data: '):
-                                line = line[6:]
-                            
-                            # Handle potential empty lines after prefix removal
-                            if not line.strip():
-                                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._sonus_extractor, # Use the specific extractor
+                    yield_raw_on_error=False # Skip non-JSON lines or lines where extractor fails
+                )
 
-                            data = json.loads(line)
-                            if "content" in data:
-                                content = data["content"]
-                                streaming_text += content
-                                resp = dict(text=content)
-                                # Yield dict or raw string
-                                yield resp if raw else resp
-                        except (json.JSONDecodeError, UnicodeDecodeError):
-                            continue
+                for content_chunk in processed_stream:
+                    # content_chunk is the string extracted by _sonus_extractor
+                    if content_chunk and isinstance(content_chunk, str):
+                        streaming_text += content_chunk
+                        yield dict(text=content_chunk) if not raw else content_chunk
                 
                 # Update history and last response after stream finishes
                 self.last_response = {"text": streaming_text}
@@ -173,23 +172,22 @@ class SonusAI(Provider):
                         f"Request failed with status code {response.status_code} - {response.text}"
                     )
 
+                response_text_raw = response.text # Get raw text
+
+                # Use sanitize_stream to process the non-streaming text
+                processed_stream = sanitize_stream(
+                    data=response_text_raw.splitlines(), # Split into lines
+                    intro_value="data:",
+                    to_json=True,
+                    content_extractor=self._sonus_extractor,
+                    yield_raw_on_error=False
+                )
+
+                # Aggregate the results
                 full_response = ""
-                # Process the full response text which might contain multiple JSON objects
-                # Split by lines and process each potential JSON object
-                for line in response.text.splitlines():
-                    if line:
-                        try:
-                            if line.startswith('data: '):
-                                line = line[6:]
-                            
-                            if not line.strip():
-                                continue
-                                
-                            data = json.loads(line)
-                            if "content" in data:
-                                full_response += data["content"]
-                        except (json.JSONDecodeError, UnicodeDecodeError):
-                            continue
+                for content in processed_stream:
+                    if content and isinstance(content, str):
+                        full_response += content
 
                 self.last_response = {"text": full_response}
                 self.conversation.update_chat_history(prompt, full_response)