webscout 8.2.6__py3-none-any.whl → 8.2.8__py3-none-any.whl

webscout/Provider/asksteve.py

@@ -156,8 +156,8 @@ class AskSteve(Provider):
             self.conversation.update_chat_history(
                 prompt, self.get_message(self.last_response)
             )
-            # Return dict or raw string based on raw flag
-            return text if raw else self.last_response
+            # Always return a dict for consistency
+            return {"text": text} if raw else self.last_response
 
         except CurlError as e:
             raise exceptions.FailedToGenerateResponseError(f"Request failed (CurlError): {e}") from e
@@ -181,7 +181,6 @@ class AskSteve(Provider):
             str: Response generated
         """
 
-        # Since ask() doesn't truly stream, we just call it once.
         response_data = self.ask(
             prompt,
             stream=False, # Always False for this API
@@ -189,19 +188,28 @@ class AskSteve(Provider):
             optimizer=optimizer,
             conversationally=conversationally,
         )
-        return self.get_message(response_data)
-
-    def get_message(self, response: dict) -> str:
+        if stream:
+            def stream_wrapper():
+                yield self.get_message(response_data)
+            return stream_wrapper()
+        else:
+            return self.get_message(response_data)
+
+    def get_message(self, response) -> str:
         """Retrieves message only from response
 
         Args:
-            response (dict): Response generated by `self.ask`
+            response (dict or str): Response generated by `self.ask` or a string
 
         Returns:
             str: Message extracted
         """
-        assert isinstance(response, dict), "Response should be of dict data-type only"
-        return response.get("text", "") # Use .get for safety
+        if isinstance(response, dict):
+            return response.get("text", "") # Use .get for safety
+        elif isinstance(response, str):
+            return response
+        else:
+            raise TypeError(f"Unsupported response type: {type(response)}")
 
 
 if __name__ == "__main__":

webscout/Provider/cerebras.py

@@ -19,7 +19,9 @@ class Cerebras(Provider):
         "llama3.1-8b",
         "llama-3.3-70b",
         "deepseek-r1-distill-llama-70b",
-        "llama-4-scout-17b-16e-instruct"
+        "llama-4-scout-17b-16e-instruct",
+        "qwen-3-32b",
+
 
     ]
 

webscout/Provider/koala.py

@@ -1,268 +1,170 @@
-import requests
-import json
-from typing import Union, Any, Dict, Optional
-from webscout.AIutel import Optimizers
-from webscout.AIutel import Conversation
-from webscout.AIutel import AwesomePrompts, sanitize_stream
-from webscout.AIbase import Provider
-from webscout import exceptions
-
-class KOALA(Provider):
-    """
-    A class to interact with the Koala.sh API.
-    """
-
-    AVAILABLE_MODELS = [
-        "gpt-4.1-mini",
-        "gpt-4.1",
-    ]
-
-    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 = "gpt-4.1",
-        web_search: bool = True,
-
-    ) -> None:
-        """
-        Initializes the KOALASH API with given parameters.
-
-        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): AI model to use. Defaults to "gpt-4o-mini".
-        """
-        if model not in self.AVAILABLE_MODELS:
-            raise ValueError(f"Invalid model: {model}. Choose from: {self.AVAILABLE_MODELS}")
-            
-        self.session = requests.Session()
-        self.is_conversation = is_conversation
-        self.max_tokens_to_sample = max_tokens
-        self.api_endpoint = "https://koala.sh/api/gpt/"
-        self.stream_chunk_size = 64
-        self.timeout = timeout
-        self.last_response = {}
-        self.model = model
-        self.headers = {
-            "accept": "text/event-stream",
-            "accept-encoding": "gzip, deflate, br, zstd",
-            "accept-language": "en-US,en;q=0.9,en-IN;q=0.8",
-            "content-length": "73",
-            "content-type": "application/json",
-            "dnt": "1",
-            "flag-real-time-data": "true" if web_search else "false", 
-            "origin": "https://koala.sh",
-            "priority": "u=1, i",
-            "referer": "https://koala.sh/chat",
-            "sec-ch-ua": '"Not)A;Brand";v="99", "Microsoft Edge";v="127", "Chromium";v="127"',
-            "sec-ch-ua-mobile": "?0",
-            "sec-ch-ua-platform": '"Windows"',
-            "sec-fetch-dest": "empty",
-            "sec-fetch-mode": "cors",
-            "sec-fetch-site": "same-origin",
-            "user-agent": "Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/127.0.0.0 Safari/537.36 Edg/127.0.0.0",
-        }
-
-        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]:
-        """
-        Sends a prompt to the Koala.sh API and returns the response.
-
-        Args:
-            prompt: The text prompt to generate text from.
-            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.
-
-        Returns:
-            The response from the API.
-        """
-        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
-                )
-            else:
-                raise Exception(
-                    f"Optimizer is not one of {self.__available_optimizers}"
-                )
-        
-        payload = {
-            "input": conversation_prompt,
-            "model": self.model 
-        }
-
-        def for_stream():
-            response = self.session.post(
-                self.api_endpoint, json=payload, headers=self.headers, stream=True, timeout=self.timeout
-            )
-
-            if not response.ok:
-                raise exceptions.FailedToGenerateResponseError(
-                    f"Failed to generate response - ({response.status_code}, {response.reason})"
-                )
-            
-            streaming_response = ""
-            for line in response.iter_lines(decode_unicode=True):
-                if line:
-                    if line.startswith("data:"):
-                        data = line[len("data:"):].strip()
-                        if data:
-                            try:
-                                event = json.loads(data)
-                                streaming_response += event.get("choices", [{}])[0].get("delta", {}).get("content", "")
-                                yield event if raw else dict(text=streaming_response)
-                            except json.decoder.JSONDecodeError:
-                                continue
-            self.last_response.update(dict(text=streaming_response))
-            self.conversation.update_chat_history(
-                prompt, self.get_message(self.last_response)
-            )
-        def for_non_stream():
-            response = self.session.post(
-                self.api_endpoint, json=payload, headers=self.headers, timeout=self.timeout
-            )
-
-            if not response.ok:
-                raise exceptions.FailedToGenerateResponseError(
-                    f"Failed to generate response - ({response.status_code}, {response.reason})"
-                )
-            
-            response_content = response.content.decode('utf-8')
-            data_parts = response_content.strip().split('\n\n')
-            formatted_response = ''.join([part.replace('data: ', '') for part in data_parts if part.startswith('data: ')])
-
-            # Remove extra quotes from the formatted response
-            formatted_response = formatted_response.replace('""', '')
-
-            # Split the response into lines and format with new lines before headers
-            lines = formatted_response.split('\n')
-            formatted_lines = []
-            for line in lines:
-                if line.startswith('###'):
-                    formatted_lines.append('\n' + line)
-                else:
-                    formatted_lines.append(line)
-
-            # Join the formatted lines back into a single string
-            final_response = '\n'.join(formatted_lines)
-
-            # self.last_response.update(dict(text=streaming_response))
-            self.conversation.update_chat_history(
-                prompt, final_response
-            )
-            return dict(text=final_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 `str`
-        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.
-        Returns:
-            str: Response generated
-        """
-
-        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
-
-        Args:
-            response (dict): Response generated by `self.ask`
-
-        Returns:
-            str: Message extracted
-        """
-        assert isinstance(response, dict), "Response should be of dict data-type only"
-        return response["text"].replace('\\n', '\n').replace('\\n\\n', '\n\n')
-if __name__ == '__main__':
-    print("-" * 80)
-    print(f"{'Model':<50} {'Status':<10} {'Response'}")
-    print("-" * 80)
-
-    for model in KOALA.AVAILABLE_MODELS:
-        try:
-            test_ai = KOALA(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)}")
+import requests
+import re
+from typing import Optional, Union, Any, Dict, Generator
+from uuid import uuid4
+
+from webscout.AIutel import Optimizers, Conversation, AwesomePrompts
+from webscout.AIbase import Provider
+from webscout import exceptions
+
+class KOALA(Provider):
+    """
+    A class to interact with the Koala.sh API, X0GPT-style, without sanitize_stream.
+    """
+    AVAILABLE_MODELS = [
+        "gpt-4.1-mini",
+        "gpt-4.1",
+    ]
+
+    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 = "gpt-4.1",
+        web_search: bool = True,
+    ):
+        if model not in self.AVAILABLE_MODELS:
+            raise ValueError(f"Invalid model: {model}. Choose from: {self.AVAILABLE_MODELS}")
+        self.session = requests.Session()
+        self.is_conversation = is_conversation
+        self.max_tokens_to_sample = max_tokens
+        self.api_endpoint = "https://koala.sh/api/gpt/"
+        self.timeout = timeout
+        self.last_response = {}
+        self.model = model
+        self.headers = {
+            "accept": "text/event-stream",
+            "accept-encoding": "gzip, deflate, br, zstd",
+            "accept-language": "en-US,en;q=0.9,en-IN;q=0.8",
+            "content-type": "application/json",
+            "dnt": "1",
+            "flag-real-time-data": "true" if web_search else "false",
+            "origin": "https://koala.sh",
+            "referer": "https://koala.sh/chat",
+            "user-agent": "Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/127.0.0.0 Safari/537.36 Edg/127.0.0.0",
+        }
+        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
+
+    @staticmethod
+    def _koala_extractor(line: str) -> Optional[str]:
+        # Koala returns lines like: data: "Hello" or data: "..."
+        match = re.match(r'data:\s*"(.*)"', line)
+        if match:
+            return match.group(1)
+        return None
+
+    def ask(
+        self,
+        prompt: str,
+        stream: bool = False,
+        raw: bool = False,
+        optimizer: str = None,
+        conversationally: bool = False,
+    ) -> Dict[str, Any]:
+        conversation_prompt = self.conversation.gen_complete_prompt(prompt)
+        if optimizer:
+            if hasattr(Optimizers, optimizer):
+                conversation_prompt = getattr(Optimizers, optimizer)(
+                    conversation_prompt if conversationally else prompt
+                )
+            else:
+                raise Exception(f"Optimizer is not valid.")
+        payload = {
+            "input": conversation_prompt,
+            "inputHistory": [],
+            "outputHistory": [],
+            "model": self.model
+        }
+        def for_stream():
+            response = self.session.post(
+                self.api_endpoint, json=payload, headers=self.headers, stream=True, timeout=self.timeout
+            )
+            if not response.ok:
+                raise exceptions.FailedToGenerateResponseError(
+                    f"Failed to generate response - ({response.status_code}, {response.reason})"
+                )
+            streaming_response = ""
+            for line in response.iter_lines(decode_unicode=True):
+                if not line:
+                    continue
+                # Only process lines starting with data:
+                if line.startswith("data:"):
+                    content = self._koala_extractor(line)
+                    if content and content.strip():
+                        streaming_response += content
+                        yield dict(text=content) if not raw else content
+            # Only update chat history if response is not empty
+            if streaming_response.strip():
+                self.last_response = dict(text=streaming_response)
+                self.conversation.update_chat_history(
+                    prompt, self.get_message(self.last_response)
+                )
+        def for_non_stream():
+            # Use streaming logic to collect the full response
+            full_text = ""
+            for chunk in for_stream():
+                if isinstance(chunk, dict):
+                    full_text += chunk.get("text", "")
+                elif isinstance(chunk, str):
+                    full_text += chunk
+            # Only update chat history if response is not empty
+            if full_text.strip():
+                self.last_response = dict(text=full_text)
+                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,
+        stream: bool = False,
+        optimizer: str = None,
+        conversationally: bool = False,
+    ) -> 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)
+        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:
+        assert isinstance(response, dict), "Response should be of dict data-type only"
+        return response.get("text", "")
+
+if __name__ == "__main__":
+    from rich import print
+    ai = KOALA(timeout=60)
+    response = ai.chat("Say 'Hello' in one word", stream=True)
+    for chunk in response:
+        print(chunk, end="", flush=True)

webscout/Provider/llmchat.py

@@ -22,6 +22,9 @@ class LLMChat(Provider):
         "@cf/meta/llama-3.2-1b-instruct",
         "@cf/meta/llama-3.3-70b-instruct-fp8-fast",
         "@cf/deepseek-ai/deepseek-r1-distill-qwen-32b",
+        "@cf/meta/llama-4-scout-17b-16e-instruct",
+        "@cf/mistralai/mistral-small-3.1-24b-instruct",
+        "@cf/google/gemma-3-12b-it",
     ]
 
     def __init__(