webscout 4.1__tar.gz → 4.2__tar.gz

{webscout-4.1/webscout.egg-info → webscout-4.2}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: webscout
-Version: 4.1
+Version: 4.2
 Summary: Search for anything using Google, DuckDuckGo, brave, qwant,  phind.com, Contains AI models, can transcribe yt videos, temporary email and phone number generation, has TTS support, webai (terminal gpt and open interpreter) and offline LLMs and more
 Author: OEvortex
 Author-email: helpingai5@gmail.com
@@ -1463,6 +1463,15 @@ print(response)
 
 ### 21. GeminiFlash and geminipro
 **Usage similar to other providers**
+
+### 22. `Ollama` - chat will AI models locally
+```python
+from webscout import OLLAMA
+ollama_provider = OLLAMA(model="qwen2:0.5b")
+response = ollama_provider.chat("What is the meaning of life?")
+print(response)
+```
+
 ### `LLM` 
 ```python
 from webscout.LLM import LLM

{webscout-4.1 → webscout-4.2}/README.md

@@ -1397,6 +1397,15 @@ print(response)
 
 ### 21. GeminiFlash and geminipro
 **Usage similar to other providers**
+
+### 22. `Ollama` - chat will AI models locally
+```python
+from webscout import OLLAMA
+ollama_provider = OLLAMA(model="qwen2:0.5b")
+response = ollama_provider.chat("What is the meaning of life?")
+print(response)
+```
+
 ### `LLM` 
 ```python
 from webscout.LLM import LLM

{webscout-4.1 → webscout-4.2}/setup.py

@@ -5,7 +5,7 @@ with open("README.md", encoding="utf-8") as f:
 
 setup(
     name="webscout",
-    version="4.1",
+    version="4.2",
     description="Search for anything using Google, DuckDuckGo, brave, qwant,  phind.com, Contains AI models, can transcribe yt videos, temporary email and phone number generation, has TTS support, webai (terminal gpt and open interpreter) and offline LLMs and more",
     long_description=README,
     long_description_content_type="text/markdown",

{webscout-4.1 → webscout-4.2}/webscout/AIutel.py

@@ -52,6 +52,7 @@ webai = [
    "vtlchat",
    "geminiflash",
    "geminipro",
+   "ollama"
 ]
 
 gpt4free_providers = [
@@ -196,7 +197,7 @@ class Conversation:
         """
         self.status = status
         self.max_tokens_to_sample = max_tokens
-        self.chat_history = ""
+        self.chat_history = self.intro
         self.history_format = "\nUser : %(user)s\nLLM :%(llm)s"
         self.file = filepath
         self.update_file = update_file

{webscout-4.1 → webscout-4.2}/webscout/Local/_version.py

@@ -1,3 +1,3 @@
 from llama_cpp import __version__ as __llama_cpp_version__
 
-__version__ = '4.1'
+__version__ = '4.2'

webscout-4.2/webscout/Provider/OLLAMA.py

@@ -0,0 +1,187 @@
+import time
+import uuid
+import requests
+from requests import get
+from uuid import uuid4
+from re import findall
+from requests.exceptions import RequestException
+from curl_cffi.requests import get, RequestsError
+import g4f
+from random import randint
+from PIL import Image
+import io
+import re
+import json
+import yaml
+from ..AIutel import Optimizers
+from ..AIutel import Conversation
+from ..AIutel import AwesomePrompts, sanitize_stream
+from ..AIbase import Provider, AsyncProvider
+from webscout import exceptions
+from typing import Any, AsyncGenerator, Dict
+import logging
+import httpx
+import ollama
+
+class OLLAMA(Provider):
+    def __init__(
+        self,
+        model: str = 'qwen2:0.5b',
+        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,
+    ):
+        """Instantiates Ollama
+
+        Args:
+            model (str, optional): Model name. Defaults to 'llama2'.
+            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.
+        """
+        self.model = model
+        self.is_conversation = is_conversation
+        self.max_tokens_to_sample = max_tokens
+        self.timeout = timeout
+        self.last_response = {}
+
+        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
+
+    def ask(
+        self,
+        prompt: str,
+        stream: bool = False,
+        raw: bool = False,
+        optimizer: str = None,
+        conversationally: bool = False,
+    ) -> dict | AsyncGenerator:
+        """Chat with AI
+
+        Args:
+            prompt (str): Prompt to be send.
+            stream (bool, optional): Flag for streaming response. Defaults to False.
+            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.
+        Returns:
+           dict|AsyncGenerator : ai content
+        ```json
+        {
+           "text" : "print('How may I help you today?')"
+        }
+        ```
+        """
+        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}"
+                )
+
+        def for_stream():
+            stream = ollama.chat(model=self.model, messages=[
+                {'role': 'user', 'content': conversation_prompt}
+            ], stream=True)
+
+            message_load = ""
+            for chunk in stream:
+                message_load += chunk['message']['content']
+                yield chunk['message']['content'] if raw else dict(text=message_load)
+            self.last_response.update(dict(text=message_load))
+            self.conversation.update_chat_history(
+                prompt, self.get_message(self.last_response)
+            )
+
+        def for_non_stream():
+            response = ollama.chat(model=self.model, messages=[
+                {'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
+
+        return for_stream() if stream else for_non_stream()
+
+    def chat(
+        self,
+        prompt: str,
+        stream: bool = False,
+        optimizer: str = None,
+        conversationally: bool = False,
+    ) -> 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.
+        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"]
+if __name__ == "__main__":
+    ollama_provider = OLLAMA(model="qwen2:0.5b")
+    response = ollama_provider.chat("What is the meaning of life?")
+    print(response)

{webscout-4.1 → webscout-4.2}/webscout/Provider/__init__.py

@@ -37,7 +37,7 @@ from .Deepinfra import DeepInfra, VLM, AsyncDeepInfra
 from .VTLchat import VTLchat
 from .Geminipro import GEMINIPRO
 from .Geminiflash import GEMINIFLASH
-
+from .OLLAMA import OLLAMA
 __all__ = [
     'ThinkAnyAI',
     'Xjai',
@@ -78,6 +78,7 @@ __all__ = [
     'OPENGPTv2',
     'GEMINIPRO',
     'GEMINIFLASH',
+    'OLLAMA'
 
 
 ]

{webscout-4.1 → webscout-4.2}/webscout/__init__.py

@@ -44,6 +44,7 @@ webai = [
    "vtlchat",
    "geminiflash",
    "geminipro",
+   "ollama"
 ]
 
 gpt4free_providers = [

{webscout-4.1 → webscout-4.2}/webscout/version.py

@@ -1,2 +1,2 @@
-__version__ = "4.1"
+__version__ = "4.2"
 __prog__ = "webscout"

{webscout-4.1 → webscout-4.2}/webscout/webai.py

@@ -831,7 +831,21 @@ class Main(cmd.Cmd):
                     act=awesome_prompt,
                     quiet=quiet,
                 )
+            elif provider == "ollama":
+                from webscout import OLLAMA
 
+                self.bot = OLLAMA(
+                    is_conversation=disable_conversation,
+                    max_tokens=max_tokens,
+                    timeout=timeout,
+                    intro=intro,
+                    filepath=filepath,
+                    update_file=update_file,
+                    proxies=proxies,
+                    history_offset=history_offset,
+                    act=awesome_prompt,
+                    model=getOr(model, "qwen2:0.5b")
+                )
             else:
                 raise NotImplementedError(
                     f"The provider `{provider}` is not yet implemented."

{webscout-4.1 → webscout-4.2/webscout.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: webscout
-Version: 4.1
+Version: 4.2
 Summary: Search for anything using Google, DuckDuckGo, brave, qwant,  phind.com, Contains AI models, can transcribe yt videos, temporary email and phone number generation, has TTS support, webai (terminal gpt and open interpreter) and offline LLMs and more
 Author: OEvortex
 Author-email: helpingai5@gmail.com
@@ -1463,6 +1463,15 @@ print(response)
 
 ### 21. GeminiFlash and geminipro
 **Usage similar to other providers**
+
+### 22. `Ollama` - chat will AI models locally
+```python
+from webscout import OLLAMA
+ollama_provider = OLLAMA(model="qwen2:0.5b")
+response = ollama_provider.chat("What is the meaning of life?")
+print(response)
+```
+
 ### `LLM` 
 ```python
 from webscout.LLM import LLM

{webscout-4.1 → webscout-4.2}/webscout.egg-info/SOURCES.txt

@@ -56,6 +56,7 @@ webscout/Provider/Groq.py
 webscout/Provider/Koboldai.py
 webscout/Provider/Leo.py
 webscout/Provider/Llama2.py
+webscout/Provider/OLLAMA.py
 webscout/Provider/OpenGPT.py
 webscout/Provider/Openai.py
 webscout/Provider/Perplexity.py