- added: Load variables from .env file.

- patch: Exclude selenium dependents providers from test. [#33](#33)
- patch: Show more gpt4free models.
- added: Test logging flag.

Author: Simatwa

docs/CHANGELOG.md

@@ -406,4 +406,13 @@ For instance:
 
 **What's new?**
 
-- added: Provider [poe](https://poe.com). Supports multiple models. Thanks to [snowby666/poe-api-wrapper](https://github.com/snowby666/poe-api-wrapper).
+- added: Provider [poe](https://poe.com). Supports multiple models. Thanks to [snowby666/poe-api-wrapper](https://github.com/snowby666/poe-api-wrapper).
+
+## v0.5.1
+
+**What's new?**
+
+- added: Load variables from `.env` file.
+- patch: Exclude selenium dependents providers from test. [#33](https://github.com/Simatwa/python-tgpt/issues/33)
+- patch: Show more gpt4free models.
+- added: Test logging flag.

docs/README.md

@@ -557,6 +557,9 @@ For example, for the option `--provider`, you would set an environment variable
 
 The environment variables can be overridden by explicitly declaring new value.
 
+> [!TIP]
+> Save the variables in a `.env` file in your current directory or export the them in your `.zshrc` file.
+
 > [!NOTE]
 > This is not limited to any command.
 

requirements.txt

@@ -12,3 +12,4 @@ pyyaml==6.0.1
 matplotlib
 gpt4all==2.2.0
 poe-api-wrapper==1.3.6
+envist==0.0.4

setup.py

@@ -21,6 +21,7 @@
     "pyperclip==1.8.2",
     "colorama==0.4.6",
     "g4f>=0.2.1.2",
+    "envist==0.0.4",
 ]
 
 EXTRA_REQUIRE = {
@@ -37,7 +38,7 @@
 
 setup(
     name="python-tgpt",
-    version="0.5.0",
+    version="0.5.1",
     license="MIT",
     author="Smartwa",
     maintainer="Smartwa",
@@ -81,6 +82,7 @@
         "gpt4free",
         "gpt4all-cli",
         "gptcli",
+        "poe-api",
     ],
     long_description=Path.open("README.md", encoding="utf-8").read(),
     long_description_content_type="text/markdown",

src/pytgpt/console.py

@@ -31,9 +31,12 @@
 from WebChatGPT.console import chat as webchatgpt
 from colorama import Fore
 from colorama import init as init_colorama
+from envist import Envist
 
 init_colorama(autoreset=True)
 
+Envist()  # loads .env variables
+
 logging.basicConfig(
     format="%(asctime)s - %(levelname)s : %(message)s ",  # [%(module)s,%(lineno)s]", # for debug purposes
     datefmt="%H:%M:%S",
@@ -96,10 +99,18 @@ def run_system_command(
             return (False, e)
 
     def g4f_providers_in_dict(
-        url=True, working=True, stream=False, context=False, gpt35=False, gpt4=False
+        url=True,
+        working=True,
+        stream=False,
+        context=False,
+        gpt35=False,
+        gpt4=False,
+        selenium=False,
     ):
         from pytgpt import g4f
+        import g4f.Provider.selenium as selenium_based
 
+        selenium_based_providers: list = dir(selenium_based)
         hunted_providers = []
         required_attrs = (
             "url",
@@ -132,6 +143,13 @@ def sanitize_provider(provider: object):
                 provider_meta["gpt35_turbo"] = provider.supports_gpt_35_turbo
             if gpt4:
                 provider_meta["gpt4"] = provider.supports_gpt_4
+            if selenium:
+                try:
+                    selenium_based_providers.index(provider_meta["name"])
+                    value = True
+                except ValueError:
+                    value = False
+                provider_meta["non_selenium"] = value
 
             hunted_providers.append(provider_meta)
 
@@ -1937,9 +1955,15 @@ def update(extra, log, sudo):
     @click.option(
         "-4", "--gpt4", is_flag=True, help="Restrict to providers supporting gpt4 model"
     )
+    @click.option(
+        "-se",
+        "--selenium",
+        is_flag=True,
+        help="Restrict to selenium dependent providers",
+    )
     @click.option("-j", "--json", is_flag=True, help="Format output in json")
     @click.help_option("-h", "--help")
-    def show(target, working, url, stream, context, gpt35, gpt4, json):
+    def show(target, working, url, stream, context, gpt35, gpt4, selenium, json):
         """List available models and providers"""
         available_targets = ["models", "providers"]
         assert (
@@ -1959,15 +1983,14 @@ def show(target, working, url, stream, context, gpt35, gpt4, json):
                             context=context,
                             gpt35=gpt35,
                             gpt4=gpt4,
+                            selenium=selenium,
                         ),
                     )
                 )
             )
-            hunted_providers = (
-                hunted_providers[1:]
-                if hunted_providers[0] is None
-                else hunted_providers
-            )
+            while None in hunted_providers:
+                hunted_providers.remove(None)
+
             hunted_providers.sort()
             if json:
                 rich.print_json(data=dict(providers=hunted_providers), indent=4)
@@ -2020,8 +2043,13 @@ def show(target, working, url, stream, context, gpt35, gpt4, json):
                     "llama7b-v2-chat",
                 ],
             )
+            for provider in pytgpt.g4f.Provider.__providers__:
+                if hasattr(provider, "models"):
+                    models[provider.__name__] = provider.models
             if json:
                 for key, value in models.items():
+                    while None in value:
+                        value.remove(None)
                     value.sort()
                     models[key] = value
 
@@ -2083,21 +2111,41 @@ def gui(port, address, debug, open):
         help="Test n amount of providers at once",
         default=5,
     )
-    @click.option("-q", "--quiet", is_flag=True, help="Suppress all stdout")
+    @click.option("-q", "--quiet", is_flag=True, help="Suppress progress bar")
     @click.option(
         "-j", "--json", is_flag=True, help="Stdout test results in json format"
     )
     @click.option("-d", "--dry-test", is_flag=True, help="Return previous test results")
     @click.option(
         "-b", "--best", is_flag=True, help="Stdout the fastest provider <name only>"
     )
+    @click.option(
+        "-se",
+        "--selenium",
+        help="Test even selenium dependent providers",
+        is_flag=True,
+    )
+    @click.option(
+        "-dl",
+        "--disable-logging",
+        is_flag=True,
+        help="Disable logging",
+    )
     @click.option("-y", "--yes", is_flag=True, help="Okay to all confirmations")
     @click.help_option("-h", "--help")
-    def test(timeout, thread, quiet, json, dry_test, best, yes):
+    def test(
+        timeout, thread, quiet, json, dry_test, best, selenium, disable_logging, yes
+    ):
         """Test and save working providers"""
         from pytgpt.gpt4free import utils
 
-        test = utils.TestProviders(test_at_once=thread, quiet=quiet, timeout=timeout)
+        test = utils.TestProviders(
+            test_at_once=thread,
+            quiet=quiet,
+            timeout=timeout,
+            selenium=selenium,
+            do_log=disable_logging == False,
+        )
         if best:
             click.secho(test.best)
             return

src/pytgpt/gpt4free/utils.py

@@ -47,26 +47,66 @@ def is_working(provider: str) -> bool:
 
 class TestProviders:
 
-    def __init__(self, test_at_once: int = 5, quiet: bool = False, timeout: int = 20):
+    def __init__(
+        self,
+        test_at_once: int = 5,
+        quiet: bool = False,
+        timeout: int = 20,
+        selenium: bool = False,
+        do_log: bool = True,
+    ):
         """Constructor
 
         Args:
             test_at_once (int, optional): Test n providers at once. Defaults to 5.
             quiet (bool, optinal): Disable stdout. Defaults to False.
             timout (int, optional): Thread timeout for each provider. Defaults to 20.
+            selenium (bool, optional): Test even selenium dependent providers. Defaults to False.
+            do_log (bool, optional): Flag to control logging. Defaults to True.
         """
         self.test_at_once: int = test_at_once
         self.quiet = quiet
         self.timeout = timeout
+        self.do_log = do_log
+        self.__logger = logging.getLogger(__name__)
         self.working_providers: list = [
             provider.__name__
             for provider in g4f.Provider.__providers__
             if provider.working
         ]
+
+        if not selenium:
+            import g4f.Provider.selenium as selenium_based
+            from g4f import webdriver
+
+            webdriver.has_requirements = False
+            selenium_based_providers: list = dir(selenium_based)
+            for provider in self.working_providers:
+                try:
+                    selenium_based_providers.index(provider)
+                except ValueError:
+                    pass
+                else:
+                    self.__log(
+                        30, f"Dropping provider - {provider} - [Selenium dependent]"
+                    )
+                    self.working_providers.remove(provider)
+
         self.results_path: Path = results_path
         self.__create_empty_file(ignore_if_found=True)
         self.results_file_is_empty: bool = False
 
+    def __log(
+        self,
+        level: int,
+        message: str,
+    ):
+        """class logger"""
+        if self.do_log:
+            self.__logger.log(level, message)
+        else:
+            pass
+
     def __create_empty_file(self, ignore_if_found: bool = False):
         if ignore_if_found and self.results_path.is_file():
             return
@@ -97,7 +137,7 @@ def test_provider(self, name: str):
                 current_results = load(fh)
             new_result = dict(time=time() - start_time, name=name)
             current_results["results"].append(new_result)
-            logging.info(f"Test result - {new_result['name']} - {new_result['time']}")
+            self.__log(20, f"Test result - {new_result['name']} - {new_result['time']}")
 
             with self.results_path.open("w") as fh:
                 dump(current_results, fh)
@@ -111,7 +151,7 @@ def main(
         # Create a progress bar
         total = len(self.working_providers)
         with Progress() as progress:
-            logging.info(f"Testing {total} providers : {self.working_providers}")
+            self.__log(20, f"Testing {total} providers : {self.working_providers}")
             task = progress.add_task(
                 f"[cyan]Testing...[{self.test_at_once}]",
                 total=total,
@@ -156,7 +196,7 @@ def get_results(self, run: bool = False, best: bool = False) -> list[dict]:
             if run:
                 raise Exception("Unable to find working g4f provider")
             else:
-                logging.warning("Hunting down working g4f providers.")
+                self.__log(30, "Hunting down working g4f providers.")
                 return self.get_results(run=True, best=best)
 
         time_list = []
@@ -182,6 +222,6 @@ def best(self):
     def auto(self):
         """Best working provider"""
         for result in self.get_results(run=False, best=False):
-            logging.info("Confirming working status of provider : " + result["name"])
+            self.__log(20, "Confirming working status of provider : " + result["name"])
             if is_working(result["name"]):
                 return result["name"]