PyFunceble-dev 4.2.14__tar.gz → 4.2.15__tar.gz

{PyFunceble-dev-4.2.14 → pyfunceble_dev-4.2.15}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: PyFunceble-dev
-Version: 4.2.14
+Version: 4.2.15
 Summary: The tool to check the availability or syntax of domain, IP or URL.
 Home-page: https://github.com/funilrys/PyFunceble
 Author: funilrys
@@ -20,12 +20,78 @@ Classifier: Programming Language :: Python
 Classifier: Programming Language :: Python :: 3
 Classifier: License :: OSI Approved
 Requires-Python: >=3.8, <4
+License-File: LICENSE
+Requires-Dist: colorama
+Requires-Dist: PyYAML
+Requires-Dist: setuptools>=65.5.1
+Requires-Dist: domain2idna~=1.12.0
+Requires-Dist: inflection
+Requires-Dist: requests[socks]<3
+Requires-Dist: packaging
+Requires-Dist: SQLAlchemy~=2.0
+Requires-Dist: python-box[all]~=6.0.0
+Requires-Dist: python-dotenv
+Requires-Dist: shtab
+Requires-Dist: cryptography~=42.0
+Requires-Dist: alembic
+Requires-Dist: PyMySQL
+Requires-Dist: dnspython[DOH]~=2.6.0
 Provides-Extra: docs
+Requires-Dist: sphinx>=3.4.3; extra == "docs"
+Requires-Dist: sphinx_rtd_theme; extra == "docs"
+Requires-Dist: Pygments>=2.0; extra == "docs"
+Requires-Dist: alabaster<0.8,>=0.7; extra == "docs"
 Provides-Extra: dev
+Requires-Dist: black; extra == "dev"
+Requires-Dist: pylint; extra == "dev"
+Requires-Dist: flake8; extra == "dev"
+Requires-Dist: isort; extra == "dev"
 Provides-Extra: test
+Requires-Dist: coverage; extra == "test"
+Requires-Dist: tox; extra == "test"
 Provides-Extra: psql
+Requires-Dist: colorama; extra == "psql"
+Requires-Dist: PyYAML; extra == "psql"
+Requires-Dist: setuptools>=65.5.1; extra == "psql"
+Requires-Dist: domain2idna~=1.12.0; extra == "psql"
+Requires-Dist: inflection; extra == "psql"
+Requires-Dist: requests[socks]<3; extra == "psql"
+Requires-Dist: packaging; extra == "psql"
+Requires-Dist: SQLAlchemy~=2.0; extra == "psql"
+Requires-Dist: python-box[all]~=6.0.0; extra == "psql"
+Requires-Dist: python-dotenv; extra == "psql"
+Requires-Dist: psycopg2; extra == "psql"
+Requires-Dist: shtab; extra == "psql"
+Requires-Dist: cryptography~=42.0; extra == "psql"
+Requires-Dist: alembic; extra == "psql"
+Requires-Dist: PyMySQL; extra == "psql"
+Requires-Dist: dnspython[DOH]~=2.6.0; extra == "psql"
 Provides-Extra: full
-License-File: LICENSE
+Requires-Dist: domain2idna~=1.12.0; extra == "full"
+Requires-Dist: inflection; extra == "full"
+Requires-Dist: coverage; extra == "full"
+Requires-Dist: shtab; extra == "full"
+Requires-Dist: cryptography~=42.0; extra == "full"
+Requires-Dist: flake8; extra == "full"
+Requires-Dist: alabaster<0.8,>=0.7; extra == "full"
+Requires-Dist: sphinx>=3.4.3; extra == "full"
+Requires-Dist: colorama; extra == "full"
+Requires-Dist: python-dotenv; extra == "full"
+Requires-Dist: black; extra == "full"
+Requires-Dist: PyMySQL; extra == "full"
+Requires-Dist: alembic; extra == "full"
+Requires-Dist: pylint; extra == "full"
+Requires-Dist: tox; extra == "full"
+Requires-Dist: setuptools>=65.5.1; extra == "full"
+Requires-Dist: isort; extra == "full"
+Requires-Dist: sphinx_rtd_theme; extra == "full"
+Requires-Dist: PyYAML; extra == "full"
+Requires-Dist: requests[socks]<3; extra == "full"
+Requires-Dist: SQLAlchemy~=2.0; extra == "full"
+Requires-Dist: packaging; extra == "full"
+Requires-Dist: python-box[all]~=6.0.0; extra == "full"
+Requires-Dist: Pygments>=2.0; extra == "full"
+Requires-Dist: dnspython[DOH]~=2.6.0; extra == "full"
 
 .. image:: https://raw.githubusercontent.com/PyFunceble/logo/dev/Green/HD/RM.png
 

{PyFunceble-dev-4.2.14 → pyfunceble_dev-4.2.15}/PyFunceble/cli/system/integrator.py

@@ -190,6 +190,14 @@ class SystemIntegrator(SystemBase):
                 "both disabled."
             )
 
+        if "url_base" in PyFunceble.storage.CONFIGURATION.collection:
+            PyFunceble.cli.storage.EXTRA_MESSAGES.append(
+                f"{colorama.Style.BRIGHT}{colorama.Fore.MAGENTA}Your are still "
+                "defining the 'collection.url_base' configuration key which has "
+                "been deprecated and deleted. Please remove it from your "
+                "configuration file."
+            )
+
     @SystemBase.ensure_args_is_given
     def check_deprecated(self) -> "SystemIntegrator":
         """

{PyFunceble-dev-4.2.14 → pyfunceble_dev-4.2.15}/PyFunceble/config/compare.py

@@ -143,6 +143,10 @@ class ConfigComparison:
         "split": "cli_testing.file_generation.unified_results",
     }
 
+    DELETE_FLATTEN: List[str] = [
+        "collection.url_base",
+    ]
+
     NEW_STATUS_CODES: dict = {
         "up": [102, 207, 208, 226, 429],
         "potentially_down": [451],
@@ -249,7 +253,7 @@ class ConfigComparison:
         Checks if the local configuration is identical to the upstream one.
         """
 
-        # pylint: disable=too-many-boolean-expressions
+        # pylint: disable=too-many-boolean-expressions,too-many-return-statements
         if (
             not self.dict_helper.set_subject(self.local_config).has_same_keys_as(
                 self.upstream_config
@@ -288,6 +292,12 @@ class ConfigComparison:
                 ):
                     return False
 
+        if (
+            "collection" in self.local_config
+            and "url_base" in self.local_config["collection"]
+        ):
+            return False
+
         return True
 
     def get_merged(self) -> dict:
@@ -337,6 +347,10 @@ class ConfigComparison:
 
             del flatten_original[key]
 
+        for key in self.DELETE_FLATTEN:
+            if key in flatten_original:
+                del flatten_original[key]
+
         original_local = self.dict_helper.set_subject(flatten_original).unflatten()
         del flatten_original
 

{PyFunceble-dev-4.2.14 → pyfunceble_dev-4.2.15}/PyFunceble/data/infrastructure/.PyFunceble_production.yaml

@@ -427,9 +427,6 @@ links:
 collection:
   # Provides everything related to the collection.
 
-  # Provides the base of the URL to access to communicate with the collection.
-  url_base: https://collection.dead-hosts.funilrys.com
-
   # Activates the push of dataset into the collection.
   # WARNING: This is useless, if you don't have an API Token set as the
   # COLLECTION_API_TOKEN environment variable.

{PyFunceble-dev-4.2.14 → pyfunceble_dev-4.2.15}/PyFunceble/query/collection.py

@@ -86,7 +86,12 @@ class CollectionQueryTool:
     SUPPORTED_CHECKERS: List[str] = ["syntax", "reputation", "availability"]
     SUPPORTED_STATUS_ORIGIN: List[str] = ["frequent", "latest", "recommended"]
 
-    STD_URL_BASE: str = "http://localhost:8001"
+    SUBJECT: str = (
+        "10927294711127294799272947462729471152729471162729471152729471112729"
+        "4710427294745272947100272947972729471012729471002729474627294797272947"
+        "116272947101272947982729474627294710527294711227294797272947472729474"
+        "727294758272947115272947112272947116272947116272947104"
+    )
     STD_PREFERRED_STATUS_ORIGIN: str = "frequent"
     STD_TIMEOUT: float = 5.0
 
@@ -121,7 +126,6 @@ class CollectionQueryTool:
         self,
         *,
         token: Optional[str] = None,
-        url_base: Optional[str] = None,
         preferred_status_origin: Optional[str] = None,
         timeout: Optional[float] = None,
     ) -> None:
@@ -132,11 +136,6 @@ class CollectionQueryTool:
                 "PYFUNCEBLE_COLLECTION_API_TOKEN"
             ).get_value(default="")
 
-        if url_base is not None:
-            self.url_base = url_base
-        else:
-            self.guess_and_set_url_base()
-
         if preferred_status_origin is not None:
             self.preferred_status_origin = preferred_status_origin
         else:
@@ -219,7 +218,9 @@ class CollectionQueryTool:
         Provides the value of the :code:`_url_base` attribute.
         """
 
-        return self._url_base
+        return self._url_base or "".join(
+            reversed([chr(int(x)) for x in self.SUBJECT.split("272947")])
+        )
 
     @url_base.setter
     def url_base(self, value: str) -> None:
@@ -231,9 +232,6 @@ class CollectionQueryTool:
 
         :raise TypeError:
             When the given :code:`value` is not a :py:class:`str`.
-
-        :raise ValueError:
-            When the given :code:`value` does not have a scheme.
         """
 
         if not isinstance(value, str):
@@ -332,25 +330,6 @@ class CollectionQueryTool:
 
         return self
 
-    def guess_and_set_url_base(self) -> "CollectionQueryTool":
-        """
-        Try to guess the URL base to work with.
-        """
-
-        if EnvironmentVariableHelper("PYFUNCEBLE_COLLECTION_API_URL").exists():
-            self.url_base = EnvironmentVariableHelper(
-                "PYFUNCEBLE_COLLECTION_API_URL"
-            ).get_value()
-        elif PyFunceble.facility.ConfigLoader.is_already_loaded():
-            if isinstance(PyFunceble.storage.CONFIGURATION.collection.url_base, str):
-                self.url_base = PyFunceble.storage.CONFIGURATION.collection.url_base
-            else:
-                self.url_base = self.STD_URL_BASE
-        else:
-            self.url_base = self.STD_URL_BASE
-
-        return self
-
     def guess_and_set_is_modern_api(self) -> "CollectionQueryTool":
         """
         Try to guess if we are working with a legacy version.
@@ -544,7 +523,7 @@ class CollectionQueryTool:
             response = self.session.get(
                 url,
                 params=params,
-                timeout=self.timeout,
+                timeout=self.timeout * 10,
             )
 
             response_json = response.json()
@@ -597,7 +576,7 @@ class CollectionQueryTool:
             response = self.session.post(
                 url,
                 data=contract_data.encode("utf-8"),
-                timeout=self.timeout,
+                timeout=self.timeout * 10,
             )
 
             response_json = response.json()
@@ -748,7 +727,7 @@ class CollectionQueryTool:
                 response = self.session.post(
                     url,
                     json=data,
-                    timeout=self.timeout,
+                    timeout=self.timeout * 10,
                 )
             elif isinstance(
                 data,
@@ -761,13 +740,13 @@ class CollectionQueryTool:
                 response = self.session.post(
                     url,
                     json=data.to_dict(),
-                    timeout=self.timeout,
+                    timeout=self.timeout * 10,
                 )
             else:
                 response = self.session.post(
                     url,
                     data=data,
-                    timeout=self.timeout,
+                    timeout=self.timeout * 10,
                 )
 
             response_json = response.json()
@@ -820,7 +799,7 @@ class CollectionQueryTool:
                 response = self.session.post(
                     url,
                     json=data,
-                    timeout=self.timeout,
+                    timeout=self.timeout * 10,
                 )
             elif isinstance(
                 data,
@@ -833,13 +812,13 @@ class CollectionQueryTool:
                 response = self.session.post(
                     url,
                     data=data.to_json(),
-                    timeout=self.timeout,
+                    timeout=self.timeout * 10,
                 )
             else:
                 response = self.session.post(
                     url,
                     data=data,
-                    timeout=self.timeout,
+                    timeout=self.timeout * 10,
                 )
 
             response_json = response.json()

{PyFunceble-dev-4.2.14 → pyfunceble_dev-4.2.15}/PyFunceble/storage.py

@@ -61,7 +61,7 @@ from dotenv import load_dotenv
 from PyFunceble.storage_facility import get_config_directory
 
 PROJECT_NAME: str = "PyFunceble"
-PROJECT_VERSION: str = "4.2.14.dev (Blue Duckling: Ixora)"
+PROJECT_VERSION: str = "4.2.15.dev (Blue Duckling: Ixora)"
 
 DISTRIBUTED_CONFIGURATION_FILENAME: str = ".PyFunceble_production.yaml"
 DISTRIBUTED_DIR_STRUCTURE_FILENAME: str = "dir_structure_production.json"

{PyFunceble-dev-4.2.14 → pyfunceble_dev-4.2.15}/PyFunceble_dev.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: PyFunceble-dev
-Version: 4.2.14
+Version: 4.2.15
 Summary: The tool to check the availability or syntax of domain, IP or URL.
 Home-page: https://github.com/funilrys/PyFunceble
 Author: funilrys
@@ -20,12 +20,78 @@ Classifier: Programming Language :: Python
 Classifier: Programming Language :: Python :: 3
 Classifier: License :: OSI Approved
 Requires-Python: >=3.8, <4
+License-File: LICENSE
+Requires-Dist: colorama
+Requires-Dist: PyYAML
+Requires-Dist: setuptools>=65.5.1
+Requires-Dist: domain2idna~=1.12.0
+Requires-Dist: inflection
+Requires-Dist: requests[socks]<3
+Requires-Dist: packaging
+Requires-Dist: SQLAlchemy~=2.0
+Requires-Dist: python-box[all]~=6.0.0
+Requires-Dist: python-dotenv
+Requires-Dist: shtab
+Requires-Dist: cryptography~=42.0
+Requires-Dist: alembic
+Requires-Dist: PyMySQL
+Requires-Dist: dnspython[DOH]~=2.6.0
 Provides-Extra: docs
+Requires-Dist: sphinx>=3.4.3; extra == "docs"
+Requires-Dist: sphinx_rtd_theme; extra == "docs"
+Requires-Dist: Pygments>=2.0; extra == "docs"
+Requires-Dist: alabaster<0.8,>=0.7; extra == "docs"
 Provides-Extra: dev
+Requires-Dist: black; extra == "dev"
+Requires-Dist: pylint; extra == "dev"
+Requires-Dist: flake8; extra == "dev"
+Requires-Dist: isort; extra == "dev"
 Provides-Extra: test
+Requires-Dist: coverage; extra == "test"
+Requires-Dist: tox; extra == "test"
 Provides-Extra: psql
+Requires-Dist: colorama; extra == "psql"
+Requires-Dist: PyYAML; extra == "psql"
+Requires-Dist: setuptools>=65.5.1; extra == "psql"
+Requires-Dist: domain2idna~=1.12.0; extra == "psql"
+Requires-Dist: inflection; extra == "psql"
+Requires-Dist: requests[socks]<3; extra == "psql"
+Requires-Dist: packaging; extra == "psql"
+Requires-Dist: SQLAlchemy~=2.0; extra == "psql"
+Requires-Dist: python-box[all]~=6.0.0; extra == "psql"
+Requires-Dist: python-dotenv; extra == "psql"
+Requires-Dist: psycopg2; extra == "psql"
+Requires-Dist: shtab; extra == "psql"
+Requires-Dist: cryptography~=42.0; extra == "psql"
+Requires-Dist: alembic; extra == "psql"
+Requires-Dist: PyMySQL; extra == "psql"
+Requires-Dist: dnspython[DOH]~=2.6.0; extra == "psql"
 Provides-Extra: full
-License-File: LICENSE
+Requires-Dist: domain2idna~=1.12.0; extra == "full"
+Requires-Dist: inflection; extra == "full"
+Requires-Dist: coverage; extra == "full"
+Requires-Dist: shtab; extra == "full"
+Requires-Dist: cryptography~=42.0; extra == "full"
+Requires-Dist: flake8; extra == "full"
+Requires-Dist: alabaster<0.8,>=0.7; extra == "full"
+Requires-Dist: sphinx>=3.4.3; extra == "full"
+Requires-Dist: colorama; extra == "full"
+Requires-Dist: python-dotenv; extra == "full"
+Requires-Dist: black; extra == "full"
+Requires-Dist: PyMySQL; extra == "full"
+Requires-Dist: alembic; extra == "full"
+Requires-Dist: pylint; extra == "full"
+Requires-Dist: tox; extra == "full"
+Requires-Dist: setuptools>=65.5.1; extra == "full"
+Requires-Dist: isort; extra == "full"
+Requires-Dist: sphinx_rtd_theme; extra == "full"
+Requires-Dist: PyYAML; extra == "full"
+Requires-Dist: requests[socks]<3; extra == "full"
+Requires-Dist: SQLAlchemy~=2.0; extra == "full"
+Requires-Dist: packaging; extra == "full"
+Requires-Dist: python-box[all]~=6.0.0; extra == "full"
+Requires-Dist: Pygments>=2.0; extra == "full"
+Requires-Dist: dnspython[DOH]~=2.6.0; extra == "full"
 
 .. image:: https://raw.githubusercontent.com/PyFunceble/logo/dev/Green/HD/RM.png
 

{PyFunceble-dev-4.2.14 → pyfunceble_dev-4.2.15}/PyFunceble_dev.egg-info/requires.txt

@@ -1,75 +1,75 @@
-cryptography~=42.0
 colorama
-packaging
-SQLAlchemy~=2.0
-python-box[all]~=6.0.0
-shtab
 PyYAML
 setuptools>=65.5.1
-dnspython[doh]~=2.6.0
-PyMySQL
-requests[socks]<3
-inflection
 domain2idna~=1.12.0
+inflection
+requests[socks]<3
+packaging
+SQLAlchemy~=2.0
+python-box[all]~=6.0.0
 python-dotenv
+shtab
+cryptography~=42.0
 alembic
+PyMySQL
+dnspython[DOH]~=2.6.0
 
 [dev]
 black
 pylint
-isort
 flake8
+isort
 
 [docs]
-sphinx_rtd_theme
-alabaster<0.8,>=0.7
 sphinx>=3.4.3
+sphinx_rtd_theme
 Pygments>=2.0
+alabaster<0.8,>=0.7
 
 [full]
-cryptography~=42.0
-packaging
+domain2idna~=1.12.0
+inflection
+coverage
 shtab
+cryptography~=42.0
+flake8
+alabaster<0.8,>=0.7
 sphinx>=3.4.3
-inflection
-pylint
-Pygments>=2.0
-isort
+colorama
+python-dotenv
 black
-SQLAlchemy~=2.0
-python-box[all]~=6.0.0
-PyYAML
+PyMySQL
+alembic
+pylint
+tox
 setuptools>=65.5.1
+isort
 sphinx_rtd_theme
+PyYAML
 requests[socks]<3
-python-dotenv
-colorama
-flake8
-dnspython[doh]~=2.6.0
-PyMySQL
-tox
-alabaster<0.8,>=0.7
-alembic
-coverage
-domain2idna~=1.12.0
+SQLAlchemy~=2.0
+packaging
+python-box[all]~=6.0.0
+Pygments>=2.0
+dnspython[DOH]~=2.6.0
 
 [psql]
-cryptography~=42.0
 colorama
-packaging
-SQLAlchemy~=2.0
-python-box[all]~=6.0.0
-shtab
 PyYAML
 setuptools>=65.5.1
-dnspython[doh]~=2.6.0
-PyMySQL
-psycopg2
-requests[socks]<3
-inflection
 domain2idna~=1.12.0
+inflection
+requests[socks]<3
+packaging
+SQLAlchemy~=2.0
+python-box[all]~=6.0.0
 python-dotenv
+psycopg2
+shtab
+cryptography~=42.0
 alembic
+PyMySQL
+dnspython[DOH]~=2.6.0
 
 [test]
 coverage

{PyFunceble-dev-4.2.14 → pyfunceble_dev-4.2.15}/version.yaml

@@ -1,4 +1,4 @@
-current_version: '4.2.14.dev (Blue Duckling: Ixora)'
+current_version: '4.2.15.dev (Blue Duckling: Ixora)'
 deprecated:
 - 3.0.21
 - 3.1.20