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

webscout/Provider/OLLAMA.py

@@ -3,8 +3,12 @@ from webscout.AIutel import Conversation
 from webscout.AIutel import AwesomePrompts, sanitize_stream
 from webscout.AIbase import Provider, AsyncProvider
 from webscout import exceptions
-from typing import Any, AsyncGenerator, Dict
+from typing import Any, AsyncGenerator, Dict, List, Optional, Union
 import ollama
+from ollama import AsyncClient, Client, ResponseError
+import asyncio
+import base64
+from pathlib import Path
 
 class OLLAMA(Provider):
     def __init__(
@@ -19,7 +23,9 @@ class OLLAMA(Provider):
         proxies: dict = {},
         history_offset: int = 10250,
         act: str = None,
-        system_prompt: str = "You are a helpful and friendly AI assistant.", 
+        system_prompt: str = "You are a helpful and friendly AI assistant.",
+        host: str = 'http://localhost:11434',
+        headers: Optional[Dict] = None,
     ):
         """Instantiates Ollama
 
@@ -34,7 +40,9 @@ class OLLAMA(Provider):
             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.
-            system_prompt (str, optional): System prompt for Ollama. Defaults to "You are a helpful and friendly AI assistant.". 
+            system_prompt (str, optional): System prompt for Ollama. Defaults to "You are a helpful and friendly AI assistant.".
+            host (str, optional): Ollama host URL. Defaults to 'http://localhost:11434'.
+            headers (dict, optional): Custom headers for requests. Defaults to None.
         """
         self.model = model
         self.is_conversation = is_conversation
@@ -42,6 +50,8 @@ class OLLAMA(Provider):
         self.timeout = timeout
         self.last_response = {}
         self.system_prompt = system_prompt
+        self.client = Client(host=host, headers=headers)
+        self.async_client = AsyncClient(host=host, headers=headers)
 
         self.__available_optimizers = (
             method
@@ -67,7 +77,9 @@ class OLLAMA(Provider):
         raw: bool = False,
         optimizer: str = None,
         conversationally: bool = False,
-    ) -> dict | AsyncGenerator:
+        tools: Optional[List[Dict]] = None,
+        images: Optional[List[str]] = None,
+    ) -> Union[dict, AsyncGenerator]:
         """Chat with AI
 
         Args:
@@ -76,13 +88,10 @@ class OLLAMA(Provider):
             raw (bool, optional): Stream back raw response as received. 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.
+            tools (List[Dict], optional): List of tools/functions to use. Defaults to None.
+            images (List[str], optional): List of image paths or base64 encoded images. Defaults to None.
         Returns:
-           dict|AsyncGenerator : ai content
-        ```json
-        {
-           "text" : "print('How may I help you today?')"
-        }
-        ```
+           Union[dict, AsyncGenerator] : ai content
         """
         conversation_prompt = self.conversation.gen_complete_prompt(prompt)
         if optimizer:
@@ -95,29 +104,101 @@ class OLLAMA(Provider):
                     f"Optimizer is not one of {self.__available_optimizers}"
                 )
 
-        def for_stream():
-            # Correctly call ollama.chat with stream=True
-            stream = ollama.chat(model=self.model, messages=[
-                {'role': 'system', 'content': self.system_prompt}, 
-                {'role': 'user', 'content': conversation_prompt}
-            ], stream=True)
+        messages = [
+            {'role': 'system', 'content': self.system_prompt},
+            {'role': 'user', 'content': conversation_prompt}
+        ]
 
-            # Yield each chunk directly
-            for chunk in stream:
-                yield chunk['message']['content'] if raw else dict(text=chunk['message']['content'])
+        if images:
+            messages[-1]['images'] = images
 
-        def for_non_stream():
-            response = ollama.chat(model=self.model, messages=[
-                {'role': 'system', 'content': self.system_prompt}, # Add system message
-                {'role': 'user', 'content': conversation_prompt}
-            ])
-            self.last_response.update(dict(text=response['message']['content']))
-            self.conversation.update_chat_history(
-                prompt, self.get_message(self.last_response)
-            )
-            return self.last_response
+        try:
+            def for_stream():
+                stream = self.client.chat(
+                    model=self.model,
+                    messages=messages,
+                    stream=True,
+                    tools=tools
+                )
+                for chunk in stream:
+                    yield chunk['message']['content'] if raw else dict(text=chunk['message']['content'])
 
-        return for_stream() if stream else for_non_stream()
+            def for_non_stream():
+                response = self.client.chat(
+                    model=self.model,
+                    messages=messages,
+                    tools=tools
+                )
+                self.last_response.update(dict(text=response['message']['content']))
+                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()
+        except ResponseError as e:
+            if e.status_code == 404:
+                raise Exception(f"Model {self.model} not found. Please pull it first using `ollama pull {self.model}`")
+            raise e
+
+    async def aask(
+        self,
+        prompt: str,
+        stream: bool = False,
+        raw: bool = False,
+        optimizer: str = None,
+        conversationally: bool = False,
+        tools: Optional[List[Dict]] = None,
+        images: Optional[List[str]] = None,
+    ) -> Union[dict, AsyncGenerator]:
+        """Async version of ask method"""
+        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}"
+                )
+
+        messages = [
+            {'role': 'system', 'content': self.system_prompt},
+            {'role': 'user', 'content': conversation_prompt}
+        ]
+
+        if images:
+            messages[-1]['images'] = images
+
+        try:
+            async def for_stream():
+                stream = await self.async_client.chat(
+                    model=self.model,
+                    messages=messages,
+                    stream=True,
+                    tools=tools
+                )
+                async for chunk in stream:
+                    yield chunk['message']['content'] if raw else dict(text=chunk['message']['content'])
+
+            async def for_non_stream():
+                response = await self.async_client.chat(
+                    model=self.model,
+                    messages=messages,
+                    tools=tools
+                )
+                self.last_response.update(dict(text=response['message']['content']))
+                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()
+        except ResponseError as e:
+            if e.status_code == 404:
+                raise Exception(f"Model {self.model} not found. Please pull it first using `ollama pull {self.model}`")
+            raise e
 
     def chat(
         self,
@@ -125,20 +206,24 @@ class OLLAMA(Provider):
         stream: bool = False,
         optimizer: str = None,
         conversationally: bool = False,
-    ) -> str | AsyncGenerator:
+        tools: Optional[List[Dict]] = None,
+        images: Optional[List[str]] = None,
+    ) -> Union[str, AsyncGenerator]:
         """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.
+            tools (List[Dict], optional): List of tools/functions to use. Defaults to None.
+            images (List[str], optional): List of image paths or base64 encoded images. Defaults to None.
         Returns:
-            str: Response generated
+            Union[str, AsyncGenerator]: Response generated
         """
-
         def for_stream():
             for response in self.ask(
-                prompt, True, optimizer=optimizer, conversationally=conversationally
+                prompt, True, optimizer=optimizer, conversationally=conversationally,
+                tools=tools, images=images
             ):
                 yield self.get_message(response)
 
@@ -149,6 +234,39 @@ class OLLAMA(Provider):
                     False,
                     optimizer=optimizer,
                     conversationally=conversationally,
+                    tools=tools,
+                    images=images
+                )
+            )
+
+        return for_stream() if stream else for_non_stream()
+
+    async def achat(
+        self,
+        prompt: str,
+        stream: bool = False,
+        optimizer: str = None,
+        conversationally: bool = False,
+        tools: Optional[List[Dict]] = None,
+        images: Optional[List[str]] = None,
+    ) -> Union[str, AsyncGenerator]:
+        """Async version of chat method"""
+        async def for_stream():
+            async for response in await self.aask(
+                prompt, True, optimizer=optimizer, conversationally=conversationally,
+                tools=tools, images=images
+            ):
+                yield self.get_message(response)
+
+        async def for_non_stream():
+            return self.get_message(
+                await self.aask(
+                    prompt,
+                    False,
+                    optimizer=optimizer,
+                    conversationally=conversationally,
+                    tools=tools,
+                    images=images
                 )
             )
 
@@ -165,8 +283,114 @@ class OLLAMA(Provider):
         """
         assert isinstance(response, dict), "Response should be of dict data-type only"
         return response["text"]
+
+    def generate(
+        self,
+        prompt: str,
+        stream: bool = False,
+        **kwargs
+    ) -> Union[dict, AsyncGenerator]:
+        """Generate text using the model"""
+        try:
+            if stream:
+                return self.client.generate(model=self.model, prompt=prompt, stream=True, **kwargs)
+            return self.client.generate(model=self.model, prompt=prompt, **kwargs)
+        except ResponseError as e:
+            if e.status_code == 404:
+                raise Exception(f"Model {self.model} not found. Please pull it first using `ollama pull {self.model}`")
+            raise e
+
+    async def agenerate(
+        self,
+        prompt: str,
+        stream: bool = False,
+        **kwargs
+    ) -> Union[dict, AsyncGenerator]:
+        """Async version of generate method"""
+        try:
+            if stream:
+                return await self.async_client.generate(model=self.model, prompt=prompt, stream=True, **kwargs)
+            return await self.async_client.generate(model=self.model, prompt=prompt, **kwargs)
+        except ResponseError as e:
+            if e.status_code == 404:
+                raise Exception(f"Model {self.model} not found. Please pull it first using `ollama pull {self.model}`")
+            raise e
+
+    def list_models(self) -> List[dict]:
+        """List all available models"""
+        return self.client.list()
+
+    def show_model(self, model: str = None) -> dict:
+        """Show model details"""
+        model = model or self.model
+        return self.client.show(model)
+
+    def pull_model(self, model: str = None) -> None:
+        """Pull a model from Ollama"""
+        model = model or self.model
+        self.client.pull(model)
+
+    def delete_model(self, model: str = None) -> None:
+        """Delete a model"""
+        model = model or self.model
+        self.client.delete(model)
+
+    def embed(
+        self,
+        input: Union[str, List[str]],
+        model: str = None
+    ) -> List[float]:
+        """Generate embeddings for input text"""
+        model = model or self.model
+        return self.client.embed(model=model, input=input)
+
+    async def aembed(
+        self,
+        input: Union[str, List[str]],
+        model: str = None
+    ) -> List[float]:
+        """Async version of embed method"""
+        model = model or self.model
+        return await self.async_client.embed(model=model, input=input)
+
 if __name__ == "__main__":
-    ai = OLLAMA(model="llama3.2:1b")
+    # Example usage
+    ai = OLLAMA(model="qwen2.5:0.5b")
+    # ai.pull_model("qwen2.5:0.5b")
+    # Basic chat
     response = ai.chat("write a poem about AI", stream=True)
     for chunk in response:
-        print(chunk, end="", flush=True)
+        print(chunk, end="", flush=True)
+    
+    # Vision example
+    # response = ai.chat(
+    #     "What's in this image?",
+    #     images=["path/to/image.jpg"]
+    # )
+    # print(response)
+    
+    # Tools example
+    def add_numbers(a: int, b: int) -> int:
+        return a + b
+    
+    tools = [{
+        'type': 'function',
+        'function': {
+            'name': 'add_numbers',
+            'description': 'Add two numbers',
+            'parameters': {
+                'type': 'object',
+                'properties': {
+                    'a': {'type': 'integer'},
+                    'b': {'type': 'integer'}
+                },
+                'required': ['a', 'b']
+            }
+        }
+    }]
+    
+    response = ai.chat(
+        "What is 5 plus 3?",
+        tools=tools
+    )
+    print(response)

webscout/Provider/Openai.py

@@ -5,7 +5,7 @@ from ..AIutel import AwesomePrompts, sanitize_stream
 from ..AIbase import  Provider, AsyncProvider
 
 from webscout import exceptions
-from typing import Any, AsyncGenerator, Dict
+from typing import Any, AsyncGenerator, Dict, List, Optional, Union
 import requests
 import httpx
 #----------------------------------------------------------OpenAI-----------------------------------
@@ -332,7 +332,8 @@ class AsyncOPENAI(AsyncProvider):
         raw: bool = False,
         optimizer: str = None,
         conversationally: bool = False,
-    ) -> dict | AsyncGenerator:
+        tools: Optional[List[Dict[str, Any]]] = None,
+    ) -> Union[dict, AsyncGenerator]:
         """Chat with AI asynchronously.
 
         Args:
@@ -341,6 +342,7 @@ class AsyncOPENAI(AsyncProvider):
             raw (bool, optional): Stream back raw response as received. 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.
+            tools (Optional[List[Dict[str, Any]]], optional): List of tools to be used. Defaults to None.
         Returns:
            dict|AsyncGenerator : ai content.
         ```json
@@ -444,13 +446,15 @@ class AsyncOPENAI(AsyncProvider):
         stream: bool = False,
         optimizer: str = None,
         conversationally: bool = False,
-    ) -> str | AsyncGenerator:
+        tools: Optional[List[Dict[str, Any]]] = None,
+    ) -> Union[str, AsyncGenerator]:
         """Generate response `str` asynchronously.
         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.
+            tools (Optional[List[Dict[str, Any]]], optional): List of tools to be used. Defaults to None.
         Returns:
             str|AsyncGenerator: Response generated
         """

webscout/Provider/PI.py

@@ -9,7 +9,7 @@ from webscout.AIutel import Conversation
 from webscout.AIutel import AwesomePrompts
 from webscout.AIbase import Provider
 from typing import Dict, Union, Any, Optional
-from webscout import LitAgent
+from webscout.litagent import LitAgent
 
 class PiAI(Provider):
     """

webscout/Provider/Perplexitylabs.py

@@ -13,7 +13,7 @@ from webscout.AIutel import Conversation
 from webscout.AIutel import AwesomePrompts, sanitize_stream
 from webscout.AIbase import Provider
 from webscout import exceptions
-from webscout import LitAgent
+from webscout.litagent import LitAgent
 
 class PerplexityLabs(Provider):
     """

webscout/Provider/Phind.py

@@ -8,7 +8,7 @@ from webscout.AIutel import AwesomePrompts, sanitize_stream
 from webscout.AIbase import  Provider
 
 from webscout import exceptions
-from typing import Any, AsyncGenerator, Dict
+from typing import Union, Any, AsyncGenerator, Dict
 
 
 #------------------------------------------------------phind-------------------------------------------------------------

webscout/Provider/PizzaGPT.py

@@ -5,7 +5,7 @@ from typing import Any, Dict, Optional, Union, Generator
 from webscout.AIutel import Optimizers, Conversation, AwesomePrompts
 from webscout.AIbase import Provider
 from webscout import exceptions
-from webscout import LitAgent as Lit
+from webscout.litagent import LitAgent as Lit
 
 class PIZZAGPT(Provider):
     """

webscout/Provider/QwenLM.py

@@ -1,13 +1,10 @@
-import requests
 import json
-from typing import Any, Dict, Generator, Optional
-import uuid
-import re
+from typing import Union, Any, Dict, Generator, Optional
 
 import cloudscraper
 
 from webscout.AIutel import Optimizers, Conversation, AwesomePrompts
-from webscout.AIbase import Provider, AsyncProvider
+from webscout.AIbase import Provider
 from webscout import exceptions
 
 class QwenLM(Provider):
@@ -126,7 +123,7 @@ class QwenLM(Provider):
         raw: bool = False,
         optimizer: Optional[str] = None,
         conversationally: bool = False,
-    ) -> Dict[str, Any] | Generator[Dict[str, Any], None, None]:
+    ) -> Union[Dict[str, Any], Generator[Any, None, None]]:
         """Chat with AI."""
 
         conversation_prompt = self.conversation.gen_complete_prompt(prompt)
@@ -229,7 +226,7 @@ class QwenLM(Provider):
         stream: bool = False,
         optimizer: Optional[str] = None,
         conversationally: bool = False,
-    ) -> str | Generator[str, None, None]:
+    ) -> Union[str, Generator[str, None, None]]:
         """Generate response string from chat."""
 
         def for_stream() -> Generator[str, None, None]:

webscout/Provider/TTI/FreeAIPlayground/async_freeaiplayground.py

@@ -7,11 +7,7 @@ from random import choice
 import aiofiles
 
 from webscout.AIbase import AsyncImageProvider
-from webscout.litagent import LitAgent  # Import our fire user agent generator 🔥
-from webscout.Litlogger import Logger  # For that cyberpunk logging swag ⚡
-
-# Initialize our fire logger 🚀
-logger = Logger("AsyncFreeAIPlayground")
+from webscout.litagent import LitAgent
 
 class AsyncFreeAIImager(AsyncImageProvider):
     """
@@ -25,15 +21,16 @@ class AsyncFreeAIImager(AsyncImageProvider):
         "Flux Pro Ultra Raw",
         "Flux Schnell",
         "Flux Realism",
-        "grok-2-aurora"
+        "grok-2-aurora",
+        "Flux Dev",
+
     ]
 
     def __init__(
         self,
-        model: str = "dall-e-3",  # Updated default model
+        model: str = "dall-e-3",
         timeout: int = 60,
-        proxies: dict = {},
-        logging: bool = True
+        proxies: dict = {}
     ):
         """Initialize your async FreeAIPlayground provider with custom settings! ⚙️
 
@@ -41,14 +38,13 @@ class AsyncFreeAIImager(AsyncImageProvider):
             model (str): Which model to use (default: dall-e-3)
             timeout (int): Request timeout in seconds (default: 60)
             proxies (dict): Proxy settings for requests (default: {})
-            logging (bool): Enable fire logging (default: True)
         """
         self.image_gen_endpoint: str = "https://api.freeaichatplayground.com/v1/images/generations"
         self.headers = {
             "Accept": "application/json",
             "Accept-Language": "en-US,en;q=0.9",
             "Content-Type": "application/json",
-            "User-Agent": LitAgent().random(),  # Using our fire random agent! 🔥
+            "User-Agent": LitAgent().random(),
             "Origin": "https://freeaichatplayground.com",
             "Referer": "https://freeaichatplayground.com/",
         }
@@ -57,9 +53,6 @@ class AsyncFreeAIImager(AsyncImageProvider):
         self.proxies = proxies
         self.prompt: str = "AI-generated image - webscout"
         self.image_extension: str = "png"
-        self.logging = logging
-        if self.logging:
-            logger.info("AsyncFreeAIPlayground initialized! Ready to create some fire art! 🚀")
 
     async def generate(
         self, prompt: str, amount: int = 1, additives: bool = True,
@@ -93,9 +86,6 @@ class AsyncFreeAIImager(AsyncImageProvider):
             + choice(punctuation)
         )
 
-        if self.logging:
-            logger.info(f"Generating {amount} images... 🎨")
-
         self.prompt = prompt
         response = []
         
@@ -115,28 +105,24 @@ class AsyncFreeAIImager(AsyncImageProvider):
                         async with session.post(self.image_gen_endpoint, json=payload) as resp:
                             resp.raise_for_status()
                             data = await resp.json()
-                            image_url = data['data'][0]['url']
-                            
-                            # Get the image data from the URL
-                            async with session.get(image_url) as img_resp:
-                                img_resp.raise_for_status()
-                                image_bytes = await img_resp.read()
-                                response.append(image_bytes)
+                            if 'data' in data and len(data['data']) > 0:
+                                image_url = data['data'][0]['url']
                                 
-                            if self.logging:
-                                logger.success(f"Generated image {len(response)}/{amount}! 🎨")
-                            break
+                                async with session.get(image_url) as img_resp:
+                                    img_resp.raise_for_status()
+                                    image_bytes = await img_resp.read()
+                                    response.append(image_bytes)
+                                break
+                            else:
+                                print(f"Warning: No image data in response: {data}")
+                                if attempt == max_retries - 1:
+                                    raise Exception("No image data received after all retries")
                     except Exception as e:
+                        print(f"Error generating image (attempt {attempt + 1}/{max_retries}): {str(e)}")
                         if attempt == max_retries - 1:
-                            if self.logging:
-                                logger.error(f"Failed to generate image after {max_retries} attempts: {e} 😢")
                             raise
-                        if self.logging:
-                            logger.warning(f"Attempt {attempt + 1} failed, retrying in {retry_delay}s... 🔄")
                         await asyncio.sleep(retry_delay)
 
-        if self.logging:
-            logger.success("All images generated successfully! 🎉")
         return response
 
     async def save(
@@ -159,8 +145,6 @@ class AsyncFreeAIImager(AsyncImageProvider):
         """
         if not os.path.exists(dir):
             os.makedirs(dir)
-            if self.logging:
-                logger.info(f"Created directory: {dir} 📁")
 
         name = self.prompt if name is None else name
         saved_paths = []
@@ -171,9 +155,6 @@ class AsyncFreeAIImager(AsyncImageProvider):
             
             async with aiofiles.open(filepath, "wb") as f:
                 await f.write(image_bytes)
-            
-            if self.logging:
-                logger.success(f"Saved image to: {filepath} 💾")
             return filename
 
         if isinstance(response, list):
@@ -181,14 +162,9 @@ class AsyncFreeAIImager(AsyncImageProvider):
         else:
             image_list = [chunk async for chunk in response]
 
-        if self.logging:
-            logger.info(f"Saving {len(image_list)} images... 💾")
-
         tasks = [save_single_image(img, i) for i, img in enumerate(image_list)]
         saved_paths = await asyncio.gather(*tasks)
 
-        if self.logging:
-            logger.success(f"All images saved successfully! Check {dir} 🎉")
         return saved_paths
 
 
@@ -199,8 +175,7 @@ if __name__ == "__main__":
             resp = await bot.generate("A shiny red sports car speeding down a scenic mountain road", 1)
             paths = await bot.save(resp)
             print(paths)
-        except Exception as e:
-            if bot.logging:
-                logger.error(f"An error occurred: {e} 😢")
+        except Exception:
+            pass
 
     asyncio.run(main())