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

webscout/Provider/Glider.py

@@ -5,7 +5,7 @@ from typing import Any, Dict, Generator, Optional
 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 import LitAgent as Lit
 
 class GliderAI(Provider):
@@ -39,10 +39,10 @@ class GliderAI(Provider):
         if model not in self.AVAILABLE_MODELS:
             raise ValueError(f"Invalid model: {model}. Choose from: {', '.join(self.AVAILABLE_MODELS)}")
         
-        self.logger = LitLogger(
+        self.logger = Logger(
             name="GliderAI",
             format=LogFormat.MODERN_EMOJI,
-            color_scheme=ColorScheme.CYBERPUNK
+
         ) if logging else None
 
         if self.logger:

webscout/Provider/Groq.py

@@ -18,12 +18,16 @@ class GROQ(Provider):
     AVAILABLE_MODELS = [
         # "whisper-large-v3",
         "llama3-70b-8192",
+        "qwen-2.5-32b",
+        "qwen-2.5-coder-32b",
+        "deepseek-r1-distill-qwen-32b",
+        "deepseek-r1-distill-llama-70b",
         "llama-3.2-3b-preview",
         "gemma2-9b-it",
         "llama-3.2-11b-vision-preview",
         "llama3-8b-8192",
         "llama-3.3-70b-versatile",
-        "deepseek-r1-distill-llama-70b",
+        "llama-3.2-11b-vision-preview",
         # "distil-whisper-large-v3-en",
         "mixtral-8x7b-32768",
         "llama-3.3-70b-specdec",

webscout/Provider/Jadve.py

@@ -8,7 +8,7 @@ from webscout.AIutel import Optimizers, Conversation, AwesomePrompts
 from webscout.AIbase import Provider
 from webscout import exceptions
 from webscout.litagent import LitAgent
-from webscout.Litlogger import LitLogger, LogFormat, ColorScheme
+from webscout.Litlogger import Logger, LogFormat
 
 class JadveOpenAI(Provider):
     """
@@ -53,10 +53,10 @@ class JadveOpenAI(Provider):
         if model not in self.AVAILABLE_MODELS:
             raise ValueError(f"Invalid model: {model}. Choose from: {self.AVAILABLE_MODELS}")
 
-        self.logger = LitLogger(
+        self.logger = Logger(
             name="JadveOpenAI",
             format=LogFormat.MODERN_EMOJI,
-            color_scheme=ColorScheme.CYBERPUNK
+
         ) if logging else None
 
         if self.logger:

webscout/Provider/Marcus.py

@@ -1,192 +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.Litlogger import LitLogger, LogFormat, ColorScheme
-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 = LitLogger(
-            name="Marcus",
-            format=LogFormat.MODERN_EMOJI,
-            color_scheme=ColorScheme.CYBERPUNK
-        ) 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)
+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

@@ -8,7 +8,7 @@ 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):
@@ -49,10 +49,10 @@ class Netwrck(Provider):
     ):
         """Initializes the Netwrck API client."""
         # Initialize logger first for initialization logging
-        self.logger = LitLogger(
+        self.logger = Logger(
             name="Netwrck",
             format=LogFormat.MODERN_EMOJI,
-            color_scheme=ColorScheme.CYBERPUNK
+
         ) if logging else None
 
         if model not in self.AVAILABLE_MODELS:

webscout/Provider/PI.py

@@ -10,7 +10,7 @@ from webscout.AIutel import AwesomePrompts
 from webscout.AIbase import Provider
 from typing import Dict, Union, Any, Optional
 from webscout import LitAgent
-from webscout.Litlogger import LitLogger, LogFormat, ColorScheme
+from webscout.Litlogger import Logger, LogFormat
 
 class PiAI(Provider):
     """
@@ -96,7 +96,7 @@ class PiAI(Provider):
         self.conversation.history_offset = history_offset
         self.session.proxies = proxies
 
-        self.logger = LitLogger(name="PiAI", format=LogFormat.MODERN_EMOJI, color_scheme=ColorScheme.CYBERPUNK) if logging else None
+        self.logger = Logger(name="PiAI", format=LogFormat.MODERN_EMOJI) if logging else None
         
         self.knowledge_cutoff = "December 2023"
         

webscout/Provider/PizzaGPT.py

@@ -6,7 +6,7 @@ from webscout.AIutel import Optimizers, Conversation, AwesomePrompts
 from webscout.AIbase import Provider
 from webscout import exceptions
 from webscout import LitAgent as Lit
-from webscout.Litlogger import LitLogger, LogFormat, ColorScheme
+from webscout.Litlogger import Logger, LogFormat
 
 class PIZZAGPT(Provider):
     """
@@ -68,10 +68,9 @@ class PIZZAGPT(Provider):
         self.conversation.history_offset = history_offset
         self.session.proxies = proxies
         
-        self.logger = LitLogger(
+        self.logger = Logger(
             name="PIZZAGPT",
             format=LogFormat.MODERN_EMOJI,
-            color_scheme=ColorScheme.CYBERPUNK
         ) if logging else None
 
         if self.logger: