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

webscout/Provider/Deepinfra.py

@@ -8,10 +8,12 @@ from webscout.AIutel import Conversation
 from webscout.AIutel import AwesomePrompts, sanitize_stream
 from webscout.AIbase import Provider, AsyncProvider
 from webscout import exceptions
+from webscout import LitAgent
+from webscout.Litlogger import LitLogger, LogFormat, ColorScheme
 
 class DeepInfra(Provider):
     """
-    A class to interact with the DeepInfra API.
+    A class to interact with the DeepInfra API with logging and LitAgent user-agent.
     """
 
     def __init__(
@@ -25,13 +27,29 @@ class DeepInfra(Provider):
         proxies: dict = {},
         history_offset: int = 10250,
         act: str = None,
-        model: str = "Qwen/Qwen2.5-72B-Instruct",  
+        model: str = "Qwen/Qwen2.5-72B-Instruct",
+        logging: bool = False
     ):
-        """Initializes the DeepInfra API client."""
+        """Initializes the DeepInfra API client with logging support."""
         self.url = "https://api.deepinfra.com/v1/openai/chat/completions"
+        # Use LitAgent for user-agent instead of hardcoded string.
         self.headers = {
-            "Accept": "text/event-stream, application/json",
-
+            '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"'
         }
         self.session = requests.Session()
         self.session.headers.update(self.headers)
@@ -61,6 +79,16 @@ class DeepInfra(Provider):
         )
         self.conversation.history_offset = history_offset
 
+        # Initialize logger if enabled
+        self.logger = LitLogger(
+            name="DeepInfra",
+            format=LogFormat.MODERN_EMOJI,
+            color_scheme=ColorScheme.CYBERPUNK
+        ) if logging else None
+
+        if self.logger:
+            self.logger.info("DeepInfra initialized successfully")
+
     def ask(
         self,
         prompt: str,
@@ -69,14 +97,17 @@ class DeepInfra(Provider):
         optimizer: str = None,
         conversationally: bool = False,
     ) -> Union[Dict[str, Any], Generator]:
-
         conversation_prompt = self.conversation.gen_complete_prompt(prompt)
         if optimizer:
             if optimizer in self.__available_optimizers:
                 conversation_prompt = getattr(Optimizers, optimizer)(
                     conversation_prompt if conversationally else prompt
                 )
+                if self.logger:
+                    self.logger.debug(f"Applied optimizer: {optimizer}")
             else:
+                if self.logger:
+                    self.logger.error(f"Invalid optimizer requested: {optimizer}")
                 raise Exception(f"Optimizer is not one of {self.__available_optimizers}")
 
         # Payload construction
@@ -90,17 +121,23 @@ class DeepInfra(Provider):
         }
 
         def for_stream():
+            if self.logger:
+                self.logger.debug("Sending streaming request to DeepInfra API...")
             try:
                 with requests.post(self.url, headers=self.headers, data=json.dumps(payload), stream=True, timeout=self.timeout) as response:
                     if response.status_code != 200:
-                        raise exceptions.FailedToGenerateResponseError(f"Request failed with status code {response.status_code}")
+                        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}")
+                    if self.logger:
+                        self.logger.debug(response.text)
                     streaming_text = ""
-                    for line in response.iter_lines(decode_unicode=True):  # Decode lines
+                    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
+                                json_str = line[6:]  # Remove "data: " prefix
                                 if json_str == "[DONE]":
                                     break
                                 try:
@@ -110,28 +147,27 @@ class DeepInfra(Provider):
                                         if 'delta' in choice and 'content' in choice['delta']:
                                             content = choice['delta']['content']
                                             streaming_text += content
-                                            
-                                            # Yield ONLY the new content:
-                                            resp = dict(text=content) 
+                                            resp = dict(text=content)
                                             yield resp if raw else resp
                                 except json.JSONDecodeError:
-                                    pass  # Or handle the error as needed
-                    self.conversation.update_chat_history(prompt, streaming_text)  # Update history *after* streaming
+                                    if self.logger:
+                                        self.logger.error("JSON decode error in streaming data")
+                                    pass
+                    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():
-            # let's make use of stream
             for _ in for_stream():
                 pass
             return self.last_response
 
-
         return for_stream() if stream else for_non_stream()
 
-
-
     def chat(
         self,
         prompt: str,
@@ -139,34 +175,22 @@ class DeepInfra(Provider):
         optimizer: str = None,
         conversationally: bool = False,
     ) -> str:
-
         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,
-                )
+                self.ask(prompt, False, optimizer=optimizer, conversationally=conversationally)
             )
-
         return for_stream() if stream else for_non_stream()
 
     def get_message(self, response: dict) -> str:
         assert isinstance(response, dict), "Response should be of dict data-type only"
         return response["text"]
 
-
-
 if __name__ == "__main__":
     from rich import print
-    ai = DeepInfra(timeout=5000)
+    ai = DeepInfra(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/Glider.py

@@ -0,0 +1,222 @@
+import requests
+import json
+from typing import Any, Dict, Generator, Optional
+
+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 import LitAgent as Lit
+
+class GliderAI(Provider):
+    """
+    A class to interact with the Glider.so API with comprehensive logging.
+    """
+
+    AVAILABLE_MODELS = {
+        "chat-llama-3-1-70b",
+        "chat-llama-3-1-8b",
+        "chat-llama-3-2-3b",
+        "deepseek-ai/DeepSeek-R1",
+    }
+
+    def __init__(
+        self,
+        is_conversation: bool = True,
+        max_tokens: int = 600,
+        timeout: int = 30,
+        intro: Optional[str] = None,
+        filepath: Optional[str] = None,
+        update_file: bool = True,
+        proxies: dict = {},
+        history_offset: int = 10250,
+        act: Optional[str] = None,
+        model: str = "chat-llama-3-1-70b",
+        system_prompt: str = "You are a helpful AI assistant.",
+        logging: bool = False
+    ):
+        """Initializes the GliderAI API client with logging capabilities."""
+        if model not in self.AVAILABLE_MODELS:
+            raise ValueError(f"Invalid model: {model}. Choose from: {', '.join(self.AVAILABLE_MODELS)}")
+        
+        self.logger = LitLogger(
+            name="GliderAI",
+            format=LogFormat.MODERN_EMOJI,
+            color_scheme=ColorScheme.CYBERPUNK
+        ) if logging else None
+
+        if self.logger:
+            self.logger.info(f"Initializing GliderAI with model: {model}")
+
+        self.session = requests.Session()
+        self.is_conversation = is_conversation
+        self.max_tokens_to_sample = max_tokens
+        self.api_endpoint = "https://glider.so/api/chat"
+        self.stream_chunk_size = 64
+        self.timeout = timeout
+        self.last_response = {}
+        self.model = model
+        self.system_prompt = system_prompt
+        self.headers = {
+            "accept": "*/*",
+            "accept-language": "en-US,en;q=0.9",
+            "content-type": "application/json",
+            "origin": "https://glider.so",
+            "referer": "https://glider.so/",
+            "user-agent": Lit().random(),
+        }
+        self.session.headers.update(self.headers)
+        self.session.proxies = proxies
+
+        self.__available_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
+            )
+            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
+
+        if self.logger:
+            self.logger.info("GliderAI initialized successfully")
+
+    def ask(
+        self,
+        prompt: str,
+        stream: bool = False,
+        raw: bool = False,
+        optimizer: Optional[str] = None,
+        conversationally: bool = False,
+    ) -> Dict[str, Any] | Generator[Dict[str, Any], None, None]:
+        """Chat with AI with logging capabilities.
+
+        Args:
+            prompt (str): Prompt to be sent.
+            stream (bool, optional): Flag for streaming response. Defaults to False.
+            raw (bool, optional): Return raw response chunks instead of dict. Defaults to False.
+            optimizer (str, optional): Prompt optimizer name. Defaults to None.
+            conversationally (bool, optional): Use conversationally modified prompt when optimizer specified. Defaults to False.
+        Returns:
+            dict or Generator[dict, None, None]: The response from the API.
+        """
+        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 {list(self.__available_optimizers)}")
+
+        payload = {
+            "messages": [
+                {"role": "user", "content": conversation_prompt},
+                {"role": "system", "content": self.system_prompt}
+            ],
+            "model": self.model,
+        }
+
+        def for_stream():
+            if self.logger:
+                self.logger.debug("Initiating streaming request to API")
+            response = self.session.post(
+                self.api_endpoint, json=payload, stream=True, timeout=self.timeout
+            )
+            if not response.ok:
+                if self.logger:
+                    self.logger.error(
+                        f"Failed to generate response - ({response.status_code}, {response.reason}) - {response.text}"
+                    )
+                raise exceptions.FailedToGenerateResponseError(
+                    f"Failed to generate response - ({response.status_code}, {response.reason}) - {response.text}"
+                )
+            streaming_text = ""
+            for value in response.iter_lines(decode_unicode=True):
+                if value:
+                    if value.startswith("data: "):
+                        try:
+                            data = json.loads(value[6:])
+                            content = data['choices'][0].get('delta', {}).get("content", "")
+                            if content:
+                                streaming_text += content
+                                yield content if raw else {"text": content}
+                        except json.JSONDecodeError:
+                            if "stop" in value:
+                                break
+            self.last_response.update(dict(text=streaming_text))
+            self.conversation.update_chat_history(prompt, self.get_message(self.last_response))
+            if self.logger:
+                self.logger.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
+
+        return for_stream() if stream else for_non_stream()
+
+    def chat(
+        self,
+        prompt: str,
+        stream: bool = False,
+        optimizer: Optional[str] = None,
+        conversationally: bool = False,
+    ) -> str | Generator[str, None, None]:
+        """Generate response as a string with logging.
+
+        Args:
+            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 conversationally modified prompt when optimizer specified. Defaults to False.
+        Returns:
+            str or Generator[str, None, None]: The response generated.
+        """
+        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
+            ):
+                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
+    # For testing with logging enabled
+    ai = GliderAI(model="chat-llama-3-1-70b", logging=True)
+    response = ai.chat("Meaning of Life", stream=True)
+    for chunk in response:
+        print(chunk, end="", flush=True)

webscout/Provider/Groq.py

@@ -16,18 +16,22 @@ class GROQ(Provider):
     """
 
     AVAILABLE_MODELS = [
-        "llama-3.1-405b-reasoning",
-        "llama-3.1-70b-versatile",
-        "llama-3.1-8b-instant",
-        "llama3-groq-70b-8192-tool-use-preview",
-        "llama3-groq-8b-8192-tool-use-preview",
-        "llama-guard-3-8b",
+        # "whisper-large-v3",
         "llama3-70b-8192",
+        "llama-3.2-3b-preview",
+        "gemma2-9b-it",
+        "llama-3.2-11b-vision-preview",
         "llama3-8b-8192",
+        "llama-3.3-70b-versatile",
+        "deepseek-r1-distill-llama-70b",
+        # "distil-whisper-large-v3-en",
         "mixtral-8x7b-32768",
-        "gemma-7b-it",
-        "gemma2-9b-it",
-        "whisper-large-v3"
+        "llama-3.3-70b-specdec",
+        "llama-3.2-90b-vision-preview",
+        "llama-3.2-1b-preview",
+        # "whisper-large-v3-turbo",
+        "llama-3.1-8b-instant",
+        "llama-guard-3-8b"
     ]
 
     def __init__(
@@ -337,18 +341,22 @@ class AsyncGROQ(AsyncProvider):
     """
 
     AVAILABLE_MODELS = [
-        "llama-3.1-405b-reasoning",
-        "llama-3.1-70b-versatile",
-        "llama-3.1-8b-instant",
-        "llama3-groq-70b-8192-tool-use-preview",
-        "llama3-groq-8b-8192-tool-use-preview",
-        "llama-guard-3-8b",
+        # "whisper-large-v3",
         "llama3-70b-8192",
+        "llama-3.2-3b-preview",
+        "gemma2-9b-it",
+        "llama-3.2-11b-vision-preview",
         "llama3-8b-8192",
+        "llama-3.3-70b-versatile",
+        "deepseek-r1-distill-llama-70b",
+        # "distil-whisper-large-v3-en",
         "mixtral-8x7b-32768",
-        "gemma-7b-it",
-        "gemma2-9b-it",
-        "whisper-large-v3"
+        "llama-3.3-70b-specdec",
+        "llama-3.2-90b-vision-preview",
+        "llama-3.2-1b-preview",
+        # "whisper-large-v3-turbo",
+        "llama-3.1-8b-instant",
+        "llama-guard-3-8b"
     ]
 
     def __init__(

webscout/Provider/HF_space/qwen_qwen2.py

@@ -0,0 +1,206 @@
+from dataclasses import dataclass
+from enum import Enum, auto
+import requests
+import json
+import re
+import uuid
+from typing import List, Dict, Generator, Optional, Any, TypedDict, Literal, Union, Final
+
+# Type definitions
+class Role(Enum):
+    SYSTEM = "system"
+    USER = "user"
+    ASSISTANT = "assistant"
+
+class Message(TypedDict):
+    role: str
+    content: str
+
+class APIResponse(TypedDict):
+    event_id: str
+    fn_index: int
+    data: List[Any]
+
+class StreamData(TypedDict):
+    msg: str
+    output: Dict[str, Any]
+
+@dataclass
+class APIConfig:
+    url: Final[str] = "https://qwen-qwen2-72b-instruct.hf.space"
+    api_endpoint: Final[str] = "https://qwen-qwen2-72b-instruct.hf.space/queue/join?"
+
+@dataclass
+class RequestHeaders:
+    join: Dict[str, str]
+    data: Dict[str, str]
+
+    @classmethod
+    def create_default(cls, base_url: str) -> 'RequestHeaders':
+        common_headers = {
+            'accept-language': 'en-US,en;q=0.9',
+            'user-agent': 'Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/131.0.0.0 Safari/537.36'
+        }
+        
+        return cls(
+            join={
+                **common_headers,
+                'accept': '*/*',
+                'content-type': 'application/json',
+                'origin': base_url,
+                'referer': f'{base_url}/',
+            },
+            data={
+                **common_headers,
+                'accept': 'text/event-stream',
+                'referer': f'{base_url}/',
+            }
+        )
+
+class QwenAPI:
+    def __init__(self, config: APIConfig = APIConfig()):
+        self.config = config
+        self.headers = RequestHeaders.create_default(config.url)
+
+    @staticmethod
+    def generate_session_hash() -> str:
+        """Generate a unique session hash."""
+        return str(uuid.uuid4()).replace('-', '')[:12]
+
+    @staticmethod
+    def format_prompt(messages: List[Message]) -> str:
+        """
+        Formats a list of messages into a single prompt string.
+
+        Args:
+            messages: A list of message dictionaries with "role" and "content" keys.
+
+        Returns:
+            str: The formatted prompt.
+        """
+        return "\n".join(f"{message['role']}: {message['content']}" for message in messages)
+
+    def create_sync_generator(
+        self,
+        model: str,
+        messages: List[Message],
+        proxy: Optional[str] = None,
+        **kwargs: Any
+    ) -> Generator[str, None, None]:
+        """
+        Synchronously streams responses from the Qwen_Qwen2_72B_Instruct API.
+
+        Args:
+            model: The model to use for the request.
+            messages: A list of message dictionaries with "role" and "content" keys.
+            proxy: Optional proxy URL for the request.
+            **kwargs: Additional keyword arguments.
+
+        Yields:
+            str: Text chunks from the API response.
+
+        Raises:
+            requests.exceptions.RequestException: If the API request fails.
+            json.JSONDecodeError: If the response cannot be parsed as JSON.
+        """
+        session_hash: str = self.generate_session_hash()
+
+        # Prepare the prompt
+        system_messages: List[str] = [
+            message["content"] 
+            for message in messages 
+            if message["role"] == Role.SYSTEM.value
+        ]
+        system_prompt: str = "\n".join(system_messages)
+        
+        user_messages: List[Message] = [
+            message 
+            for message in messages 
+            if message["role"] != Role.SYSTEM.value
+        ]
+        prompt: str = self.format_prompt(user_messages)
+
+        payload_join: Dict[str, Any] = {
+            "data": [prompt, [], system_prompt],
+            "event_data": None,
+            "fn_index": 0,
+            "trigger_id": 11,
+            "session_hash": session_hash
+        }
+
+        with requests.Session() as session:
+            # Send join request
+            response = session.post(
+                self.config.api_endpoint,
+                headers=self.headers.join,
+                json=payload_join
+            )
+            response.raise_for_status()
+            event_data: APIResponse = response.json()
+
+            # Prepare data stream request
+            url_data: str = f'{self.config.url}/queue/data'
+            params_data: Dict[str, str] = {'session_hash': session_hash}
+
+            # Send data stream request
+            full_response: str = ""
+            final_full_response: str = ""
+
+            with session.get(
+                url_data,
+                headers=self.headers.data,
+                params=params_data,
+                stream=True
+            ) as response:
+                response.raise_for_status()
+                
+                for line in response.iter_lines():
+                    if line:
+                        decoded_line: str = line.decode('utf-8')
+                        if decoded_line.startswith('data: '):
+                            try:
+                                json_data: StreamData = json.loads(decoded_line[6:])
+
+                                if json_data.get('msg') == 'process_generating':
+                                    if 'output' in json_data and 'data' in json_data['output']:
+                                        output_data: List[Any] = json_data['output']['data']
+                                        if len(output_data) > 1 and len(output_data[1]) > 0:
+                                            for item in output_data[1]:
+                                                if isinstance(item, list) and len(item) > 1:
+                                                    fragment: str = str(item[1])
+                                                    if not re.match(r'^\[.*\]$', fragment) and not full_response.endswith(fragment):
+                                                        full_response += fragment
+                                                        yield fragment
+
+                                if json_data.get('msg') == 'process_completed':
+                                    if 'output' in json_data and 'data' in json_data['output']:
+                                        output_data = json_data['output']['data']
+                                        if len(output_data) > 1 and len(output_data[1]) > 0:
+                                            final_full_response = output_data[1][0][1]
+                                            
+                                            if final_full_response.startswith(full_response):
+                                                final_full_response = final_full_response[len(full_response):]
+                                            
+                                            if final_full_response:
+                                                yield final_full_response
+                                        break
+
+                            except json.JSONDecodeError as e:
+                                print(f"Could not parse JSON: {decoded_line}")
+                                raise e
+
+
+def main() -> None:
+    messages: List[Message] = [
+        {"role": Role.SYSTEM.value, "content": "You are a helpful assistant."},
+        {"role": Role.USER.value, "content": "LOL"}
+    ]
+
+    api = QwenAPI()
+    for text in api.create_sync_generator("qwen-qwen2-72b-instruct", messages):
+        print(text, end="", flush=True)
+    print("\n---\n")
+
+
+if __name__ == "__main__":
+    main()