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

webscout/Provider/Jadve.py

@@ -1,18 +1,19 @@
+
 import requests
 import json
 import re
 from typing import Any, Dict, Optional, Generator
 
-from webscout.AIutel import Optimizers
-from webscout.AIutel import Conversation
-from webscout.AIutel import AwesomePrompts
+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
 
 class JadveOpenAI(Provider):
     """
-    A class to interact with the OpenAI API through jadve.com.
+    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"]
@@ -29,36 +30,50 @@ class JadveOpenAI(Provider):
         history_offset: int = 10250,
         act: str = None,
         model: str = "gpt-4o-mini",
-        system_prompt: str = "You are a helpful AI assistant."
+        system_prompt: str = "You are a helpful AI assistant.",
+        logging: bool = False
     ):
         """
-        Initializes the OpenAI API client through jadve.com with given parameters.
+        Initializes the JadveOpenAI client with optional logging support.
 
         Args:
-            is_conversation (bool, optional): Flag for chatting conversationally. Defaults to True.
-            max_tokens (int, optional): Maximum number of tokens to be generated upon completion. Defaults to 600.
-            timeout (int, optional): Http request timeout. Defaults to 30.
-            intro (str, optional): Conversation introductory prompt. Defaults to None.
-            filepath (str, optional): Path to file containing conversation history. Defaults to None.
-            update_file (bool, optional): Add new prompts and responses to the file. Defaults to True.
-            proxies (dict, optional): Http request proxies. Defaults to {}.
-            history_offset (int, optional): Limit conversation history to this number of last texts. Defaults to 10250.
-            act (str|int, optional): Awesome prompt key or index. (Used as intro). Defaults to None.
-            system_prompt (str, optional): System prompt for OpenAI. Defaults to "You are a helpful AI assistant.".
-            model (str, optional): AI model to use for text generation. Defaults to "gpt-4o".
+            is_conversation (bool, optional): Enable conversational mode. Defaults to True.
+            max_tokens (int, optional): Maximum tokens for generation. Defaults to 600.
+            timeout (int, optional): HTTP request timeout in seconds. Defaults to 30.
+            intro (str, optional): Introductory prompt text. Defaults to None.
+            filepath (str, optional): Path to conversation history file. Defaults to None.
+            update_file (bool, optional): Whether to update the conversation history file. Defaults to True.
+            proxies (dict, optional): Proxies for HTTP requests. Defaults to {}.
+            history_offset (int, optional): Limit for conversation history. Defaults to 10250.
+            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 = LitLogger(
+            name="JadveOpenAI",
+            format=LogFormat.MODERN_EMOJI,
+            color_scheme=ColorScheme.CYBERPUNK
+        ) 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
-        self.api_endpoint = "https://openai.jadve.com/chatgpt"
+        # Streaming endpoint for jadve.com
+        self.api_endpoint = "https://openai.jadve.com/stream"
         self.stream_chunk_size = 64
         self.timeout = timeout
         self.last_response = {}
         self.model = model
         self.system_prompt = system_prompt
+
+        # Updated headers with required x-authorization header.
         self.headers = {
             "accept": "*/*",
             "accept-encoding": "gzip, deflate, br, zstd",
@@ -75,14 +90,16 @@ class JadveOpenAI(Provider):
             "sec-fetch-mode": "cors",
             "sec-fetch-site": "same-site",
             "user-agent": LitAgent().random(),
+            "x-authorization": "Bearer"
         }
+        self.session.headers.update(self.headers)
+        self.session.proxies = proxies
 
         self.__available_optimizers = (
-            method
-            for method in dir(Optimizers)
+            method for method in dir(Optimizers)
             if callable(getattr(Optimizers, method)) and not method.startswith("__")
         )
-        self.session.headers.update(self.headers)
+
         Conversation.intro = (
             AwesomePrompts().get_act(
                 act, raise_not_found=True, default=None, case_insensitive=True
@@ -90,11 +107,14 @@ class JadveOpenAI(Provider):
             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("JadveOpenAI initialized successfully.")
 
     def ask(
         self,
@@ -103,78 +123,87 @@ class JadveOpenAI(Provider):
         raw: bool = False,
         optimizer: str = None,
         conversationally: bool = False,
-    ) -> dict:
-        """Chat with AI
+    ) -> dict | Generator[dict, None, None]:
+        """
+        Chat with AI.
+
         Args:
             prompt (str): Prompt to be sent.
             stream (bool, optional): Flag for streaming response. Defaults to False.
-            raw (bool, optional): Stream back raw response as received. Defaults to False.
-            optimizer (str, optional): Prompt optimizer name - `[code, shell_command]`. Defaults to None.
-            conversationally (bool, optional): Chat conversationally when using optimizer. Defaults to False.
+            raw (bool, optional): Return raw content chunks. Defaults to False.
+            optimizer (str, optional): Prompt optimizer name. Defaults to None.
+            conversationally (bool, optional): Flag for conversational optimization. Defaults to False.
         Returns:
-           dict : {}
-        ```json
-        {
-           "text" : "How may I assist you today?"
-        }
-        ```
+            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 {self.__available_optimizers}"
+                    f"Optimizer is not one of {list(self.__available_optimizers)}"
                 )
 
         payload = {
-            "action": "sendmessage",
-            "model": self.model,
             "messages": [
-                {"role": "system", "content": self.system_prompt},
-                {"role": "user", "content": conversation_prompt}
+                {"role": "user", "content": [{"type": "text", "text": conversation_prompt}]}
             ],
+            "model": self.model,
+            "botId": "",
+            "chatId": "",
+            "stream": stream,
             "temperature": 0.7,
-            "language": "en",
             "returnTokensUsage": True,
-            "botId": "guest-chat",
-            "chatId": ""
+            "useTools": False
         }
 
         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 = r'0:"(.*?)"'
+            chunks = re.findall(pattern, response_text)
             streaming_text = ""
-            for line in response.iter_lines(decode_unicode=True):
-                if line:
-                    if line.startswith("data: "):
-                        data = line[6:]
-                        if data == "[DONE]":
-                            break
-                        try:
-                            json_data = json.loads(data)
-                            if "choices" in json_data and len(json_data["choices"]) > 0:
-                                content = json_data["choices"][0].get("delta", {}).get("content", "")
-                                if content:
-                                    streaming_text += content
-                                    yield content if raw else dict(text=content)
-                        except json.JSONDecodeError as e:
-                            print(f"Error parsing line: {line} - {e}")
+            for content in chunks:
+                streaming_text += content
+
+                yield content if raw else dict(text=content)
+
             self.last_response.update(dict(text=streaming_text))
-            self.conversation.update_chat_history(
-                prompt, self.get_message(self.last_response)
-            )
+            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
             return self.last_response
@@ -187,48 +216,50 @@ class JadveOpenAI(Provider):
         stream: bool = False,
         optimizer: str = None,
         conversationally: bool = False,
-    ) -> str:
-        """Generate response `str`
+    ) -> str | Generator[str, None, None]:
+        """
+        Generate a chat response (string).
+
         Args:
-            prompt (str): Prompt to be send.
+            prompt (str): Prompt to be sent.
             stream (bool, optional): Flag for streaming response. Defaults to False.
-            optimizer (str, optional): Prompt optimizer name - `[code, shell_command]`. Defaults to None.
-            conversationally (bool, optional): Chat conversationally when using optimizer. Defaults to False.
+            optimizer (str, optional): Prompt optimizer name. Defaults to None.
+            conversationally (bool, optional): Flag for conversational optimization. Defaults to False.
         Returns:
-            str: Response generated
+            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, True, optimizer=optimizer, conversationally=conversationally
+                prompt, stream=True, optimizer=optimizer, conversationally=conversationally
             ):
                 yield self.get_message(response)
 
         def for_non_stream():
             return self.get_message(
-                self.ask(
-                    prompt,
-                    False,
-                    optimizer=optimizer,
-                    conversationally=conversationally,
-                )
+                self.ask(prompt, stream=False, optimizer=optimizer, conversationally=conversationally)
             )
 
         return for_stream() if stream else for_non_stream()
 
     def get_message(self, response: dict) -> str:
-        """Retrieves message only from response
+        """
+        Retrieves message from the response.
+
         Args:
-            response (dict): Response generated by `self.ask`
+            response (dict): Response from the ask() method.
         Returns:
-            str: Message extracted
+            str: Extracted text.
         """
         assert isinstance(response, dict), "Response should be of dict data-type only"
         return response["text"]
 
 if __name__ == "__main__":
     from rich import print
-    ai = JadveOpenAI(timeout=5000)
+    ai = JadveOpenAI(timeout=5000, logging=False)
+    # For streaming response demonstration.
     response = ai.chat("yo what's up", stream=True)
     for chunk in response:
-        print(chunk, end="", flush=True)
+        print(chunk, end="", flush=True)

webscout/Provider/Llama3.py

@@ -1,20 +1,30 @@
-import os
-import openai
 import requests
+import json
+from typing import Any, Dict, 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
 
-class LLAMA3(Provider):
+class Sambanova(Provider):
     """
-    A class to interact with the Sambanova API using the openai library.
+    A class to interact with the Sambanova API.
     """
 
     AVAILABLE_MODELS = [
         "Meta-Llama-3.1-8B-Instruct",
         "Meta-Llama-3.1-70B-Instruct",
-        "Meta-Llama-3.1-405B-Instruct"
+        "Meta-Llama-3.1-405B-Instruct",
+        "DeepSeek-R1-Distill-Llama-70B",
+        "Llama-3.1-Tulu-3-405B",
+        "Meta-Llama-3.2-1B-Instruct",
+        "Meta-Llama-3.2-3B-Instruct",
+        "Meta-Llama-3.3-70B-Instruct",
+        "Qwen2.5-72B-Instruct",
+        "Qwen2.5-Coder-32B-Instruct",
+        "QwQ-32B-Preview"
     ]
 
     def __init__(
@@ -22,9 +32,6 @@ class LLAMA3(Provider):
         api_key: str = None,
         is_conversation: bool = True,
         max_tokens: int = 600,
-        temperature: float = 1,
-        top_p: float = 0.95,
-        model: str = "Meta-Llama-3.1-8B-Instruct",
         timeout: int = 30,
         intro: str = None,
         filepath: str = None,
@@ -32,42 +39,25 @@ class LLAMA3(Provider):
         proxies: dict = {},
         history_offset: int = 10250,
         act: str = None,
+        model: str = "Meta-Llama-3.1-8B-Instruct",
         system_prompt: str = "You are a helpful AI assistant.",
     ):
         """
-        Initializes the Sambanova API with the given parameters.
-
-        Args:
-            api_key (str, optional): Your Sambanova API key. If None, it will use the environment variable "SAMBANOVA_API_KEY". Defaults to None.
-            is_conversation (bool, optional): Flag for chatting conversationally. Defaults to True.
-            max_tokens (int, optional): Maximum number of tokens to be generated upon completion. Defaults to 600.
-            temperature (float, optional): The temperature parameter for the model. Defaults to 1.
-            top_p (float, optional): The top_p parameter for the model. Defaults to 0.95.
-            model (str, optional): The name of the Sambanova model to use. Defaults to "Meta-Llama-3.1-8B-Instruct".
-            timeout (int, optional): Http request timeout. Defaults to 30.
-            intro (str, optional): Conversation introductory prompt. Defaults to None.
-            filepath (str, optional): Path to file containing conversation history. Defaults to None.
-            update_file (bool, optional): Add new prompts and responses to the file. Defaults to True.
-            proxies (dict, optional): Http request proxies. Defaults to {}.
-            history_offset (int, optional): Limit conversation history to this number of last texts. Defaults to 10250.
-            act (str|int, optional): Awesome prompt key or index. (Used as intro). Defaults to None.
-            system_prompt (str, optional): System instruction to guide the AI's behavior.
-                                           Defaults to "You are a helpful and informative AI assistant.".
+        Initializes the Sambanova API with given parameters.
         """
         if model not in self.AVAILABLE_MODELS:
             raise ValueError(f"Invalid model: {model}. Choose from: {self.AVAILABLE_MODELS}")
 
-        self.api_key = api_key or os.environ["SAMBANOVA_API_KEY"]
+        self.api_key = api_key
         self.model = model
-        self.temperature = temperature
-        self.top_p = top_p
-        self.system_prompt = system_prompt  # Add this line to set the system_prompt attribute
+        self.system_prompt = system_prompt
 
-        self.session = requests.Session()  # Not directly used for Gemini API calls, but can be used for other requests
+        self.session = requests.Session()
+        self.session.proxies = proxies
         self.is_conversation = is_conversation
         self.max_tokens_to_sample = max_tokens
         self.timeout = timeout
-        self.last_response = {}
+        self.last_response = ""
 
         self.__available_optimizers = (
             method
@@ -85,13 +75,13 @@ class LLAMA3(Provider):
             is_conversation, self.max_tokens_to_sample, filepath, update_file
         )
         self.conversation.history_offset = history_offset
-        self.session.proxies = proxies
 
-        # Configure the Sambanova API
-        self.client = openai.OpenAI(
-            api_key=self.api_key,
-            base_url="https://api.sambanova.ai/v1",
-        )
+        # Configure the API base URL and headers
+        self.base_url = "https://api.sambanova.ai/v1/chat/completions"
+        self.headers = {
+            "Authorization": f"Bearer {self.api_key}",
+            "Content-Type": "application/json"
+        }
 
     def ask(
         self,
@@ -100,23 +90,8 @@ class LLAMA3(Provider):
         raw: bool = False,
         optimizer: str = None,
         conversationally: bool = False,
-    ) -> dict:
-        """Chat with AI
-
-        Args:
-            prompt (str): Prompt to be send.
-            stream (bool, optional): Not used for Sambanova API. Defaults to False.
-            raw (bool, optional): Not used for Sambanova API. Defaults to False.
-            optimizer (str, optional): Prompt optimizer name - `[code, shell_command]`. Defaults to None.
-            conversationally (bool, optional): Chat conversationally when using optimizer. Defaults to False.
-        Returns:
-           dict : {}
-        ```json
-        {
-           "text" : "How may I assist you today?"
-        }
-        ```
-        """
+    ) -> Any | Generator[Any, None, None]:
+        """Chat with AI using the Sambanova API."""
         conversation_prompt = self.conversation.gen_complete_prompt(prompt)
         if optimizer:
             if optimizer in self.__available_optimizers:
@@ -125,65 +100,113 @@ class LLAMA3(Provider):
                 )
             else:
                 raise Exception(
-                    f"Optimizer is not one of {self.__available_optimizers}"
+                    f"Optimizer is not one of {list(self.__available_optimizers)}"
                 )
 
-        response = self.client.chat.completions.create(
-            model=self.model,
-            messages=[
+        payload = {
+            "model": self.model,
+            "stream": stream,
+            "messages": [
                 {"role": "system", "content": self.system_prompt},
                 {"role": "user", "content": conversation_prompt},
             ],
-            temperature=self.temperature,
-            top_p=self.top_p
-        )
+            "max_tokens": self.max_tokens_to_sample,
+        }
 
-        self.last_response.update(dict(text=response.choices[0].message.content))
-        self.conversation.update_chat_history(
-            prompt, self.get_message(self.last_response)
-        )
-        return self.last_response
+        def for_stream():
+            streaming_text = ""
+            try:
+                response = self.session.post(
+                    self.base_url, headers=self.headers, json=payload, stream=True, timeout=self.timeout
+                )
+                if not response.ok:
+                    raise exceptions.FailedToGenerateResponseError(
+                        f"Request failed: {response.status_code} - {response.text}"
+                    )
+
+                for line in response.iter_lines():
+                    if line:
+                        # Remove the "data:" prefix and extra whitespace if present
+                        line_str = line.decode('utf-8').strip() if isinstance(line, bytes) else line.strip()
+                        if line_str.startswith("data:"):
+                            data = line_str[5:].strip()
+                        else:
+                            data = line_str
+                        if data == "[DONE]":
+                            break
+                        try:
+                            json_data = json.loads(data)
+                            # Skip entries without valid choices
+                            if not json_data.get("choices"):
+                                continue
+                            choice = json_data["choices"][0]
+                            delta = choice.get("delta", {})
+                            if "content" in delta:
+                                content = delta["content"]
+                                streaming_text += content
+                                # Yield content directly as a string for consistency
+                                yield content
+                            # If finish_reason is provided, consider the stream complete
+                            if choice.get("finish_reason"):
+                                break
+                        except json.JSONDecodeError:
+                            continue
+                self.last_response = streaming_text
+                self.conversation.update_chat_history(
+                    prompt, self.last_response
+                )
+            except requests.exceptions.RequestException as e:
+                raise exceptions.ProviderConnectionError(f"Request failed: {e}")
+
+        def for_non_stream():
+            for _ in for_stream():
+                pass
+            return self.last_response
+
+        return for_stream() if stream else for_non_stream()
 
     def chat(
         self,
         prompt: str,
-        stream: bool = False,  # Streaming not supported by the current google-generativeai library
+        stream: bool = False,
         optimizer: str = None,
         conversationally: bool = False,
-    ) -> str:
-        """Generate response `str`
-
+    ) -> Any | Generator[str, None, None]:
+        """Generate response as a string.
         Args:
-            prompt (str): Prompt to be send.
-            stream (bool, optional): Not used for Sambanova API. Defaults to False.
-            optimizer (str, optional): Prompt optimizer name - `[code, shell_command]`. Defaults to None.
-            conversationally (bool, optional): Chat conversationally when using optimizer. Defaults to False.
+            prompt (str): Prompt to be sent.
+            stream (bool, optional): Flag for streaming response. Defaults to False.
+            optimizer (str, optional): Prompt optimizer name. Defaults to None.
+            conversationally (bool, optional): Use conversational tuning with the optimizer. Defaults to False.
         Returns:
-            str: Response generated
+            str: Generated response, or a generator of strings if streaming.
         """
-        return self.get_message(
-            self.ask(
-                prompt,
-                optimizer=optimizer,
-                conversationally=conversationally,
-            )
-        )
-
-    def get_message(self, response: dict) -> str:
-        """Retrieves message only from response
+        if stream:
+            # For stream mode, yield the text chunks directly
+            return self.ask(prompt, stream=True, optimizer=optimizer, conversationally=conversationally)
+        else:
+            # For non-stream mode, return the complete text response
+            return self.ask(prompt, stream=False, optimizer=optimizer, conversationally=conversationally)
+
+    def get_message(self, response: Any) -> str:
+        """
+        Retrieves a clean message from the provided response.
 
         Args:
-            response (dict): Response generated by `self.ask`
+            response: The raw response data.
 
         Returns:
-            str: Message extracted
+            str: The extracted message.
         """
-        assert isinstance(response, dict), "Response should be of dict data-type only"
-        return response["text"]
+        if isinstance(response, str):
+            return response
+        elif isinstance(response, dict) and "text" in response:
+            return response["text"]
+        return ""
 
 if __name__ == "__main__":
     from rich import print
-    ai = LLAMA3(api_key='')
-    response = ai.chat(input(">>> "))
-    for chunks in response:
-        print(chunks, end="", flush=True)
+    ai = Sambanova(api_key='')
+    response = ai.chat(input(">>> "), stream=True)
+    for chunk in response:
+        print(chunk, end="", flush=True)