webscout 7.1__tar.gz → 7.2__tar.gz

{webscout-7.1/webscout.egg-info → webscout-7.2}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.2
 Name: webscout
-Version: 7.1
+Version: 7.2
 Summary: Search for anything using Google, DuckDuckGo, 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
@@ -41,7 +41,7 @@ Requires-Dist: orjson
 Requires-Dist: PyYAML
 Requires-Dist: tls_client
 Requires-Dist: clipman
-Requires-Dist: playsound
+Requires-Dist: playsound==1.2.2
 Requires-Dist: ollama
 Requires-Dist: pillow
 Requires-Dist: bson
@@ -56,6 +56,7 @@ Requires-Dist: pyreqwest_impersonate
 Requires-Dist: gradio_client
 Requires-Dist: psutil
 Requires-Dist: pygetwindow
+Requires-Dist: aiohttp
 Provides-Extra: dev
 Requires-Dist: ruff>=0.1.6; extra == "dev"
 Requires-Dist: pytest>=7.4.2; extra == "dev"
@@ -1107,7 +1108,7 @@ print(a.chat("HelpingAI-9B"))
 ```
 
 
-###  LLAMA3, pizzagpt, RUBIKSAI, Koala, Darkai, AI4Chat, Farfalle, PIAI, Felo, Julius, YouChat, YEPCHAT, Cloudflare, TurboSeek, Editee, AI21, Chatify, Cerebras, X0GPT, Lepton, GEMINIAPI, Cleeai, Elmo, Free2GPT, Bing, DiscordRocks, GPTWeb, LlamaTutor, PromptRefine, TutorAI, ChatGPTES, Bagoodex, ChatHub, AmigoChat, AIMathGPT, GaurishCerebras, NinjaChat, GeminiPro, Talkai, LLMChat, AskMyAI, Llama3Mitril, Marcus, TypeGPT, Mhystical, Netwrck, MultiChatAI, JadveOpenAI, ChatGLM, Deepfind, NousHermes, TextPollinationsAI, GliderAI, DGAFAI
+###  LLAMA3, pizzagpt, RUBIKSAI, Koala, Darkai, AI4Chat, Farfalle, PIAI, Felo, Julius, YouChat, YEPCHAT, Cloudflare, TurboSeek, Editee, AI21, Chatify, Cerebras, X0GPT, Lepton, GEMINIAPI, Cleeai, Elmo, Free2GPT, Bing, DiscordRocks, GPTWeb, LlamaTutor, PromptRefine, TutorAI, ChatGPTES, Bagoodex, ChatHub, AmigoChat, AIMathGPT, GaurishCerebras, NinjaChat, GeminiPro, Talkai, LLMChat, AskMyAI, Llama3Mitril, Marcus, TypeGPT, Mhystical, Netwrck, MultiChatAI, JadveOpenAI, ChatGLM, Deepfind, NousHermes, TextPollinationsAI, GliderAI, DGAFAI, ChatGPTGratis, QwenLM, IBMGranite, WiseCat, DeepSeek
 
 Code is similar to other providers.
 

{webscout-7.1 → webscout-7.2}/README.md

@@ -1028,7 +1028,7 @@ print(a.chat("HelpingAI-9B"))
 ```
 
 
-###  LLAMA3, pizzagpt, RUBIKSAI, Koala, Darkai, AI4Chat, Farfalle, PIAI, Felo, Julius, YouChat, YEPCHAT, Cloudflare, TurboSeek, Editee, AI21, Chatify, Cerebras, X0GPT, Lepton, GEMINIAPI, Cleeai, Elmo, Free2GPT, Bing, DiscordRocks, GPTWeb, LlamaTutor, PromptRefine, TutorAI, ChatGPTES, Bagoodex, ChatHub, AmigoChat, AIMathGPT, GaurishCerebras, NinjaChat, GeminiPro, Talkai, LLMChat, AskMyAI, Llama3Mitril, Marcus, TypeGPT, Mhystical, Netwrck, MultiChatAI, JadveOpenAI, ChatGLM, Deepfind, NousHermes, TextPollinationsAI, GliderAI, DGAFAI
+###  LLAMA3, pizzagpt, RUBIKSAI, Koala, Darkai, AI4Chat, Farfalle, PIAI, Felo, Julius, YouChat, YEPCHAT, Cloudflare, TurboSeek, Editee, AI21, Chatify, Cerebras, X0GPT, Lepton, GEMINIAPI, Cleeai, Elmo, Free2GPT, Bing, DiscordRocks, GPTWeb, LlamaTutor, PromptRefine, TutorAI, ChatGPTES, Bagoodex, ChatHub, AmigoChat, AIMathGPT, GaurishCerebras, NinjaChat, GeminiPro, Talkai, LLMChat, AskMyAI, Llama3Mitril, Marcus, TypeGPT, Mhystical, Netwrck, MultiChatAI, JadveOpenAI, ChatGLM, Deepfind, NousHermes, TextPollinationsAI, GliderAI, DGAFAI, ChatGPTGratis, QwenLM, IBMGranite, WiseCat, DeepSeek
 
 Code is similar to other providers.
 

{webscout-7.1 → webscout-7.2}/setup.py

@@ -1,92 +1,93 @@
-from setuptools import setup, find_packages
-from webscout.version import __prog__, __version__
-
-with open("README.md", encoding="utf-8") as f:
-    README = f.read()
-
-setup(
-    name="webscout",
-    version=__version__,
-    description="Search for anything using Google, DuckDuckGo, 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",
-    author="OEvortex",
-    author_email="helpingai5@gmail.com",
-    packages=find_packages(),
-    python_requires=">=3.7",
-    classifiers=[
-        "Development Status :: 5 - Production/Stable",
-        "Intended Audience :: Developers",
-        "License :: Other/Proprietary License",
-        "Operating System :: OS Independent",
-        "Programming Language :: Python :: 3",
-        "Programming Language :: Python :: 3.8",
-        "Programming Language :: Python :: 3.9",
-        "Programming Language :: Python :: 3.10",
-        "Programming Language :: Python :: 3.11",
-        "Programming Language :: Python :: 3.12",
-        "Programming Language :: Python :: Implementation :: CPython",
-        "Topic :: Internet :: WWW/HTTP :: Indexing/Search",
-        "Topic :: Software Development :: Libraries :: Python Modules",
-    ],
-        install_requires=[
-            "setuptools",
-            "wheel",
-            "pip",
-            "mistune",
-            "tenacity",
-            "curl_cffi",
-            "nest-asyncio",
-            "rich",
-            "markdownify",
-            "requests",
-            "google-generativeai",
-            "lxml>=5.2.2",
-            "termcolor",
-            "orjson",
-            "PyYAML",
-            "tls_client",
-            "clipman",
-            "playsound",
-            "ollama",
-            "pillow",
-            "bson",
-            "cloudscraper",
-            "html5lib",
-            "aiofiles",
-            "emoji",
-            "openai",
-            "prompt-toolkit",
-            "primp",
-            "pyreqwest_impersonate",
-            "gradio_client",
-            "psutil",
-            "pygetwindow",
-        ],
-
-    entry_points={
-        "console_scripts": [
-            "WEBS = webscout.cli:cli",
-            "webscout = webscout.cli:cli",
-        ],
-    },
-    extras_require={
-        "dev": [
-            "ruff>=0.1.6",
-            "pytest>=7.4.2",
-        ],
-        "local": [
-            'llama-cpp-python',
-            'colorama',
-            'numpy',
-            'huggingface_hub[cli]',
-            'unicorn',
-        ],
-    },
-    license="HelpingAI",
-    project_urls={
-        "Source": "https://github.com/HelpingAI/Webscout",
-        "Tracker": "https://github.com/HelpingAI/Webscout/issues",
-        "YouTube": "https://youtube.com/@OEvortex",
-    },
-)
+from setuptools import setup, find_packages
+from webscout.version import __prog__, __version__
+
+with open("README.md", encoding="utf-8") as f:
+    README = f.read()
+
+setup(
+    name="webscout",
+    version=__version__,
+    description="Search for anything using Google, DuckDuckGo, 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",
+    author="OEvortex",
+    author_email="helpingai5@gmail.com",
+    packages=find_packages(),
+    python_requires=">=3.7",
+    classifiers=[
+        "Development Status :: 5 - Production/Stable",
+        "Intended Audience :: Developers",
+        "License :: Other/Proprietary License",
+        "Operating System :: OS Independent",
+        "Programming Language :: Python :: 3",
+        "Programming Language :: Python :: 3.8",
+        "Programming Language :: Python :: 3.9",
+        "Programming Language :: Python :: 3.10",
+        "Programming Language :: Python :: 3.11",
+        "Programming Language :: Python :: 3.12",
+        "Programming Language :: Python :: Implementation :: CPython",
+        "Topic :: Internet :: WWW/HTTP :: Indexing/Search",
+        "Topic :: Software Development :: Libraries :: Python Modules",
+    ],
+        install_requires=[
+            "setuptools",
+            "wheel",
+            "pip",
+            "mistune",
+            "tenacity",
+            "curl_cffi",
+            "nest-asyncio",
+            "rich",
+            "markdownify",
+            "requests",
+            "google-generativeai",
+            "lxml>=5.2.2",
+            "termcolor",
+            "orjson",
+            "PyYAML",
+            "tls_client",
+            "clipman",
+            "playsound==1.2.2",
+            "ollama",
+            "pillow",
+            "bson",
+            "cloudscraper",
+            "html5lib",
+            "aiofiles",
+            "emoji",
+            "openai",
+            "prompt-toolkit",
+            "primp",
+            "pyreqwest_impersonate",
+            "gradio_client",
+            "psutil",
+            "pygetwindow",
+            "aiohttp",
+        ],
+
+    entry_points={
+        "console_scripts": [
+            "WEBS = webscout.cli:cli",
+            "webscout = webscout.cli:cli",
+        ],
+    },
+    extras_require={
+        "dev": [
+            "ruff>=0.1.6",
+            "pytest>=7.4.2",
+        ],
+        "local": [
+            'llama-cpp-python',
+            'colorama',
+            'numpy',
+            'huggingface_hub[cli]',
+            'unicorn',
+        ],
+    },
+    license="HelpingAI",
+    project_urls={
+        "Source": "https://github.com/HelpingAI/Webscout",
+        "Tracker": "https://github.com/HelpingAI/Webscout/issues",
+        "YouTube": "https://youtube.com/@OEvortex",
+    },
+)

{webscout-7.1 → webscout-7.2}/webscout/AIauto.py

@@ -1,191 +1,191 @@
-from webscout.AIbase import Provider
-from webscout.g4f import GPT4FREE, TestProviders
-from webscout.exceptions import AllProvidersFailure
-from webscout.Litlogger import Litlogger, LogFormat, ColorScheme
-from typing import Union, Any, Dict, Generator
-import importlib
-import pkgutil
-import random
-import inspect
-
-# Initialize LitLogger with cyberpunk theme
-logger = Litlogger(
-    name="AIauto",
-    format=LogFormat.DETAILED,
-    color_scheme=ColorScheme.CYBERPUNK
-)
-
-def load_providers():
-    provider_map = {}
-    api_key_providers = set()
-    provider_package = importlib.import_module("webscout.Provider")
-    
-    for _, module_name, _ in pkgutil.iter_modules(provider_package.__path__):
-        try:
-            module = importlib.import_module(f"webscout.Provider.{module_name}")
-            for attr_name in dir(module):
-                attr = getattr(module, attr_name)
-                if isinstance(attr, type) and issubclass(attr, Provider) and attr != Provider:
-                    provider_map[attr_name.upper()] = attr
-                    # Check if the provider needs an API key
-                    if 'api_key' in inspect.signature(attr.__init__).parameters:
-                        api_key_providers.add(attr_name.upper())
-                        logger.debug(f"Provider {attr_name} requires API key")
-            logger.success(f"Loaded provider module: {module_name}")
-        except Exception as e:
-            logger.error(f"Failed to load provider {module_name}: {str(e)}")
-    
-    logger.info(f"Total providers loaded: {len(provider_map)}")
-    logger.info(f"API key providers: {len(api_key_providers)}")
-    return provider_map, api_key_providers
-
-provider_map, api_key_providers = load_providers()
-
-class AUTO(Provider):
-    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,
-        exclude: list[str] = [],
-    ):
-        self.provider = None
-        self.provider_name = None
-        self.is_conversation = is_conversation
-        self.max_tokens = max_tokens
-        self.timeout = timeout
-        self.intro = intro
-        self.filepath = filepath
-        self.update_file = update_file
-        self.proxies = proxies
-        self.history_offset = history_offset
-        self.act = act
-        self.exclude = [e.upper() for e in exclude]
-
-    @property
-    def last_response(self) -> dict[str, Any]:
-        return self.provider.last_response if self.provider else {}
-
-    @property
-    def conversation(self) -> object:
-        return self.provider.conversation if self.provider else None
-
-    def ask(
-        self,
-        prompt: str,
-        stream: bool = False,
-        raw: bool = False,
-        optimizer: str = None,
-        conversationally: bool = False,
-        run_new_test: bool = False,
-    ) -> Union[Dict, Generator]:
-        ask_kwargs = {
-            "prompt": prompt,
-            "stream": stream,
-            "raw": raw,
-            "optimizer": optimizer,
-            "conversationally": conversationally,
-        }
-
-        # Filter out API key required providers and excluded providers
-        available_providers = [
-            (name, cls) for name, cls in provider_map.items()
-            if name not in api_key_providers and name not in self.exclude
-        ]
-
-        # Shuffle the list of available providers
-        random.shuffle(available_providers)
-
-        # Try webscout-based providers
-        for provider_name, provider_class in available_providers:
-            try:
-                self.provider_name = f"webscout-{provider_name}"
-                logger.info(f"Trying provider: {self.provider_name}")
-                
-                self.provider = provider_class(
-                    is_conversation=self.is_conversation,
-                    max_tokens=self.max_tokens,
-                    timeout=self.timeout,
-                    intro=self.intro,
-                    filepath=self.filepath,
-                    update_file=self.update_file,
-                    proxies=self.proxies,
-                    history_offset=self.history_offset,
-                    act=self.act,
-                )
-                response = self.provider.ask(**ask_kwargs)
-                logger.success(f"Successfully used provider: {self.provider_name}")
-                return response
-            except Exception as e:
-                logger.warning(f"Provider {self.provider_name} failed: {str(e)}")
-                continue
-
-        # Try GPT4FREE providers
-        gpt4free_providers = TestProviders(timeout=self.timeout).get_results(run=run_new_test)
-        random.shuffle(gpt4free_providers)
-        
-        for provider_info in gpt4free_providers:
-            if provider_info["name"].upper() in self.exclude:
-                continue
-            try:
-                self.provider_name = f"g4f-{provider_info['name']}"
-                logger.info(f"Trying provider: {self.provider_name}")
-                
-                self.provider = GPT4FREE(
-                    provider=provider_info["name"],
-                    is_conversation=self.is_conversation,
-                    max_tokens=self.max_tokens,
-                    intro=self.intro,
-                    filepath=self.filepath,
-                    update_file=self.update_file,
-                    proxies=self.proxies,
-                    history_offset=self.history_offset,
-                    act=self.act,
-                )
-
-                response = self.provider.ask(**ask_kwargs)
-                logger.success(f"Successfully used provider: {self.provider_name}")
-                return response
-            except Exception as e:
-                logger.warning(f"Provider {self.provider_name} failed: {str(e)}")
-                continue
-
-        # If we get here, all providers failed
-        logger.error("All providers failed to process the request")
-        raise AllProvidersFailure("All providers failed to process the request")
-
-    def chat(
-        self,
-        prompt: str,
-        stream: bool = False,
-        optimizer: str = None,
-        conversationally: bool = False,
-        run_new_test: bool = False,
-    ) -> Union[str, Generator[str, None, None]]:
-        response = self.ask(
-            prompt,
-            stream,
-            optimizer=optimizer,
-            conversationally=conversationally,
-            run_new_test=run_new_test,
-        )
-        
-        if stream:
-            return (self.get_message(chunk) for chunk in response)
-        else:
-            return self.get_message(response)
-
-    def get_message(self, response: dict) -> str:
-        assert self.provider is not None, "Chat with AI first"
-        return self.provider.get_message(response)
-if __name__ == "__main__":
-    auto = AUTO()
-
-    response = auto.chat("Hello, how are you?")
-    print(response)
+from webscout.AIbase import Provider
+from webscout.g4f import GPT4FREE, TestProviders
+from webscout.exceptions import AllProvidersFailure
+from webscout.Litlogger import Litlogger, LogFormat, ColorScheme
+from typing import Union, Any, Dict, Generator
+import importlib
+import pkgutil
+import random
+import inspect
+
+# Initialize LitLogger with cyberpunk theme
+logger = Litlogger(
+    name="AIauto",
+    format=LogFormat.DETAILED,
+    color_scheme=ColorScheme.CYBERPUNK
+)
+
+def load_providers():
+    provider_map = {}
+    api_key_providers = set()
+    provider_package = importlib.import_module("webscout.Provider")
+    
+    for _, module_name, _ in pkgutil.iter_modules(provider_package.__path__):
+        try:
+            module = importlib.import_module(f"webscout.Provider.{module_name}")
+            for attr_name in dir(module):
+                attr = getattr(module, attr_name)
+                if isinstance(attr, type) and issubclass(attr, Provider) and attr != Provider:
+                    provider_map[attr_name.upper()] = attr
+                    # Check if the provider needs an API key
+                    if 'api_key' in inspect.signature(attr.__init__).parameters:
+                        api_key_providers.add(attr_name.upper())
+                        logger.debug(f"Provider {attr_name} requires API key")
+            logger.success(f"Loaded provider module: {module_name}")
+        except Exception as e:
+            logger.error(f"Failed to load provider {module_name}: {str(e)}")
+    
+    logger.info(f"Total providers loaded: {len(provider_map)}")
+    logger.info(f"API key providers: {len(api_key_providers)}")
+    return provider_map, api_key_providers
+
+provider_map, api_key_providers = load_providers()
+
+class AUTO(Provider):
+    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,
+        exclude: list[str] = [],
+    ):
+        self.provider = None
+        self.provider_name = None
+        self.is_conversation = is_conversation
+        self.max_tokens = max_tokens
+        self.timeout = timeout
+        self.intro = intro
+        self.filepath = filepath
+        self.update_file = update_file
+        self.proxies = proxies
+        self.history_offset = history_offset
+        self.act = act
+        self.exclude = [e.upper() for e in exclude]
+
+    @property
+    def last_response(self) -> dict[str, Any]:
+        return self.provider.last_response if self.provider else {}
+
+    @property
+    def conversation(self) -> object:
+        return self.provider.conversation if self.provider else None
+
+    def ask(
+        self,
+        prompt: str,
+        stream: bool = False,
+        raw: bool = False,
+        optimizer: str = None,
+        conversationally: bool = False,
+        run_new_test: bool = False,
+    ) -> Union[Dict, Generator]:
+        ask_kwargs = {
+            "prompt": prompt,
+            "stream": stream,
+            "raw": raw,
+            "optimizer": optimizer,
+            "conversationally": conversationally,
+        }
+
+        # Filter out API key required providers and excluded providers
+        available_providers = [
+            (name, cls) for name, cls in provider_map.items()
+            if name not in api_key_providers and name not in self.exclude
+        ]
+
+        # Shuffle the list of available providers
+        random.shuffle(available_providers)
+
+        # Try webscout-based providers
+        for provider_name, provider_class in available_providers:
+            try:
+                self.provider_name = f"webscout-{provider_name}"
+                logger.info(f"Trying provider: {self.provider_name}")
+                
+                self.provider = provider_class(
+                    is_conversation=self.is_conversation,
+                    max_tokens=self.max_tokens,
+                    timeout=self.timeout,
+                    intro=self.intro,
+                    filepath=self.filepath,
+                    update_file=self.update_file,
+                    proxies=self.proxies,
+                    history_offset=self.history_offset,
+                    act=self.act,
+                )
+                response = self.provider.ask(**ask_kwargs)
+                logger.success(f"Successfully used provider: {self.provider_name}")
+                return response
+            except Exception as e:
+                logger.warning(f"Provider {self.provider_name} failed: {str(e)}")
+                continue
+
+        # Try GPT4FREE providers
+        gpt4free_providers = TestProviders(timeout=self.timeout).get_results(run=run_new_test)
+        random.shuffle(gpt4free_providers)
+        
+        for provider_info in gpt4free_providers:
+            if provider_info["name"].upper() in self.exclude:
+                continue
+            try:
+                self.provider_name = f"g4f-{provider_info['name']}"
+                logger.info(f"Trying provider: {self.provider_name}")
+                
+                self.provider = GPT4FREE(
+                    provider=provider_info["name"],
+                    is_conversation=self.is_conversation,
+                    max_tokens=self.max_tokens,
+                    intro=self.intro,
+                    filepath=self.filepath,
+                    update_file=self.update_file,
+                    proxies=self.proxies,
+                    history_offset=self.history_offset,
+                    act=self.act,
+                )
+
+                response = self.provider.ask(**ask_kwargs)
+                logger.success(f"Successfully used provider: {self.provider_name}")
+                return response
+            except Exception as e:
+                logger.warning(f"Provider {self.provider_name} failed: {str(e)}")
+                continue
+
+        # If we get here, all providers failed
+        logger.error("All providers failed to process the request")
+        raise AllProvidersFailure("All providers failed to process the request")
+
+    def chat(
+        self,
+        prompt: str,
+        stream: bool = False,
+        optimizer: str = None,
+        conversationally: bool = False,
+        run_new_test: bool = False,
+    ) -> Union[str, Generator[str, None, None]]:
+        response = self.ask(
+            prompt,
+            stream,
+            optimizer=optimizer,
+            conversationally=conversationally,
+            run_new_test=run_new_test,
+        )
+        
+        if stream:
+            return (self.get_message(chunk) for chunk in response)
+        else:
+            return self.get_message(response)
+
+    def get_message(self, response: dict) -> str:
+        assert self.provider is not None, "Chat with AI first"
+        return self.provider.get_message(response)
+if __name__ == "__main__":
+    auto = AUTO()
+
+    response = auto.chat("Hello, how are you?")
+    print(response)