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

webscout/Provider/uncovr.py

@@ -165,8 +165,6 @@ class UncovrAI(Provider):
                 )
             else:
                 raise Exception(f"Optimizer is not one of {self.__available_optimizers}")
-
-        # Prepare the request payload
         payload = {
             "content": conversation_prompt,
             "chatId": self.chat_id,
@@ -180,78 +178,72 @@ class UncovrAI(Provider):
                 "creativity": creativity
             }
         }
-
         def for_stream():
             try:
-                # Use curl_cffi session post with impersonate
                 response = self.session.post(
                     self.url, 
                     json=payload, 
                     stream=True, 
                     timeout=self.timeout,
-                    impersonate=self.fingerprint.get("browser_type", "chrome110") # Use fingerprint browser type
+                    impersonate=self.fingerprint.get("browser_type", "chrome110")
                 )
-                
                 if response.status_code != 200:
-                    # If we get a non-200 response, try refreshing our identity once
                     if response.status_code in [403, 429]:
                         self.refresh_identity()
-                        # Retry with new identity using curl_cffi session
                         retry_response = self.session.post(
                             self.url, 
                             json=payload, 
                             stream=True, 
                             timeout=self.timeout,
-                            impersonate=self.fingerprint.get("browser_type", "chrome110") # Use updated fingerprint
+                            impersonate=self.fingerprint.get("browser_type", "chrome110")
                         )
                         if not retry_response.ok:
                             raise exceptions.FailedToGenerateResponseError(
                                 f"Failed to generate response after identity refresh - ({retry_response.status_code}, {retry_response.reason}) - {retry_response.text}"
                             )
-                        response = retry_response # Use the successful retry response
+                        response = retry_response
                     else:
                         raise exceptions.FailedToGenerateResponseError(
                             f"Request failed with status code {response.status_code} - {response.text}"
                         )
-
                 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_json=False,    # Content is not JSON
-                    content_extractor=self._uncovr_extractor, # Use the specific extractor
-                    yield_raw_on_error=True # Keep yielding even if extractor fails, for potential error messages? (Adjust if needed)
+                    data=response.iter_content(chunk_size=None),
+                    intro_value=None,
+                    to_json=False,
+                    content_extractor=self._uncovr_extractor,
+                    yield_raw_on_error=True,
+                    raw=raw
                 )
-
                 for content_chunk in processed_stream:
-                    if content_chunk and isinstance(content_chunk, str):
-                        streaming_text += content_chunk
-                        yield dict(text=content_chunk) if not raw else 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 content_chunk is None:
+                        continue  # Ignore non-content lines
+                    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 = {"text": streaming_text}
                 self.conversation.update_chat_history(prompt, streaming_text)
-                    
-            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():
             try:
-                # Use curl_cffi session post with impersonate
                 response = self.session.post(
                     self.url, 
                     json=payload, 
                     timeout=self.timeout,
                     impersonate=self.fingerprint.get("browser_type", "chrome110")
                 )
-                
                 if response.status_code != 200:
                     if response.status_code in [403, 429]:
                         self.refresh_identity()
-                        # Retry with new identity using curl_cffi session
                         response = self.session.post(
                             self.url, 
                             json=payload, 
@@ -266,36 +258,32 @@ class UncovrAI(Provider):
                         raise exceptions.FailedToGenerateResponseError(
                             f"Request failed with status code {response.status_code} - {response.text}"
                         )
-
-                response_text = response.text # Get the full response text
-                
-                # Use sanitize_stream to process the non-streaming text
-                # It won't parse as JSON, but will apply the extractor line by line
+                response_text = response.text
                 processed_stream = sanitize_stream(
-                    data=response_text.splitlines(), # Split into lines first
+                    data=response_text.splitlines(),
                     intro_value=None,
                     to_json=False,
                     content_extractor=self._uncovr_extractor,
-                    yield_raw_on_error=True 
+                    yield_raw_on_error=True,
+                    raw=raw
                 )
-
-                # Aggregate the results from the generator
                 full_response = ""
                 for content in processed_stream:
-                    if content and isinstance(content, str):
+                    if isinstance(content, bytes):
+                        content = content.decode('utf-8', errors='ignore')
+                    if content is None:
+                        continue  # Ignore non-content lines
+                    if raw:
+                        full_response += content
+                    elif content and isinstance(content, str):
                         full_response += content
-
-                # Check if aggregation resulted in empty response (might indicate error not caught by extractor)
                 self.last_response = {"text": full_response}
                 self.conversation.update_chat_history(prompt, full_response)
-                return {"text": full_response}
-                
-            except CurlError as e: # Catch CurlError
+                return {"text": full_response} if not raw else full_response
+            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"Request failed ({type(e).__name__}): {e}")
-
-
         return for_stream() if stream else for_non_stream()
 
     def chat(
@@ -307,23 +295,29 @@ class UncovrAI(Provider):
         temperature: int = 32,
         creativity: str = "medium",
         selected_focus: list = ["web"],
-        selected_tools: list = []
+        selected_tools: list = [],
+        raw: bool = False,  # Added raw parameter
     ) -> Union[str, Generator[str, None, None]]:
         def for_stream():
             for response in self.ask(
-                prompt, True, optimizer=optimizer, conversationally=conversationally,
+                prompt, True, raw=raw, optimizer=optimizer, conversationally=conversationally,
                 temperature=temperature, creativity=creativity,
                 selected_focus=selected_focus, selected_tools=selected_tools
             ):
-                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,
-                    temperature=temperature, creativity=creativity,
-                    selected_focus=selected_focus, selected_tools=selected_tools
-                )
+            result = self.ask(
+                prompt, False, raw=raw, optimizer=optimizer, conversationally=conversationally,
+                temperature=temperature, creativity=creativity,
+                selected_focus=selected_focus, selected_tools=selected_tools
             )
+            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:
@@ -333,36 +327,7 @@ class UncovrAI(Provider):
         return text.replace('\\n', '\n').replace('\\n\\n', '\n\n') # Keep newline replacement
 
 if __name__ == "__main__":
-    # Ensure curl_cffi is installed
-    print("-" * 80)
-    print(f"{'Model':<50} {'Status':<10} {'Response'}")
-    print("-" * 80)
-
-    for model in UncovrAI.AVAILABLE_MODELS:
-        try:
-            test_ai = UncovrAI(model=model, timeout=60)
-            # Test non-stream first as stream logic depends on it
-            response_non_stream = test_ai.chat("Say 'Hello' in one word", stream=False) 
-            
-            if response_non_stream and len(response_non_stream.strip()) > 0:
-                 # Now test stream
-                response_stream = test_ai.chat("Say 'Hi' in one word", stream=True)
-                response_text = ""
-                for chunk in response_stream:
-                    response_text += chunk
-                
-                if response_text and len(response_text.strip()) > 0:
-                    status = "✓"
-                    # Clean and truncate response
-                    clean_text = response_text.strip().encode('utf-8', errors='ignore').decode('utf-8')
-                    display_text = clean_text[:50] + "..." if len(clean_text) > 50 else clean_text
-                else:
-                    status = "✗ (Stream)"
-                    display_text = "Empty or invalid stream response"
-            else:
-                status = "✗ (Non-Stream)"
-                display_text = "Empty or invalid non-stream response"
-                
-            print(f"\r{model:<50} {status:<10} {display_text}")
-        except Exception as e:
-            print(f"\r{model:<50} {'✗':<10} {str(e)}")
+    ai = UncovrAI()
+    response = ai.chat("who is pm of india?", raw=False, stream=True)
+    for chunk in response:
+        print(chunk, end='', flush=True)

webscout/Provider/x0gpt.py

@@ -1,4 +1,4 @@
-from typing import Optional, Union, Any, Dict
+from typing import Generator, Optional, Union, Any, Dict
 from uuid import uuid4
 from curl_cffi import CurlError
 from curl_cffi.requests import Session
@@ -134,7 +134,7 @@ class X0GPT(Provider):
         raw: bool = False,
         optimizer: str = None,
         conversationally: bool = False,
-    ) -> Dict[str, Any]:
+    ) -> Union[Dict[str, Any], Generator]:
         """
         Sends a prompt to the x0-gpt.devwtf.in API and returns the response.
 
@@ -197,13 +197,20 @@ class X0GPT(Provider):
                     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._x0gpt_extractor # Use the specific extractor
+                    content_extractor=self._x0gpt_extractor, # Use the specific extractor
+                    raw=raw
                 )
 
                 for content_chunk in processed_stream:
-                    if content_chunk and isinstance(content_chunk, str):
-                        streaming_response += 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_response += content_chunk
+                            yield dict(text=content_chunk)
 
                 self.last_response.update(dict(text=streaming_response))
                 self.conversation.update_chat_history(
@@ -217,6 +224,8 @@ class X0GPT(Provider):
 
         def for_non_stream():
             # This function implicitly uses the updated for_stream
+            if stream:
+                return for_stream()
             for _ in for_stream():
                 pass
             return self.last_response
@@ -229,7 +238,8 @@ class X0GPT(Provider):
         stream: bool = False,
         optimizer: str = None,
         conversationally: bool = False,
-    ) -> str:
+        raw: bool = False,  # Added raw parameter
+    ) -> Union[str, Generator[str, None, None]]:
         """
         Generates a response from the X0GPT API.
 
@@ -251,19 +261,25 @@ class X0GPT(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()
 
@@ -294,6 +310,6 @@ class X0GPT(Provider):
 if __name__ == "__main__":
     from rich import print
     ai = X0GPT(timeout=5000)
-    response = ai.chat("write a poem about AI", stream=True)
+    response = ai.chat("write a poem about AI", stream=True, raw=True)
     for chunk in response:
         print(chunk, end="", flush=True)

webscout/Provider/yep.py

@@ -1,10 +1,8 @@
 import uuid
-import json
 from curl_cffi import CurlError
 from curl_cffi.requests import Session
 
 from typing import Any, Dict, Optional, Generator, Union, List, TypeVar
-
 from webscout.AIutel import Optimizers
 from webscout.AIutel import AwesomePrompts, sanitize_stream # Import sanitize_stream
 from webscout.AIbase import Provider
@@ -192,81 +190,63 @@ class YEPCHAT(Provider):
 
         def for_stream():
             try:
-                # buffer = b"" # No longer needed here
-                # Use curl_cffi session post, pass cookies explicitly
                 response = self.session.post(self.chat_endpoint, headers=self.headers, cookies=self.cookies, json=data, stream=True, timeout=self.timeout, impersonate=self.fingerprint.get("browser_type", "chrome110"))
-                
                 if not response.ok:
-                    # If we get a non-200 response, try refreshing our identity once
                     if response.status_code in [403, 429]:
                         self.refresh_identity()
-                        # Retry with new identity
-                        # Use curl_cffi session post, pass cookies explicitly
                         retry_response = self.session.post(self.chat_endpoint, headers=self.headers, cookies=self.cookies, json=data, stream=True, timeout=self.timeout, impersonate=self.fingerprint.get("browser_type", "chrome110"))
                         if not retry_response.ok:
                             raise exceptions.FailedToGenerateResponseError(
                                 f"Failed to generate response after identity refresh - ({retry_response.status_code}, {retry_response.reason}) - {retry_response.text}"
                             )
-                        response = retry_response # Use the successful retry response
+                        response = retry_response
                     else:
                         raise exceptions.FailedToGenerateResponseError(
                             f"Failed to generate response - ({response.status_code}, {response.reason}) - {response.text}"
                         )
-
-                # --- Start of stream processing block (should be outside the 'if not response.ok' block) ---
                 streaming_text = ""
-
-                # Use sanitize_stream to process the lines
                 processed_stream = sanitize_stream(
-                    data=response.iter_content(chunk_size=None), # Pass the byte iterator directly
+                    data=response.iter_content(chunk_size=None),
                     intro_value="data:",
-                    to_json=True, # Yep sends JSON after 'data:'
-                    skip_markers=["[DONE]"], # Skip the final marker
-                    yield_raw_on_error=False, # Only process valid JSON data
-                    # --- Add the content extractor ---
-                    content_extractor=lambda chunk: chunk.get('choices', [{}])[0].get('delta', {}).get('content') if isinstance(chunk, dict) else None
+                    to_json=True,
+                    skip_markers=["[DONE]"],
+                    yield_raw_on_error=False,
+                    content_extractor=lambda chunk: chunk.get('choices', [{}])[0].get('delta', {}).get('content') if isinstance(chunk, dict) else None,
+                    raw=raw
                 )
-                # The loop now yields the final extracted string content directly
                 for content_chunk in processed_stream:
-                    # --- TEMPORARY DEBUG PRINT ---
-                    # print(f"\nDEBUG: Received extracted content: {content_chunk!r}\n", flush=True) # Keep or remove debug print as needed
-                    if content_chunk and isinstance(content_chunk, str): # Ensure it's a non-empty string
-                        streaming_text += content_chunk
-                        # Yield dict or raw string chunk based on 'raw' flag
-                        yield dict(text=content_chunk) if not raw else content_chunk
-                # --- End of stream processing block ---
-
-                # Check if the response contains a tool call (This should happen *after* processing the stream)
-                response_data = self.conversation.handle_tool_response(streaming_text)
-                
-                if response_data["is_tool_call"]:
-                    # Handle tool call results
-                    if response_data["success"]:
-                        for tool_call in response_data.get("tool_calls", []):
-                            tool_name = tool_call.get("name", "unknown_tool")
-                            result = response_data["result"]
-                            self.conversation.update_chat_history_with_tool(prompt, tool_name, result)
+                    # 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 tool call failed, update history with error
-                        self.conversation.update_chat_history(prompt, 
-                            f"Error executing tool call: {response_data['result']}")
-                else:
-                    # Normal response handling
-                    self.conversation.update_chat_history(prompt, streaming_text)
-                        
-            except CurlError as e: # Catch CurlError
-                 raise exceptions.FailedToGenerateResponseError(f"Request failed (CurlError): {e}")
+                        if content_chunk and isinstance(content_chunk, str):
+                            streaming_text += content_chunk
+                            yield dict(text=content_chunk)
+                if not raw:
+                    response_data = self.conversation.handle_tool_response(streaming_text)
+                    if response_data["is_tool_call"]:
+                        if response_data["success"]:
+                            for tool_call in response_data.get("tool_calls", []):
+                                tool_name = tool_call.get("name", "unknown_tool")
+                                result = response_data["result"]
+                                self.conversation.update_chat_history_with_tool(prompt, tool_name, result)
+                        else:
+                            self.conversation.update_chat_history(prompt, f"Error executing tool call: {response_data['result']}")
+                    else:
+                        self.conversation.update_chat_history(prompt, streaming_text)
+            except CurlError as e:
+                raise exceptions.FailedToGenerateResponseError(f"Request failed (CurlError): {e}")
             except Exception as e:
                 raise exceptions.FailedToGenerateResponseError(f"Request failed: {e}")
 
         def for_non_stream():
             try:
-                # Use curl_cffi session post, pass cookies explicitly
                 response = self.session.post(self.chat_endpoint, headers=self.headers, cookies=self.cookies, json=data, timeout=self.timeout, impersonate=self.fingerprint.get("browser_type", "chrome110"))
                 if not response.ok:
                     if response.status_code in [403, 429]:
                         self.refresh_identity()
-                        # Use curl_cffi session post, pass cookies explicitly
                         response = self.session.post(self.chat_endpoint, headers=self.headers, cookies=self.cookies, json=data, timeout=self.timeout, impersonate=self.fingerprint.get("browser_type", "chrome110"))
                         if not response.ok:
                             raise exceptions.FailedToGenerateResponseError(
@@ -276,40 +256,28 @@ class YEPCHAT(Provider):
                         raise exceptions.FailedToGenerateResponseError(
                             f"Failed to generate response - ({response.status_code}, {response.reason}) - {response.text}"
                         )
-
-                # ... existing non-stream response handling code ...
+                if raw:
+                    return response.text
                 response_data = response.json()
                 if 'choices' in response_data and len(response_data['choices']) > 0:
                     content = response_data['choices'][0].get('message', {}).get('content', '')
-                    
-                    # Check if the response contains a tool call
                     tool_response = self.conversation.handle_tool_response(content)
-                    
                     if tool_response["is_tool_call"]:
-                        # Process tool call
                         if tool_response["success"]:
-                            # Get the first tool call for simplicity
                             if "tool_calls" in tool_response and len(tool_response["tool_calls"]) > 0:
                                 tool_call = tool_response["tool_calls"][0]
                                 tool_name = tool_call.get("name", "unknown_tool")
                                 tool_result = tool_response["result"]
-                                
-                                # Update chat history with tool call
                                 self.conversation.update_chat_history_with_tool(prompt, tool_name, tool_result)
-                                
-                                # Return tool result
                                 return {"text": tool_result, "is_tool_call": True, "tool_name": tool_name}
-                        
-                        # If tool call processing failed
                         return {"text": tool_response["result"], "is_tool_call": True, "error": True}
                     else:
-                        # Normal response handling
                         self.conversation.update_chat_history(prompt, content)
                         return {"text": content}
                 else:
                     raise exceptions.FailedToGenerateResponseError("No response content found")
-            except CurlError as e: # Catch CurlError
-                 raise exceptions.FailedToGenerateResponseError(f"Request failed (CurlError): {e}")
+            except CurlError as e:
+                raise exceptions.FailedToGenerateResponseError(f"Request failed (CurlError): {e}")
             except Exception as e:
                 raise exceptions.FailedToGenerateResponseError(f"Request failed: {e}")
 
@@ -321,6 +289,7 @@ class YEPCHAT(Provider):
         stream: bool = False,
         optimizer: str = None,
         conversationally: bool = False,
+        raw: bool = False,  # Added raw parameter
     ) -> Union[str, Generator[str, None, None]]:
         """
         Initiates a chat with the Yep API using the provided prompt.
@@ -335,19 +304,25 @@ class YEPCHAT(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()
 
@@ -361,29 +336,37 @@ class YEPCHAT(Provider):
             >>> ai.get_message(response)
             Extracts and returns the message content from the response.
         """
-        assert isinstance(response, dict)
-        return response["text"]
+        if isinstance(response, dict):
+            return response["text"]
+        elif isinstance(response, (str, bytes)):
+            return response
+        else:
+            raise TypeError(f"Unexpected response type: {type(response)}")
 
 
 if __name__ == "__main__":
-    print("-" * 80)
-    print(f"{'Model':<50} {'Status':<10} {'Response'}")
-    print("-" * 80)
-
-    for model in YEPCHAT.AVAILABLE_MODELS:
-        try:
-            test_ai = YEPCHAT(model=model, timeout=60)
-            response = test_ai.chat("Say 'Hello' in one word")
-            response_text = response
+    # print("-" * 80)
+    # print(f"{'Model':<50} {'Status':<10} {'Response'}")
+    # print("-" * 80)
+
+    # for model in YEPCHAT.AVAILABLE_MODELS:
+    #     try:
+    #         test_ai = YEPCHAT(model=model, timeout=60)
+    #         response = test_ai.chat("Say 'Hello' in one word")
+    #         response_text = response
             
-            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(f"{model:<50} {status:<10} {display_text}")
-        except Exception as e:
-            print(f"{model:<50} {'✗':<10} {str(e)}")
-
+    #         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(f"{model:<50} {status:<10} {display_text}")
+    #     except Exception as e:
+    #         print(f"{model:<50} {'✗':<10} {str(e)}")
+    ai = YEPCHAT(model="DeepSeek-R1-Distill-Qwen-32B", timeout=60)
+    response = ai.chat("Say 'Hello' in one word", raw=True, stream=True)
+    for chunk in response:
+
+        print(chunk, end='', flush=True)

webscout/auth/__init__.py

@@ -13,7 +13,18 @@ from .schemas import (
     UserResponse,
     HealthCheckResponse
 )
-from .server import create_app, run_api, start_server
+# Import server functions lazily to avoid module execution issues
+def create_app():
+    from .server import create_app as _create_app
+    return _create_app()
+
+def run_api(*args, **kwargs):
+    from .server import run_api as _run_api
+    return _run_api(*args, **kwargs)
+
+def start_server(*args, **kwargs):
+    from .server import start_server as _start_server
+    return _start_server(*args, **kwargs)
 from .routes import Api
 from .config import ServerConfig, AppConfig
 from .exceptions import APIError