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

webscout/Provider/granite.py

@@ -5,15 +5,15 @@ from typing import Any, Dict, Generator
 from webscout.AIutel import Optimizers, Conversation, AwesomePrompts
 from webscout.AIbase import Provider
 from webscout import exceptions
-from webscout.Litlogger import Logger, LogFormat
 from webscout import LitAgent as Lit
+
 class IBMGranite(Provider):
     """
     A class to interact with the IBM Granite API (accessed via d18n68ssusgr7r.cloudfront.net)
-    with comprehensive logging and using Lit agent for the user agent.
+    using Lit agent for the user agent.
     """
 
-    AVAILABLE_MODELS = ["granite-3-8b-instruct"]
+    AVAILABLE_MODELS = ["granite-3-8b-instruct", "granite-3-2-8b-instruct"]
 
     def __init__(
         self,
@@ -27,24 +27,14 @@ class IBMGranite(Provider):
         proxies: dict = {},
         history_offset: int = 10250,
         act: str = None,
-        model: str = "granite-3-8b-instruct",
+        model: str = "granite-3-2-8b-instruct",
         system_prompt: str = "You are a helpful AI assistant.",
-        logging: bool = False
+        thinking: bool = False,
     ):
-        """Initializes the IBM Granite API client with logging and Lit agent for the user agent."""
+        """Initializes the IBMGranite API client using Lit agent for the user agent."""
         if model not in self.AVAILABLE_MODELS:
             raise ValueError(f"Invalid model: {model}. Choose from: {self.AVAILABLE_MODELS}")
 
-        # Setup logging if enabled
-        self.logger = Logger(
-            name="IBMGranite",
-            format=LogFormat.MODERN_EMOJI,
-
-        ) if logging else None
-
-        if self.logger:
-            self.logger.info(f"Initializing IBMGranite with model: {model}")
-
         self.session = requests.Session()
         self.is_conversation = is_conversation
         self.max_tokens_to_sample = max_tokens
@@ -54,6 +44,7 @@ class IBMGranite(Provider):
         self.last_response = {}
         self.model = model
         self.system_prompt = system_prompt
+        self.thinking = thinking
 
         # Use Lit agent to generate a random User-Agent
         self.headers = {
@@ -101,20 +92,13 @@ class IBMGranite(Provider):
         Returns:
             Union[Dict, Generator[Dict, None, None]]: Response generated
         """
-        if self.logger:
-            self.logger.debug(f"Ask method initiated - Prompt (first 50 chars): {prompt[:50]}")
-
         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 {self.__available_optimizers}")
 
         payload = {
@@ -123,20 +107,17 @@ class IBMGranite(Provider):
                 {"role": "system", "content": self.system_prompt},
                 {"role": "user", "content": conversation_prompt},
             ],
-            "stream": stream
+            "stream": stream,
+            "thinking": self.thinking,
         }
 
         def for_stream():
             try:
-                if self.logger:
-                    self.logger.debug(f"Sending POST request to {self.api_endpoint} with payload: {payload}")
                 response = self.session.post(
                     self.api_endpoint, headers=self.headers, json=payload, stream=True, timeout=self.timeout
                 )
                 if not response.ok:
                     msg = f"Request failed with status code {response.status_code}: {response.text}"
-                    if self.logger:
-                        self.logger.error(msg)
                     raise exceptions.FailedToGenerateResponseError(msg)
 
                 streaming_text = ""
@@ -149,28 +130,17 @@ class IBMGranite(Provider):
                                 streaming_text += content
                                 yield content if raw else dict(text=content)
                             else:
-                                if self.logger:
-                                    self.logger.debug(f"Skipping unrecognized line: {line}")
-                        except json.JSONDecodeError as e:
-                            if self.logger:
-                                self.logger.error(f"JSON decode error: {e}")
+                                # Skip unrecognized lines
+                                pass
+                        except json.JSONDecodeError:
                             continue
                 self.last_response.update(dict(text=streaming_text))
                 self.conversation.update_chat_history(prompt, self.get_message(self.last_response))
-                if self.logger:
-                    self.logger.info("Stream processing completed.")
-
             except requests.exceptions.RequestException as e:
-                if self.logger:
-                    self.logger.error(f"Request exception: {e}")
                 raise exceptions.ProviderConnectionError(f"Request failed: {e}")
             except json.JSONDecodeError as e:
-                if self.logger:
-                    self.logger.error(f"Invalid JSON received: {e}")
                 raise exceptions.InvalidResponseError(f"Failed to decode JSON response: {e}")
             except Exception as e:
-                if self.logger:
-                    self.logger.error(f"Unexpected error: {e}")
                 raise exceptions.FailedToGenerateResponseError(f"An unexpected error occurred: {e}")
 
         def for_non_stream():
@@ -189,20 +159,14 @@ class IBMGranite(Provider):
         conversationally: bool = False,
     ) -> str | Generator[str, None, None]:
         """Generate response as a string using chat method"""
-        if self.logger:
-            self.logger.debug(f"Chat method initiated - Prompt (first 50 chars): {prompt[:50]}")
-
         def for_stream():
             for response in self.ask(prompt, True, optimizer=optimizer, conversationally=conversationally):
                 yield self.get_message(response)
 
         def for_non_stream():
-            result = self.get_message(
+            return self.get_message(
                 self.ask(prompt, False, optimizer=optimizer, conversationally=conversationally)
             )
-            if self.logger:
-                self.logger.info("Chat method completed.")
-            return result
 
         return for_stream() if stream else for_non_stream()
 
@@ -213,11 +177,11 @@ class IBMGranite(Provider):
 
 if __name__ == "__main__":
     from rich import print
-    # Example usage: Initialize with logging enabled.
+    # Example usage: Initialize without logging.
     ai = IBMGranite(
-        api_key="", # press f12 to see the API key
-        logging=True
+        api_key="",  # press f12 to see the API key
+        thinking=True,
     )
     response = ai.chat("write a poem about AI", stream=True)
     for chunk in response:
-        print(chunk, end="", flush=True)
+        print(chunk, end="", flush=True)

webscout/Provider/llamatutor.py

@@ -1,4 +1,3 @@
-
 import requests
 import json
 
@@ -8,11 +7,10 @@ from webscout.AIutel import AwesomePrompts
 from webscout.AIbase import Provider
 from webscout import exceptions
 from webscout import LitAgent as Lit
-from webscout.Litlogger import Logger, LogFormat
 
 class LlamaTutor(Provider):
     """
-    A class to interact with the LlamaTutor API (Together.ai) with comprehensive logging.
+    A class to interact with the LlamaTutor API (Together.ai)
     """
 
     def __init__(
@@ -26,20 +24,11 @@ class LlamaTutor(Provider):
         proxies: dict = {},
         history_offset: int = 10250,
         act: str = None,
-        system_prompt: str = "You are a helpful AI assistant.",
-        logging: bool = False
+        system_prompt: str = "You are a helpful AI assistant."
     ):
         """
-        Initializes the LlamaTutor API with given parameters and logging capabilities.
+        Initializes the LlamaTutor API with given parameters.
         """
-        self.logger = Logger(
-            name="LlamaTutor",
-            format=LogFormat.MODERN_EMOJI,
-
-        ) if logging else None
-
-        if self.logger:
-            self.logger.info("Initializing LlamaTutor API")
 
         self.session = requests.Session()
         self.is_conversation = is_conversation
@@ -74,9 +63,6 @@ class LlamaTutor(Provider):
         )
         
         self.session.headers.update(self.headers)
-        
-        if self.logger:
-            self.logger.debug("Headers configured and session updated")
 
         Conversation.intro = (
             AwesomePrompts().get_act(
@@ -92,9 +78,6 @@ class LlamaTutor(Provider):
         self.conversation.history_offset = history_offset
         self.session.proxies = proxies
 
-        if self.logger:
-            self.logger.info("LlamaTutor initialized successfully")
-
     def ask(
         self,
         prompt: str,
@@ -103,10 +86,7 @@ class LlamaTutor(Provider):
         optimizer: str = None,
         conversationally: bool = False,
     ) -> dict:
-        """Chat with LlamaTutor with logging capabilities"""
-        if self.logger:
-            self.logger.debug(f"Processing request - Prompt: {prompt[:50]}...")
-            self.logger.debug(f"Stream: {stream}, Optimizer: {optimizer}")
+        """Chat with LlamaTutor"""
 
         conversation_prompt = self.conversation.gen_complete_prompt(prompt)
         if optimizer:
@@ -114,11 +94,7 @@ class LlamaTutor(Provider):
                 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 {self.__available_optimizers}")
         
         payload = {
@@ -136,8 +112,6 @@ class LlamaTutor(Provider):
 
         def for_stream():
             try:
-                if self.logger:
-                    self.logger.debug("Initiating streaming request to API")
 
                 response = requests.post(
                     self.api_endpoint,
@@ -148,9 +122,6 @@ class LlamaTutor(Provider):
                 )
                 response.raise_for_status()
                 
-                if self.logger:
-                    self.logger.info(f"API connection established successfully. Status: {response.status_code}")
-                
                 full_response = ''
                 for line in response.iter_lines(decode_unicode=True):
                     if line:
@@ -162,8 +133,6 @@ class LlamaTutor(Provider):
                                     full_response += json_data["text"]
                                     yield json_data["text"] if raw else dict(text=json_data["text"])
                         except json.JSONDecodeError as e:
-                            if self.logger:
-                                self.logger.warning(f"Failed to parse response line: {e}")
                             continue
 
                 self.last_response.update(dict(text=full_response))
@@ -172,17 +141,11 @@ class LlamaTutor(Provider):
                 )
 
             except requests.exceptions.HTTPError as http_err:
-                if self.logger:
-                    self.logger.error(f"HTTP error occurred: {http_err}")
                 raise exceptions.FailedToGenerateResponseError(f"HTTP error occurred: {http_err}")
             except requests.exceptions.RequestException as err:
-                if self.logger:
-                    self.logger.error(f"Request error occurred: {err}")
                 raise exceptions.FailedToGenerateResponseError(f"An error occurred: {err}")
 
         def for_non_stream():
-            if self.logger:
-                self.logger.debug("Processing non-streaming request")
             for _ in for_stream():
                 pass
             return self.last_response
@@ -196,9 +159,7 @@ class LlamaTutor(Provider):
         optimizer: str = None,
         conversationally: bool = False,
     ) -> str:
-        """Generate response with logging capabilities"""
-        if self.logger:
-            self.logger.debug(f"Chat request initiated - Prompt: {prompt[:50]}...")
+        """Generate response"""
 
         def for_stream():
             for response in self.ask(
@@ -225,8 +186,7 @@ class LlamaTutor(Provider):
 
 if __name__ == "__main__":
     from rich import print
-    # Enable logging for testing
-    ai = LlamaTutor(logging=True)
+    ai = LlamaTutor()
     response = ai.chat("Write a poem about AI", stream=True)
     for chunk in response:
         print(chunk, end="", flush=True)

webscout/Provider/llmchat.py

@@ -1,4 +1,3 @@
-
 import requests
 import json
 from typing import Any, Dict, Optional, Generator, List
@@ -8,12 +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 LLMChat(Provider):
     """
-    A class to interact with the LLMChat API with comprehensive logging.
+    A class to interact with the LLMChat API
     """
 
     AVAILABLE_MODELS = [
@@ -37,23 +35,13 @@ class LLMChat(Provider):
         history_offset: int = 10250,
         act: str = None,
         model: str = "@cf/meta/llama-3.1-70b-instruct",
-        system_prompt: str = "You are a helpful assistant.",
-        logging: bool = False
+        system_prompt: str = "You are a helpful assistant."
     ):
         """
-        Initializes the LLMChat API with given parameters and logging capabilities.
+        Initializes the LLMChat API with given parameters.
         """
-        self.logger = Logger(
-            name="LLMChat",
-            format=LogFormat.MODERN_EMOJI,
-        ) if logging else None
-
-        if self.logger:
-            self.logger.info(f"Initializing LLMChat with model: {model}")
 
         if model not in self.AVAILABLE_MODELS:
-            if self.logger:
-                self.logger.error(f"Invalid model selected: {model}")
             raise ValueError(f"Invalid model: {model}. Choose from: {self.AVAILABLE_MODELS}")
 
         self.session = requests.Session()
@@ -93,9 +81,6 @@ class LLMChat(Provider):
         self.conversation.history_offset = history_offset
         self.session.proxies = proxies
 
-        if self.logger:
-            self.logger.info("LLMChat initialized successfully")
-
     def ask(
         self,
         prompt: str,
@@ -105,9 +90,6 @@ class LLMChat(Provider):
         conversationally: bool = False,
     ) -> Dict[str, Any]:
         """Chat with LLMChat with logging capabilities"""
-        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:
@@ -115,11 +97,7 @@ class LLMChat(Provider):
                 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}"
                 )
@@ -136,14 +114,9 @@ class LLMChat(Provider):
 
         def for_stream():
             try:
-                if self.logger:
-                    self.logger.debug("Initiating streaming request to API")
 
                 with requests.post(url, json=payload, headers=self.headers, 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}")
 
                     full_response = ""
                     for line in response.iter_lines():
@@ -158,9 +131,7 @@ class LLMChat(Provider):
                                         yield response_text if raw else dict(text=response_text)
                                 except json.JSONDecodeError:
                                     if line.strip() != 'data: [DONE]':
-                                        if self.logger:
-                                            self.logger.warning(f"Failed to parse line: {line}")
-                                    continue
+                                        continue
 
                     self.last_response.update(dict(text=full_response))
                     self.conversation.update_chat_history(
@@ -168,21 +139,14 @@ class LLMChat(Provider):
                     )
 
             except requests.exceptions.RequestException as e:
-                if self.logger:
-                    self.logger.error(f"API request failed: {str(e)}")
                 raise exceptions.FailedToGenerateResponseError(f"Request failed: {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['text'] if not raw else line
-            
-            if self.logger:
-                self.logger.debug("Response processing completed")
-            
+
             return dict(text=full_response)
 
         return for_stream() if stream else for_non_stream()
@@ -195,8 +159,6 @@ class LLMChat(Provider):
         conversationally: bool = False,
     ) -> str | Generator[str, None, None]:
         """Generate response with logging capabilities"""
-        if self.logger:
-            self.logger.debug(f"Chat request initiated - Prompt: {prompt[:50]}...")
 
         def for_stream():
             for response in self.ask(
@@ -223,8 +185,7 @@ class LLMChat(Provider):
 
 if __name__ == "__main__":
     from rich import print
-    # Enable logging for testing
-    ai = LLMChat(model='@cf/meta/llama-3.1-70b-instruct', logging=True)
+    ai = LLMChat(model='@cf/meta/llama-3.1-70b-instruct')
     response = ai.chat("What's the meaning of life?", stream=True)
     for chunk in response:
         print(chunk, end="", flush=True)