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

webscout/Provider/Cloudflare.py

@@ -9,12 +9,10 @@ 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
@@ -72,7 +70,6 @@ class Cloudflare(Provider):
         act: str = None,
         model: str = "@cf/deepseek-ai/deepseek-r1-distill-qwen-32b",
         system_prompt: str = "You are a helpful assistant.",
-        logging: bool = False
     ):
         """Instantiates Cloudflare Provider
 
@@ -145,13 +142,13 @@ class Cloudflare(Provider):
         self.conversation.history_offset = history_offset
 
         # Initialize logger if logging is enabled
-        self.logger = Logger(
-            name="Cloudflare",
-            format=LogFormat.MODERN_EMOJI,
-        ) if logging else None
+        # self.logger = Logger(
+        #     name="Cloudflare",
+        #     format=LogFormat.MODERN_EMOJI,
+        # ) if logging else None
 
-        if self.logger:
-            self.logger.info("Cloudflare initialized successfully")
+        # if self.logger:
+        #     self.logger.info("Cloudflare initialized successfully")
 
     def ask(
         self,
@@ -178,11 +175,11 @@ class Cloudflare(Provider):
                 conversation_prompt = getattr(Optimizers, optimizer)(
                     conversation_prompt if conversationally else prompt
                 )
-                if self.logger:
-                    self.logger.debug(f"Applied optimizer: {optimizer}")
+                # if self.logger:
+                #     self.logger.debug(f"Applied optimizer: {optimizer}")
             else:
-                if self.logger:
-                    self.logger.error(f"Invalid optimizer requested: {optimizer}")
+                # if self.logger:
+                #     self.logger.error(f"Invalid optimizer requested: {optimizer}")
                 raise Exception(f"Optimizer is not one of {list(self.__available_optimizers)}")
         
         payload = {
@@ -192,13 +189,13 @@ class Cloudflare(Provider):
             ],
             "lora": None,
             "model": self.model,
-            "max_tokens": 512,
+            "max_tokens": self.max_tokens_to_sample,
             "stream": True
         }
 
         def for_stream():
-            if self.logger:
-                self.logger.debug("Sending streaming request to Cloudflare API...")
+            # if self.logger:
+            #     self.logger.debug("Sending streaming request to Cloudflare API...")
             response = self.scraper.post(
                 self.chat_endpoint,
                 headers=self.headers,
@@ -208,8 +205,8 @@ class Cloudflare(Provider):
                 timeout=self.timeout
             )
             if not response.ok:
-                if self.logger:
-                    self.logger.error(f"Request failed: ({response.status_code}, {response.reason})")
+                # 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})"
                 )
@@ -222,8 +219,8 @@ class Cloudflare(Provider):
                     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))
-            if self.logger:
-                self.logger.info("Streaming response completed successfully")
+            # if self.logger:
+            #     self.logger.info("Streaming response completed successfully")
 
         def for_non_stream():
             for _ in for_stream():
@@ -269,7 +266,7 @@ class Cloudflare(Provider):
 
 if __name__ == '__main__':
     from rich import print
-    ai = Cloudflare(timeout=5000, logging=True)
+    ai = Cloudflare(timeout=5000)
     response = ai.chat("write a poem about AI", stream=True)
     for chunk in response:
         print(chunk, end="", flush=True)

webscout/Provider/DeepSeek.py

@@ -1,13 +1,11 @@
-
 import requests
 import json
-from typing import Any, Dict, Optional, Generator
+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
-from webscout.Litlogger import Logger, LogFormat
 from webscout import LitAgent as Lit
 
 class DeepSeek(Provider):
@@ -15,11 +13,11 @@ 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"
-    }
+    AVAILABLE_MODELS = [
+        "deepseek-v3",
+        "deepseek-r1",
+        "deepseek-llm-67b-chat"
+    ]
 
     def __init__(
         self,
@@ -33,8 +31,7 @@ class DeepSeek(Provider):
         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
+        system_prompt: str = "You are a helpful AI assistant."
     ):
         """
         Initializes the DeepSeek AI API with given parameters.
@@ -42,15 +39,6 @@ class DeepSeek(Provider):
         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
@@ -93,20 +81,13 @@ class DeepSeek(Provider):
         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}"
                 )
@@ -122,13 +103,9 @@ class DeepSeek(Provider):
         }
 
         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}"
                         )
@@ -151,18 +128,12 @@ class DeepSeek(Provider):
                                             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():
@@ -204,15 +175,23 @@ class DeepSeek(Provider):
         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}")
+    print("-" * 80)
+    print(f"{'Model':<50} {'Status':<10} {'Response'}")
+    print("-" * 80)
+
+    for model in DeepSeek.AVAILABLE_MODELS:
+        try:
+            test_ai = DeepSeek(model=model, timeout=60)
+            response = test_ai.chat("Say 'Hello' in one word")
+            response_text = response
+            
+            if response_text and len(response_text.strip()) > 0:
+                status = "✓"
+                # Truncate response if too long
+                display_text = response_text.strip()[:50] + "..." if len(response_text.strip()) > 50 else response_text.strip()
+            else:
+                status = "✗"
+                display_text = "Empty or invalid response"
+            print(f"{model:<50} {status:<10} {display_text}")
+        except Exception as e:
+            print(f"{model:<50} {'✗':<10} {str(e)}")

webscout/Provider/Deepinfra.py

@@ -16,39 +16,48 @@ class DeepInfra(Provider):
     """
 
     AVAILABLE_MODELS = [
-        "deepseek-ai/DeepSeek-R1-Turbo",
+        # "anthropic/claude-3-7-sonnet-latest",  # >>>> NOT WORKING
         "deepseek-ai/DeepSeek-R1",
         "deepseek-ai/DeepSeek-R1-Distill-Llama-70B",
-        "deepseek-ai/DeepSeek-V3",
-        "meta-llama/Llama-3.3-70B-Instruct-Turbo",
-        "mistralai/Mistral-Small-24B-Instruct-2501",
         "deepseek-ai/DeepSeek-R1-Distill-Qwen-32B",
-        "microsoft/phi-4",
-        "meta-llama/Meta-Llama-3.1-70B-Instruct",
+        "deepseek-ai/DeepSeek-R1-Turbo",
+        "deepseek-ai/DeepSeek-V3",
+        # "google/gemma-2-27b-it",  # >>>> NOT WORKING
+        # "google/gemma-2-9b-it",  # >>>> NOT WORKING
+        "google/gemma-3-27b-it",
+        # "google/gemini-1.5-flash",  # >>>> NOT WORKING
+        # "google/gemini-1.5-flash-8b",  # >>>> NOT WORKING
+        # "google/gemini-2.0-flash-001",  # >>>> NOT WORKING
+        # "Gryphe/MythoMax-L2-13b",  # >>>> NOT WORKING
+        # "meta-llama/Llama-3.2-1B-Instruct",  # >>>> NOT WORKING
+        # "meta-llama/Llama-3.2-3B-Instruct",  # >>>> NOT WORKING
+        "meta-llama/Llama-3.2-90B-Vision-Instruct",
+        "meta-llama/Llama-3.2-11B-Vision-Instruct",
+        # "meta-llama/Meta-Llama-3-70B-Instruct",  # >>>> NOT WORKING
+        # "meta-llama/Meta-Llama-3-8B-Instruct",  # >>>> NOT WORKING
+        # "meta-llama/Meta-Llama-3.1-70B-Instruct",  # >>>> NOT WORKING
+        "meta-llama/Meta-Llama-3.1-70B-Instruct-Turbo",
         "meta-llama/Meta-Llama-3.1-8B-Instruct",
-        "meta-llama/Meta-Llama-3.1-405B-Instruct",
         "meta-llama/Meta-Llama-3.1-8B-Instruct-Turbo",
-        "meta-llama/Meta-Llama-3.1-70B-Instruct-Turbo",
-        "Qwen/Qwen2.5-Coder-32B-Instruct",
+        # "meta-llama/Meta-Llama-3.1-405B-Instruct",  # >>>> NOT WORKING
+        "microsoft/phi-4",
+        "microsoft/Phi-4-multimodal-instruct",
+        "microsoft/WizardLM-2-8x22B",
+        # "mistralai/Mixtral-8x7B-Instruct-v0.1",  # >>>> NOT WORKING
+        # "mistralai/Mistral-7B-Instruct-v0.3",  # >>>> NOT WORKING
+        # "mistralai/Mistral-Nemo-Instruct-2407",  # >>>> NOT WORKING
+        "mistralai/Mistral-Small-24B-Instruct-2501",
         "nvidia/Llama-3.1-Nemotron-70B-Instruct",
+        # "NousResearch/Hermes-3-Llama-3.1-405B",  # >>>> NOT WORKING
+        # "NovaSky-AI/Sky-T1-32B-Preview",  # >>>> NOT WORKING
+        "Qwen/QwQ-32B",
+        # "Qwen/Qwen2.5-7B-Instruct",  # >>>> NOT WORKING
         "Qwen/Qwen2.5-72B-Instruct",
-        "meta-llama/Llama-3.2-90B-Vision-Instruct",
-        "meta-llama/Llama-3.2-11B-Vision-Instruct",
-        "Gryphe/MythoMax-L2-13b",
-        "NousResearch/Hermes-3-Llama-3.1-405B",
-        "NovaSky-AI/Sky-T1-32B-Preview",
-        "Qwen/Qwen2.5-7B-Instruct",
-        "Sao10K/L3.1-70B-Euryale-v2.2",
-        "Sao10K/L3.3-70B-Euryale-v2.3",
-        "google/gemma-2-27b-it",
-        "google/gemma-2-9b-it",
-        "meta-llama/Llama-3.2-1B-Instruct",
-        "meta-llama/Llama-3.2-3B-Instruct",
-        "meta-llama/Meta-Llama-3-70B-Instruct",
-        "meta-llama/Meta-Llama-3-8B-Instruct",
-        "mistralai/Mistral-Nemo-Instruct-2407",
-        "mistralai/Mistral-7B-Instruct-v0.3",
-        "mistralai/Mixtral-8x7B-Instruct-v0.1"
+        "Qwen/Qwen2.5-Coder-32B-Instruct",
+        # "Sao10K/L3.1-70B-Euryale-v2.2",  # >>>> NOT WORKING
+        # "Sao10K/L3.3-70B-Euryale-v2.3",  # >>>> NOT WORKING
+        "meta-llama/Llama-3.3-70B-Instruct",
+        "meta-llama/Llama-3.3-70B-Instruct-Turbo",
     ]
 
     def __init__(
@@ -62,32 +71,41 @@ class DeepInfra(Provider):
         proxies: dict = {},
         history_offset: int = 10250,
         act: str = None,
-        model: str = "meta-llama/Llama-3.3-70B-Instruct-Turbo"  # Updated default model
+        model: str = "meta-llama/Llama-3.3-70B-Instruct-Turbo",
+        browser: str = "chrome"
     ):
         """Initializes the DeepInfra API client."""
         if model not in self.AVAILABLE_MODELS:
             raise ValueError(f"Invalid model: {model}. Choose from: {self.AVAILABLE_MODELS}")
             
         self.url = "https://api.deepinfra.com/v1/openai/chat/completions"
-        # Use LitAgent for user-agent instead of hardcoded string.
+        
+        # Initialize LitAgent for user agent generation
+        self.agent = LitAgent()
+        # Use fingerprinting to create a consistent browser identity
+        self.fingerprint = self.agent.generate_fingerprint(browser)
+        
+        # Use the fingerprint for headers
         self.headers = {
-            'User-Agent': LitAgent().random(),
-            'Accept-Language': 'en,fr-FR;q=0.9,fr;q=0.8,es-ES;q=0.7,es;q=0.6,en-US;q=0.5,am;q=0.4,de;q=0.3',
-            'Cache-Control': 'no-cache',
-            'Connection': 'keep-alive',
-            'Content-Type': 'application/json',
-            'Origin': 'https://deepinfra.com',
-            'Pragma': 'no-cache',
-            'Referer': 'https://deepinfra.com/',
-            'Sec-Fetch-Dest': 'empty',
-            'Sec-Fetch-Mode': 'cors',
-            'Sec-Fetch-Site': 'same-site',
-            'X-Deepinfra-Source': 'web-embed',
-            'accept': 'text/event-stream',
-            'sec-ch-ua': '"Google Chrome";v="119", "Chromium";v="119", "Not?A_Brand";v="24"',
-            'sec-ch-ua-mobile': '?0',
-            'sec-ch-ua-platform': '"macOS"'
+            "Accept": self.fingerprint["accept"],
+            "Accept-Encoding": "gzip, deflate, br, zstd",
+            "Accept-Language": self.fingerprint["accept_language"],
+            "Content-Type": "application/json",
+            "Cache-Control": "no-cache",
+            "Connection": "keep-alive",
+            "Origin": "https://deepinfra.com",
+            "Pragma": "no-cache",
+            "Referer": "https://deepinfra.com/",
+            "Sec-Fetch-Dest": "empty",
+            "Sec-Fetch-Mode": "cors",
+            "Sec-Fetch-Site": "same-site",
+            "X-Deepinfra-Source": "web-embed",
+            "Sec-CH-UA": self.fingerprint["sec_ch_ua"] or '"Not)A;Brand";v="99", "Microsoft Edge";v="127", "Chromium";v="127"',
+            "Sec-CH-UA-Mobile": "?0",
+            "Sec-CH-UA-Platform": f'"{self.fingerprint["platform"]}"',
+            "User-Agent": self.fingerprint["user_agent"],
         }
+        
         self.session = requests.Session()
         self.session.headers.update(self.headers)
         self.session.proxies.update(proxies)
@@ -116,6 +134,31 @@ class DeepInfra(Provider):
         )
         self.conversation.history_offset = history_offset
 
+    def refresh_identity(self, browser: str = None):
+        """
+        Refreshes the browser identity fingerprint.
+        
+        Args:
+            browser: Specific browser to use for the new fingerprint
+        """
+        browser = browser or self.fingerprint.get("browser_type", "chrome")
+        self.fingerprint = self.agent.generate_fingerprint(browser)
+        
+        # Update headers with new fingerprint
+        self.headers.update({
+            "Accept": self.fingerprint["accept"],
+            "Accept-Language": self.fingerprint["accept_language"],
+            "Sec-CH-UA": self.fingerprint["sec_ch_ua"] or self.headers["Sec-CH-UA"],
+            "Sec-CH-UA-Platform": f'"{self.fingerprint["platform"]}"',
+            "User-Agent": self.fingerprint["user_agent"],
+        })
+        
+        # Update session headers
+        for header, value in self.headers.items():
+            self.session.headers[header] = value
+        
+        return self.fingerprint
+
     def ask(
         self,
         prompt: str,
@@ -171,15 +214,30 @@ class DeepInfra(Provider):
                                 except json.JSONDecodeError:
                                     continue
                     
+                    self.last_response = {"text": streaming_text}
                     self.conversation.update_chat_history(prompt, streaming_text)
                     
             except requests.RequestException as e:
                 raise exceptions.FailedToGenerateResponseError(f"Request failed: {str(e)}")
 
         def for_non_stream():
-            for _ in for_stream():
-                pass
-            return self.last_response
+            try:
+                response = requests.post(self.url, headers=self.headers, data=json.dumps(payload), timeout=self.timeout)
+                if response.status_code != 200:
+                    raise exceptions.FailedToGenerateResponseError(
+                        f"Request failed with status code {response.status_code}"
+                    )
+
+                response_data = response.json()
+                if 'choices' in response_data and len(response_data['choices']) > 0:
+                    content = response_data['choices'][0].get('message', {}).get('content', '')
+                    self.last_response = {"text": content}
+                    self.conversation.update_chat_history(prompt, content)
+                    return {"text": content}
+                else:
+                    raise exceptions.FailedToGenerateResponseError("No response content found")
+            except Exception as e:
+                raise exceptions.FailedToGenerateResponseError(f"Request failed: {e}")
 
         return for_stream() if stream else for_non_stream()
 
@@ -189,7 +247,7 @@ class DeepInfra(Provider):
         stream: bool = False,
         optimizer: str = None,
         conversationally: bool = False,
-    ) -> str:
+    ) -> Union[str, Generator[str, None, None]]:
         def for_stream():
             for response in self.ask(prompt, True, optimizer=optimizer, conversationally=conversationally):
                 yield self.get_message(response)
@@ -204,8 +262,26 @@ class DeepInfra(Provider):
         return response["text"]
 
 if __name__ == "__main__":
-    from rich import print
-    ai = DeepInfra(timeout=5000)
-    response = ai.chat("write a poem about AI", stream=True)
-    for chunk in response:
-        print(chunk, end="", flush=True)
+    print("-" * 80)
+    print(f"{'Model':<50} {'Status':<10} {'Response'}")
+    print("-" * 80)
+
+    for model in DeepInfra.AVAILABLE_MODELS:
+        try:
+            test_ai = DeepInfra(model=model, timeout=60)
+            response = test_ai.chat("Say 'Hello' in one word", stream=True)
+            response_text = ""
+            for chunk in response:
+                response_text += chunk
+            
+            if response_text and len(response_text.strip()) > 0:
+                status = "✓"
+                # Clean and truncate response
+                clean_text = response_text.strip().encode('utf-8', errors='ignore').decode('utf-8')
+                display_text = clean_text[:50] + "..." if len(clean_text) > 50 else clean_text
+            else:
+                status = "✗"
+                display_text = "Empty or invalid response"
+            print(f"\r{model:<50} {status:<10} {display_text}")
+        except Exception as e:
+            print(f"\r{model:<50} {'✗':<10} {str(e)}")

webscout/Provider/Gemini.py

@@ -10,7 +10,7 @@ from ..AIbase import Provider, AsyncProvider
 from ..Bard import Chatbot, Model
 
 # Import Logger and related classes (assumed similar to what is in yep.py)
-from webscout import Logger, LogFormat
+from webscout.Litlogger import Logger, LogFormat
 
 warnings.simplefilter("ignore", category=UserWarning)