PyFunceble-dev 4.2.17__py3-none-any.whl → 4.2.19__py3-none-any.whl

PyFunceble/checker/availability/base.py

@@ -159,7 +159,7 @@ class AvailabilityCheckerBase(CheckerBase):
         do_syntax_check_first: Optional[bool] = None,
         db_session: Optional[Session] = None,
         use_whois_db: Optional[bool] = None,
-        use_collection: Optional[bool] = None,
+        use_platform: Optional[bool] = None,
     ) -> None:
         self.dns_query_tool = DNSQueryTool()
         self.whois_query_tool = WhoisQueryTool()
@@ -224,7 +224,7 @@ class AvailabilityCheckerBase(CheckerBase):
             subject,
             do_syntax_check_first=do_syntax_check_first,
             db_session=db_session,
-            use_collection=use_collection,
+            use_platform=use_platform,
         )
 
     @property
@@ -1020,27 +1020,27 @@ class AvailabilityCheckerBase(CheckerBase):
 
         raise NotImplementedError()
 
-    def try_to_query_status_from_collection(self) -> "AvailabilityCheckerBase":
+    def try_to_query_status_from_platform(self) -> "AvailabilityCheckerBase":
         """
-        Tries to get and set the status from the Collection API.
+        Tries to get and set the status from the platform API.
         """
 
         PyFunceble.facility.Logger.info(
-            "Started to try to query the status of %r from: Collection Lookup",
+            "Started to try to query the status of %r from: Platform Lookup",
             self.status.idna_subject,
         )
 
-        data = self.collection_query_tool.pull(self.idna_subject)
+        data = self.platform_query_tool.pull(self.idna_subject)
 
         if data and "status" in data:
             if (
-                self.collection_query_tool.preferred_status_origin == "frequent"
+                self.platform_query_tool.preferred_status_origin == "frequent"
                 and data["status"]["availability"]["frequent"]
             ):
                 self.status.status = data["status"]["availability"]["frequent"]
-                self.status.status_source = "COLLECTION"
+                self.status.status_source = "PLATFORM"
             elif (
-                self.collection_query_tool.preferred_status_origin == "latest"
+                self.platform_query_tool.preferred_status_origin == "latest"
                 and data["status"]["availability"]["latest"]
             ):
                 try:
@@ -1050,21 +1050,21 @@ class AvailabilityCheckerBase(CheckerBase):
                     ]
                 except KeyError:
                     self.status.status = data["status"]["availability"]["latest"]
-                self.status.status_source = "COLLECTION"
+                self.status.status_source = "PLATFORM"
             elif (
-                self.collection_query_tool.preferred_status_origin == "recommended"
+                self.platform_query_tool.preferred_status_origin == "recommended"
                 and data["status"]["availability"]["recommended"]
             ):
                 self.status.status = data["status"]["availability"]["recommended"]
-                self.status.status_source = "COLLECTION"
+                self.status.status_source = "PLATFORM"
 
             PyFunceble.facility.Logger.info(
-                "Could define the status of %r from: Collection Lookup",
+                "Could define the status of %r from: Platform Lookup",
                 self.status.idna_subject,
             )
 
         PyFunceble.facility.Logger.info(
-            "Finished to try to query the status of %r from: Collection Lookup",
+            "Finished to try to query the status of %r from: Platform Lookup",
             self.status.idna_subject,
         )
 

PyFunceble/checker/availability/domain.py

@@ -129,8 +129,8 @@ class DomainAvailabilityChecker(AvailabilityCheckerBase):
 
         status_post_syntax_checker = None
 
-        if not self.status.status and self.use_collection:
-            self.try_to_query_status_from_collection()
+        if not self.status.status and self.use_platform:
+            self.try_to_query_status_from_platform()
 
         if not self.status.status and self.do_syntax_check_first:
             self.try_to_query_status_from_syntax_lookup(from_domain_test=True)

PyFunceble/checker/availability/domain_and_ip.py

@@ -111,7 +111,7 @@ class DomainAndIPAvailabilityChecker(AvailabilityCheckerBase):
                 do_syntax_check_first=self.do_syntax_check_first,
                 db_session=self.db_session,
                 use_whois_db=self.use_whois_db,
-                use_collection=self.use_collection,
+                use_platform=self.use_platform,
             )
         else:
             query_object = DomainAvailabilityChecker(
@@ -125,12 +125,12 @@ class DomainAndIPAvailabilityChecker(AvailabilityCheckerBase):
                 do_syntax_check_first=self.do_syntax_check_first,
                 db_session=self.db_session,
                 use_whois_db=self.use_whois_db,
-                use_collection=self.use_collection,
+                use_platform=self.use_platform,
             )
 
         query_object.dns_query_tool = self.dns_query_tool
         query_object.whois_query_tool = self.whois_query_tool
-        query_object.collection_query_tool = self.collection_query_tool
+        query_object.platform_query_tool = self.platform_query_tool
         query_object.hostbyaddr_query_tool = self.hostbyaddr_query_tool
         query_object.addressinfo_query_tool = self.addressinfo_query_tool
         query_object.http_status_code_query_tool = self.http_status_code_query_tool

PyFunceble/checker/base.py

@@ -62,7 +62,7 @@ import PyFunceble.storage
 from PyFunceble.checker.params_base import CheckerParamsBase
 from PyFunceble.checker.status_base import CheckerStatusBase
 from PyFunceble.converter.url2netloc import Url2Netloc
-from PyFunceble.query.collection import CollectionQueryTool
+from PyFunceble.query.platform import PlatformQueryTool
 
 
 class CheckerBase:
@@ -79,10 +79,10 @@ class CheckerBase:
     """
 
     STD_DO_SYNTAX_CHECK_FIRST: bool = False
-    STD_USE_COLLECTION: bool = False
+    STD_USE_PLATFORM: bool = False
 
     _do_syntax_check_first: bool = False
-    _use_collection: bool = False
+    _use_platform: bool = False
 
     _subject: Optional[str] = None
     _idna_subject: Optional[str] = None
@@ -90,7 +90,7 @@ class CheckerBase:
     url2netloc: Optional[Url2Netloc] = None
 
     db_session: Optional[Session] = None
-    collection_query_tool: Optional[CollectionQueryTool] = None
+    platform_query_tool: Optional[PlatformQueryTool] = None
 
     status: Optional[CheckerStatusBase] = None
     params: Optional[CheckerParamsBase] = None
@@ -101,9 +101,9 @@ class CheckerBase:
         *,
         do_syntax_check_first: Optional[bool] = None,
         db_session: Optional[Session] = None,
-        use_collection: Optional[bool] = None,
+        use_platform: Optional[bool] = None,
     ) -> None:
-        self.collection_query_tool = CollectionQueryTool()
+        self.platform_query_tool = PlatformQueryTool()
         self.url2netloc = Url2Netloc()
 
         if self.params is None:
@@ -120,10 +120,10 @@ class CheckerBase:
         else:
             self.do_syntax_check_first = self.STD_DO_SYNTAX_CHECK_FIRST
 
-        if use_collection is not None:
-            self.use_collection = use_collection
+        if use_platform is not None:
+            self.use_platform = use_platform
         else:
-            self.guess_and_set_use_collection()
+            self.guess_and_set_use_platform()
 
         self.db_session = db_session
 
@@ -185,7 +185,7 @@ class CheckerBase:
         def wrapper(self, *args, **kwargs):  # pragma: no cover ## Safety!
             result = func(self, *args, **kwargs)  # pylint: disable=not-callable
 
-            self.status.tested_at = datetime.datetime.utcnow()
+            self.status.tested_at = datetime.datetime.now(datetime.timezone.utc)
 
             return result
 
@@ -320,17 +320,17 @@ class CheckerBase:
         return self
 
     @property
-    def use_collection(self) -> bool:
+    def use_platform(self) -> bool:
         """
-        Provides the current value of the :code:`_use_collection` attribute.
+        Provides the current value of the :code:`_use_platform` attribute.
         """
 
-        return self._use_collection
+        return self._use_platform
 
-    @use_collection.setter
-    def use_collection(self, value: bool) -> None:
+    @use_platform.setter
+    def use_platform(self, value: bool) -> None:
         """
-        Sets the value which authorizes the usage of the Collection.
+        Sets the value which authorizes the usage of the platform.
 
         :param value:
             The value to set.
@@ -342,32 +342,32 @@ class CheckerBase:
         if not isinstance(value, bool):
             raise TypeError(f"<value> should be {bool}, {type(value)} given.")
 
-        self._use_collection = self.params.use_collection = value
+        self._use_platform = self.params.use_platform = value
 
-    def set_use_collection(self, value: bool) -> "CheckerBase":
+    def set_use_platform(self, value: bool) -> "CheckerBase":
         """
-        Sets the value which authorizes the usage of the Collection.
+        Sets the value which authorizes the usage of the platform.
 
         :param value:
             The value to set.
         """
 
-        self.use_collection = value
+        self.use_platform = value
 
         return self
 
-    def guess_and_set_use_collection(self) -> "CheckerBase":
+    def guess_and_set_use_platform(self) -> "CheckerBase":
         """
-        Try to guess and set the value of the :code:`use_collection` attribute.
+        Try to guess and set the value of the :code:`use_platform` attribute.
         """
 
         if PyFunceble.facility.ConfigLoader.is_already_loaded():
-            if isinstance(PyFunceble.storage.CONFIGURATION.lookup.collection, bool):
-                self.use_collection = PyFunceble.storage.CONFIGURATION.lookup.collection
+            if isinstance(PyFunceble.storage.CONFIGURATION.lookup.platform, bool):
+                self.use_platform = PyFunceble.storage.CONFIGURATION.lookup.platform
             else:
-                self.use_collection = self.STD_USE_COLLECTION
+                self.use_platform = self.STD_USE_PLATFORM
         else:
-            self.use_collection = self.STD_USE_COLLECTION
+            self.use_platform = self.STD_USE_PLATFORM
 
     def subject_propagator(self) -> "CheckerBase":
         """

PyFunceble/checker/params_base.py

@@ -64,7 +64,7 @@ class CheckerParamsBase:
     """
 
     do_syntax_check_first: Optional[bool] = None
-    use_collection: Optional[bool] = None
+    use_platform: Optional[bool] = None
 
     def to_dict(self) -> dict:
         """

PyFunceble/checker/reputation/base.py

@@ -92,7 +92,7 @@ class ReputationCheckerBase(CheckerBase):
         subject: Optional[str] = None,
         do_syntax_check_first: Optional[bool] = None,
         db_session: Optional[Session] = None,
-        use_collection: Optional[bool] = None,
+        use_platform: Optional[bool] = None,
     ) -> None:
         self.dns_query_tool = DNSQueryTool()
         self.ipv4_reputation_query_tool = IPV4ReputationDataset()
@@ -110,7 +110,7 @@ class ReputationCheckerBase(CheckerBase):
             subject,
             do_syntax_check_first=do_syntax_check_first,
             db_session=db_session,
-            use_collection=use_collection,
+            use_platform=use_platform,
         )
 
     @staticmethod
@@ -242,45 +242,45 @@ class ReputationCheckerBase(CheckerBase):
 
         return self
 
-    def try_to_query_status_from_collection(self) -> "ReputationCheckerBase":
+    def try_to_query_status_from_platform(self) -> "ReputationCheckerBase":
         """
-        Tries to get and set the status from the Collection API.
+        Tries to get and set the status from the Platform API.
         """
 
         PyFunceble.facility.Logger.info(
-            "Started to try to query the status of %r from: Collection Lookup",
+            "Started to try to query the status of %r from: Platform Lookup",
             self.status.idna_subject,
         )
 
-        data = self.collection_query_tool[self.idna_subject]
+        data = self.platform_query_tool[self.idna_subject]
 
         if data and "status" in data:
             if (
-                self.collection_query_tool.preferred_status_origin == "frequent"
+                self.platform_query_tool.preferred_status_origin == "frequent"
                 and data["status"]["reputation"]["frequent"]
             ):
                 self.status.status = data["status"]["reputation"]["frequent"]
-                self.status.status_source = "COLLECTION"
+                self.status.status_source = "PLATFORM"
             elif (
-                self.collection_query_tool.preferred_status_origin == "latest"
+                self.platform_query_tool.preferred_status_origin == "latest"
                 and data["status"]["reputation"]["latest"]
             ):
                 self.status.status = data["status"]["reputation"]["latest"]["status"]
-                self.status.status_source = "COLLECTION"
+                self.status.status_source = "PLATFORM"
             elif (
-                self.collection_query_tool.preferred_status_origin == "recommended"
+                self.platform_query_tool.preferred_status_origin == "recommended"
                 and data["status"]["reputation"]["recommended"]
             ):
                 self.status.status = data["status"]["reputation"]["recommended"]
-                self.status.status_source = "COLLECTION"
+                self.status.status_source = "PLATFORM"
 
             PyFunceble.facility.Logger.info(
-                "Could define the status of %r from: Collection Lookup",
+                "Could define the status of %r from: Platform Lookup",
                 self.status.idna_subject,
             )
 
         PyFunceble.facility.Logger.info(
-            "Finished to try to query the status of %r from: Collection Lookup",
+            "Finished to try to query the status of %r from: Platform Lookup",
             self.status.idna_subject,
         )
 
@@ -294,9 +294,9 @@ class ReputationCheckerBase(CheckerBase):
         status_post_syntax_checker = None
 
         if (
-            not self.status.status and self.use_collection
+            not self.status.status and self.use_platform
         ):  # pragma: no cover ## Underlying tested
-            self.try_to_query_status_from_collection()
+            self.try_to_query_status_from_platform()
 
         if not self.status.status and self.do_syntax_check_first:
             self.try_to_query_status_from_syntax_lookup()

PyFunceble/checker/reputation/domain_and_ip.py

@@ -78,18 +78,18 @@ class DomainAndIPReputationChecker(ReputationCheckerBase):
                 self.subject,
                 do_syntax_check_first=self.do_syntax_check_first,
                 db_session=self.db_session,
-                use_collection=self.use_collection,
+                use_platform=self.use_platform,
             )
         else:
             query_object = DomainReputationChecker(
                 self.subject,
                 do_syntax_check_first=self.do_syntax_check_first,
                 db_session=self.db_session,
-                use_collection=self.use_collection,
+                use_platform=self.use_platform,
             )
 
         query_object.ipv4_reputation_query_tool = self.ipv4_reputation_query_tool
-        query_object.collection_query_tool = self.collection_query_tool
+        query_object.platform_query_tool = self.platform_query_tool
         query_object.dns_query_tool = self.dns_query_tool
 
         result = query_object.query_status()

PyFunceble/checker/syntax/domain_and_ip.py

@@ -83,7 +83,7 @@ class DomainAndIPSyntaxChecker(SyntaxCheckerBase):
         else:
             query_object = DomainSyntaxChecker(self.subject, db_session=self.db_session)
 
-        query_object.collection_query_tool = self.collection_query_tool
+        query_object.platform_query_tool = self.platform_query_tool
 
         result = query_object.query_status()
 

PyFunceble/cli/continuous_integration/base.py

@@ -55,7 +55,7 @@ License:
 import datetime
 import functools
 import secrets
-from typing import Any, Optional
+from typing import Any, List, Optional
 
 import PyFunceble.cli.continuous_integration.exceptions
 import PyFunceble.facility
@@ -105,6 +105,8 @@ class ContinuousIntegrationBase:
     STD_END_COMMIT_MESSAGE: str = "PyFunceble - Results"
     STD_MAX_EXEC_MINUTES: int = 15
 
+    COMMON_CI_SKIP_MARKER: List[str] = ["[skip ci]", "[ci skip]", "[no ci]"]
+
     end_commit_marker: str = "[ci skip]"
 
     _authorized: bool = False
@@ -347,6 +349,17 @@ class ContinuousIntegrationBase:
 
         self._authorized = value
 
+    @property
+    def bypass_bypass(self) -> bool:
+        """
+        Provides the currently state of the :code:`_bypass_bypass` attribute.
+        """
+
+        return (
+            EnvironmentVariableHelper("PYFUNCEBLE_BYPASS_BYPASS").get_value()
+            is not None
+        )
+
     def set_authorized(self, value: bool) -> "ContinuousIntegrationBase":
         """
         Sets the value of the :code:`authorized` attribute.
@@ -786,7 +799,7 @@ class ContinuousIntegrationBase:
         Sets the starting time to now.
         """
 
-        self.start_time = datetime.datetime.utcnow()
+        self.start_time = datetime.datetime.now(datetime.timezone.utc)
         self.expected_end_time = self.start_time + datetime.timedelta(
             minutes=self.max_exec_minutes
         )
@@ -1020,7 +1033,7 @@ class ContinuousIntegrationBase:
         Checks if we exceeded the allocated time we have.
         """
 
-        return self.expected_end_time < datetime.datetime.utcnow()
+        return self.expected_end_time < datetime.datetime.now(datetime.timezone.utc)
 
     @execute_if_authorized(None)
     @ensure_token_is_given
@@ -1136,12 +1149,15 @@ class ContinuousIntegrationBase:
             raise PyFunceble.cli.continuous_integration.exceptions.StopExecution()
 
     @execute_if_authorized(None)
-    def apply_end_commit(self) -> None:
+    def apply_end_commit(self, *, push: bool = True) -> None:
         """
         Apply the "end" commit and push.
 
         Side effect:
             It runs the declared command to execute.
+
+        :param push:
+            Whether we should push the changes or not.
         """
 
         PyFunceble.facility.Logger.info(
@@ -1189,18 +1205,19 @@ class ContinuousIntegrationBase:
             "Finished to prepare and apply final GIT commit."
         )
 
-        if self.git_distribution_branch != self.git_branch:
-            self.push_changes(branch_to_use)
-        else:
+        if push:
             self.push_changes(branch_to_use)
 
     @execute_if_authorized(None)
-    def apply_commit(self) -> None:
+    def apply_commit(self, *, push: bool = True) -> None:
         """
         Apply the commit and push.
 
         Side effect:
             It runs the declared command to execute.
+
+        :param push:
+            Whether we should push the changes or not.
         """
 
         PyFunceble.facility.Logger.info("Started to prepare and apply GIT commit.")
@@ -1234,7 +1251,8 @@ class ContinuousIntegrationBase:
 
         PyFunceble.facility.Logger.info("Finished to prepare and apply GIT commit.")
 
-        self.push_changes(self.git_branch)
+        if push:
+            self.push_changes(self.git_branch)
 
     @execute_if_authorized(None)
     def bypass(self) -> None:
@@ -1243,13 +1261,24 @@ class ContinuousIntegrationBase:
 
             - :code:`[PyFunceble skip]` (case insensitive)
             - :code:`[PyFunceble-skip]` (case insensitive)
+            - :code:`[skip-PyFunceble]` (case insensitive)
+            - :code:`[skip PyFunceble]` (case insensitive)
             - :attr:`~PyFunceble.cli.continuous_integration.base.end_commit_marker`
+            - :attr:`~PyFunceble.cli.continuous_integration.base.COMMON_CI_SKIP_MARKER`
         """
 
-        our_marker = ["[pyfunceble skip]", "[pyfunceble-skip]", self.end_commit_marker]
+        our_marker = self.COMMON_CI_SKIP_MARKER + [
+            "[pyfunceble skip]",
+            "[pyfunceble-skip]",
+            "[skip-pyfunceble]",
+            "[skip pyfunceble]",
+            self.end_commit_marker,
+        ]
         latest_commit = CommandHelper("git log -1").execute().lower()
 
-        if any(x.lower() in latest_commit for x in our_marker):
+        if not self.bypass_bypass and any(
+            x.lower() in latest_commit for x in our_marker
+        ):
             PyFunceble.facility.Logger.info(
                 "Bypass marker caught. Saving and stopping process."
             )

PyFunceble/cli/entry_points/pyfunceble/cli.py

@@ -386,30 +386,30 @@ def get_test_control_group_data() -> List[Tuple[List[str], dict]]:
             },
         ),
         (
-            ["--collection-preferred-origin"],
+            ["--platform-preferred-origin"],
             {
-                "dest": "collection.preferred_status_origin",
+                "dest": "platform.preferred_status_origin",
                 "type": str,
                 "choices": ["frequent", "latest", "recommended"],
                 "help": "Sets the preferred status origin. %s"
-                % get_configured_value("collection.preferred_status_origin"),
+                % get_configured_value("platform.preferred_status_origin"),
             },
         ),
         (
-            ["--collection-lookup"],
+            ["--platform-lookup"],
             {
-                "dest": "lookup.collection",
+                "dest": "lookup.platform",
                 "action": "store_true",
-                "help": "Activates or disables the usage of the Collection lookup\n"
-                "whether possible. %s" % get_configured_value("lookup.collection"),
+                "help": "Activates or disables the usage of the Platform lookup\n"
+                "whether possible. %s" % get_configured_value("lookup.platform"),
             },
         ),
         (
-            ["--collection-lookup-only"],
+            ["--platform-lookup-only"],
             {
-                "dest": "self_contained.lookup.collection",
+                "dest": "self_contained.lookup.platform",
                 "action": "store_true",
-                "help": "Only perform a Collection lookup.",
+                "help": "Only perform a Platform lookup.",
             },
         ),
         (
@@ -1009,13 +1009,13 @@ def get_output_control_group_data() -> List[Tuple[List[str], dict]]:
         ),
         (
             [
-                "--push-collection",
+                "--push-platform",
             ],
             {
-                "dest": "collection.push",
+                "dest": "platform.push",
                 "action": "store_true",
                 "help": "Activates or disables the push of test result into the\n"
-                "collection API. %s" % get_configured_value("collection.push"),
+                "Platform API. %s" % get_configured_value("platform.push"),
             },
         ),
         (

PyFunceble/cli/execution_time.py

@@ -181,7 +181,7 @@ class ExecutionTime:
         Sets the starting time to now.
         """
 
-        self.start_time = datetime.datetime.utcnow()
+        self.start_time = datetime.datetime.now(datetime.timezone.utc)
 
         return self
 
@@ -191,7 +191,7 @@ class ExecutionTime:
         Sets the starting time to now.
         """
 
-        self.end_time = datetime.datetime.utcnow()
+        self.end_time = datetime.datetime.now(datetime.timezone.utc)
 
         return self
 

PyFunceble/cli/file_preloader.py

@@ -53,7 +53,7 @@ License:
 import copy
 import functools
 import os
-from datetime import datetime, timedelta
+from datetime import datetime, timedelta, timezone
 from typing import Any, Optional
 
 from domain2idna import domain2idna
@@ -455,9 +455,9 @@ class FilePreloader:
                             to_send = copy.deepcopy(self.protocol)
                             to_send["subject"] = subject
                             to_send["idna_subject"] = domain2idna(subject)
-                            to_send["tested_at"] = datetime.utcnow() - timedelta(
-                                days=365.25 * 20
-                            )
+                            to_send["tested_at"] = datetime.now(
+                                timezone.utc
+                            ) - timedelta(days=365.25 * 20)
 
                             if self.inactive_dataset.exists(to_send):
                                 print_single_line("I")

PyFunceble/cli/filesystem/printer/file.py

@@ -51,7 +51,7 @@ License:
 """
 
 import functools
-from datetime import datetime
+from datetime import datetime, timezone
 from typing import Dict, Optional
 
 import PyFunceble.facility
@@ -171,7 +171,7 @@ class FilePrinter(PrinterBase):
         Provides the line which informs of the date a file was generated.
         """
 
-        return f"# Date of generation: {datetime.utcnow().isoformat()}"
+        return f"# Date of generation: {datetime.now(timezone.utc).isoformat()}"
 
     @ensure_destination_is_given
     def print_interpolated_line(self) -> None:

PyFunceble/cli/migrators/json2csv/inactive.py

@@ -133,7 +133,8 @@ class InactiveJSON2CSVMigrator(JSON2CSVMigratorBase):
                     if not value:
                         if index.isdigit():
                             dataset["tested_at"] = datetime.datetime.fromtimestamp(
-                                float(index)
+                                float(index),
+                                datetime.timezone.utc,
                             ).isoformat()
                         else:
                             dataset["source"] = os.path.abspath(index)
@@ -147,7 +148,9 @@ class InactiveJSON2CSVMigrator(JSON2CSVMigratorBase):
                     dataset["status"] = value
 
                     if not dataset["tested_at"]:
-                        dataset["tested_at"] = datetime.datetime.utcnow().isoformat()
+                        dataset["tested_at"] = datetime.datetime.now(
+                            datetime.timezone.utc
+                        ).isoformat()
 
                     PyFunceble.facility.Logger.debug("Decoded dataset:\n%r.", dataset)