webscout 7.0__py3-none-any.whl → 7.2__py3-none-any.whl

webscout/Provider/Marcus.py

@@ -1,137 +1,191 @@
-import requests
-import json
-from typing import Any, Dict, Optional, Generator
-
-from webscout.AIutel import Optimizers
-from webscout.AIutel import Conversation
-from webscout.AIutel import AwesomePrompts
-from webscout.AIbase import Provider
-from webscout import exceptions
-from webscout import LitAgent as Lit
-
-class Marcus(Provider):
-    """
-    This class provides methods for interacting with the AskMarcus API.
-    Improved to match webscout provider standards.
-    """
-
-    def __init__(
-        self,
-        is_conversation: bool = True,
-        max_tokens: int = 2048,  # Added max_tokens parameter
-        timeout: int = 30,
-        intro: str = None,
-        filepath: str = None,
-        update_file: bool = True,
-        proxies: dict = {},
-        history_offset: int = 10250,
-        act: str = None,
-    ):
-        """Initializes the Marcus API."""
-        self.session = requests.Session()
-        self.is_conversation = is_conversation
-        self.max_tokens_to_sample = max_tokens
-        self.api_endpoint = "https://www.askmarcus.app/api/response"
-        self.timeout = timeout
-        self.last_response = {}
-        self.headers = {
-            'content-type': 'application/json',
-            'accept': '*/*',
-            'origin': 'https://www.askmarcus.app',
-            'referer': 'https://www.askmarcus.app/chat',
-            'user-agent': Lit().random(),
-        }
-        self.__available_optimizers = (
-            method
-            for method in dir(Optimizers)
-            if callable(getattr(Optimizers, method)) and not method.startswith("__")
-        )
-        Conversation.intro = (
-            AwesomePrompts().get_act(
-                act, raise_not_found=True, default=None, case_insensitive=True
-            )
-            if act
-            else intro or Conversation.intro
-        )
-        self.conversation = Conversation(
-            is_conversation, self.max_tokens_to_sample, filepath, update_file
-        )
-        self.conversation.history_offset = history_offset
-        self.session.proxies = proxies
-
-    def ask(
-        self,
-        prompt: str,
-        stream: bool = False,
-        raw: bool = False,
-        optimizer: str = None,
-        conversationally: bool = False,
-    ) -> Dict[str, Any] | Generator[str, None, None]:
-        """Sends a prompt to the AskMarcus API and returns the response."""
-        conversation_prompt = self.conversation.gen_complete_prompt(prompt)
-        if optimizer:
-            if optimizer in self.__available_optimizers:
-                conversation_prompt = getattr(Optimizers, optimizer)(
-                    conversation_prompt if conversationally else prompt
-                )
-            else:
-                raise exceptions.FailedToGenerateResponseError(
-                    f"Optimizer is not one of {self.__available_optimizers}"
-                )
-
-        data = {"message": conversation_prompt}
-
-        def for_stream():
-            try:
-                with requests.post(self.api_endpoint, headers=self.headers, json=data, stream=True, timeout=self.timeout) as response:
-                    response.raise_for_status()
-                    for line in response.iter_lines():
-                        if line:
-                            yield line.decode('utf-8')
-                    self.conversation.update_chat_history(prompt, self.get_message(self.last_response))
-
-            except requests.exceptions.RequestException as e:
-                raise exceptions.ProviderConnectionError(f"Error connecting to Marcus: {str(e)}")
-
-        def for_non_stream():
-            full_response = ""
-            for line in for_stream():
-                full_response += line
-            self.last_response = {"text": full_response}
-            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,
-    ) -> str | Generator[str, None, None]:
-        """Generates a response from the AskMarcus API."""
-
-        def for_stream():
-            for response_chunk in self.ask(
-                prompt, stream=True, optimizer=optimizer, conversationally=conversationally
-            ):
-                yield response_chunk
-
-        def for_non_stream():
-            response = self.ask(
-                prompt, stream=False, optimizer=optimizer, conversationally=conversationally
-            )
-            return self.get_message(response)
-
-        return for_stream() if stream else for_non_stream()
-
-    def get_message(self, response: Dict[str, Any]) -> str:
-        """Extracts the message from the API response."""
-        assert isinstance(response, dict), "Response should be of dict data-type only"
-        return response.get("text", "")
-
-if __name__ == '__main__':
-    ai = Marcus(timeout=30)
-    response = ai.chat("Tell me about India", stream=True)
-    for chunk in response:
-        print(chunk, end="", flush=True)
+import requests
+import json
+from typing import Any, Dict, Optional, Generator
+
+from webscout.AIutel import Optimizers
+from webscout.AIutel import Conversation
+from webscout.AIutel import AwesomePrompts
+from webscout.AIbase import Provider
+from webscout import exceptions
+from webscout.Litlogger import Logger, LogFormat
+from webscout import LitAgent as Lit
+
+class Marcus(Provider):
+    """
+    This class provides methods for interacting with the AskMarcus API.
+    Improved to match webscout provider standards with comprehensive logging.
+    """
+
+    def __init__(
+        self,
+        is_conversation: bool = True,
+        max_tokens: int = 2048,
+        timeout: int = 30,
+        intro: str = None,
+        filepath: str = None,
+        update_file: bool = True,
+        proxies: dict = {},
+        history_offset: int = 10250,
+        act: str = None,
+        logging: bool = False
+    ):
+        """Initializes the Marcus API with logging capabilities."""
+        self.logger = Logger(
+            name="Marcus",
+            format=LogFormat.MODERN_EMOJI,
+        ) if logging else None
+
+        if self.logger:
+            self.logger.info("Initializing Marcus API")
+
+        self.session = requests.Session()
+        self.is_conversation = is_conversation
+        self.max_tokens_to_sample = max_tokens
+        self.api_endpoint = "https://www.askmarcus.app/api/response"
+        self.timeout = timeout
+        self.last_response = {}
+        
+        self.headers = {
+            'content-type': 'application/json',
+            'accept': '*/*',
+            'origin': 'https://www.askmarcus.app',
+            'referer': 'https://www.askmarcus.app/chat',
+            'user-agent': Lit().random(),
+        }
+
+        self.__available_optimizers = (
+            method
+            for method in dir(Optimizers)
+            if callable(getattr(Optimizers, method)) and not method.startswith("__")
+        )
+
+        Conversation.intro = (
+            AwesomePrompts().get_act(
+                act, raise_not_found=True, default=None, case_insensitive=True
+            )
+            if act
+            else intro or Conversation.intro
+        )
+
+        self.conversation = Conversation(
+            is_conversation, self.max_tokens_to_sample, filepath, update_file
+        )
+        self.conversation.history_offset = history_offset
+        self.session.proxies = proxies
+
+        if self.logger:
+            self.logger.info("Marcus API initialized successfully")
+
+    def ask(
+        self,
+        prompt: str,
+        stream: bool = False,
+        raw: bool = False,
+        optimizer: str = None,
+        conversationally: bool = False,
+    ) -> Dict[str, Any] | Generator[str, None, None]:
+        """Sends a prompt to the AskMarcus API and returns the response with logging."""
+        if self.logger:
+            self.logger.debug(f"Processing request - Prompt: {prompt[:50]}...")
+            self.logger.debug(f"Stream: {stream}, Optimizer: {optimizer}")
+
+        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
+                )
+                if self.logger:
+                    self.logger.debug(f"Applied optimizer: {optimizer}")
+            else:
+                if self.logger:
+                    self.logger.error(f"Invalid optimizer requested: {optimizer}")
+                raise exceptions.FailedToGenerateResponseError(
+                    f"Optimizer is not one of {self.__available_optimizers}"
+                )
+
+        data = {"message": conversation_prompt}
+
+        def for_stream():
+            try:
+                if self.logger:
+                    self.logger.debug("Initiating streaming request to API")
+
+                with requests.post(
+                    self.api_endpoint,
+                    headers=self.headers,
+                    json=data,
+                    stream=True,
+                    timeout=self.timeout
+                ) as response:
+                    response.raise_for_status()
+                    
+                    if self.logger:
+                        self.logger.info(f"API connection established successfully. Status: {response.status_code}")
+
+                    for line in response.iter_lines():
+                        if line:
+                            yield line.decode('utf-8')
+                    
+                    self.conversation.update_chat_history(
+                        prompt, self.get_message(self.last_response)
+                    )
+
+            except requests.exceptions.RequestException as e:
+                if self.logger:
+                    self.logger.error(f"API request failed: {str(e)}")
+                raise exceptions.ProviderConnectionError(f"Error connecting to Marcus: {str(e)}")
+
+        def for_non_stream():
+            if self.logger:
+                self.logger.debug("Processing non-streaming request")
+            
+            full_response = ""
+            for line in for_stream():
+                full_response += line
+            self.last_response = {"text": full_response}
+            
+            if self.logger:
+                self.logger.debug("Response processing completed")
+            
+            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,
+    ) -> str | Generator[str, None, None]:
+        """Generates a response from the AskMarcus API with logging."""
+        if self.logger:
+            self.logger.debug(f"Chat request initiated - Prompt: {prompt[:50]}...")
+
+        def for_stream():
+            for response_chunk in self.ask(
+                prompt, stream=True, optimizer=optimizer, conversationally=conversationally
+            ):
+                yield response_chunk
+
+        def for_non_stream():
+            response = self.ask(
+                prompt, stream=False, optimizer=optimizer, conversationally=conversationally
+            )
+            return self.get_message(response)
+
+        return for_stream() if stream else for_non_stream()
+
+    def get_message(self, response: Dict[str, Any]) -> str:
+        """Extracts the message from the API response."""
+        assert isinstance(response, dict), "Response should be of dict data-type only"
+        return response.get("text", "")
+
+if __name__ == "__main__":
+    from rich import print
+    # Enable logging for testing
+    ai = Marcus(logging=True)
+    response = ai.chat(input(">>> "), stream=True)
+    for chunk in response:
+        print(chunk, end="", flush=True)

webscout/Provider/Netwrck.py

@@ -2,41 +2,39 @@ import time
 import uuid
 import requests
 import json
-
 from typing import Any, Dict, Optional, Generator, Union
 from dataclasses import dataclass, asdict
 from datetime import date
-
 from webscout.AIutel import Optimizers, Conversation, AwesomePrompts
 from webscout.AIbase import Provider
 from webscout import exceptions
-from webscout.Litlogger import LitLogger, LogFormat, ColorScheme
+from webscout.Litlogger import Logger, LogFormat
 from webscout.litagent import LitAgent
 
-
 class Netwrck(Provider):
     """
     A class to interact with the Netwrck.com API. Supports streaming.
     """
-    greeting = """An unknown multiverse phenomenon occurred, and you found yourself in a dark space. You looked around and found a source of light in a distance. You approached the light and *whoosh*....\nChoose your origin:\na) As a baby who just got birthed, your fate unknown\nb) As an amnesic stranded on an uninhabited island with mysterious ruins\nc) As an abandoned product of a forbidden experiment\nd) As a slave being sold at an auction\ne) Extremely Chaotic Randomizer\nOr, dive into your own fantasy."""
+    greeting = """Hello! I'm a helpful assistant. How can I help you today?"""
 
     AVAILABLE_MODELS = {
-        "lumimaid": "neversleep/llama-3.1-lumimaid-8b",
+        "lumimaid": "neversleep/llama-3-lumimaid-8b:extended",
         "grok": "x-ai/grok-2",
         "claude": "anthropic/claude-3.5-sonnet:beta",
         "euryale": "sao10k/l3-euryale-70b",
         "gpt4mini": "openai/gpt-4o-mini",
         "mythomax": "gryphe/mythomax-l2-13b",
         "gemini": "google/gemini-pro-1.5",
-        "lumimaid70b": "neversleep/llama-3.1-lumimaid-70b",
         "nemotron": "nvidia/llama-3.1-nemotron-70b-instruct",
+        "deepseek-r1": "deepseek/deepseek-r1",
+        "deepseek": "deepseek/deepseek-chat",
     }
 
     def __init__(
         self,
         model: str = "claude",
         is_conversation: bool = True,
-        max_tokens: int = 2048,
+        max_tokens: int = 4096,
         timeout: int = 30,
         intro: Optional[str] = None,
         filepath: Optional[str] = None,
@@ -50,8 +48,18 @@ class Netwrck(Provider):
         logging: bool = False
     ):
         """Initializes the Netwrck API client."""
+        # Initialize logger first for initialization logging
+        self.logger = Logger(
+            name="Netwrck",
+            format=LogFormat.MODERN_EMOJI,
+
+        ) if logging else None
+
         if model not in self.AVAILABLE_MODELS:
-            raise ValueError(f"Invalid model: {model}. Choose from: {list(self.AVAILABLE_MODELS.keys())}")
+            error_msg = f"Invalid model: {model}. Choose from: {list(self.AVAILABLE_MODELS.keys())}"
+            if self.logger:
+                self.logger.error(error_msg)
+            raise ValueError(error_msg)
 
         self.model = model
         self.model_name = self.AVAILABLE_MODELS[model]
@@ -64,9 +72,7 @@ class Netwrck(Provider):
         self.temperature = temperature
         self.top_p = top_p
         
-        # Initialize LitAgent for user agent generation
         self.agent = LitAgent()
-
         self.headers = {
             'authority': 'netwrck.com',
             'accept': '*/*',
@@ -76,6 +82,7 @@ class Netwrck(Provider):
             'referer': 'https://netwrck.com/',
             'user-agent': self.agent.random()
         }
+        
         self.session.headers.update(self.headers)
         self.proxies = proxies or {}
 
@@ -84,16 +91,16 @@ class Netwrck(Provider):
             if act
             else intro or Conversation.intro
         )
+        
         self.conversation = Conversation(is_conversation, max_tokens, filepath, update_file)
         self.conversation.history_offset = history_offset
         self.__available_optimizers = (
-            method
-            for method in dir(Optimizers)
+            method for method in dir(Optimizers)
             if callable(getattr(Optimizers, method)) and not method.startswith("__")
         )
 
-        # Initialize logger
-        self.logger = LitLogger(name="Netwrck", format=LogFormat.MODERN_EMOJI, color_scheme=ColorScheme.CYBERPUNK) if logging else None
+        if self.logger:
+            self.logger.info(f"Initialized Netwrck with model: {self.model_name}")
 
     def ask(
         self,
@@ -104,22 +111,20 @@ class Netwrck(Provider):
         conversationally: bool = False,
     ) -> Union[Dict[str, Any], Generator]:
         """Sends a prompt to the Netwrck API and returns the response."""
-
-        if self.logger:
-             self.logger.debug(f"ask() called with prompt: {prompt}")
+        if optimizer and optimizer not in self.__available_optimizers:
+            error_msg = f"Optimizer is not one of {self.__available_optimizers}"
+            if self.logger:
+                self.logger.error(f"Invalid optimizer requested: {optimizer}")
+            raise exceptions.FailedToGenerateResponseError(error_msg)
 
         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:
-                if self.logger:
-                    self.logger.error(f"Invalid optimizer: {optimizer}")
-                raise exceptions.FailedToGenerateResponseError(
-                    f"Optimizer is not one of {self.__available_optimizers}"
-                )
+            conversation_prompt = getattr(Optimizers, optimizer)(
+                conversation_prompt if conversationally else prompt
+            )
+            if self.logger:
+                self.logger.debug(f"Applied optimizer: {optimizer}")
+
         payload = {
             "query": prompt,
             "context": self.system_prompt,
@@ -128,6 +133,9 @@ class Netwrck(Provider):
             "greeting": self.greeting
         }
 
+        if self.logger:
+            self.logger.debug(f"Sending request to Netwrck API [stream={stream}]")
+
         def for_stream():
             try:
                 response = self.session.post(
@@ -140,26 +148,23 @@ class Netwrck(Provider):
                 )
                 response.raise_for_status()
 
-                # Initialize an empty string to accumulate the streaming text
                 streaming_text = ""
                 for line in response.iter_lines():
                     if line:
                         decoded_line = line.decode('utf-8').strip('"')
-                        streaming_text += decoded_line  # Accumulate the text
-                        yield {"text": decoded_line}  # Yield each chunk
+                        streaming_text += decoded_line
+                        yield {"text": decoded_line}
 
-                # Optionally, you can update the conversation history with the full streaming text
                 self.conversation.update_chat_history(payload["query"], streaming_text)
 
-            except Exception as e:
+            except requests.exceptions.RequestException as e:
                 if self.logger:
-                    self.logger.error(f"Error communicating with Netwrck: {e}")
-                raise exceptions.ProviderConnectionError(f"Error communicating with Netwrck: {e}") from e
-
+                    self.logger.error(f"Network error: {str(e)}")
+                raise exceptions.ProviderConnectionError(f"Network error: {str(e)}") from e
             except Exception as e:
                 if self.logger:
-                    self.logger.error(f"Error communicating with Netwrck: {e}")
-                raise exceptions.ProviderConnectionError(f"Error communicating with Netwrck: {e}") from e
+                    self.logger.error(f"Unexpected error: {str(e)}")
+                raise exceptions.ProviderConnectionError(f"Unexpected error: {str(e)}") from e
 
         def for_non_stream():
             try:
@@ -171,16 +176,24 @@ class Netwrck(Provider):
                     timeout=self.timeout,
                 )
                 response.raise_for_status()
-                # print(response.text)
+                
+                if self.logger:
+                    self.logger.debug(f"Response status: {response.status_code}")
+                
                 text = response.text.strip('"')
                 self.last_response = {"text": text}
                 self.conversation.update_chat_history(prompt, text)
 
                 return self.last_response
+
+            except requests.exceptions.RequestException as e:
+                if self.logger:
+                    self.logger.error(f"Network error: {str(e)}")
+                raise exceptions.FailedToGenerateResponseError(f"Network error: {str(e)}") from e
             except Exception as e:
                 if self.logger:
-                    self.logger.error(f"Error communicating with Netwrck: {e}")
-                raise exceptions.ProviderConnectionError(f"Error communicating with Netwrck: {e}") from e
+                    self.logger.error(f"Unexpected error: {str(e)}")
+                raise exceptions.FailedToGenerateResponseError(f"Unexpected error: {str(e)}") from e
 
         return for_stream() if stream else for_non_stream()
 
@@ -193,7 +206,7 @@ class Netwrck(Provider):
     ) -> str:
         """Generates a response from the Netwrck API."""
         if self.logger:
-             self.logger.debug(f"chat() called with prompt: {prompt}")
+            self.logger.debug(f"Processing chat request [stream={stream}]")
 
         def for_stream():
             for response in self.ask(
@@ -219,21 +232,20 @@ class Netwrck(Provider):
     def get_message(self, response: Dict[str, Any]) -> str:
         """Retrieves message only from response"""
         assert isinstance(response, dict), "Response should be of dict data-type only"
-        return response["text"]
+        return response["text"].replace('\\n', '\n').replace('\\n\\n', '\n\n')
 
-# Example Usage:
 if __name__ == "__main__":
     from rich import print
 
-    # Non-streaming example
+    # Example with logging enabled
+    netwrck = Netwrck(model="claude", logging=False)
+    
     print("Non-Streaming Response:")
-    netwrck = Netwrck(model="claude", logging=True)
-    response = netwrck.chat("tell me about Russia")
+    response = netwrck.chat("Tell me about Russia")
     print(response)
 
-    # Streaming example
     print("\nStreaming Response:")
-    response = netwrck.chat("tell me about India", stream=True)
+    response = netwrck.chat("Tell me about India", stream=True)
     for chunk in response:
         print(chunk, end="", flush=True)
-    print()  # Add a newline at the end
+    print()