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

webscout/Provider/Cloudflare.py

@@ -8,33 +8,42 @@ from webscout.AIbase import Provider, AsyncProvider
 from webscout import exceptions
 from typing import Any, AsyncGenerator, Dict
 import cloudscraper
+from webscout import LitAgent
+from webscout.Litlogger import Logger, LogFormat
 
 class Cloudflare(Provider):
+    """
+    Cloudflare provider to interact with Cloudflare's text generation API.
+    Includes logging capabilities using Logger and uses LitAgent for user-agent.
+    """
 
+    # Updated AVAILABLE_MODELS from given JSON data
     AVAILABLE_MODELS = [
-        "@cf/llava-hf/llava-1.5-7b-hf",
-        "@cf/unum/uform-gen2-qwen-500m",
-        "@cf/facebook/detr-resnet-50",
-        "@cf/facebook/bart-large-cnn",
         "@hf/thebloke/deepseek-coder-6.7b-base-awq",
         "@hf/thebloke/deepseek-coder-6.7b-instruct-awq",
-        "@cf/deepseek-ai/deepseek-math-7b-base",
         "@cf/deepseek-ai/deepseek-math-7b-instruct",
+        "@cf/deepseek-ai/deepseek-r1-distill-qwen-32b",
         "@cf/thebloke/discolm-german-7b-v1-awq",
         "@cf/tiiuae/falcon-7b-instruct",
-        "@cf/google/gemma-2b-it-lora",
         "@hf/google/gemma-7b-it",
-        "@cf/google/gemma-7b-it-lora",
         "@hf/nousresearch/hermes-2-pro-mistral-7b",
         "@hf/thebloke/llama-2-13b-chat-awq",
-        "@cf/meta-llama/llama-2-7b-chat-hf-lora",
+        "@cf/meta/llama-2-7b-chat-fp16",
+        "@cf/meta/llama-2-7b-chat-int8",
         "@cf/meta/llama-3-8b-instruct",
         "@cf/meta/llama-3-8b-instruct-awq",
         "@cf/meta/llama-3.1-8b-instruct",
+        "@cf/meta/llama-3.1-8b-instruct-awq",
+        "@cf/meta/llama-3.1-8b-instruct-fp8",
+        "@cf/meta/llama-3.2-11b-vision-instruct",
+        "@cf/meta/llama-3.2-1b-instruct",
+        "@cf/meta/llama-3.2-3b-instruct",
+        "@cf/meta/llama-3.3-70b-instruct-fp8-fast",
         "@hf/thebloke/llamaguard-7b-awq",
+        "@hf/meta-llama/meta-llama-3-8b-instruct",
+        "@cf/mistral/mistral-7b-instruct-v0.1",
         "@hf/thebloke/mistral-7b-instruct-v0.1-awq",
         "@hf/mistral/mistral-7b-instruct-v0.2",
-        "@cf/mistral/mistral-7b-instruct-v0.2-lora",
         "@hf/thebloke/neural-chat-7b-v3-1-awq",
         "@cf/openchat/openchat-3.5-0106",
         "@hf/thebloke/openhermes-2.5-mistral-7b-awq",
@@ -61,26 +70,25 @@ class Cloudflare(Provider):
         proxies: dict = {},
         history_offset: int = 10250,
         act: str = None,
-        model: str = "@cf/meta/llama-3.1-8b-instruct",
-        system_prompt: str = "You are a helpful assistant."
+        model: str = "@cf/deepseek-ai/deepseek-r1-distill-qwen-32b",
+        system_prompt: str = "You are a helpful assistant.",
+        logging: bool = False
     ):
-        """Instantiates Cloudflare
+        """Instantiates Cloudflare Provider
 
         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.
-            model (str, optional): Model to use for generating text. 
-                                   Defaults to "@cf/meta/llama-3.1-8b-instruct".
-                                   Choose from AVAILABLE_MODELS.
-            system_prompt (str, optional): System prompt for Cloudflare. 
-                                   Defaults to "You are a helpful assistant.".
+            is_conversation (bool, optional): Flag for conversational mode. Defaults to True.
+            max_tokens (int, optional): Max tokens to generate. Defaults to 600.
+            timeout (int, optional): HTTP request timeout. Defaults to 30.
+            intro (str, optional): Introductory prompt. Defaults to None.
+            filepath (str, optional): File path for conversation history. Defaults to None.
+            update_file (bool, optional): Update history file flag. Defaults to True.
+            proxies (dict, optional): Request proxies. Defaults to {}.
+            history_offset (int, optional): Chat history limit. Defaults to 10250.
+            act (str, optional): Awesome prompt key/index. Defaults to None.
+            model (str, optional): Model to use. Defaults to "@cf/deepseek-ai/deepseek-r1-distill-qwen-32b".
+            system_prompt (str, optional): System prompt for conversation. Defaults to "You are a helpful assistant.".
+            logging (bool, optional): Enable logging if True. Defaults to False.
         """
         if model not in self.AVAILABLE_MODELS:
             raise ValueError(f"Invalid model: {model}. Choose from: {self.AVAILABLE_MODELS}")
@@ -94,6 +102,7 @@ class Cloudflare(Provider):
         self.last_response = {}
         self.model = model
         self.system_prompt = system_prompt
+
         self.headers = {
             'Accept': 'text/event-stream',
             'Accept-Encoding': 'gzip, deflate, br, zstd',
@@ -108,7 +117,7 @@ class Cloudflare(Provider):
             'Sec-Fetch-Dest': 'empty',
             'Sec-Fetch-Mode': 'cors',
             'Sec-Fetch-Site': 'same-origin',
-            'User-Agent': webscout.LitAgent().random()
+            'User-Agent': LitAgent().random()
         }
 
         self.cookies = {
@@ -122,21 +131,27 @@ class Cloudflare(Provider):
             for method in dir(Optimizers)
             if callable(getattr(Optimizers, method)) and not method.startswith("__")
         )
-        # FIX: Initialize the session here
-        self.session = cloudscraper.create_scraper() 
+
+        # Initialize session and apply proxies
+        self.session = cloudscraper.create_scraper()
         self.session.headers.update(self.headers)
+        self.session.proxies = proxies
+
         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
+            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
+
+        # Initialize logger if logging is enabled
+        self.logger = Logger(
+            name="Cloudflare",
+            format=LogFormat.MODERN_EMOJI,
+        ) if logging else None
+
+        if self.logger:
+            self.logger.info("Cloudflare initialized successfully")
 
     def ask(
         self,
@@ -149,14 +164,13 @@ class Cloudflare(Provider):
         """Chat with AI
 
         Args:
-            prompt (str): Prompt to be send.
+            prompt (str): Prompt to be sent.
             stream (bool, optional): Whether to stream the response. Defaults to False.
-            raw (bool, optional): Whether to return the raw response. Defaults to False.
-            optimizer (str, optional): The name of the optimizer to use. Defaults to None.
-            conversationally (bool, optional): Whether to chat conversationally. Defaults to False.
-
+            raw (bool, optional): Return raw response. Defaults to False.
+            optimizer (str, optional): Optimizer to use. Defaults to None.
+            conversationally (bool, optional): Conversational mode flag. Defaults to False.
         Returns:
-            The response from the API.
+            dict: Response from the API.
         """
         conversation_prompt = self.conversation.gen_complete_prompt(prompt)
         if optimizer:
@@ -164,10 +178,12 @@ class Cloudflare(Provider):
                 conversation_prompt = getattr(Optimizers, optimizer)(
                     conversation_prompt if conversationally else prompt
                 )
+                if self.logger:
+                    self.logger.debug(f"Applied optimizer: {optimizer}")
             else:
-                raise Exception(
-                    f"Optimizer is not one of {self.__available_optimizers}"
-                )
+                if self.logger:
+                    self.logger.error(f"Invalid optimizer requested: {optimizer}")
+                raise Exception(f"Optimizer is not one of {list(self.__available_optimizers)}")
         
         payload = {
             "messages": [
@@ -181,11 +197,19 @@ class Cloudflare(Provider):
         }
 
         def for_stream():
+            if self.logger:
+                self.logger.debug("Sending streaming request to Cloudflare API...")
             response = self.scraper.post(
-                self.chat_endpoint, headers=self.headers, cookies=self.cookies, data=json.dumps(payload), stream=True, timeout=self.timeout
+                self.chat_endpoint,
+                headers=self.headers,
+                cookies=self.cookies,
+                data=json.dumps(payload),
+                stream=True,
+                timeout=self.timeout
             )
-
             if not response.ok:
+                if self.logger:
+                    self.logger.error(f"Request failed: ({response.status_code}, {response.reason})")
                 raise exceptions.FailedToGenerateResponseError(
                     f"Failed to generate response - ({response.status_code}, {response.reason})"
                 )
@@ -197,9 +221,9 @@ class Cloudflare(Provider):
                     streaming_response += content
                     yield content if raw else dict(text=content)
             self.last_response.update(dict(text=streaming_response))
-            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.info("Streaming response completed successfully")
 
         def for_non_stream():
             for _ in for_stream():
@@ -215,48 +239,37 @@ class Cloudflare(Provider):
         optimizer: str = None,
         conversationally: bool = False,
     ) -> str:
-        """Generate response `str`
+        """Generate response string from chat
+
         Args:
-            prompt (str): Prompt to be send.
-            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.
+            prompt (str): Prompt to be sent.
+            stream (bool, optional): Stream response flag. Defaults to False.
+            optimizer (str, optional): Optimizer name. Defaults to None.
+            conversationally (bool, optional): Conversational mode flag. Defaults to False.
         Returns:
-            str: Response generated
+            str: Generated response.
         """
-
         def for_stream():
-            for response in self.ask(
-                prompt, True, optimizer=optimizer, conversationally=conversationally
-            ):
+            for response in self.ask(prompt, 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,
-                )
-            )
-
+            return self.get_message(self.ask(prompt, 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
+        """Extracts the message text from the response
 
         Args:
-            response (dict): Response generated by `self.ask`
-
+            response (dict): API response.
         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 = Cloudflare(timeout=5000)
+    ai = Cloudflare(timeout=5000, logging=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/DeepSeek.py

@@ -0,0 +1,218 @@
+
+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 DeepSeek(Provider):
+    """
+    A class to interact with the DeepSeek AI API.
+    """
+
+    AVAILABLE_MODELS = {
+        "deepseek-v3": "deepseek-v3",
+        "deepseek-r1": "deepseek-r1",
+        "deepseek-llm-67b-chat": "deepseek-llm-67b-chat"
+    }
+
+    def __init__(
+        self,
+        is_conversation: bool = True,
+        max_tokens: int = 600,
+        timeout: int = 30,
+        intro: str = None,
+        filepath: str = None,
+        update_file: bool = True,
+        proxies: dict = {},
+        history_offset: int = 10250,
+        act: str = None,
+        model: str = "deepseek-r1",  # Default model
+        system_prompt: str = "You are a helpful AI assistant.",
+        logging: bool = False
+    ):
+        """
+        Initializes the DeepSeek AI API with given parameters.
+        """
+        if model not in self.AVAILABLE_MODELS:
+            raise ValueError(f"Invalid model: {model}. Choose from: {self.AVAILABLE_MODELS.keys()}")
+
+        # Initialize logging
+        self.logger = Logger(
+            name="DeepSeek",
+            format=LogFormat.MODERN_EMOJI,
+        ) if logging else None
+
+        if self.logger:
+            self.logger.info(f"Initializing DeepSeek with model: {model}")
+
+        self.session = requests.Session()
+        self.is_conversation = is_conversation
+        self.max_tokens_to_sample = max_tokens
+        self.api_endpoint = "https://www.deepseekapp.io/v1/chat/completions"
+        self.timeout = timeout
+        self.last_response = {}
+        self.system_prompt = system_prompt
+        self.model = model
+        self.api_key = "skgadi_mare_2_seater"
+        self.headers = {
+            "Content-Type": "application/json",
+            "Authorization": f"Bearer {self.api_key}",
+        }
+
+        self.__available_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
+            )
+            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]:
+        """Chat with AI"""
+        if self.logger:
+            self.logger.debug(f"Processing request - Prompt: {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: {optimizer}")
+                raise Exception(
+                    f"Optimizer is not one of {self.__available_optimizers}"
+                )
+
+        messages = [
+            {"role": "system", "content": self.system_prompt},
+            {"role": "user", "content": conversation_prompt}
+        ]
+
+        payload = {
+            "model": self.model,
+            "messages": messages
+        }
+
+        def for_stream():
+            if self.logger:
+                self.logger.debug("Sending streaming request to DeepInfra API...")
+            try:
+                with requests.post(self.api_endpoint, headers=self.headers, json=payload, stream=True, timeout=self.timeout) as response:
+                    if response.status_code != 200:
+                        if self.logger:
+                            self.logger.error(f"Request failed with status code {response.status_code}")
+                        raise exceptions.FailedToGenerateResponseError(
+                            f"Request failed with status code {response.status_code}"
+                        )
+                    
+                    streaming_text = ""
+                    for line in response.iter_lines(decode_unicode=True):
+                        if line:
+                            line = line.strip()
+                            if line.startswith("data: "):
+                                json_str = line[6:]  # Remove "data: " prefix
+                                if json_str == "[DONE]":
+                                    break
+                                try:
+                                    json_data = json.loads(json_str)
+                                    if 'choices' in json_data:
+                                        choice = json_data['choices'][0]
+                                        if 'delta' in choice and 'content' in choice['delta']:
+                                            content = choice['delta']['content']
+                                            streaming_text += content
+                                            resp = {"text": content}
+                                            yield resp if raw else resp
+                                except json.JSONDecodeError:
+                                    if self.logger:
+                                        self.logger.error("JSON decode error in streaming data")
+                                    continue
+                    
+                    self.last_response = {"text": streaming_text}
+                    self.conversation.update_chat_history(prompt, streaming_text)
+                    if self.logger:
+                        self.logger.info("Streaming response completed successfully")
+                        
+            except requests.RequestException as e:
+                if self.logger:
+                    self.logger.error(f"Request failed: {e}")
+                raise exceptions.FailedToGenerateResponseError(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,
+        optimizer: str = None,
+        conversationally: bool = False,
+    ) -> str:
+        """Generate response string"""
+        def for_stream():
+            for response in self.ask(
+                prompt, 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,
+                )
+            )
+
+        return for_stream() if stream else for_non_stream()
+
+    def get_message(self, response: dict) -> str:
+        """Retrieves message only from response"""
+        assert isinstance(response, dict), "Response should be of dict data-type only"
+        return response["text"]
+
+if __name__ == "__main__":
+    from rich import print
+
+    # Example usage
+    ai = DeepSeek(system_prompt="You are an expert AI assistant.", logging=True)
+
+    try:
+        # Send a prompt and stream the response
+        response = ai.chat("Write me a short poem about AI.", stream=True)
+        for chunk in response:
+            print(chunk, end="", flush=True)
+    except Exception as e:
+        print(f"Error: {e}")