webscout 2.2__tar.gz → 2.3b0__tar.gz

{webscout-2.2 → webscout-2.3b0}/PKG-INFO

@@ -1,7 +1,7 @@
 Metadata-Version: 2.1
 Name: webscout
-Version: 2.2
-Summary: Search for anything using the Google, DuckDuckGo, phind.com. Also containes AI models, can transcribe yt videos, temporary email and phone number generation, have TTS support and webai(terminal gpt and open interpeter)
+Version: 2.3b0
+Summary: Search for anything using Google, DuckDuckGo, phind.com. Also contains AI models, can transcribe yt videos, temporary email and phone number generation, has TTS support, and webai (terminal gpt and open interpreter).
 Author: OEvortex
 Author-email: helpingai5@gmail.com
 License: HelpingAI Simplified Universal License
@@ -36,7 +36,6 @@ Requires-Dist: halo>=0.0.31
 Requires-Dist: g4f>=0.2.2.3
 Requires-Dist: rich
 Requires-Dist: python-dotenv
-Requires-Dist: Helpingai-T2
 Requires-Dist: beautifulsoup4
 Requires-Dist: markdownify
 Requires-Dist: pydantic
@@ -55,6 +54,10 @@ Requires-Dist: playsound
 Provides-Extra: dev
 Requires-Dist: ruff>=0.1.6; extra == "dev"
 Requires-Dist: pytest>=7.4.2; extra == "dev"
+Provides-Extra: local
+Requires-Dist: llama-cpp-python; extra == "local"
+Requires-Dist: colorama; extra == "local"
+Requires-Dist: numpy; extra == "local"
 
 <div align="center">
   <!-- Replace `#` with your actual links -->

webscout-2.3b0/setup.py

@@ -0,0 +1,83 @@
+from setuptools import setup, find_packages
+
+with open("README.md", encoding="utf-8") as f:
+    README = f.read()
+
+setup(
+    name="webscout",
+    version="2.3-beta",
+    description="Search for anything using Google, DuckDuckGo, phind.com. Also contains AI models, can transcribe yt videos, temporary email and phone number generation, has TTS support, and webai (terminal gpt and open interpreter).",
+    long_description=README,
+    long_description_content_type="text/markdown",
+    author="OEvortex",
+    author_email="helpingai5@gmail.com",
+    packages=find_packages(),
+    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=[
+        "docstring_inheritance",
+        "click",
+        "curl_cffi",
+        "lxml",
+        "nest-asyncio",
+        "selenium",
+        "tqdm",
+        "webdriver-manager",
+        "halo>=0.0.31",
+        "g4f>=0.2.2.3",
+        "rich",
+        "python-dotenv",
+        "beautifulsoup4",
+        "markdownify",
+        "pydantic",
+        "requests",
+        "sse_starlette",
+        "termcolor",
+        "tiktoken",
+        "tldextract",
+        "orjson",
+        "PyYAML",
+        "appdirs",
+        "GoogleBard1>=2.1.4",
+        "tls_client",
+        "clipman",
+        "playsound",
+    ],
+    entry_points={
+        "console_scripts": [
+            "WEBS = webscout.cli:cli",
+            "webscout = webscout.webai:main",
+        ],
+    },
+    extras_require={
+        "dev": [
+            "ruff>=0.1.6",
+            "pytest>=7.4.2",
+        ],
+        "local": [
+            'llama-cpp-python',
+            'colorama',
+            'numpy',
+        ],
+    },
+    license="HelpingAI Simplified Universal License",
+    project_urls={
+        "Documentation": "https://github.com/OE-LUCIFER/Webscout/wiki",
+        "Source": "https://github.com/OE-LUCIFER/Webscout",
+        "Tracker": "https://github.com/OE-LUCIFER/Webscout/issues",
+        "YouTube": "https://youtube.com/@OEvortex",
+    },
+)

{webscout-2.2 → webscout-2.3b0}/webscout/AIauto.py

@@ -1,13 +1,29 @@
-from webscout.AI import Provider, AsyncProvider
-from webscout.AI import OPENGPT, AsyncOPENGPT
-from webscout.AI import KOBOLDAI, AsyncKOBOLDAI
-from webscout.AI import PhindSearch, AsyncPhindSearch
-from webscout.AI import LLAMA2, AsyncLLAMA2
-from webscout.AI import BLACKBOXAI, AsyncBLACKBOXAI
-from webscout.AI import PERPLEXITY
-from webscout.AI import ThinkAnyAI
-from webscout.AI import YouChat
-from webscout.AI import YEPCHAT
+from webscout.AIbase import Provider, AsyncProvider
+from webscout import OPENGPT, AsyncOPENGPT
+from webscout import KOBOLDAI, AsyncKOBOLDAI
+from webscout import PhindSearch, AsyncPhindSearch
+from webscout import LLAMA2, AsyncLLAMA2
+from webscout import BLACKBOXAI, AsyncBLACKBOXAI
+from webscout import PERPLEXITY
+from webscout import ThinkAnyAI
+from webscout import YouChat
+from webscout import YEPCHAT
+from webscout.AIbase import Provider, AsyncProvider
+from webscout import KOBOLDAI, AsyncKOBOLDAI
+from webscout import PhindSearch, AsyncPhindSearch
+from webscout import LLAMA2, AsyncLLAMA2
+from webscout import BLACKBOXAI, AsyncBLACKBOXAI
+from webscout import PERPLEXITY
+from webscout import ThinkAnyAI
+from webscout import YouChat
+from webscout import YEPCHAT, AsyncYEPCHAT
+from webscout import LEO, AsyncLEO
+from webscout import GROQ, AsyncGROQ
+from webscout import OPENAI, AsyncOPENAI
+from webscout import REKA
+from webscout import Xjai
+from webscout import Berlin4h
+from webscout import ChatGPTUK
 from webscout.g4f import GPT4FREE, AsyncGPT4FREE
 from webscout.g4f import TestProviders
 from webscout.exceptions import AllProvidersFailure
@@ -20,7 +36,26 @@ import logging
 
 
 provider_map: dict[
-    str, Union[OPENGPT, KOBOLDAI, PhindSearch, LLAMA2, BLACKBOXAI, PERPLEXITY, GPT4FREE, ThinkAnyAI, YEPCHAT, YouChat]
+    str, Union[    ThinkAnyAI,
+    Xjai,
+    LLAMA2,
+    AsyncLLAMA2,
+    LEO,
+    AsyncLEO,
+    KOBOLDAI,
+    AsyncKOBOLDAI,
+    OPENGPT,
+    AsyncOPENGPT,
+    PERPLEXITY,
+    BLACKBOXAI,
+    AsyncBLACKBOXAI,
+    PhindSearch,
+    AsyncPhindSearch,
+    YEPCHAT,
+    AsyncYEPCHAT,
+    YouChat,
+    Berlin4h,
+    ChatGPTUK,]
 ] = {
     "PhindSearch": PhindSearch,
     "perplexity": PERPLEXITY,
@@ -32,6 +67,12 @@ provider_map: dict[
     "thinkany": ThinkAnyAI,
     "yepchat": YEPCHAT,
     "you": YouChat,
+    "leo": LEO,
+    "xjai": Xjai,
+    "berlin4h": Berlin4h,
+    "chatgptuk": ChatGPTUK,
+    "gpt4free": GPT4FREE,
+    
 }
 
 
@@ -113,13 +154,13 @@ class AUTO(Provider):
             "conversationally": conversationally,
         }
 
-        # tgpt-based providers
+        # webscout-based providers
         for provider_name, provider_obj in provider_map.items():
             # continue
             if provider_name in self.exclude:
                 continue
             try:
-                self.provider_name = f"tgpt-{provider_name}"
+                self.provider_name = f"webscout-{provider_name}"
                 self.provider = provider_obj(
                     is_conversation=self.is_conversation,
                     max_tokens=self.max_tokens,

webscout-2.3b0/webscout/__init__.py

@@ -0,0 +1,120 @@
+from .webscout_search import WEBS
+from .webscout_search_async import AsyncWEBS
+from .version import __version__
+from .DWEBS import DeepWEBS
+from .transcriber import transcriber
+from .voice import play_audio
+from .tempid import Client as TempMailClient, TemporaryPhoneNumber
+from .LLM import LLM
+# Import Localai models and utilities directly
+from .Localai import *
+import g4f
+# Import provider classes for direct access
+from .Provider import (
+   ThinkAnyAI,
+   Xjai,
+   LLAMA2, 
+   AsyncLLAMA2,
+   Cohere,
+   REKA,
+   GROQ,
+   AsyncGROQ,
+   OPENAI,
+   AsyncOPENAI,
+   LEO,
+   AsyncLEO,
+   KOBOLDAI,
+   AsyncKOBOLDAI,
+   OPENGPT,
+   AsyncOPENGPT,
+   PERPLEXITY,
+   BLACKBOXAI,
+   AsyncBLACKBOXAI,
+   PhindSearch,
+   AsyncPhindSearch,
+   YEPCHAT,
+   AsyncYEPCHAT,
+   YouChat,
+   GEMINI,
+   Berlin4h,
+   ChatGPTUK,
+)
+
+__repo__ = "https://github.com/OE-LUCIFER/Webscout"
+
+webai = [
+   "leo",
+   "openai",
+   "opengpt",
+   "koboldai",
+   "gemini",
+   "phind",
+   "blackboxai",
+   "g4fauto",
+   "perplexity",
+   "groq",
+   "reka",
+   "cohere",
+   "yepchat",
+   "you",
+   "xjai",
+   "thinkany",
+   "berlin4h",
+   "chatgptuk",
+   "auto",
+]
+
+gpt4free_providers = [
+   provider.__name__ for provider in g4f.Provider.__providers__  # if provider.working
+]
+
+available_providers = webai + gpt4free_providers
+
+# Add all the provider classes, Localai models, Thread, and Model to __all__
+__all__ = [
+   "WEBS",
+   "AsyncWEBS",
+   "__version__",
+   "DeepWEBS",
+   "transcriber",
+   "play_audio",
+   "TempMailClient", 
+   "TemporaryPhoneNumber",
+   "LLM",
+   # Localai models and utilities 
+   "Model",
+   "Thread",
+   "formats", 
+
+   # AI Providers
+   "ThinkAnyAI",
+   "Xjai",
+   "LLAMA2",
+   "AsyncLLAMA2",
+   "Cohere",
+   "REKA",
+   "GROQ",
+   "AsyncGROQ",
+   "OPENAI",
+   "AsyncOPENAI",
+   "LEO",
+   "AsyncLEO",
+   "KOBOLDAI",
+   "AsyncKOBOLDAI",
+   "OPENGPT",
+   "AsyncOPENGPT",
+   "PERPLEXITY",
+   "BLACKBOXAI",
+   "AsyncBLACKBOXAI",
+   "PhindSearch",
+   "AsyncPhindSearch",
+   "YEPCHAT",
+   "AsyncYEPCHAT",
+   "YouChat",
+   "GEMINI",
+   "Berlin4h",
+   "ChatGPTUK",
+]
+
+import logging
+logging.getLogger("webscout").addHandler(logging.NullHandler())

{webscout-2.2 → webscout-2.3b0}/webscout/async_providers.py

@@ -1,12 +1,12 @@
-from webscout.AI import AsyncPhindSearch
-from webscout.AI import AsyncYEPCHAT
-from webscout.AI import AsyncOPENGPT
-from webscout.AI import AsyncOPENAI
-from webscout.AI import AsyncLLAMA2
-from webscout.AI import AsyncLEO
-from webscout.AI import AsyncKOBOLDAI
-from webscout.AI import AsyncGROQ
-from webscout.AI import AsyncBLACKBOXAI
+from webscout import AsyncPhindSearch
+from webscout import AsyncYEPCHAT
+from webscout import AsyncOPENGPT
+from webscout import AsyncOPENAI
+from webscout import AsyncLLAMA2
+from webscout import AsyncLEO
+from webscout import AsyncKOBOLDAI
+from webscout import AsyncGROQ
+from webscout import AsyncBLACKBOXAI
 from webscout.g4f import AsyncGPT4FREE
 
 mapper: dict[str, object] = {

{webscout-2.2 → webscout-2.3b0}/webscout/g4f.py

@@ -227,8 +227,8 @@ class GPT4FREE(Provider):
         auth: str = None,
         max_tokens: int = 600,
         model: str = None,
-        chat_completion: bool = False,
-        ignore_working: bool = False,
+        chat_completion: bool = True,
+        ignore_working: bool = True,
         timeout: int = 30,
         intro: str = None,
         filepath: str = None,

{webscout-2.2 → webscout-2.3b0}/webscout.egg-info/PKG-INFO

@@ -1,7 +1,7 @@
 Metadata-Version: 2.1
 Name: webscout
-Version: 2.2
-Summary: Search for anything using the Google, DuckDuckGo, phind.com. Also containes AI models, can transcribe yt videos, temporary email and phone number generation, have TTS support and webai(terminal gpt and open interpeter)
+Version: 2.3b0
+Summary: Search for anything using Google, DuckDuckGo, phind.com. Also contains AI models, can transcribe yt videos, temporary email and phone number generation, has TTS support, and webai (terminal gpt and open interpreter).
 Author: OEvortex
 Author-email: helpingai5@gmail.com
 License: HelpingAI Simplified Universal License
@@ -36,7 +36,6 @@ Requires-Dist: halo>=0.0.31
 Requires-Dist: g4f>=0.2.2.3
 Requires-Dist: rich
 Requires-Dist: python-dotenv
-Requires-Dist: Helpingai-T2
 Requires-Dist: beautifulsoup4
 Requires-Dist: markdownify
 Requires-Dist: pydantic
@@ -55,6 +54,10 @@ Requires-Dist: playsound
 Provides-Extra: dev
 Requires-Dist: ruff>=0.1.6; extra == "dev"
 Requires-Dist: pytest>=7.4.2; extra == "dev"
+Provides-Extra: local
+Requires-Dist: llama-cpp-python; extra == "local"
+Requires-Dist: colorama; extra == "local"
+Requires-Dist: numpy; extra == "local"
 
 <div align="center">
   <!-- Replace `#` with your actual links -->

webscout-2.3b0/webscout.egg-info/entry_points.txt

@@ -0,0 +1,3 @@
+[console_scripts]
+WEBS = webscout.cli:cli
+webscout = webscout.webai:main

{webscout-2.2 → webscout-2.3b0}/webscout.egg-info/requires.txt

@@ -10,7 +10,6 @@ halo>=0.0.31
 g4f>=0.2.2.3
 rich
 python-dotenv
-Helpingai-T2
 beautifulsoup4
 markdownify
 pydantic
@@ -30,3 +29,8 @@ playsound
 [dev]
 ruff>=0.1.6
 pytest>=7.4.2
+
+[local]
+llama-cpp-python
+colorama
+numpy

webscout-2.2/setup.py

@@ -1,82 +0,0 @@
-from setuptools import setup, find_packages
-
-with open("README.md", encoding="utf-8") as f:
-    README = f.read()
-
-setup(
-    name="webscout",
-    version="2.2", 
-    description="Search for anything using the Google, DuckDuckGo, phind.com. Also containes AI models, can transcribe yt videos, temporary email and phone number generation, have TTS support and webai(terminal gpt and open interpeter)",
-    long_description=README,
-    long_description_content_type="text/markdown",
-    author="OEvortex",
-    author_email="helpingai5@gmail.com",
-    packages=find_packages(),
-    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=[
-        "docstring_inheritance",
-        "click",
-        "curl_cffi",
-        "lxml",
-        "nest-asyncio",
-        "selenium",
-        "tqdm",
-        "webdriver-manager",
-        "halo>=0.0.31",
-        "g4f>=0.2.2.3",
-        "rich",
-        "python-dotenv",
-        "Helpingai-T2",
-        "beautifulsoup4",
-        "markdownify",
-        "pydantic",
-        "requests",
-        "sse_starlette",
-        "termcolor",
-        "tiktoken",
-        "tldextract",
-        "orjson",
-        "PyYAML",
-        "appdirs",
-        "GoogleBard1>=2.1.4",
-        "tls_client",
-        "clipman",
-        "playsound",
-    ],
-    entry_points={
-        "console_scripts": [
-            "WEBS = webscout.cli:cli",
-            "webscout-ai-phindsearch = webscout.AI:phindsearch",
-            "webscout-ai-yepchat = webscout.AI:yepchat",
-            "webscout-ai = webscout.AI:cli",
-            "webscout-llm = webscout.LLM:chat",
-        ],
-    },
-    extras_require={
-        "dev": [
-            "ruff>=0.1.6",
-            "pytest>=7.4.2",
-        ],
-    },
-    license='HelpingAI Simplified Universal License',
-    project_urls={
-        'Documentation': 'https://github.com/OE-LUCIFER/Webscout/wiki',
-        'Source': 'https://github.com/OE-LUCIFER/Webscout',
-        'Tracker': 'https://github.com/OE-LUCIFER/Webscout/issues',
-        'YouTube': 'https://youtube.com/@OEvortex',
-    },
-)

webscout-2.2/webscout/__init__.py

@@ -1,117 +0,0 @@
-"""Webscout.
-
-Search for anything using the Google, DuckDuckGo, phind.com. Also containes AI models, can transcribe yt videos, temporary email and phone number generation, have TTS support and webai(terminal gpt and open interpeter)
-"""
-# webscout/__init__.py
-
-from .webscout_search import WEBS 
-from .webscout_search_async import AsyncWEBS 
-from .version import __version__
-from .DWEBS import DeepWEBS 
-from .transcriber import transcriber
-from .voice import play_audio
-import g4f
-# Import provider classes for direct access
-from .Provider import (
-    ThinkAnyAI,
-    Xjai,
-    LLAMA2,
-    AsyncLLAMA2,
-    Cohere,
-    REKA,
-    GROQ,
-    AsyncGROQ,
-    OPENAI,
-    AsyncOPENAI,
-    LEO,
-    AsyncLEO,
-    KOBOLDAI,
-    AsyncKOBOLDAI,
-    OPENGPT,
-    AsyncOPENGPT,
-    PERPLEXITY,
-    BLACKBOXAI,
-    AsyncBLACKBOXAI,
-    PhindSearch,
-    AsyncPhindSearch,
-    YEPCHAT,
-    AsyncYEPCHAT,
-    YouChat,
-    GEMINI,
-    Berlin4h,
-    ChatGPTUK,
-)
-
-__repo__ = "https://github.com/OE-LUCIFER/Webscout"
-
-webai = [
-    "leo",
-    "openai",
-    "opengpt",
-    "koboldai",
-    "gemini",
-    "phind",
-    "blackboxai",
-    "g4fauto",
-    "perplexity",
-    "groq",
-    "reka",
-    "cohere",
-    "yepchat",
-    "you",
-    "xjai",
-    "thinkany",
-    "berlin4h",
-    "chatgptuk",
-    "auto",
-]
-
-gpt4free_providers = [
-    provider.__name__ for provider in g4f.Provider.__providers__  # if provider.working
-]
-
-available_providers = webai + gpt4free_providers
-
-# Add all the provider classes you want to directly import to __all__
-__all__ = [
-    "WEBS", 
-    "AsyncWEBS", 
-    "__version__", 
-    "cli", 
-    "DeepWEBS", 
-    "transcriber", 
-    "play_audio",
-
-    # AI Providers
-    "ThinkAnyAI",
-    "Xjai",
-    "LLAMA2",
-    "AsyncLLAMA2",
-    "Cohere",
-    "REKA",
-    "GROQ",
-    "AsyncGROQ",
-    "OPENAI",
-    "AsyncOPENAI",
-    "LEO",
-    "AsyncLEO",
-    "KOBOLDAI",
-    "AsyncKOBOLDAI",
-    "OPENGPT",
-    "AsyncOPENGPT",
-    "PERPLEXITY",
-    "BLACKBOXAI",
-    "AsyncBLACKBOXAI",
-    "PhindSearch",
-    "AsyncPhindSearch",
-    "YEPCHAT",
-    "AsyncYEPCHAT",
-    "YouChat",
-    "GEMINI",
-    "Berlin4h",
-    "ChatGPTUK",
-]
-
-# Set up basic logger
-import logging
-logging.getLogger("webscout").addHandler(logging.NullHandler()) 

webscout-2.2/webscout.egg-info/entry_points.txt

@@ -1,6 +0,0 @@
-[console_scripts]
-WEBS = webscout.cli:cli
-webscout-ai = webscout.AI:cli
-webscout-ai-phindsearch = webscout.AI:phindsearch
-webscout-ai-yepchat = webscout.AI:yepchat
-webscout-llm = webscout.LLM:chat