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

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/__init__.py

@@ -17,8 +17,13 @@ from .litagent import LitAgent
 from .scout import *
 from .zeroart import *
 from .yep_search import *
-# # Import litprinter components for direct access from webscout
+
+# Import litprinter components for direct access from webscout (uncomment if needed)
 # from .litprinter import lit, litprint, ic, install, uninstall
+
+# Import sanitize_stream and lit_streamer for easy access
+from .AIutel import sanitize_stream, lit_streamer, LITSTREAM
+
 agent = LitAgent()
 
 __repo__ = "https://github.com/OE-LUCIFER/Webscout"
@@ -30,7 +35,7 @@ try:
     if update_message:
         print(update_message)
 except Exception:
-    pass  # Silently handle any update check errorslently handle any update check errors
+    pass  # Silently handle any update check errors
 
 import logging
 logging.getLogger("webscout").addHandler(logging.NullHandler())

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

webscout/auth/providers.py

@@ -87,13 +87,13 @@ def initialize_tti_provider_map() -> None:
     logger.info("Initializing TTI provider map...")
 
     try:
-        import webscout.Provider.TTI as tti_module
         from webscout.Provider.TTI.base import TTICompatibleProvider
-        
+        module = sys.modules["webscout.Provider.TTI"]
+
         provider_count = 0
         model_count = 0
 
-        for name, obj in inspect.getmembers(tti_module):
+        for name, obj in inspect.getmembers(module):
             if (
                 inspect.isclass(obj)
                 and issubclass(obj, TTICompatibleProvider)
@@ -242,7 +242,18 @@ def get_provider_instance(provider_class: Any):
     key = provider_class.__name__
     instance = provider_instances.get(key)
     if instance is None:
-        instance = provider_class()
+        try:
+            instance = provider_class()
+        except TypeError as e:
+            # Handle abstract class instantiation error
+            if "abstract class" in str(e):
+                from .exceptions import APIError
+                raise APIError(
+                    f"Provider misconfiguration: Cannot instantiate abstract class '{provider_class.__name__}'. Please check the provider implementation.",
+                    HTTP_500_INTERNAL_SERVER_ERROR,
+                    "provider_error"
+                )
+            raise
         provider_instances[key] = instance
     return instance
 
@@ -252,6 +263,17 @@ def get_tti_provider_instance(provider_class: Any):
     key = provider_class.__name__
     instance = tti_provider_instances.get(key)
     if instance is None:
-        instance = provider_class()
+        try:
+            instance = provider_class()
+        except TypeError as e:
+            # Handle abstract class instantiation error
+            if "abstract class" in str(e):
+                from .exceptions import APIError
+                raise APIError(
+                    f"Provider misconfiguration: Cannot instantiate abstract class '{provider_class.__name__}'. Please check the provider implementation.",
+                    HTTP_500_INTERNAL_SERVER_ERROR,
+                    "provider_error",
+                )
+            raise
         tti_provider_instances[key] = instance
     return instance