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

webscout/Provider/multichat.py

@@ -1,41 +1,57 @@
 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
+import uuid
+from typing import Any, Dict
+from datetime import datetime
+from webscout.AIutel import Optimizers, Conversation, AwesomePrompts
 from webscout.AIbase import Provider
 from webscout import exceptions
+from webscout.Litlogger import LitLogger, LogFormat, ColorScheme
+from webscout.litagent import LitAgent
 
 # Model configurations
 MODEL_CONFIGS = {
     "llama": {
         "endpoint": "https://www.multichatai.com/api/chat/meta",
         "models": {
-            "llama-3.1-70b-versatile": {"contextLength": 8192},
-            "llama-3.2-90b-vision-preview": {"contextLength": 32768},
+            "llama-3.3-70b-versatile": {"contextLength": 131072},
             "llama-3.2-11b-vision-preview": {"contextLength": 32768},
-        },
-    },
-    "alibaba": {
-        "endpoint": "https://www.multichatai.com/api/chat/alibaba",
-        "models": {
-            "Qwen/Qwen2.5-72B-Instruct": {"contextLength": 32768},
-            "Qwen/Qwen2.5-Coder-32B-Instruct": {"contextLength": 32768},
+            "deepseek-r1-distill-llama-70b": {"contextLength": 128000},
         },
     },
     "cohere": {
         "endpoint": "https://www.multichatai.com/api/chat/cohere",
         "models": {"command-r": {"contextLength": 128000}},
     },
+    "google": {
+        "endpoint": "https://www.multichatai.com/api/chat/google",
+        "models": {
+            "gemini-1.5-flash-002": {"contextLength": 1048576},
+            "gemma2-9b-it": {"contextLength": 8192},
+        },
+        "message_format": "parts",
+    },
+    "deepinfra": {
+        "endpoint": "https://www.multichatai.com/api/chat/deepinfra",
+        "models": {
+            "Sao10K/L3.1-70B-Euryale-v2.2": {"contextLength": 8192},
+            "Gryphe/MythoMax-L2-13b": {"contextLength": 8192},
+            "nvidia/Llama-3.1-Nemotron-70B-Instruct": {"contextLength": 131072},
+            "deepseek-ai/DeepSeek-V3": {"contextLength": 32000},
+        },
+    },
+    "mistral": {
+        "endpoint": "https://www.multichatai.com/api/chat/mistral",
+        "models": {
+            "mistral-small-latest": {"contextLength": 32000},
+            "codestral-latest": {"contextLength": 32000},
+            "open-mistral-7b": {"contextLength": 8000},
+            "open-mixtral-8x7b": {"contextLength": 8000},
+        },
+    },
 }
 
 class MultiChatAI(Provider):
-    """
-    A class to interact with the MultiChatAI API.
-    """
-
     def __init__(
         self,
         is_conversation: bool = True,
@@ -47,14 +63,25 @@ class MultiChatAI(Provider):
         proxies: dict = {},
         history_offset: int = 10250,
         act: str = None,
-        model: str = "llama-3.1-70b-versatile",  # Default model
-        system_prompt: str = "You are a helpful assistant.",
+        model: str = "llama-3.3-70b-versatile",
+        system_prompt: str = "You are a friendly, helpful AI assistant.",
         temperature: float = 0.5,
         presence_penalty: int = 0,
         frequency_penalty: int = 0,
         top_p: float = 1,
+        logging: bool = False,
     ):
-        """Initializes the MultiChatAI API client."""
+        """Initializes the MultiChatAI API client with logging capabilities."""
+        # Initialize logger first
+        self.logger = LitLogger(
+            name="MultiChatAI",
+            format=LogFormat.MODERN_EMOJI,
+            color_scheme=ColorScheme.CYBERPUNK
+        ) if logging else None
+
+        if self.logger:
+            self.logger.debug("Initializing MultiChatAI")
+
         self.session = requests.Session()
         self.is_conversation = is_conversation
         self.max_tokens_to_sample = max_tokens
@@ -66,22 +93,31 @@ class MultiChatAI(Provider):
         self.presence_penalty = presence_penalty
         self.frequency_penalty = frequency_penalty
         self.top_p = top_p
+        
+        # Initialize LitAgent for user agent generation
+        self.agent = LitAgent()
+        
         self.headers = {
             "accept": "*/*",
             "accept-language": "en-US,en;q=0.9",
             "content-type": "text/plain;charset=UTF-8",
             "origin": "https://www.multichatai.com",
             "referer": "https://www.multichatai.com/",
-            "user-agent": "Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/131.0.0.0 Safari/537.36",
+            "user-agent": self.agent.random(),
         }
+        
+        if self.logger:
+            self.logger.debug(f"Setting up session with headers: {self.headers}")
+        
         self.session.headers.update(self.headers)
         self.session.proxies = proxies
+        self.session.cookies.update({"session": uuid.uuid4().hex})
 
         self.__available_optimizers = (
-            method
-            for method in dir(Optimizers)
+            method for method in dir(Optimizers)
             if callable(getattr(Optimizers, method)) and not method.startswith("__")
         )
+        
         Conversation.intro = (
             AwesomePrompts().get_act(
                 act, raise_not_found=True, default=None, case_insensitive=True
@@ -89,41 +125,30 @@ class MultiChatAI(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
 
-        # Parse provider and model name
-        self.provider = "llama"  # Default provider
+        # Get provider after logger initialization
+        self.provider = self._get_provider_from_model(self.model)
         self.model_name = self.model
-        
-        # Check if model exists in any provider
-        model_found = False
-        for provider, config in MODEL_CONFIGS.items():
-            if self.model in config["models"]:
-                self.provider = provider
-                self.model_name = self.model
-                model_found = True
-                break
-        
-        if not model_found:
-            available_models = []
-            for provider, config in MODEL_CONFIGS.items():
-                for model in config["models"].keys():
-                    available_models.append(f"{provider}/{model}")
-            raise ValueError(
-                f"Invalid model: {self.model}\nAvailable models: {', '.join(available_models)}"
-            )
+
+        if self.logger:
+            self.logger.info(f"MultiChatAI initialized with model: {self.model}")
 
     def _get_endpoint(self) -> str:
         """Get the API endpoint for the current provider."""
-        return MODEL_CONFIGS[self.provider]["endpoint"]
+        endpoint = MODEL_CONFIGS[self.provider]["endpoint"]
+        if self.logger:
+            self.logger.debug(f"Using endpoint: {endpoint}")
+        return endpoint
 
     def _get_chat_settings(self) -> Dict[str, Any]:
         """Get chat settings for the current model."""
         base_settings = MODEL_CONFIGS[self.provider]["models"][self.model_name]
-        return {
+        settings = {
             "model": self.model,
             "prompt": self.system_prompt,
             "temperature": self.temperature,
@@ -132,99 +157,175 @@ class MultiChatAI(Provider):
             "includeWorkspaceInstructions": True,
             "embeddingsProvider": "openai"
         }
+        if self.logger:
+            self.logger.debug(f"Chat settings: {settings}")
+        return settings
+
+    def _get_system_message(self) -> str:
+        """Generate system message with current date."""
+        current_date = datetime.now().strftime("%d/%m/%Y")
+        message = f"Today is {current_date}.\n\nUser Instructions:\n{self.system_prompt}"
+        if self.logger:
+            self.logger.debug(f"System message: {message}")
+        return message
+
+    def _build_messages(self, conversation_prompt: str) -> list:
+        """Build messages array based on provider type."""
+        if self.provider == "google":
+            messages = [
+                {"role": "user", "parts": self._get_system_message()},
+                {"role": "model", "parts": "I will follow your instructions."},
+                {"role": "user", "parts": conversation_prompt}
+            ]
+        else:
+            messages = [
+                {"role": "system", "content": self._get_system_message()},
+                {"role": "user", "content": conversation_prompt}
+            ]
+        
+        if self.logger:
+            self.logger.debug(f"Built messages: {messages}")
+        return messages
+
+    def _get_provider_from_model(self, model: str) -> str:
+        """Determine the provider based on the model name."""
+        if self.logger:
+            self.logger.debug(f"Getting provider for model: {model}")
+            
+        for provider, config in MODEL_CONFIGS.items():
+            if model in config["models"]:
+                if self.logger:
+                    self.logger.info(f"Found provider: {provider} for model: {model}")
+                return provider
+        
+        available_models = []
+        for provider, config in MODEL_CONFIGS.items():
+            for model_name in config["models"].keys():
+                available_models.append(f"{provider}/{model_name}")
+        
+        error_msg = f"Invalid model: {model}\nAvailable models: {', '.join(available_models)}"
+        if self.logger:
+            self.logger.error(error_msg)
+        raise ValueError(error_msg)
+
+    def _make_request(self, payload: Dict[str, Any]) -> requests.Response:
+        """Make the API request with proper error handling and logging."""
+        if self.logger:
+            self.logger.debug(f"Making request to endpoint: {self._get_endpoint()}")
+            self.logger.debug(f"Request payload: {json.dumps(payload, indent=2)}")
+
+        try:
+            response = self.session.post(
+                self._get_endpoint(),
+                headers=self.headers,
+                json=payload,
+                timeout=self.timeout,
+            )
+            response.raise_for_status()
+            
+            if self.logger:
+                self.logger.info(f"Request successful: {response.status_code}")
+                self.logger.debug(f"Response content: {response.text[:200]}...")
+                
+            return response
+        except requests.exceptions.RequestException as e:
+            if self.logger:
+                self.logger.error(f"Request failed: {str(e)}")
+            raise exceptions.FailedToGenerateResponseError(f"API request failed: {e}") from e
 
     def ask(
         self,
         prompt: str,
-        stream: bool = False,
         raw: bool = False,
         optimizer: str = None,
         conversationally: bool = False,
-    ) -> Dict[str, Any] | Generator:
+    ) -> Dict[str, Any]:
         """Sends a prompt to the MultiChatAI API and returns the response."""
+        if self.logger:
+            self.logger.debug(f"ask() called with prompt: {prompt}")
+            
         conversation_prompt = self.conversation.gen_complete_prompt(prompt)
         if optimizer:
             if optimizer in self.__available_optimizers:
+                if self.logger:
+                    self.logger.info(f"Applying optimizer: {optimizer}")
                 conversation_prompt = getattr(Optimizers, optimizer)(
                     conversation_prompt if conversationally else prompt
                 )
             else:
-                raise exceptions.FailedToGenerateResponseError(
-                    f"Optimizer is not one of {self.__available_optimizers}"
-                )
+                error_msg = f"Optimizer is not one of {self.__available_optimizers}"
+                if self.logger:
+                    self.logger.error(error_msg)
+                raise exceptions.FailedToGenerateResponseError(error_msg)
 
         payload = {
             "chatSettings": self._get_chat_settings(),
-            "messages": [
-                {"role": "system", "content": self.system_prompt},
-                {"role": "user", "content": conversation_prompt},
-            ],
+            "messages": self._build_messages(conversation_prompt),
             "customModelId": "",
         }
 
+        response = self._make_request(payload)
         try:
-            response = self.session.post(
-                self._get_endpoint(),
-                headers=self.headers,
-                json=payload,
-                stream=True,
-                timeout=self.timeout,
-            )
-            response.raise_for_status()
-
-            full_response = ""
-            for line in response.iter_lines():
-                if line:
-                    decoded_line = line.decode("utf-8")
-                    if stream:
-                        yield {"text": decoded_line}
-                    full_response += decoded_line
-
-            self.last_response = {"text": full_response.strip()}
-            self.conversation.update_chat_history(prompt, full_response.strip())
+            full_response = response.text.strip()
+            self.last_response = {"text": full_response}
+            self.conversation.update_chat_history(prompt, full_response)
             
-            if not stream:
-                return self.last_response
-
-        except requests.exceptions.RequestException as e:
-            raise exceptions.ProviderConnectionError(f"API request failed: {e}") from e
+            if self.logger:
+                self.logger.info("Successfully processed response")
+                self.logger.debug(f"Final response: {full_response[:200]}...")
+                
+            return self.last_response
         except json.JSONDecodeError as e:
-            raise exceptions.InvalidResponseError(f"Invalid JSON response: {e}") from e
-        except Exception as e:
-            raise exceptions.FailedToGenerateResponseError(f"Unexpected error: {e}") from e
+            if self.logger:
+                self.logger.error(f"Failed to decode JSON response: {e}")
+            raise exceptions.FailedToGenerateResponseError(f"Invalid JSON response: {e}") from e
 
     def chat(
         self,
         prompt: str,
-        stream: bool = False,
         optimizer: str = None,
         conversationally: bool = False,
-    ) -> str | Generator[str, None, None]:
-        """Generate response."""
-        if stream:
-            for chunk in self.ask(
-                prompt, stream=True, optimizer=optimizer, conversationally=conversationally
-            ):
-                if isinstance(chunk, dict):
-                    yield chunk.get("text", "")
-                else:
-                    yield str(chunk)
-        else:
-            response = self.ask(
-                prompt, stream=False, optimizer=optimizer, conversationally=conversationally
-            )
-            return response.get("text", "") if isinstance(response, dict) else str(response)
+    ) -> str:
+        """Generate response with logging."""
+        if self.logger:
+            self.logger.debug(f"chat() called with prompt: {prompt}")
+            
+        response = self.ask(
+            prompt, optimizer=optimizer, conversationally=conversationally
+        )
+        
+        if self.logger:
+            self.logger.info("Chat response generated successfully")
+            
+        return self.get_message(response)
 
     def get_message(self, response: Dict[str, Any] | str) -> str:
-        """Retrieves message from response."""
+        """
+        Retrieves message from response.
+        
+        Args:
+            response (Union[Dict[str, Any], str]): The response to extract the message from
+            
+        Returns:
+            str: The extracted message text
+        """
+        if self.logger:
+            self.logger.debug(f"Extracting message from response type: {type(response)}")
+            
         if isinstance(response, dict):
-            return response.get("text", "")
+            message = response.get("text", "")
+            if self.logger:
+                self.logger.debug(f"Extracted message from dict: {message[:200]}...")
+            return message
         return str(response)
 
 if __name__ == "__main__":
     from rich import print
 
-    ai = MultiChatAI(model="llama-3.1-70b-versatile")
-    response = ai.chat("What is the meaning of life?", stream=True)
-    for chunk in response:
-        print(chunk, end="", flush=True)
+    # Example usage with logging enabled
+    ai = MultiChatAI(model="deepseek-r1-distill-llama-70b", logging=False)
+    try:
+        response = ai.chat("What is quantum computing?")
+        print(response)
+    except Exception as e:
+        print(f"Error: {str(e)}")

webscout/Provider/typegpt.py

@@ -1,6 +1,7 @@
 import requests
 import json
 from typing import *
+import requests.exceptions
 
 from webscout.AIutel import Optimizers
 from webscout.AIutel import Conversation
@@ -8,9 +9,10 @@ from webscout.AIutel import AwesomePrompts
 from webscout.AIbase import Provider
 from webscout import exceptions
 from webscout.litagent import LitAgent
+
 class TypeGPT(Provider):
     """
-    A class to interact with the TypeGPT.net API.  Improved to match webscout standards.
+    A class to interact with the TypeGPT.net API. Improved to match webscout standards.
     """
     url = "https://chat.typegpt.net"
     working = True
@@ -19,6 +21,7 @@ class TypeGPT(Provider):
     models = [
         # OpenAI Models
         "gpt-3.5-turbo",
+        "chatgpt-4o-latest",
         "gpt-3.5-turbo-202201",
         "gpt-4o",
         "gpt-4o-2024-05-13",
@@ -184,7 +187,7 @@ class TypeGPT(Provider):
         proxies: dict = {},
         history_offset: int = 10250,
         act: str = None,
-        model: str = "claude-3-5-sonnet-20240620",
+        model: str = "gpt-4o",
         system_prompt: str = "You are a helpful assistant.",
         temperature: float = 0.5,
         presence_penalty: int = 0,
@@ -217,7 +220,6 @@ class TypeGPT(Provider):
             "user-agent": LitAgent().random()
         }
 
-
         self.__available_optimizers = (
             method
             for method in dir(Optimizers)
@@ -230,9 +232,7 @@ class TypeGPT(Provider):
             if act
             else intro or Conversation.intro
         )
-        self.conversation = Conversation(
-            is_conversation, self.max_tokens_to_sample, filepath, update_file
-        )
+        self.conversation = Conversation(is_conversation, self.max_tokens_to_sample, filepath, update_file)
         self.conversation.history_offset = history_offset
         self.session.proxies = proxies
 
@@ -256,7 +256,6 @@ class TypeGPT(Provider):
                     f"Optimizer is not one of {self.__available_optimizers}"
                 )
 
-
         payload = {
             "messages": [
                 {"role": "system", "content": self.system_prompt},
@@ -270,10 +269,17 @@ class TypeGPT(Provider):
             "top_p": self.top_p,
             "max_tokens": self.max_tokens_to_sample,
         }
+
         def for_stream():
-            response = self.session.post(
-                self.api_endpoint, headers=self.headers, json=payload, stream=True, timeout=self.timeout
-            )
+            try:
+                response = self.session.post(
+                    self.api_endpoint, headers=self.headers, json=payload, stream=True, timeout=self.timeout
+                )
+            except requests.exceptions.ConnectionError as ce:
+                raise exceptions.FailedToGenerateResponseError(
+                    f"Network connection failed. Check your firewall or antivirus settings. Original error: {ce}"
+                ) from ce
+
             if not response.ok:
                 raise exceptions.FailedToGenerateResponseError(
                     f"Failed to generate response - ({response.status_code}, {response.reason}) - {response.text}"
@@ -287,10 +293,8 @@ class TypeGPT(Provider):
                         # Skip [DONE] message
                         if line.strip() == "[DONE]":
                             break
-
                         try:
                             data = json.loads(line)
-                            
                             # Extract and yield only new content
                             if 'choices' in data and len(data['choices']) > 0:
                                 delta = data['choices'][0].get('delta', {})
@@ -300,14 +304,18 @@ class TypeGPT(Provider):
                                     # Yield only the new content
                                     yield dict(text=new_content) if not raw else new_content
                                     self.last_response = dict(text=message_load)
-
                         except json.JSONDecodeError:
                             continue
             self.conversation.update_chat_history(prompt, self.get_message(self.last_response))
 
         def for_non_stream():
+            try:
+                response = self.session.post(self.api_endpoint, headers=self.headers, json=payload, timeout=self.timeout)
+            except requests.exceptions.ConnectionError as ce:
+                raise exceptions.FailedToGenerateResponseError(
+                    f"Network connection failed. Check your firewall or antivirus settings. Original error: {ce}"
+                ) from ce
 
-            response = self.session.post(self.api_endpoint, headers=self.headers, json=payload)
             if not response.ok:
                 raise exceptions.FailedToGenerateResponseError(
                     f"Request failed - {response.status_code}: {response.text}"
@@ -316,10 +324,8 @@ class TypeGPT(Provider):
             self.conversation.update_chat_history(prompt, self.get_message(self.last_response))
             return self.last_response
 
-
         return for_stream() if stream else for_non_stream()
 
-
     def chat(
         self,
         prompt: str,
@@ -327,8 +333,7 @@ class TypeGPT(Provider):
         optimizer: str = None,
         conversationally: bool = False,
     ) -> str | Generator[str, None, None]:
-        """Generate response `str` or stream."""
-
+        """Generate response string or stream."""
         if stream:
             gen = self.ask(
                 prompt, stream=True, optimizer=optimizer, conversationally=conversationally
@@ -340,18 +345,16 @@ class TypeGPT(Provider):
 
     def get_message(self, response: Dict[str, Any]) -> str:
         """Retrieves message from response."""
-        if isinstance(response, str): #Handle raw responses
+        if isinstance(response, str):  # Handle raw responses
             return response
         elif isinstance(response, dict):
             assert isinstance(response, dict), "Response should be of dict data-type only"
-            return response.get("text", "") #Extract text from dictionary response
+            return response.get("text", "")  # Extract text from dictionary response
         else:
             raise TypeError("Invalid response type. Expected str or dict.")
 
-
 if __name__ == "__main__":
-       
-    ai = TypeGPT(model="claude-3-5-sonnet-20240620")
+    ai = TypeGPT(model="chatgpt-4o-latest")
     response = ai.chat("hi", stream=True)
     for chunks in response:
         print(chunks, end="", flush=True)

webscout/Provider/yep.py

@@ -24,7 +24,7 @@ class YEPCHAT(Provider):
         AVAILABLE_MODELS (list): List of available models for the provider.
     """
 
-    AVAILABLE_MODELS = ["Mixtral-8x7B-Instruct-v0.1"]
+    AVAILABLE_MODELS = ["DeepSeek-R1-Distill-Qwen-32B"]
 
     def __init__(
         self,
@@ -37,7 +37,7 @@ class YEPCHAT(Provider):
         proxies: dict = {},
         history_offset: int = 10250,
         act: str = None,
-        model: str = "Mixtral-8x7B-Instruct-v0.1",
+        model: str = "DeepSeek-R1-Distill-Qwen-32B",
         temperature: float = 0.6,
         top_p: float = 0.7,
         logging: bool = False,
@@ -257,6 +257,6 @@ if __name__ == "__main__":
 
     ai = YEPCHAT(logging=False)
 
-    response = ai.chat("hi", stream=True)
+    response = ai.chat("how many r in 'strawberry'", stream=True)
     for chunk in response:
         print(chunk, end="", flush=True)

webscout/version.py

@@ -1,2 +1,2 @@
-__version__ = "7.0"
+__version__ = "7.1"
 __prog__ = "webscout"