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

webscout/Provider/TextPollinationsAI.py

@@ -2,7 +2,9 @@ from curl_cffi.requests import Session
 from curl_cffi import CurlError
 import json
 from typing import Union, Any, Dict, Generator, Optional, List
-from webscout.AIutel import Optimizers, Conversation, AwesomePrompts
+
+import requests
+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 as Lit
@@ -13,32 +15,30 @@ class TextPollinationsAI(Provider):
     """
 
     AVAILABLE_MODELS = [
-        "openai",              # OpenAI GPT-4.1-nano (Azure) - vision capable
-        "openai-large",        # OpenAI GPT-4.1 mini (Azure) - vision capable
-        "openai-reasoning",    # OpenAI o4-mini (Azure) - vision capable, reasoning
-        "qwen-coder",          # Qwen 2.5 Coder 32B (Scaleway)
-        "llama",               # Llama 3.3 70B (Cloudflare)
-        "llamascout",          # Llama 4 Scout 17B (Cloudflare)
-        "mistral",             # Mistral Small 3 (Scaleway) - vision capable
-        "unity",               # Unity Mistral Large (Scaleway) - vision capable, uncensored
-        "midijourney",         # Midijourney (Azure)
-        "rtist",               # Rtist (Azure)
-        "searchgpt",           # SearchGPT (Azure) - vision capable
-        "evil",                # Evil (Scaleway) - vision capable, uncensored
-        "deepseek-reasoning",  # DeepSeek-R1 Distill Qwen 32B (Cloudflare) - reasoning
-        "deepseek-reasoning-large", # DeepSeek R1 - Llama 70B (Scaleway) - reasoning
-        "phi",                 # Phi-4 Instruct (Cloudflare) - vision and audio capable
-        "llama-vision",        # Llama 3.2 11B Vision (Cloudflare) - vision capable
-        "gemini",              # gemini-2.5-flash-preview-04-17 (Azure) - vision and audio capable
-        "hormoz",              # Hormoz 8b (Modal)
-        "hypnosis-tracy",      # Hypnosis Tracy 7B (Azure) - audio capable
-        "deepseek",            # DeepSeek-V3 (DeepSeek)
-        "sur",                 # Sur AI Assistant (Mistral) (Scaleway) - vision capable
-        "openai-audio",        # OpenAI GPT-4o-audio-preview (Azure) - vision and audio capable
+        "openai",
+        "openai-large",
+        "qwen-coder",
+        "llama",
+        "llamascout",
+        "mistral",
+        "unity",
+        "midijourney",
+        "rtist",
+        "searchgpt",
+        "evil",
+        "deepseek-reasoning",
+        "deepseek-reasoning-large",
+        "phi",
+        "llama-vision",
+        "hormoz",
+        "hypnosis-tracy",
+        "deepseek",
+        "sur",
+        "openai-audio",
     ]
+    _models_url = "https://text.pollinations.ai/models"
 
-    def __init__(
-        self,
+    def __init__(self,
         is_conversation: bool = True,
         max_tokens: int = 8096, # Note: max_tokens is not directly used by this API endpoint
         timeout: int = 30,
@@ -52,10 +52,6 @@ class TextPollinationsAI(Provider):
         system_prompt: str = "You are a helpful AI assistant.",
     ):
         """Initializes the TextPollinationsAI API client."""
-        if model not in self.AVAILABLE_MODELS:
-            raise ValueError(f"Invalid model: {model}. Choose from: {self.AVAILABLE_MODELS}")
-
-        # Initialize curl_cffi Session
         self.session = Session()
         self.is_conversation = is_conversation
         self.max_tokens_to_sample = max_tokens
@@ -66,6 +62,10 @@ class TextPollinationsAI(Provider):
         self.model = model
         self.system_prompt = system_prompt
 
+        # Validate against the hardcoded list
+        if model not in self.AVAILABLE_MODELS:
+            raise ValueError(f"Invalid model: {model}. Choose from: {self.AVAILABLE_MODELS}")
+
         self.headers = {
             'Accept': '*/*',
             'Accept-Language': 'en-US,en;q=0.9',
@@ -96,6 +96,7 @@ class TextPollinationsAI(Provider):
         )
         self.conversation.history_offset = history_offset
 
+
     def ask(
         self,
         prompt: str,
@@ -148,40 +149,34 @@ class TextPollinationsAI(Provider):
                         f"Failed to generate response - ({response.status_code}, {response.reason}) - {response.text}"
                     )
 
-                full_response = ""
-                # Iterate over bytes and decode manually
-                for line_bytes in response.iter_lines():
-                    if line_bytes:
-                        line = line_bytes.decode('utf-8').strip()
-                        if line == "data: [DONE]":
-                            break
-                        if line.startswith('data: '):
-                            try:
-                                json_data = json.loads(line[6:])
-                                if 'choices' in json_data and len(json_data['choices']) > 0:
-                                    choice = json_data['choices'][0]
-                                    if 'delta' in choice:
-                                        if 'content' in choice['delta'] and choice['delta']['content'] is not None:
-                                            content = choice['delta']['content']
-                                            full_response += content
-                                            # Yield dict or raw string
-                                            yield content if raw else dict(text=content)
-                                        elif 'tool_calls' in choice['delta']:
-                                            # Handle tool calls in streaming response
-                                            tool_calls = choice['delta']['tool_calls']
-                                            # Yield dict or raw list
-                                            yield tool_calls if raw else dict(tool_calls=tool_calls)
-                            except json.JSONDecodeError:
-                                continue
-                            except UnicodeDecodeError:
-                                continue
+                streaming_text = ""
+                # 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]"],
+                    # Extractor handles both content and tool_calls
+                    content_extractor=lambda chunk: chunk.get('choices', [{}])[0].get('delta') if isinstance(chunk, dict) else None,
+                    yield_raw_on_error=False # Skip non-JSON or lines where extractor fails
+                )
+
+                for delta in processed_stream:
+                    # delta is the extracted 'delta' object or None
+                    if delta and isinstance(delta, dict):
+                        if 'content' in delta and delta['content'] is not None:
+                            content = delta['content']
+                            streaming_text += content
+                            yield content if raw else dict(text=content)
+                        elif 'tool_calls' in delta:
+                            tool_calls = delta['tool_calls']
+                            yield tool_calls if raw else dict(tool_calls=tool_calls)
 
                 # Update history and last response after stream finishes
-                # Note: last_response might only contain text, not tool calls if they occurred
-                self.last_response.update(dict(text=full_response))
-                if full_response: # Only update history if text was received
+                self.last_response.update(dict(text=streaming_text)) # Store aggregated text
+                if streaming_text: # Only update history if text was received
                     self.conversation.update_chat_history(
-                        prompt, full_response # Use the fully aggregated text
+                        prompt, streaming_text # Use the fully aggregated text
                     )
             except CurlError as e: # Catch CurlError
                 raise exceptions.FailedToGenerateResponseError(f"Request failed (CurlError): {e}") from e
@@ -193,22 +188,27 @@ class TextPollinationsAI(Provider):
             # Aggregate the stream using the updated for_stream logic
             final_content = ""
             tool_calls_aggregated = None # To store potential tool calls
-            for chunk_data in for_stream():
-                if isinstance(chunk_data, dict):
-                    if "text" in chunk_data:
-                        final_content += chunk_data["text"]
-                    elif "tool_calls" in chunk_data:
-                        # Aggregate tool calls (simple aggregation, might need refinement)
-                        if tool_calls_aggregated is None:
-                            tool_calls_aggregated = []
-                        tool_calls_aggregated.extend(chunk_data["tool_calls"])
-                elif isinstance(chunk_data, str): # Handle raw stream case
-                    final_content += chunk_data
-                # Handle raw tool calls list if raw=True
-                elif isinstance(chunk_data, list) and raw:
-                     if tool_calls_aggregated is None:
-                         tool_calls_aggregated = []
-                     tool_calls_aggregated.extend(chunk_data)
+            try: # Add try block for potential errors during aggregation
+                for chunk_data in for_stream():
+                    if isinstance(chunk_data, dict):
+                        if "text" in chunk_data:
+                            final_content += chunk_data["text"]
+                        elif "tool_calls" in chunk_data:
+                            # Aggregate tool calls (simple aggregation, might need refinement)
+                            if tool_calls_aggregated is None:
+                                tool_calls_aggregated = []
+                            tool_calls_aggregated.extend(chunk_data["tool_calls"])
+                    elif isinstance(chunk_data, str): # Handle raw stream case
+                        final_content += chunk_data
+                    # Handle raw tool calls list if raw=True
+                    elif isinstance(chunk_data, list) and raw:
+                         if tool_calls_aggregated is None:
+                             tool_calls_aggregated = []
+                         tool_calls_aggregated.extend(chunk_data)
+            except Exception as e:
+                 # If aggregation fails but some text was received, use it. Otherwise, re-raise.
+                 if not final_content and not tool_calls_aggregated:
+                     raise exceptions.FailedToGenerateResponseError(f"Failed to get non-stream response: {str(e)}") from e
 
 
             # last_response and history are updated within for_stream (for text)
@@ -263,6 +263,7 @@ class TextPollinationsAI(Provider):
         elif "tool_calls" in response:
             # For tool calls, return a string representation
             return json.dumps(response["tool_calls"])
+        return "" # Return empty string if neither text nor tool_calls found
 
 if __name__ == "__main__":
     # Ensure curl_cffi is installed
@@ -274,6 +275,7 @@ if __name__ == "__main__":
     working = 0
     total = len(TextPollinationsAI.AVAILABLE_MODELS)
 
+
     for model in TextPollinationsAI.AVAILABLE_MODELS:
         try:
             test_ai = TextPollinationsAI(model=model, timeout=60)

webscout/Provider/TwoAI.py

@@ -2,20 +2,25 @@ from curl_cffi.requests import Session
 from curl_cffi import CurlError
 import json
 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.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,25 @@ 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/'
         }
-        
+
         # Initialize curl_cffi Session
         self.session = Session()
-        # Update curl_cffi session headers and proxies
         self.session.headers.update(self.headers)
         self.session.proxies = proxies
 
@@ -79,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,
@@ -87,7 +104,6 @@ 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:
@@ -96,78 +112,92 @@ class TwoAI(Provider):
             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:
-                # Use curl_cffi session post with impersonate
                 response = self.session.post(
-                    self.url, 
-                    json=payload, 
-                    stream=True, 
+                    self.url,
+                    json=payload,
+                    stream=True,
                     timeout=self.timeout,
-                    impersonate="chrome110" # Add impersonate
+                    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} - {response.text}"
+                        f"Request failed with status code {response.status_code} - {error_detail}"
                     )
-                    
-                streaming_text = ""
-                # Iterate over bytes and decode manually
-                for line_bytes in response.iter_lines():
-                    if line_bytes:
-                        try:
-                            line = line_bytes.decode('utf-8') # Decode bytes
-                            chunk = json.loads(line)
-                            if chunk.get("typeName") == "LLMChunk": # Use .get for safety
-                                content = chunk.get("content", "") # Use .get for safety
-                                streaming_text += content
-                                resp = dict(text=content)
-                                # Yield dict or raw string
-                                yield resp if raw else resp
-                        except json.JSONDecodeError:
-                            continue
-                        except UnicodeDecodeError:
-                            continue
-                
-                # Update history and last response after stream finishes
+
+                # 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: # Catch CurlError
-                raise exceptions.FailedToGenerateResponseError(f"Request failed (CurlError): {e}")
-            except Exception as e: # Catch other potential exceptions
-                raise exceptions.FailedToGenerateResponseError(f"An unexpected error occurred ({type(e).__name__}): {e}")
+
+            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)
+
 
         def for_non_stream():
-            # Non-stream requests might not work the same way if the API expects streaming.
-            # This implementation aggregates the stream.
+            # Non-stream still uses the stream internally and aggregates
             streaming_text = ""
-            # Iterate through the generator provided by for_stream
-            for chunk_data in for_stream():
-                # Check if chunk_data is a dict (not raw) and has 'text'
-                if isinstance(chunk_data, dict) and "text" in chunk_data:
-                    streaming_text += chunk_data["text"]
-                # If raw=True, chunk_data is the string content itself
-                elif isinstance(chunk_data, str):
-                     streaming_text += chunk_data
-            # last_response and history are updated within for_stream
-            return self.last_response # Return the final aggregated response
-
-        # Ensure stream defaults to True if not provided, matching original behavior
+            # 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
+
         effective_stream = stream if stream is not None else True
         return for_stream() if effective_stream else for_non_stream()
 
@@ -178,56 +208,56 @@ class TwoAI(Provider):
         optimizer: str = None,
         conversationally: bool = False,
         online_search: bool = True,
-        reasoning_on: bool = False,
     ) -> str:
-        # Ensure stream defaults to True if not provided
         effective_stream = stream if stream is not None else True
 
         def for_stream_chat():
-            # ask() yields dicts when raw=False
-            for response_dict in self.ask(
-                prompt, 
-                stream=True, 
+            # ask() yields dicts when raw=False (default for chat)
+            gen = self.ask(
+                prompt,
+                stream=True,
                 raw=False, # Ensure ask yields dicts
-                optimizer=optimizer, 
+                optimizer=optimizer,
                 conversationally=conversationally,
                 online_search=online_search,
-                reasoning_on=reasoning_on
-            ):
-                yield self.get_message(response_dict)
-        
+            )
+            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
+             # ask() returns a dict when stream=False
             response_dict = self.ask(
-                prompt, 
-                stream=False, 
-                optimizer=optimizer, 
+                prompt,
+                stream=False, # Ensure ask returns dict
+                raw=False,
+                optimizer=optimizer,
                 conversationally=conversationally,
                 online_search=online_search,
-                reasoning_on=reasoning_on
             )
-            return self.get_message(response_dict)
-        
+            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"
 
-    api_key = "" # Add your API key here or load from env
-    
-    try: # Add try-except block for testing
+    try:
         ai = TwoAI(
             api_key=api_key,
             timeout=60,
+            model="sutra-r0",
             system_message="You are an intelligent AI assistant. Be concise and helpful."
         )
-        
-        print("[bold blue]Testing Stream:[/bold blue]")
-        response_stream = ai.chat("666+444=?", stream=True, reasoning_on=True)
+
+        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)
@@ -236,13 +266,15 @@ if __name__ == "__main__":
 
         # Optional: Test non-stream
         # print("[bold blue]Testing Non-Stream:[/bold blue]")
-        # response_non_stream = ai.chat("What is the capital of France?", stream=False)
-        # print(response_non_stream)
-        # print("[bold green]Non-Stream Test Complete.[/bold green]")
+        # 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}")
+        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}")
+