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

webscout/Provider/TwoAI.py

@@ -1,21 +1,26 @@
-import requests
+from curl_cffi.requests import Session
+from curl_cffi import CurlError
 import json
-import os
 from typing import Any, Dict, Optional, Generator, Union
+import re  # Import re for parsing SSE
 
 from webscout.AIutel import Optimizers
 from webscout.AIutel import Conversation
-from webscout.AIutel import AwesomePrompts, sanitize_stream
-from webscout.AIbase import Provider, AsyncProvider
+from webscout.AIutel import AwesomePrompts, sanitize_stream # Import sanitize_stream
+from webscout.AIbase import Provider
 from webscout import exceptions
 from webscout.litagent import LitAgent
+
+
 class TwoAI(Provider):
     """
-    A class to interact with the Two AI API with LitAgent user-agent.
+    A class to interact with the Two AI API (v2) with LitAgent user-agent.
     """
 
     AVAILABLE_MODELS = [
-        "sutra-light",
+        "sutra-v2",
+        "sutra-r0"
+
     ]
 
     def __init__(
@@ -30,26 +35,27 @@ class TwoAI(Provider):
         proxies: dict = {},
         history_offset: int = 10250,
         act: str = None,
-        model: str = "sutra-light",
+        model: str = "sutra-v2",  # Update default model
         temperature: float = 0.6,
         system_message: str = "You are a helpful assistant."
     ):
         """Initializes the TwoAI API client."""
         if model not in self.AVAILABLE_MODELS:
             raise ValueError(f"Invalid model: {model}. Choose from: {self.AVAILABLE_MODELS}")
-        self.url = "https://api.two.app/v1/sutra-light/completion"
+        self.url = "https://api.two.app/v2/chat/completions"  # Update API endpoint
         self.headers = {
             'User-Agent': LitAgent().random(),
-            'Accept': 'application/json',
+            'Accept': 'application/json',  # Keep application/json for request, response is text/event-stream
             'Content-Type': 'application/json',
             'X-Session-Token': api_key,
             'Origin': 'https://chat.two.ai',
             'Referer': 'https://api.two.app/'
         }
-        
-        self.session = requests.Session()
+
+        # Initialize curl_cffi Session
+        self.session = Session()
         self.session.headers.update(self.headers)
-        self.session.proxies.update(proxies)
+        self.session.proxies = proxies
 
         self.is_conversation = is_conversation
         self.max_tokens_to_sample = max_tokens
@@ -77,6 +83,19 @@ class TwoAI(Provider):
         )
         self.conversation.history_offset = history_offset
 
+    @staticmethod
+    def _twoai_extractor(chunk_json: Dict[str, Any]) -> Optional[str]:
+        """Extracts content from TwoAI v2 stream JSON objects."""
+        if not isinstance(chunk_json, dict) or "choices" not in chunk_json or not chunk_json["choices"]:
+            return None
+
+        delta = chunk_json["choices"][0].get("delta")
+        if not isinstance(delta, dict):
+            return None
+
+        content = delta.get("content")
+        return content if isinstance(content, str) else None
+
     def ask(
         self,
         prompt: str,
@@ -85,65 +104,102 @@ class TwoAI(Provider):
         optimizer: str = None,
         conversationally: bool = False,
         online_search: bool = True,
-        reasoning_on: bool = False,
     ) -> Union[Dict[str, Any], Generator]:
         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 Exception(f"Optimizer is not one of {self.__available_optimizers}")
 
-        # Payload construction
         payload = {
             "messages": [
-                {"role": "system", "content": self.system_message},
+                *([{"role": "system", "content": self.system_message}] if self.system_message else []),
                 {"role": "user", "content": conversation_prompt},
             ],
             "model": self.model,
             "temperature": self.temperature,
             "max_tokens": self.max_tokens_to_sample,
-            "reasoningOn": reasoning_on,
-            "onlineSearch": online_search
+            "extra_body": {
+                "online_search": online_search,
+            }
         }
 
         def for_stream():
+            streaming_text = "" # Initialize outside try block
             try:
-                with self.session.post(self.url, json=payload, stream=True, timeout=self.timeout) as response:
-                    if response.status_code != 200:
-                        raise exceptions.FailedToGenerateResponseError(
-                            f"Request failed with status code {response.status_code}"
-                        )
-                    
-                    streaming_text = ""
-                    for line in response.iter_lines(decode_unicode=True):
-                        if line:
-                            try:
-                                chunk = json.loads(line)
-                                if chunk["typeName"] == "LLMChunk":
-                                    content = chunk["content"]
-                                    streaming_text += content
-                                    resp = dict(text=content)
-                                    yield resp if raw else resp
-                            except json.JSONDecodeError:
-                                continue
-                    
+                response = self.session.post(
+                    self.url,
+                    json=payload,
+                    stream=True,
+                    timeout=self.timeout,
+                    impersonate="chrome110"
+                )
+
+                if response.status_code != 200:
+                    error_detail = response.text
+                    try:
+                        error_json = response.json()
+                        error_detail = error_json.get("error", {}).get("message", error_detail)
+                    except json.JSONDecodeError:
+                        pass
+                    raise exceptions.FailedToGenerateResponseError(
+                        f"Request failed with status code {response.status_code} - {error_detail}"
+                    )
+
+                # Use sanitize_stream for SSE processing
+                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._twoai_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 _twoai_extractor
+                    if content_chunk and isinstance(content_chunk, str):
+                        streaming_text += content_chunk
+                        resp = dict(text=content_chunk)
+                        yield resp if not raw else content_chunk
+
+                # If stream completes successfully, update history
+                self.last_response = {"text": streaming_text}
+                self.conversation.update_chat_history(prompt, streaming_text)
+
+            except CurlError as e:
+                raise exceptions.FailedToGenerateResponseError(f"Request failed (CurlError): {e}") from e
+            except exceptions.FailedToGenerateResponseError:
+                raise # Re-raise specific exception
+            except Exception as e:
+                raise exceptions.FailedToGenerateResponseError(f"An unexpected error occurred during streaming ({type(e).__name__}): {e}") from e
+            finally:
+                # Ensure history is updated even if stream ends abruptly but text was received
+                if streaming_text and not self.last_response: # Check if last_response wasn't set in the try block
                     self.last_response = {"text": streaming_text}
                     self.conversation.update_chat_history(prompt, streaming_text)
-                    
-            except requests.RequestException as e:
-                raise exceptions.FailedToGenerateResponseError(f"Request failed: {str(e)}")
+
 
         def for_non_stream():
+            # Non-stream still uses the stream internally and aggregates
             streaming_text = ""
-            for resp in for_stream():
-                streaming_text += resp["text"]
-            self.last_response = {"text": streaming_text}
-            return self.last_response
+            # We need to consume the generator from for_stream()
+            gen = for_stream()
+            try:
+                for chunk_data in gen:
+                    if isinstance(chunk_data, dict) and "text" in chunk_data:
+                        streaming_text += chunk_data["text"]
+                    elif isinstance(chunk_data, str): # Handle raw=True case
+                        streaming_text += chunk_data
+            except exceptions.FailedToGenerateResponseError:
+                 # If the underlying stream fails, re-raise the error
+                 raise
+            # self.last_response and history are updated within for_stream's try/finally
+            return self.last_response # Return the final aggregated dict
 
-        return for_stream() if stream else for_non_stream()
+        effective_stream = stream if stream is not None else True
+        return for_stream() if effective_stream else for_non_stream()
 
     def chat(
         self,
@@ -152,48 +208,73 @@ class TwoAI(Provider):
         optimizer: str = None,
         conversationally: bool = False,
         online_search: bool = True,
-        reasoning_on: bool = False,
     ) -> str:
-        def for_stream():
-            for response in self.ask(
-                prompt, 
-                True, 
-                optimizer=optimizer, 
+        effective_stream = stream if stream is not None else True
+
+        def for_stream_chat():
+            # ask() yields dicts when raw=False (default for chat)
+            gen = self.ask(
+                prompt,
+                stream=True,
+                raw=False, # Ensure ask yields dicts
+                optimizer=optimizer,
                 conversationally=conversationally,
                 online_search=online_search,
-                reasoning_on=reasoning_on
-            ):
-                yield self.get_message(response)
-        
-        def for_non_stream():
-            return self.get_message(
-                self.ask(
-                    prompt, 
-                    False, 
-                    optimizer=optimizer, 
-                    conversationally=conversationally,
-                    online_search=online_search,
-                    reasoning_on=reasoning_on
-                )
             )
-        
-        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 a dict when stream=False
+            response_dict = self.ask(
+                prompt,
+                stream=False, # Ensure ask returns dict
+                raw=False,
+                optimizer=optimizer,
+                conversationally=conversationally,
+                online_search=online_search,
+            )
+            return self.get_message(response_dict) # get_message expects dict
+
+        return for_stream_chat() if effective_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"]
+        return response.get("text", "") # Use .get for safety
+
 
 if __name__ == "__main__":
     from rich import print
+    import os
+
+    api_key = "eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJ1c2VySWQiOiJzanl2OHJtZGxDZDFnQ2hQdGxzZHdxUlVteXkyIiwic291cmNlIjoiRmlyZWJhc2UiLCJpYXQiOjE3NDYxMDY0NjksImV4cCI6MTc0NjEwNzM2OX0.o3fprDgsUJwvwCsWr0HfqmVpSBUthHsxqnopfWhtiYc"
+
+    try:
+        ai = TwoAI(
+            api_key=api_key,
+            timeout=60,
+            model="sutra-r0",
+            system_message="You are an intelligent AI assistant. Be concise and helpful."
+        )
+
+        response_stream = ai.chat("write me a poem about AI", stream=True, online_search=True)
+        full_stream_response = ""
+        for chunk in response_stream:
+            print(chunk, end="", flush=True)
+            full_stream_response += chunk
+        print("\n[bold green]Stream Test Complete.[/bold green]\n")
+
+        # Optional: Test non-stream
+        # print("[bold blue]Testing Non-Stream:[/bold blue]")
+        # non_stream_response = ai.chat("What is the capital of France?", stream=False, online_search=False)
+        # print(non_stream_response)
+        # print("[bold green]Non-Stream Test Complete.[/bold green]\n")
+
+
+    except exceptions.FailedToGenerateResponseError as e:
+        print(f"\n[bold red]API Error:[/bold red] {e}")
+    except ValueError as e:
+        print(f"\n[bold red]Configuration Error:[/bold red] {e}")
+    except Exception as e:
+        print(f"\n[bold red]An unexpected error occurred:[/bold red] {e}")
 
-    api_key = ""
-    
-    ai = TwoAI(
-        api_key=api_key,
-        timeout=60,
-        system_message="You are an intelligent AI assistant. Be concise and helpful."
-    )
-    
-    response = ai.chat("666+444=?", stream=True, reasoning_on=True)
-    for chunk in response:
-        print(chunk, end="", flush=True)

webscout/Provider/TypliAI.py

@@ -0,0 +1,305 @@
+import re
+import json
+import random
+import string
+from typing import Optional, Union, Any, Dict, Generator
+from curl_cffi import CurlError
+from curl_cffi.requests import Session
+# from curl_cffi.const import CurlHttpVersion # Not strictly needed if using default
+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
+
+
+def generate_random_id(length=16):
+    """Generates a random alphanumeric string."""
+    characters = string.ascii_letters + string.digits
+    return ''.join(random.choice(characters) for i in range(length))
+
+class TypliAI(Provider):
+    """
+    A class to interact with the Typli.ai API.
+
+    Attributes:
+        system_prompt (str): The system prompt to define the assistant's role.
+
+    Examples:
+        >>> from lol import TypliAI
+        >>> ai = TypliAI()
+        >>> response = ai.chat("What's the weather today?")
+        >>> print(response)
+        'I don't have access to real-time weather information...'
+    """
+    AVAILABLE_MODELS = ["free-no-sign-up-chatgpt"]
+
+    def __init__(
+        self,
+        is_conversation: bool = True,
+        max_tokens: int = 600,
+        timeout: int = 30,
+        intro: str = None,
+        filepath: str = None,
+        update_file: bool = True,
+        proxies: dict = {},
+        history_offset: int = 10250,
+        act: str = None,
+        system_prompt: str = "You are a helpful assistant.",
+        model: str = "free-no-sign-up-chatgpt"
+    ):
+        """
+        Initializes the TypliAI API with given parameters.
+
+        Args:
+            is_conversation (bool): Whether the provider is in conversation mode.
+            max_tokens (int): Maximum number of tokens to sample.
+            timeout (int): Timeout for API requests.
+            intro (str): Introduction message for the conversation.
+            filepath (str): Filepath for storing conversation history.
+            update_file (bool): Whether to update the conversation history file.
+            proxies (dict): Proxies for the API requests.
+            history_offset (int): Offset for conversation history.
+            act (str): Act for the conversation.
+            system_prompt (str): The system prompt to define the assistant's role.
+            model (str): The model to use for generation.
+        """
+        # Initialize curl_cffi Session instead of requests.Session
+        self.session = Session()
+        self.is_conversation = is_conversation
+        self.max_tokens_to_sample = max_tokens
+        self.api_endpoint = "https://typli.ai/api/generators/chat"
+        self.timeout = timeout
+        self.last_response = {}
+        self.system_prompt = system_prompt
+        self.model = model
+
+        # Initialize LitAgent for user agent generation if available
+
+        self.agent = LitAgent()
+        # user_agent = self.agent.random() # Let impersonate handle the user-agent
+        self.headers = {
+            'accept': '*/*', # Changed from '/' in example, but '*' is safer
+            'accept-language': 'en-US,en;q=0.9',
+            'content-type': 'application/json',
+            'origin': 'https://typli.ai',
+            'referer': 'https://typli.ai/free-no-sign-up-chatgpt',
+            # Let impersonate handle sec-ch-ua headers
+            # 'sec-ch-ua': '"Microsoft Edge";v="135", "Not-A.Brand";v="8", "Chromium";v="135"',
+            # 'sec-ch-ua-mobile': '?0',
+            # 'sec-ch-ua-platform': '"Windows"',
+            'sec-fetch-dest': 'empty',
+            'sec-fetch-mode': 'cors',
+            'sec-fetch-site': 'same-origin',
+            'dnt': '1',
+            # 'user-agent': user_agent, # Let impersonate handle this
+        }
+
+
+        self.__available_optimizers = (
+            method
+            for method in dir(Optimizers)
+            if callable(getattr(Optimizers, method)) and not method.startswith("__")
+        )
+        # Update curl_cffi session headers and proxies
+        self.session.headers.update(self.headers)
+        self.session.proxies = proxies
+
+        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
+
+
+    @staticmethod
+    def _typli_extractor(chunk: Union[str, Dict[str, Any]]) -> Optional[str]:
+        """Extracts content from the Typli.ai stream format '0:"..."'."""
+        if isinstance(chunk, str):
+            match = re.search(r'0:"(.*?)"', chunk)
+            if match:
+                # Decode potential unicode escapes like \u00e9
+                content = match.group(1).encode().decode('unicode_escape')
+                return content.replace('\\\\', '\\').replace('\\"', '"') # Handle escaped backslashes and quotes
+        return None
+
+    def ask(
+        self,
+        prompt: str,
+        stream: bool = False,
+        raw: bool = False,
+        optimizer: str = None,
+        conversationally: bool = False,
+    ) -> Union[Dict[str, Any], Generator[Dict[str, Any], None, None]]:
+        """
+        Sends a prompt to the Typli.ai API and returns the response.
+
+        Args:
+            prompt (str): The prompt to send to the API.
+            stream (bool): Whether to stream the response.
+            raw (bool): Whether to return the raw response.
+            optimizer (str): Optimizer to use for the prompt.
+            conversationally (bool): Whether to generate the prompt conversationally.
+
+        Returns:
+            Union[Dict[str, Any], Generator[Dict[str, Any], None, None]]: The API 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 Exception(
+                    f"Optimizer is not one of {self.__available_optimizers}"
+                )
+
+
+        payload = {
+            "id": generate_random_id(),
+            "messages": [
+                { # Add the system role message
+                    "role": "system",
+                    "content": self.system_prompt
+                },
+                {
+                    "role": "user",
+                    "content": conversation_prompt,
+                    "parts": [
+                        {
+                            "type": "text",
+                            "text": conversation_prompt
+                        }
+                    ]
+                }
+            ],
+            "slug": self.model
+        }
+
+        def for_stream():
+            try:
+                # Use curl_cffi session post with updated impersonate and http_version
+                response = self.session.post(
+                    self.api_endpoint,
+                    headers=self.headers,
+                    json=payload,
+                    stream=True,
+                    timeout=self.timeout,
+                    impersonate="chrome120",  # Switch to a more common profile
+                    # http_version=CurlHttpVersion.V1_1 # Usually not needed
+                )
+                if not response.ok:
+                    error_msg = f"Failed to generate response - ({response.status_code}, {response.reason}) - {response.text}"
+                    raise exceptions.FailedToGenerateResponseError(error_msg)
+
+                streaming_response = ""
+                # 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 like 'data:'
+                    to_json=False,    # Content is extracted as string, not JSON object per line
+                    content_extractor=self._typli_extractor, # Use the specific extractor
+                    skip_markers=["f:{", "e:{", "d:{", "8:[", "2:["] # Skip metadata lines based on observed format
+                )
+
+                for content_chunk in processed_stream:
+                    if content_chunk and isinstance(content_chunk, str): # Extractor returns string
+                        streaming_response += content_chunk
+                        yield content_chunk if raw else dict(text=content_chunk)
+
+                self.last_response.update(dict(text=streaming_response))
+
+                self.conversation.update_chat_history(
+                    prompt, self.get_message(self.last_response)
+                )
+
+            except CurlError as e:  # Catch CurlError
+                error_msg = f"Request failed (CurlError): {e}"
+                raise exceptions.FailedToGenerateResponseError(error_msg)
+
+            except Exception as e:  # Catch other potential exceptions
+                # Include the original exception type in the message for clarity
+                error_msg = f"An unexpected error occurred ({type(e).__name__}): {e}"
+                raise exceptions.FailedToGenerateResponseError(error_msg)
+
+
+        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(
+        self,
+        prompt: str,
+        stream: bool = False,
+        optimizer: str = None,
+        conversationally: bool = False,
+    ) -> Union[str, Generator[str, None, None]]:
+        """
+        Generates a response from the Typli.ai API.
+
+        Args:
+            prompt (str): The prompt to send to the API.
+            stream (bool): Whether to stream the response.
+            optimizer (str): Optimizer to use for the prompt.
+            conversationally (bool): Whether to generate the prompt conversationally.
+
+        Returns:
+            Union[str, Generator[str, None, None]]: The API response.
+        """
+
+        def for_stream():
+            for response in self.ask(
+                prompt, True, optimizer=optimizer, conversationally=conversationally
+            ):
+                yield self.get_message(response)
+
+        def for_non_stream():
+            return self.get_message(
+                self.ask(
+                    prompt,
+                    False,
+                    optimizer=optimizer,
+                    conversationally=conversationally,
+                )
+            )
+
+        return for_stream() if stream else for_non_stream()
+
+    def get_message(self, response: dict) -> str:
+        """
+        Extracts the message from the API response.
+
+        Args:
+            response (dict): The API response.
+
+        Returns:
+            str: The message content.
+        """
+        assert isinstance(response, dict), "Response should be of dict data-type only"
+        # Ensure text exists before processing
+        return response.get("text", "")
+
+
+
+if __name__ == "__main__":
+    from rich import print
+    try:
+        ai = TypliAI(timeout=60)
+        response = ai.chat("Write a short poem about AI", stream=True)
+        for chunk in response:
+            print(chunk, end="", flush=True)
+    except Exception as e:
+        print(f"An error occurred: {e}")