webscout 8.3.1__py3-none-any.whl → 8.3.3__py3-none-any.whl

webscout/Provider/WiseCat.py

@@ -106,7 +106,6 @@ class WiseCat(Provider):
                 raise Exception(
                     f"Optimizer is not one of {self.__available_optimizers}"
                 )
-
         payload = {
             "id": "ephemeral",
             "messages": [
@@ -121,52 +120,49 @@ class WiseCat(Provider):
             ],
             "selectedChatModel": self.model
         }
-
         def for_stream():
-            try: # Add try block for CurlError
-                # Use curl_cffi session post with impersonate
+            try:
                 response = self.session.post(
                     self.api_endpoint, 
                     headers=self.headers, 
                     json=payload, 
                     stream=True, 
                     timeout=self.timeout,
-                    impersonate="chrome120" # Add impersonate
+                    impersonate="chrome120"
                 )
                 if not response.ok:
                     error_msg = f"Failed to generate response - ({response.status_code}, {response.reason}) - {response.text}"
                     raise exceptions.FailedToGenerateResponseError(error_msg)
-
                 streaming_text = ""
-                # Use sanitize_stream with the custom extractor
                 processed_stream = sanitize_stream(
-                    data=response.iter_content(chunk_size=None), # Pass byte iterator
-                    intro_value=None, # No simple prefix to remove here
-                    to_json=False,    # Content is not JSON
-                    content_extractor=self._wisecat_extractor # Use the specific extractor
+                    data=response.iter_content(chunk_size=None),
+                    intro_value=None,
+                    to_json=False,
+                    content_extractor=self._wisecat_extractor,
+                    raw=raw
                 )
-
                 for content_chunk in processed_stream:
-                    if content_chunk and isinstance(content_chunk, str):
-                        streaming_text += content_chunk
-                        yield content_chunk if raw else dict(text=content_chunk)
-
-                self.last_response.update(dict(text=streaming_text)) # Use streaming_text here
+                    # Always yield as string, even in raw mode
+                    if isinstance(content_chunk, bytes):
+                        content_chunk = content_chunk.decode('utf-8', errors='ignore')
+                    if raw:
+                        yield content_chunk
+                    else:
+                        if content_chunk and isinstance(content_chunk, str):
+                            streaming_text += content_chunk
+                            yield dict(text=content_chunk)
+                self.last_response.update(dict(text=streaming_text))
                 self.conversation.update_chat_history(
                     prompt, self.get_message(self.last_response)
                 )
-            except CurlError as e: # Catch CurlError
+            except CurlError as e:
                 raise exceptions.FailedToGenerateResponseError(f"Request failed (CurlError): {e}")
-            except Exception as e: # Catch other potential exceptions
+            except Exception as e:
                 raise exceptions.FailedToGenerateResponseError(f"An unexpected error occurred ({type(e).__name__}): {e}")
-
-
         def for_non_stream():
-            # This function implicitly uses the updated for_stream
             for _ in for_stream():
                 pass
             return self.last_response
-
         return for_stream() if stream else for_non_stream()
 
     def chat(
@@ -175,24 +171,28 @@ class WiseCat(Provider):
         stream: bool = False,
         optimizer: str = None,
         conversationally: bool = False,
+        raw: bool = False,  # Added raw parameter
     ) -> str:
-        """Generate response `str`"""
         def for_stream():
             for response in self.ask(
-                prompt, True, optimizer=optimizer, conversationally=conversationally
+                prompt, True, raw=raw, optimizer=optimizer, conversationally=conversationally
             ):
-                yield self.get_message(response)
-
+                if raw:
+                    yield response
+                else:
+                    yield self.get_message(response)
         def for_non_stream():
-            return self.get_message(
-                self.ask(
-                    prompt,
-                    False,
-                    optimizer=optimizer,
-                    conversationally=conversationally,
-                )
+            result = self.ask(
+                prompt,
+                False,
+                raw=raw,
+                optimizer=optimizer,
+                conversationally=conversationally,
             )
-
+            if raw:
+                return result
+            else:
+                return self.get_message(result)
         return for_stream() if stream else for_non_stream()
 
     def get_message(self, response: dict) -> str:

webscout/Provider/WrDoChat.py

@@ -244,7 +244,6 @@ class WrDoChat(Provider):
         def for_stream():
             try:
                 self.headers["referer"] = f"https://oi.wr.do/chat/{chat_id}"
-                
                 response = self.session.post(
                     self.api_endpoint,
                     json=payload,
@@ -252,31 +251,27 @@ class WrDoChat(Provider):
                     timeout=self.timeout,
                     impersonate="chrome110"
                 )
-                
                 if response.status_code == 401:
                     raise exceptions.AuthenticationError("Authentication failed. Please check your cookies.")
-                
                 response.raise_for_status()
-                
                 streaming_response = ""
                 has_content = False
-                
-                # Use sanitize_stream with the custom extractor
                 processed_stream = sanitize_stream(
                     data=response.iter_lines(),
                     intro_value=None,  # No intro to remove
                     to_json=False,     # Response is not JSON
                     content_extractor=self._wrdo_extractor,
-                    yield_raw_on_error=False
+                    yield_raw_on_error=False,
+                    raw=raw
                 )
-
                 for content in processed_stream:
+                    # Always yield as string, even in raw mode
+                    if isinstance(content, bytes):
+                        content = content.decode('utf-8', errors='ignore')
                     if content and isinstance(content, str):
                         streaming_response += content
                         has_content = True
-                        yield {"text": content} if not raw else content
-
-                # Only update conversation history if we received content
+                        yield content if raw else {"text": content}
                 if has_content:
                     self.last_response = {"text": streaming_response}
                     self.conversation.update_chat_history(
@@ -286,12 +281,10 @@ class WrDoChat(Provider):
                     raise exceptions.FailedToGenerateResponseError(
                         "No content received from API"
                     )
-
             except CurlError as e:
                 raise exceptions.FailedToGenerateResponseError(f"Request failed (CurlError): {e}")
             except Exception as e:
                 raise exceptions.FailedToGenerateResponseError(f"An error occurred: {str(e)}")
-
         def for_non_stream():
             response_text = ""
             try:
@@ -303,9 +296,7 @@ class WrDoChat(Provider):
             except Exception as e:
                 if not response_text:
                     raise exceptions.FailedToGenerateResponseError(f"Failed to get response: {str(e)}")
-
             return response_text if raw else {"text": response_text}
-
         return for_stream() if stream else for_non_stream()
 
     def chat(
@@ -314,6 +305,7 @@ class WrDoChat(Provider):
         stream: bool = False,
         optimizer: str = None,
         conversationally: bool = False,
+        raw: bool = False,  # Added raw parameter
     ) -> Union[str, Generator[str, None, None]]:
         """
         Generate a response to a prompt.
@@ -329,20 +321,24 @@ class WrDoChat(Provider):
         """
         def for_stream():
             for response in self.ask(
-                prompt, True, optimizer=optimizer, conversationally=conversationally
+                prompt, True, raw=raw, optimizer=optimizer, conversationally=conversationally
             ):
-                yield self.get_message(response)
-
+                if raw:
+                    yield response
+                else:
+                    yield self.get_message(response)
         def for_non_stream():
-            return self.get_message(
-                self.ask(
-                    prompt,
-                    False,
-                    optimizer=optimizer,
-                    conversationally=conversationally,
-                )
+            result = self.ask(
+                prompt,
+                False,
+                raw=raw,
+                optimizer=optimizer,
+                conversationally=conversationally,
             )
-
+            if raw:
+                return result
+            else:
+                return self.get_message(result)
         return for_stream() if stream else for_non_stream()
 
     def get_message(self, response: dict) -> str:

webscout/Provider/WritingMate.py

@@ -178,13 +178,20 @@ class WritingMate(Provider):
                     data=response.iter_content(chunk_size=None), # Pass byte iterator
                     intro_value=None, # No simple prefix
                     to_json=False,    # Content is not JSON
-                    content_extractor=self._writingmate_extractor # Use the specific extractor
+                    content_extractor=self._writingmate_extractor, # Use the specific extractor
+                    raw=raw
                 )
 
                 for content_chunk in processed_stream:
-                    if content_chunk and isinstance(content_chunk, str):
-                        streaming_text += content_chunk
-                        yield content_chunk if raw else dict(text=content_chunk)
+                    # Always yield as string, even in raw mode
+                    if isinstance(content_chunk, bytes):
+                        content_chunk = content_chunk.decode('utf-8', errors='ignore')
+                    if raw:
+                        yield content_chunk
+                    else:
+                        if content_chunk and isinstance(content_chunk, str):
+                            streaming_text += content_chunk
+                            yield dict(text=content_chunk)
 
                 self.last_response.update(dict(text=streaming_text))
                 self.conversation.update_chat_history(
@@ -196,12 +203,10 @@ class WritingMate(Provider):
                 raise exceptions.FailedToGenerateResponseError(f"An unexpected error occurred ({type(e).__name__}): {e}")
 
         def for_non_stream():
-            # This function implicitly uses the updated for_stream
             for _ in for_stream():
                 pass
             return self.last_response
 
-        # Ensure stream defaults to True if not provided, matching original behavior
         effective_stream = stream if stream is not None else True 
         return for_stream() if effective_stream else for_non_stream()
 
@@ -210,36 +215,35 @@ class WritingMate(Provider):
         prompt: str,
         stream: bool = False, # Default stream to False as per original chat method
         optimizer: str = None,
-        conversationally: bool = False
+        conversationally: bool = False,
+        raw: bool = False,  # Added raw parameter
     ) -> Union[str, Generator[str,None,None]]:
         if stream:
-            # yield decoded text chunks
             def text_stream():
-                # Call ask with stream=True, raw=False to get dicts
-                for response_dict in self.ask(
-                    prompt, stream=True, raw=False,
+                for response in self.ask(
+                    prompt, stream=True, raw=raw,
                     optimizer=optimizer, conversationally=conversationally
                 ):
-                    # Extract text from dict
-                    yield self.get_message(response_dict) 
+                    if raw:
+                        yield response
+                    else:
+                        yield self.get_message(response)
             return text_stream()
-        else: # non‐stream: return aggregated text
-            # Call ask with stream=False, raw=False
+        else:
             response_data = self.ask(
                 prompt,
                 stream=False,
-                raw=False,
+                raw=raw,
                 optimizer=optimizer,
                 conversationally=conversationally,
             )
-            # Ensure response_data is a dict before passing to get_message
+            if raw:
+                return response_data
             if isinstance(response_data, dict):
-                 return self.get_message(response_data)
+                return self.get_message(response_data)
             else:
-                 # Handle unexpected generator case if ask(stream=False) behaves differently
-                 # This part might need adjustment based on actual behavior
-                 full_text = "".join(self.get_message(chunk) for chunk in response_data if isinstance(chunk, dict))
-                 return full_text
+                full_text = "".join(self.get_message(chunk) for chunk in response_data if isinstance(chunk, dict))
+                return full_text
 
 
     def get_message(self, response: dict) -> str:

webscout/Provider/XenAI.py

@@ -0,0 +1,324 @@
+import json
+import uuid
+import random
+import string
+from typing import Any, Dict, Generator, Union
+import requests
+import warnings
+import urllib3
+
+from webscout.AIutel import Optimizers
+from webscout.AIutel import Conversation
+from webscout.AIutel import AwesomePrompts, sanitize_stream 
+from webscout.AIbase import Provider
+from webscout import exceptions
+from webscout.litagent import LitAgent
+
+# Suppress only the single InsecureRequestWarning from urllib3 needed for verify=False
+warnings.filterwarnings("ignore", category=urllib3.exceptions.InsecureRequestWarning)
+
+class XenAI(Provider):
+
+    # Add more models if known, starting with the one from the example
+    AVAILABLE_MODELS = [
+        "gemini-2.5-pro-preview-05-06",
+        "gemini-2.5-flash-preview-05-20",
+        "o4-mini-high",
+        "grok-3-mini-fast-beta",
+        "grok-3-fast-beta",
+        "gpt-4.1",
+        "o3-high",
+        "gpt-4o-search-preview",
+        "gpt-4o",
+        "claude-sonnet-4-20250514",
+        "claude-sonnet-4-20250514-thinking",
+        "deepseek-ai/DeepSeek-V3-0324",
+        "deepseek-ai/DeepSeek-R1-0528",
+        "groq/deepseek-r1-distill-llama-70b",
+        "deepseek-ai/DeepSeek-Prover-V2-671B",
+        "meta-llama/llama-4-maverick-17b-128e-instruct",
+        "meta-llama/llama-4-scout-17b-16e-instruct",
+        "cognitivecomputations/Dolphin3.0-Mistral-24B",
+        "sonar-pro",
+        "gpt-4o-mini",
+        "gemini-2.0-flash-lite-preview-02-05",
+        "claude-3-7-sonnet-20250219",
+        "claude-3-7-sonnet-20250219-thinking",
+        "claude-opus-4-20250514",
+        "claude-opus-4-20250514-thinking",
+        "chutesai/Llama-4-Maverick-17B-128E-Instruct-FP8",
+        "chutesai/Llama-4-Scout-17B-16E-Instruct",
+    ]
+
+    def __init__(
+        self,
+        is_conversation: bool = True,
+        max_tokens: int = 2048,
+        timeout: int = 60,
+        intro: str = None,
+        filepath: str = None,
+        update_file: bool = True,
+        proxies: dict = {},
+        history_offset: int = 10250,
+        act: str = None,
+        model: str = "gemini-2.5-pro-preview-05-06",
+        system_prompt: str = "You are a helpful assistant.",
+    ):
+        """Initializes the xenai API client."""
+        if model not in self.AVAILABLE_MODELS:
+            print(f"Warning: Model '{model}' is not listed in AVAILABLE_MODELS. Proceeding with the provided model.")
+
+        self.api_endpoint = "https://chat.xenai.tech/api/chat/completions"
+        
+        self.model = model
+        self.system_prompt = system_prompt
+
+        # Initialize requests Session
+        self.session = requests.Session()
+
+        # Set up headers based on the provided request
+        self.headers = {
+            **LitAgent().generate_fingerprint(),
+            'origin': 'https://chat.xenai.tech',
+            'referer': 'https://chat.xenai.tech/',
+        }
+
+        # Apply headers, proxies, and cookies to the session
+        self.session.headers.update(self.headers)
+        self.session.proxies.update(proxies)
+        # Always disable SSL verification for this session
+        self.session.verify = False
+
+        # Provider settings
+        self.is_conversation = is_conversation
+        self.max_tokens_to_sample = max_tokens
+        self.timeout = timeout
+        self.last_response = {}
+
+        # Initialize optimizers
+        self.__available_optimizers = (
+            method
+            for method in dir(Optimizers)
+            if callable(getattr(Optimizers, method))
+            and not method.startswith("__")
+        )
+        Conversation.intro = (
+            AwesomePrompts().get_act(
+                act, raise_not_found=True, default=None, case_insensitive=True
+            )
+            if act
+            else intro or Conversation.intro
+        )
+        self.conversation = Conversation(
+            is_conversation, self.max_tokens_to_sample, filepath, update_file
+        )
+        self.conversation.history_offset = history_offset
+
+        # Token handling: always auto-fetch token, no cookies logic
+        self.token = self._auto_fetch_token()
+
+        # Set the Authorization header for the session
+        self.session.headers.update({
+            'authorization': f'Bearer {self.token}',
+        })
+
+    def _auto_fetch_token(self):
+        """Automatically fetch a token from the signup endpoint using requests."""
+        session = requests.Session()
+        session.verify = False  # Always disable SSL verification for this session
+        def random_string(length=8):
+            return ''.join(random.choices(string.ascii_lowercase, k=length))
+        name = random_string(8)
+        email = f"{name}@gmail.com"
+        password = email
+        profile_image_url = "data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAGQAAABkCAYAAABw4pVUAAAAAXNSR0IArs4c6QAAAkRJREFUeF7tmDFOw0AUBdcSiIaKM3CKHIQ7UHEISq5AiUTFHYC0XADoTRsJEZFEjhFIaYAim92fjGFS736/zOTZzjavl0d98oMh0CgE4+IriEJYPhQC86EQhdAIwPL4DFEIjAAsjg1RCIwALI4NUQiMACyODVEIjAAsjg1RCIwALI4NUQiMACyODVEIjAAsjg1RCIwALI4NUQiMACyODVEIjAAsjg1RCIwALI4NUQiMACyODVEIjAAsjg1RCIwALI4NUQiMACyODVEIjAAsjg1RCIwALI4NUQiMACyODVEIjAAsjg2BCfkAIqwAA94KZ/EAAAAASUVORK5CYII="
+        payload = {
+            "name": name,
+            "email": email,
+            "password": password,
+            "profile_image_url": profile_image_url
+        }
+        headers = {
+            **LitAgent().generate_fingerprint(),
+            'origin': 'https://chat.xenai.tech',
+            'referer': 'https://chat.xenai.tech/auth',
+        }
+        try:
+            resp = session.post(
+                "https://chat.xenai.tech/api/v1/auths/signup",
+                headers=headers,
+                json=payload,
+                timeout=30,
+                verify=False  # Disable SSL verification for testing
+            )
+            if resp.ok:
+                data = resp.json()
+                token = data.get("token")
+                if token:
+                    return token
+                set_cookie = resp.headers.get("set-cookie", "")
+                if "token=" in set_cookie:
+                    return set_cookie.split("token=")[1].split(";")[0]
+            raise exceptions.FailedToGenerateResponseError(f"Failed to auto-fetch token: {resp.status_code} {resp.text}")
+        except Exception as e:
+            raise exceptions.FailedToGenerateResponseError(f"Token auto-fetch failed: {e}")
+
+    def ask(
+        self,
+        prompt: str,
+        stream: bool = False,
+        raw: bool = False,
+        optimizer: str = None,
+        conversationally: bool = False,
+        **kwargs
+    ) -> Union[Dict[str, Any], Generator]:
+        """Sends a prompt to the xenai 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
+                )
+            else:
+                raise exceptions.InvalidOptimizerError(
+                    f"Optimizer is not one of {self.__available_optimizers}"
+                )
+
+        chat_id = kwargs.get("chat_id", str(uuid.uuid4()))
+        message_id = str(uuid.uuid4())
+
+        payload = {
+            "stream": stream,
+            "model": self.model,
+            "messages": [
+                {"role": "system", "content": self.system_prompt},
+                {"role": "user", "content": conversation_prompt}
+            ],
+            "params": kwargs.get("params", {}),
+            "tool_servers": kwargs.get("tool_servers", []),
+            "features": kwargs.get("features", {"web_search": False}),
+            "chat_id": chat_id,
+            "id": message_id,
+            "stream_options": kwargs.get("stream_options", {"include_usage": True})
+        }
+
+        def for_stream():
+            streaming_text = ""
+            try:
+                response = self.session.post(
+                    self.api_endpoint,
+                    json=payload,
+                    stream=True,
+                    timeout=self.timeout,
+                    verify=False  # Always disable SSL verification for this request
+                )
+                response.raise_for_status()
+
+                # 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
+
+                self.last_response = {"text": streaming_text}
+                self.conversation.update_chat_history(prompt, self.get_message(self.last_response))
+
+            except requests.RequestException as e:
+                raise exceptions.FailedToGenerateResponseError(f"Request failed (requests): {e}") from e
+            except Exception as e:
+                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():
+            full_text = ""
+            try:
+                stream_generator = self.ask(
+                    prompt, stream=True, raw=False, optimizer=optimizer, conversationally=conversationally, **kwargs
+                )
+                for chunk_data in stream_generator:
+                    if isinstance(chunk_data, dict):
+                        full_text += chunk_data["text"]
+                    elif isinstance(chunk_data, str):
+                        full_text += chunk_data
+            except requests.RequestException as e:
+                raise exceptions.FailedToGenerateResponseError(f"Failed to aggregate non-stream response (requests): {str(e)}") from e
+            except Exception as e:
+                raise exceptions.FailedToGenerateResponseError(f"Failed to aggregate non-stream response: {str(e)}") from e
+
+            return full_text if raw else self.last_response
+
+        return for_stream() if stream else for_non_stream()
+
+    def chat(
+        self,
+        prompt: str,
+        stream: bool = False,
+        optimizer: str = None,
+        conversationally: bool = False,
+        **kwargs
+    ) -> Union[str, Generator[str, None, None]]:
+        """Generates a response from the xenai API."""
+
+        def for_stream_chat() -> Generator[str, None, None]:
+            gen = self.ask(
+                prompt, stream=True, raw=False,
+                optimizer=optimizer, conversationally=conversationally, **kwargs
+            )
+            for response_dict in gen:
+                yield self.get_message(response_dict)
+
+        def for_non_stream_chat() -> str:
+            response_data = self.ask(
+                prompt, stream=False, raw=False,
+                optimizer=optimizer, conversationally=conversationally, **kwargs
+            )
+            return self.get_message(response_data)
+
+        return for_stream_chat() if stream else for_non_stream_chat()
+
+    def get_message(self, response: Dict[str, Any]) -> str:
+        """Extracts the message from the API response."""
+        assert isinstance(response, dict), "Response should be of dict data-type only"
+        return response.get("text", "")
+
+# Example usage (no cookies file needed)
+if __name__ == "__main__":
+    from rich import print
+
+    print("-" * 80)
+    print(f"{'Model':<50} {'Status':<10} {'Response'}")
+    print("-" * 80)
+
+    for model in XenAI.AVAILABLE_MODELS:
+        try:
+            test_ai = XenAI(model=model, timeout=60)
+            response = test_ai.chat("Say 'Hello' in one word", stream=True)
+            response_text = ""
+            # Accumulate the response text without printing in the loop
+            for chunk in response:
+                response_text += chunk
+
+            if response_text and len(response_text.strip()) > 0:
+                status = "✓"
+                # Truncate response if too long
+                display_text = response_text.strip()[:50] + "..." if len(response_text.strip()) > 50 else response_text.strip()
+            else:
+                status = "✗"
+                display_text = "Empty or invalid response"
+            # Print the final status and response, overwriting the "Testing..." line
+            print(f"\r{model:<50} {status:<10} {display_text}")
+        except Exception as e:
+            # Print error, overwriting the "Testing..." line
+            print(f"\r{model:<50} {'✗':<10} {str(e)}")