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

webscout/Provider/meta.py

@@ -6,7 +6,8 @@ import uuid
 from typing import Dict, Generator, Iterator, List, Union
 
 import random
-import requests
+from curl_cffi import CurlError
+from curl_cffi.requests import Session
 from webscout.scout import Scout
 
 from webscout.AIutel import Optimizers
@@ -105,12 +106,17 @@ def get_fb_session(email, password, proxies=None):
         "upgrade-insecure-requests": "1",
         "user-agent": Lit().random(),
     }
+    # Create a session
+    session = Session()
+    if proxies:
+        session.proxies = proxies
+
     # Send the GET request
-    response = requests.get(login_url, headers=headers, proxies=proxies)
-    
+    response = session.get(login_url, headers=headers)
+
     # Use Scout for parsing instead of BeautifulSoup
     scout = Scout(response.text)
-    
+
     # Parse necessary parameters from the login form
     lsd = scout.find_first('input[name="lsd"]').get('value')
     jazoest = scout.find_first('input[name="jazoest"]').get('value')
@@ -151,9 +157,6 @@ def get_fb_session(email, password, proxies=None):
     }
 
     # Send the POST request
-    session = requests.session()
-    session.proxies = proxies
-
     result = session.post(post_url, headers=headers, data=data)
     if "sb" not in session.cookies:
         raise exceptions.FacebookInvalidCredentialsException(
@@ -195,7 +198,12 @@ def get_fb_session(email, password, proxies=None):
         "viewport-width": "1728",
     }
 
-    response = requests.request("POST", url, headers=headers, data=payload, proxies=proxies)
+    # Create a new session for this request
+    req_session = Session()
+    if proxies:
+        req_session.proxies = proxies
+
+    response = req_session.post(url, headers=headers, data=payload)
 
     state = extract_value(response.text, start_str='"state":"', end_str='"')
 
@@ -214,9 +222,13 @@ def get_fb_session(email, password, proxies=None):
         "upgrade-insecure-requests": "1",
         "user-agent": Lit().random(),
     }
-    session = requests.session()
-    session.proxies = proxies
-    response = session.get(url, headers=headers, data=payload, allow_redirects=False)
+
+    # Create a new session for Facebook
+    fb_session = Session()
+    if proxies:
+        fb_session.proxies = proxies
+
+    response = fb_session.get(url, headers=headers, data=payload, allow_redirects=False)
 
     next_url = response.headers["Location"]
 
@@ -238,8 +250,8 @@ def get_fb_session(email, password, proxies=None):
         "Sec-Fetch-User": "?1",
         "TE": "trailers",
     }
-    session.get(url, headers=headers, data=payload)
-    cookies = session.cookies.get_dict()
+    fb_session.get(url, headers=headers, data=payload)
+    cookies = fb_session.cookies.get_dict()
     if "abra_sess" not in cookies:
         raise exceptions.FacebookInvalidCredentialsException(
             "Was not able to login to Facebook. Please check your credentials. "
@@ -249,24 +261,20 @@ def get_fb_session(email, password, proxies=None):
     return cookies
 
 
-def get_cookies(self) -> dict:
+def get_cookies() -> dict:
     """
     Extracts necessary cookies from the Meta AI main page.
 
     Returns:
         dict: A dictionary containing essential cookies.
     """
-    headers = {}
-    if self.fb_email is not None and self.fb_password is not None:
-        fb_session = get_fb_session(self.fb_email, self.fb_password, self.proxy)
-        headers = {"cookie": f"abra_sess={fb_session['abra_sess']}"}
-    
-    response = requests.get(
+    # Create a session
+    session = Session()
+
+    response = session.get(
         "https://www.meta.ai/",
-        headers=headers,
-        proxies=self.proxy,
     )
-    
+
     cookies = {
         "_js_datr": extract_value(
             response.text, start_str='_js_datr":{"value":"', end_str='",'
@@ -280,14 +288,10 @@ def get_cookies(self) -> dict:
         "fb_dtsg": extract_value(
             response.text, start_str='DTSGInitData",[],{"token":"', end_str='"'
         ),
-    }
-
-    if len(headers) > 0:
-        cookies["abra_sess"] = fb_session["abra_sess"]
-    else:
-        cookies["abra_csrf"] = extract_value(
+        "abra_csrf": extract_value(
             response.text, start_str='abra_csrf":{"value":"', end_str='",'
         )
+    }
     return cookies
 
 class Meta(Provider):
@@ -328,7 +332,7 @@ class Meta(Provider):
             history_offset (int, optional): Limit conversation history to this number of last texts. Defaults to 10250.
             act (str|int, optional): Awesome prompt key or index. (Used as intro). Defaults to None.
         """
-        self.session = requests.Session()
+        self.session = Session()
         self.session.headers.update(
             {
                 "user-agent": Lit().random(),
@@ -385,7 +389,7 @@ class Meta(Provider):
                 self.session.proxies = self.proxy
                 return True
             return False
-        except requests.RequestException:
+        except CurlError:
             return False
 
     def get_access_token(self) -> str:
@@ -513,7 +517,7 @@ class Meta(Provider):
         if self.is_authed:
             headers["cookie"] = f'abra_sess={self.cookies["abra_sess"]}'
             # Recreate the session to avoid cookie leakage when user is authenticated
-            self.session = requests.Session()
+            self.session = Session()
             self.session.proxies = self.proxy
 
         if stream:
@@ -700,13 +704,13 @@ class Meta(Provider):
         if self.fb_email is not None and self.fb_password is not None:
             fb_session = get_fb_session(self.fb_email, self.fb_password, self.proxy)
             headers = {"cookie": f"abra_sess={fb_session['abra_sess']}"}
-        
-        response = requests.get(
-            "https://www.meta.ai/",
+
+        response = self.session.get(
+            url="https://www.meta.ai/",
             headers=headers,
             proxies=self.proxy,
         )
-        
+
         cookies = {
             "_js_datr": extract_value(
                 response.text, start_str='_js_datr":{"value":"', end_str='",'
@@ -786,7 +790,7 @@ class Meta(Provider):
         """
         assert isinstance(response, dict), "Response should be of dict data-type only"
         return response["message"]
-    
+
 if __name__ == "__main__":
     Meta = Meta()
     ai = Meta.chat("hi")

webscout/Provider/multichat.py

@@ -1,9 +1,10 @@
-import requests
+from curl_cffi.requests import Session
+from curl_cffi import CurlError
 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 
@@ -108,7 +109,7 @@ class MultiChatAI(Provider):
     def __init__(
         self,
         is_conversation: bool = True,
-        max_tokens: int = 4000,
+        max_tokens: int = 4000, # Note: max_tokens is not directly used by this API
         timeout: int = 30,
         intro: str = None,
         filepath: str = None,
@@ -119,14 +120,15 @@ class MultiChatAI(Provider):
         model: str = "llama-3.3-70b-versatile",
         system_prompt: str = "You are a friendly, helpful AI assistant.",
         temperature: float = 0.5,
-        presence_penalty: int = 0,
-        frequency_penalty: int = 0,
-        top_p: float = 1
+        presence_penalty: int = 0, # Note: presence_penalty is not used by this API
+        frequency_penalty: int = 0, # Note: frequency_penalty is not used by this API
+        top_p: float = 1 # Note: top_p is not used by this API
     ):
         """Initializes the MultiChatAI API client."""
         if model not in self.AVAILABLE_MODELS:
             raise ValueError(f"Invalid model: {model}. Choose from: {self.AVAILABLE_MODELS}")
-        self.session = requests.Session()
+        # Initialize curl_cffi Session
+        self.session = Session()
         self.is_conversation = is_conversation
         self.max_tokens_to_sample = max_tokens
         self.timeout = timeout
@@ -138,21 +140,24 @@ class MultiChatAI(Provider):
         self.frequency_penalty = frequency_penalty
         self.top_p = top_p
         
-        # Initialize LitAgent for user agent generation
+        # Initialize LitAgent for user agent generation (keep if needed for other headers)
         self.agent = LitAgent()
         
         self.headers = {
             "accept": "*/*",
             "accept-language": "en-US,en;q=0.9",
-            "content-type": "text/plain;charset=UTF-8",
+            "content-type": "text/plain;charset=UTF-8", # Keep content-type
             "origin": "https://www.multichatai.com",
             "referer": "https://www.multichatai.com/",
             "user-agent": self.agent.random(),
+            # Add sec-ch-ua headers if needed for impersonation consistency
         }
         
+        # Update curl_cffi session headers, proxies, and cookies
         self.session.headers.update(self.headers)
-        self.session.proxies = proxies
-        self.session.cookies.update({"session": uuid.uuid4().hex})
+        self.session.proxies = proxies # Assign proxies directly
+        # Set cookies on the session object for curl_cffi
+        self.session.cookies.set("session", uuid.uuid4().hex)
 
         self.__available_optimizers = (
             method for method in dir(Optimizers)
@@ -225,34 +230,41 @@ class MultiChatAI(Provider):
         error_msg = f"Invalid model: {model}\nAvailable models: {', '.join(available_models)}"
         raise ValueError(error_msg)
 
-    def _make_request(self, payload: Dict[str, Any]) -> requests.Response:
+    def _make_request(self, payload: Dict[str, Any]) -> Any:
         """Make the API request with proper error handling."""
         try:
+            # Use curl_cffi session post with impersonate
+            # Cookies are handled by the session
             response = self.session.post(
                 self._get_endpoint(),
-                headers=self.headers,
+                # headers are set on the session
                 json=payload,
                 timeout=self.timeout,
+                # proxies are set on the session
+                impersonate="chrome110" # Use a common impersonation profile
             )
-            response.raise_for_status()
+            response.raise_for_status() # Check for HTTP errors
             return response
-        except requests.exceptions.RequestException as e:
-            raise exceptions.FailedToGenerateResponseError(f"API request failed: {e}") from e
+        except CurlError as e: # Catch CurlError
+            raise exceptions.FailedToGenerateResponseError(f"API request failed (CurlError): {e}") from e
+        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"API request failed ({type(e).__name__}): {e} - {err_text}") from e
 
     def ask(
         self,
         prompt: str,
-        raw: bool = False,
+        raw: bool = False, # Keep raw param for interface consistency
         optimizer: str = None,
         conversationally: bool = False,
+        # Add stream parameter for consistency, though API doesn't stream
+        stream: bool = False 
     ) -> Dict[str, Any]:
         """Sends a prompt to the MultiChatAI API and returns the response."""
         conversation_prompt = self.conversation.gen_complete_prompt(prompt)
         if optimizer:
             if optimizer in self.__available_optimizers:
-                conversation_prompt = getattr(Optimizers, optimizer)(
-                    conversation_prompt if conversationally else prompt
-                )
+                conversation_prompt = getattr(Optimizers, optimizer)(conversation_prompt if conversationally else prompt)
             else:
                 error_msg = f"Optimizer is not one of {self.__available_optimizers}"
                 raise exceptions.FailedToGenerateResponseError(error_msg)
@@ -263,26 +275,53 @@ class MultiChatAI(Provider):
             "customModelId": "",
         }
 
+        # API does not stream, implement non-stream logic directly
         response = self._make_request(payload)
         try:
-            full_response = response.text.strip()
-            self.last_response = {"text": full_response}
+            # Use response.text which is already decoded
+            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 self.last_response
-        except json.JSONDecodeError as e:
-            raise exceptions.FailedToGenerateResponseError(f"Invalid JSON response: {e}") from e
+            # Return dict or raw string based on raw flag
+            return full_response if raw else self.last_response
+        except Exception as e: # Catch potential errors during text processing
+            raise exceptions.FailedToGenerateResponseError(f"Failed to process response: {e}") from e
 
     def chat(
         self,
         prompt: str,
         optimizer: str = None,
         conversationally: bool = False,
+        # Add stream parameter for consistency
+        stream: bool = False
     ) -> str:
         """Generate response."""
-        response = self.ask(
-            prompt, optimizer=optimizer, conversationally=conversationally
+        # Since ask() now handles both stream=True/False by returning the full response dict/str:
+        response_data = self.ask(
+            prompt, 
+            stream=False, # Call ask in non-stream mode internally
+            raw=False, # Ensure ask returns dict
+            optimizer=optimizer, 
+            conversationally=conversationally
         )
-        return self.get_message(response)
+        # If stream=True was requested, simulate streaming by yielding the full message at once
+        if stream:
+            def stream_wrapper():
+                yield self.get_message(response_data)
+            return stream_wrapper()
+        else:
+            # If stream=False, return the full message directly
+            return self.get_message(response_data)
 
     def get_message(self, response: Union[Dict[str, Any], str]) -> str:
         """

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)