webscout 7.3__py3-none-any.whl → 7.5__py3-none-any.whl

webscout/Provider/Jadve.py

@@ -1,4 +1,3 @@
-
 import requests
 import json
 import re
@@ -8,15 +7,13 @@ 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 Logger, LogFormat
 
 class JadveOpenAI(Provider):
     """
     A class to interact with the OpenAI API through jadve.com using the streaming endpoint.
-    Includes optional logging capabilities.
     """
 
-    AVAILABLE_MODELS = ["gpt-4o", "gpt-4o-mini"]
+    AVAILABLE_MODELS = ["gpt-4o", "gpt-4o-mini", "claude-3-7-sonnet-20250219", "claude-3-5-sonnet-20240620", "o1-mini", "deepseek-chat", "o1-mini", "claude-3-5-haiku-20241022"]
 
     def __init__(
         self,
@@ -29,12 +26,11 @@ class JadveOpenAI(Provider):
         proxies: dict = {},
         history_offset: int = 10250,
         act: str = None,
-        model: str = "gpt-4o-mini",
-        system_prompt: str = "You are a helpful AI assistant.",
-        logging: bool = False
+        model: str = "claude-3-7-sonnet-20250219",
+        system_prompt: str = "You are a helpful AI assistant."
     ):
         """
-        Initializes the JadveOpenAI client with optional logging support.
+        Initializes the JadveOpenAI client.
 
         Args:
             is_conversation (bool, optional): Enable conversational mode. Defaults to True.
@@ -48,24 +44,13 @@ class JadveOpenAI(Provider):
             act (str|int, optional): Act key for AwesomePrompts. Defaults to None.
             model (str, optional): AI model to be used. Defaults to "gpt-4o-mini".
             system_prompt (str, optional): System prompt text. Defaults to "You are a helpful AI assistant."
-            logging (bool, optional): Enable logging functionality. Defaults to False.
         """
         if model not in self.AVAILABLE_MODELS:
             raise ValueError(f"Invalid model: {model}. Choose from: {self.AVAILABLE_MODELS}")
 
-        self.logger = Logger(
-            name="JadveOpenAI",
-            format=LogFormat.MODERN_EMOJI,
-
-        ) if logging else None
-
-        if self.logger:
-            self.logger.info(f"Initializing JadveOpenAI with model: {model}")
-
         self.session = requests.Session()
         self.is_conversation = is_conversation
         self.max_tokens_to_sample = max_tokens
-        # Streaming endpoint for jadve.com
         self.api_endpoint = "https://openai.jadve.com/stream"
         self.stream_chunk_size = 64
         self.timeout = timeout
@@ -73,17 +58,17 @@ class JadveOpenAI(Provider):
         self.model = model
         self.system_prompt = system_prompt
 
-        # Updated headers with required x-authorization header.
+        # Headers for API requests
         self.headers = {
             "accept": "*/*",
             "accept-encoding": "gzip, deflate, br, zstd",
-            "accept-language": "en",
+            "accept-language": "en-US,en;q=0.9,en-IN;q=0.8",
             "content-type": "application/json",
             "dnt": "1",
             "origin": "https://jadve.com",
             "priority": "u=1, i",
             "referer": "https://jadve.com/",
-            "sec-ch-ua": '"Microsoft Edge";v="131", "Chromium";v="131", "Not_A Brand";v="24"',
+            "sec-ch-ua": '"Not(A:Brand";v="99", "Microsoft Edge";v="133", "Chromium";v="133"',
             "sec-ch-ua-mobile": "?0",
             "sec-ch-ua-platform": '"Windows"',
             "sec-fetch-dest": "empty",
@@ -113,9 +98,6 @@ class JadveOpenAI(Provider):
         )
         self.conversation.history_offset = history_offset
 
-        if self.logger:
-            self.logger.info("JadveOpenAI initialized successfully.")
-
     def ask(
         self,
         prompt: str,
@@ -136,21 +118,13 @@ class JadveOpenAI(Provider):
         Returns:
             dict or generator: A dictionary with the generated text or a generator yielding text chunks.
         """
-        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 Exception(
                     f"Optimizer is not one of {list(self.__available_optimizers)}"
                 )
@@ -169,43 +143,59 @@ class JadveOpenAI(Provider):
         }
 
         def for_stream():
-            if self.logger:
-                self.logger.debug("Initiating streaming request to API")
             response = self.session.post(
                 self.api_endpoint, headers=self.headers, json=payload, stream=True, timeout=self.timeout
             )
 
             if not response.ok:
-                if self.logger:
-                    self.logger.error(f"API request failed. Status: {response.status_code}, Reason: {response.reason}")
                 raise exceptions.FailedToGenerateResponseError(
                     f"Failed to generate response - ({response.status_code}, {response.reason}) - {response.text}"
                 )
 
-            if self.logger:
-                self.logger.info(f"API connection established successfully. Status: {response.status_code}")
-
-            # Read the entire response text.
-            response_text = response.text
+            # Pattern to match the streaming chunks format: 0:"text"
             pattern = r'0:"(.*?)"'
-            chunks = re.findall(pattern, response_text)
-            streaming_text = ""
-            for content in chunks:
-                streaming_text += content
-
-                yield content if raw else dict(text=content)
-
-            self.last_response.update(dict(text=streaming_text))
+            full_response_text = ""
+            
+            # Process the response as it comes in
+            buffer = ""
+            
+            for line in response.iter_lines(decode_unicode=True):
+                if not line:
+                    continue
+                
+                buffer += line
+                
+                # Try to match chunks in the current buffer
+                matches = re.findall(pattern, buffer)
+                if matches:
+                    for chunk in matches:
+                        full_response_text += chunk
+                        # Return the current chunk
+                        yield chunk if raw else dict(text=chunk)
+                    
+                    # Remove matched parts from the buffer
+                    matched_parts = [f'0:"{match}"' for match in matches]
+                    for part in matched_parts:
+                        buffer = buffer.replace(part, '', 1)
+                
+                # Check if we've reached the end of the response
+                if 'e:' in line or 'd:' in line:
+                    # No need to process usage data without logging
+                    break
+
+            self.last_response.update(dict(text=full_response_text))
             self.conversation.update_chat_history(prompt, self.get_message(self.last_response))
 
-            if self.logger:
-                self.logger.debug("Response processing completed.")
-
         def for_non_stream():
-            if self.logger:
-                self.logger.debug("Processing non-streaming request")
-            for _ in for_stream():
-                pass
+            # For non-streaming requests, we collect all chunks and return the complete response
+            collected_text = ""
+            for chunk in for_stream():
+                if raw:
+                    collected_text += chunk
+                else:
+                    collected_text += chunk.get("text", "")
+            
+            self.last_response = {"text": collected_text}
             return self.last_response
 
         return for_stream() if stream else for_non_stream()
@@ -228,9 +218,6 @@ class JadveOpenAI(Provider):
         Returns:
             str or generator: Generated response string or generator yielding response chunks.
         """
-        if self.logger:
-            self.logger.debug(f"Chat request initiated - Prompt: {prompt[:50]}...")
-
         def for_stream():
             for response in self.ask(
                 prompt, stream=True, optimizer=optimizer, conversationally=conversationally
@@ -258,8 +245,7 @@ class JadveOpenAI(Provider):
 
 if __name__ == "__main__":
     from rich import print
-    ai = JadveOpenAI(timeout=5000, logging=False)
-    # For streaming response demonstration.
-    response = ai.chat("yo what's up", stream=True)
+    ai = JadveOpenAI(timeout=5000)
+    response = ai.chat("Who made u?", stream=True)
     for chunk in response:
         print(chunk, end="", flush=True)

webscout/Provider/Marcus.py

@@ -7,13 +7,11 @@ 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.
+    Improved to match webscout provider standards.
     """
 
     def __init__(
@@ -26,18 +24,9 @@ class Marcus(Provider):
         update_file: bool = True,
         proxies: dict = {},
         history_offset: int = 10250,
-        act: str = None,
-        logging: bool = False
+        act: str = None
     ):
-        """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")
-
+        """Initializes the Marcus API."""
         self.session = requests.Session()
         self.is_conversation = is_conversation
         self.max_tokens_to_sample = max_tokens
@@ -50,7 +39,7 @@ class Marcus(Provider):
             'accept': '*/*',
             'origin': 'https://www.askmarcus.app',
             'referer': 'https://www.askmarcus.app/chat',
-            'user-agent': Lit().random(),
+            'user-agent': 'Mozilla/5.0',
         }
 
         self.__available_optimizers = (
@@ -73,9 +62,6 @@ class Marcus(Provider):
         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,
@@ -84,22 +70,14 @@ class Marcus(Provider):
         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}")
-
+        """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
                 )
-                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}"
                 )
@@ -108,9 +86,6 @@ class Marcus(Provider):
 
         def for_stream():
             try:
-                if self.logger:
-                    self.logger.debug("Initiating streaming request to API")
-
                 with requests.post(
                     self.api_endpoint,
                     headers=self.headers,
@@ -119,35 +94,21 @@ class Marcus(Provider):
                     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()
@@ -159,10 +120,7 @@ class Marcus(Provider):
         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]}...")
-
+        """Generates a response from the AskMarcus API."""
         def for_stream():
             for response_chunk in self.ask(
                 prompt, stream=True, optimizer=optimizer, conversationally=conversationally
@@ -184,8 +142,7 @@ class Marcus(Provider):
 
 if __name__ == "__main__":
     from rich import print
-    # Enable logging for testing
-    ai = Marcus(logging=True)
+    ai = Marcus()
     response = ai.chat(input(">>> "), stream=True)
     for chunk in response:
         print(chunk, end="", flush=True)

webscout/Provider/Netwrck.py

@@ -8,7 +8,6 @@ from datetime import date
 from webscout.AIutel import Optimizers, Conversation, AwesomePrompts
 from webscout.AIbase import Provider
 from webscout import exceptions
-from webscout.Litlogger import Logger, LogFormat
 from webscout.litagent import LitAgent
 
 class Netwrck(Provider):
@@ -20,7 +19,7 @@ class Netwrck(Provider):
     AVAILABLE_MODELS = {
         "lumimaid": "neversleep/llama-3-lumimaid-8b:extended",
         "grok": "x-ai/grok-2",
-        "claude": "anthropic/claude-3.5-sonnet:beta",
+        "claude": "anthropic/claude-3-7-sonnet-20250219",
         "euryale": "sao10k/l3-euryale-70b",
         "gpt4mini": "openai/gpt-4o-mini",
         "mythomax": "gryphe/mythomax-l2-13b",
@@ -44,22 +43,11 @@ class Netwrck(Provider):
         act: Optional[str] = None,
         system_prompt: str = "You are a helpful assistant.",
         temperature: float = 0.7,
-        top_p: float = 0.8,
-        logging: bool = False
+        top_p: float = 0.8
     ):
         """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:
-            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)
+            raise ValueError(f"Invalid model: {model}. Choose from: {list(self.AVAILABLE_MODELS.keys())}")
 
         self.model = model
         self.model_name = self.AVAILABLE_MODELS[model]
@@ -99,9 +87,6 @@ class Netwrck(Provider):
             if callable(getattr(Optimizers, method)) and not method.startswith("__")
         )
 
-        if self.logger:
-            self.logger.info(f"Initialized Netwrck with model: {self.model_name}")
-
     def ask(
         self,
         prompt: str,
@@ -112,18 +97,13 @@ class Netwrck(Provider):
     ) -> Union[Dict[str, Any], Generator]:
         """Sends a prompt to the Netwrck API and returns the response."""
         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)
+            raise exceptions.FailedToGenerateResponseError(f"Optimizer is not one of {self.__available_optimizers}")
 
         conversation_prompt = self.conversation.gen_complete_prompt(prompt)
         if optimizer:
             conversation_prompt = getattr(Optimizers, optimizer)(
                 conversation_prompt if conversationally else prompt
             )
-            if self.logger:
-                self.logger.debug(f"Applied optimizer: {optimizer}")
 
         payload = {
             "query": prompt,
@@ -133,9 +113,6 @@ 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(
@@ -158,12 +135,8 @@ class Netwrck(Provider):
                 self.conversation.update_chat_history(payload["query"], streaming_text)
 
             except requests.exceptions.RequestException as e:
-                if self.logger:
-                    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"Unexpected error: {str(e)}")
                 raise exceptions.ProviderConnectionError(f"Unexpected error: {str(e)}") from e
 
         def for_non_stream():
@@ -177,9 +150,6 @@ class Netwrck(Provider):
                 )
                 response.raise_for_status()
                 
-                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)
@@ -187,12 +157,8 @@ class Netwrck(Provider):
                 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"Unexpected error: {str(e)}")
                 raise exceptions.FailedToGenerateResponseError(f"Unexpected error: {str(e)}") from e
 
         return for_stream() if stream else for_non_stream()
@@ -205,9 +171,6 @@ class Netwrck(Provider):
         conversationally: bool = False,
     ) -> str:
         """Generates a response from the Netwrck API."""
-        if self.logger:
-            self.logger.debug(f"Processing chat request [stream={stream}]")
-
         def for_stream():
             for response in self.ask(
                 prompt,
@@ -237,15 +200,5 @@ class Netwrck(Provider):
 if __name__ == "__main__":
     from rich import print
 
-    # Example with logging enabled
-    netwrck = Netwrck(model="claude", logging=False)
-    
-    print("Non-Streaming Response:")
-    response = netwrck.chat("Tell me about Russia")
-    print(response)
-
-    print("\nStreaming Response:")
-    response = netwrck.chat("Tell me about India", stream=True)
-    for chunk in response:
-        print(chunk, end="", flush=True)
-    print()
+    netwrck = Netwrck(model="claude")
+    print(netwrck.chat("Hello! How are you?"))