webscout 8.2.3__py3-none-any.whl → 8.2.4__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,4 +1,5 @@
-import requests
+from curl_cffi.requests import Session
+from curl_cffi import CurlError
 import json
 import uuid
 from typing import Any, Dict, Union
@@ -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,43 @@ class MultiChatAI(Provider):
             "customModelId": "",
         }
 
+        # API does not stream, implement non-stream logic directly
         response = self._make_request(payload)
         try:
+            # Use response.text which is already decoded
             full_response = response.text.strip()
             self.last_response = {"text": full_response}
             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/scnet.py

@@ -1,4 +1,5 @@
-import requests
+from curl_cffi.requests import Session
+from curl_cffi import CurlError
 import json
 import secrets
 from typing import Any, Dict, Optional, Generator, Union
@@ -26,13 +27,13 @@ class SCNet(Provider):
         self,
         model: str = "QWQ-32B",
         is_conversation: bool = True,
-        max_tokens: int = 2048,
+        max_tokens: int = 2048, # Note: max_tokens is not used by this API
         timeout: int = 30,
         intro: Optional[str] = None,
         filepath: Optional[str] = None,
         update_file: bool = True,
         proxies: Optional[dict] = None,
-        history_offset: int = 0,
+        history_offset: int = 0, # Note: history_offset might not be fully effective due to API structure
         act: Optional[str] = None,
         system_prompt: str = (
             "You are a helpful, advanced LLM assistant. "
@@ -46,14 +47,15 @@ class SCNet(Provider):
         self.model = model
         self.modelId = self.MODEL_NAME_TO_ID[model]
         self.system_prompt = system_prompt
-        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
         self.last_response: Dict[str, Any] = {}
         self.proxies = proxies or {}
         self.cookies = {
-            "Token": secrets.token_hex(16),
+            "Token": secrets.token_hex(16), # Keep cookie generation logic
         }
         self.headers = {
             "accept": "text/event-stream",
@@ -61,8 +63,17 @@ class SCNet(Provider):
             "user-agent": "Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/135.0.0.0 Safari/537.36 Edg/135.0.0.0",
             "referer": "https://www.scnet.cn/ui/chatbot/temp_1744712663464",
             "origin": "https://www.scnet.cn",
+            # Add sec-ch-ua headers if needed for impersonation consistency
         }
         self.url = "https://www.scnet.cn/acx/chatbot/v1/chat/completion"
+        
+        # Update curl_cffi session headers, proxies, and cookies
+        self.session.headers.update(self.headers)
+        self.session.proxies = self.proxies # Assign proxies directly
+        # Set cookies on the session object for curl_cffi
+        for name, value in self.cookies.items():
+            self.session.cookies.set(name, value) 
+
         self.__available_optimizers = (
             method for method in dir(Optimizers)
             if callable(getattr(Optimizers, method)) and not method.startswith("__")
@@ -86,9 +97,7 @@ class SCNet(Provider):
         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:
                 raise exceptions.FailedToGenerateResponseError(f"Optimizer is not one of {list(self.__available_optimizers)}")
 
@@ -105,39 +114,61 @@ class SCNet(Provider):
 
         def for_stream():
             try:
-                with self.session.post(
+                # Use curl_cffi session post with impersonate
+                # Cookies are now handled by the session object
+                response = self.session.post(
                     self.url,
-                    headers=self.headers,
-                    cookies=self.cookies,
                     json=payload,
                     stream=True,
                     timeout=self.timeout,
-                    proxies=self.proxies
-                ) as resp:
-                    streaming_text = ""
-                    for line in resp.iter_lines(decode_unicode=True):
-                        if line and line.startswith("data:"):
+                    impersonate="chrome120" # Changed impersonation to chrome120
+                )
+                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
-                                    yield {"text": content} if raw else {"text": content}
-                                except Exception:
+                                    resp = {"text": content}
+                                    # Yield dict or raw string
+                                    yield resp if not raw else content
+                                except (json.JSONDecodeError, UnicodeDecodeError):
                                     continue
                             elif data == "[done]":
                                 break
-                    self.last_response = {"text": streaming_text}
-                    self.conversation.update_chat_history(prompt, streaming_text)
-            except Exception as e:
-                raise exceptions.FailedToGenerateResponseError(f"Request failed: {e}")
+                
+                # 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): {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"An unexpected error occurred ({type(e).__name__}): {e} - {err_text}") from e
 
         def for_non_stream():
+            # Aggregate the stream using the updated for_stream logic
             text = ""
-            for chunk in for_stream():
-                text += chunk["text"]
-            return {"text": text}
+             # Ensure raw=False so for_stream yields dicts
+            for chunk_data in for_stream():
+                if isinstance(chunk_data, dict) and "text" in chunk_data:
+                     text += chunk_data["text"]
+                # Handle raw string case if raw=True was passed
+                elif isinstance(chunk_data, str):
+                     text += chunk_data
+            # last_response and history are updated within for_stream
+            # Return the final aggregated response dict or raw string
+            return text if raw else self.last_response
+
 
         return for_stream() if stream else for_non_stream()
 
@@ -148,40 +179,59 @@ class SCNet(Provider):
         optimizer: Optional[str] = None,
         conversationally: bool = False,
     ) -> Union[str, Generator[str, None, None]]:
-        def for_stream():
-            for response in self.ask(
-                prompt, stream=True, optimizer=optimizer, conversationally=conversationally
-            ):
-                yield self.get_message(response)
-        def for_non_stream():
-            return self.get_message(
-                self.ask(
-                    prompt, stream=False, optimizer=optimizer, conversationally=conversationally
-                )
+        def for_stream_chat():
+            # ask() yields dicts or strings when streaming
+            gen = self.ask(
+                prompt, stream=True, raw=False, # Ensure ask yields dicts
+                optimizer=optimizer, conversationally=conversationally
             )
-        return for_stream() if stream else for_non_stream()
+            for response_dict in gen:
+                yield self.get_message(response_dict) # get_message expects dict
+
+        def for_non_stream_chat():
+            # ask() returns dict or str when not streaming
+            response_data = self.ask(
+                prompt, stream=False, raw=False, # Ensure ask returns dict
+                optimizer=optimizer, conversationally=conversationally
+            )
+            return self.get_message(response_data) # get_message expects dict
+
+        return for_stream_chat() if stream else for_non_stream_chat()
 
     def get_message(self, response: dict) -> str:
         assert isinstance(response, dict), "Response should be of dict data-type only"
         return response["text"]
 
 if __name__ == "__main__":
+    # Ensure curl_cffi is installed
     print("-" * 80)
     print(f"{'ModelId':<10} {'Model':<30} {'Status':<10} {'Response'}")
     print("-" * 80)
     for model in SCNet.AVAILABLE_MODELS:
         try:
             test_ai = SCNet(model=model["name"], timeout=60)
-            response = test_ai.chat("Say 'Hello' in one word", stream=True)
+            # Test stream first
+            response_stream = test_ai.chat("Say 'Hello' in one word", stream=True)
             response_text = ""
-            for chunk in response:
+            print(f"\r{model['modelId']:<10} {model['name']:<30} {'Streaming...':<10}", end="", flush=True)
+            for chunk in response_stream:
                 response_text += chunk
+            
             if response_text and len(response_text.strip()) > 0:
                 status = "✓"
-                display_text = response_text.strip()[:50] + "..." if len(response_text.strip()) > 50 else response_text.strip()
+                # Clean and truncate response
+                clean_text = response_text.strip()
+                display_text = clean_text[:50] + "..." if len(clean_text) > 50 else clean_text
             else:
-                status = "✗"
-                display_text = "Empty or invalid response"
-            print(f"{model['modelId']:<10} {model['name']:<30} {status:<10} {display_text}")
+                status = "✗ (Stream)"
+                display_text = "Empty or invalid stream response"
+            print(f"\r{model['modelId']:<10} {model['name']:<30} {status:<10} {display_text}")
+
+            # Optional: Add non-stream test if needed
+            # print(f"\r{model['modelId']:<10} {model['name']:<30} {'Non-Stream...':<10}", end="", flush=True)
+            # response_non_stream = test_ai.chat("Say 'Hi' again", stream=False)
+            # if not response_non_stream or len(response_non_stream.strip()) == 0:
+            #      print(f"\r{model['modelId']:<10} {model['name']:<30} {'✗ (Non-Stream)':<10} Empty non-stream response")
+
         except Exception as e:
-            print(f"{model['modelId']:<10} {model['name']:<30} {'✗':<10} {str(e)}")
+            print(f"\r{model['modelId']:<10} {model['name']:<30} {'✗':<10} {str(e)}")