fix(checks): fixed __slots__ in RabbitMQHealthCheck, renamed check_pydantinc_installed -> check_pydantic_installed, from_dsn for MongoHealthCheck and parse_dsn for BasePostgreSQLHealthCheck more stable

Author: shepilov-vladislav

fast_healthchecks/checks/_base.py

@@ -46,7 +46,7 @@ def from_dsn(
         raise NotImplementedError
 
     @classmethod
-    def check_pydantinc_installed(cls) -> None:
+    def check_pydantic_installed(cls) -> None:
         """Check if Pydantic is installed."""
         if not PYDANTIC_INSTALLED:
             msg = "Pydantic is not installed"

fast_healthchecks/checks/mongo.py

@@ -97,7 +97,7 @@ def __init__(  # noqa: PLR0913
 
         Args:
             hosts: The MongoDB host or list of hosts.
-            port: The MongoDB port (используется, если host — строка).
+            port: The MongoDB port (used when hosts is a single string).
             user: The MongoDB user.
             password: The MongoDB password.
             database: The MongoDB database to use.
@@ -126,7 +126,7 @@ def parse_dsn(cls, dsn: str) -> ParseDSNResult:
         """
         parse_result: ParseResult = urlparse(dsn)
         query = (
-            {k: unquote(v) for k, v in (q.split("=") for q in parse_result.query.split("&"))}
+            {k: unquote(v) for k, v in (q.split("=", 1) for q in parse_result.query.split("&"))}
             if parse_result.query
             else {}
         )
@@ -156,7 +156,7 @@ def from_dsn(
         hosts: str | list[str]
         port: int | None
         if "," in parse_result.netloc:
-            hosts = parse_result.netloc.split("@")[1].split(",")
+            hosts = parse_result.netloc.split("@")[-1].split(",")
             port = None
         else:
             hosts = parse_result.hostname or "localhost"

fast_healthchecks/checks/postgresql/base.py

@@ -125,7 +125,7 @@ def parse_dsn(cls, dsn: str) -> ParseDSNResult:
         """
         parse_result: ParseResult = urlparse(dsn)
         query = (
-            {k: unquote(v) for k, v in (q.split("=") for q in parse_result.query.split("&"))}
+            {k: unquote(v) for k, v in (q.split("=", 1) for q in parse_result.query.split("&"))}
             if parse_result.query
             else {}
         )

fast_healthchecks/checks/rabbitmq.py

@@ -59,7 +59,7 @@ class RabbitMQHealthCheck(HealthCheckDSN[HealthCheckResult]):
         _vhost: The RabbitMQ virtual host.
     """
 
-    __slots__ = ("_host", "_name", "_password", "_port", "_secure", "_timeout", "_user")
+    __slots__ = ("_host", "_name", "_password", "_port", "_secure", "_timeout", "_user", "_vhost")
 
     _host: str
     _port: int

fast_healthchecks/checks/types.py

@@ -32,10 +32,6 @@
     from fast_healthchecks.checks.rabbitmq import RabbitMQHealthCheck
 except ImportError:
     RabbitMQHealthCheck = Any  # ty: ignore[invalid-assignment]
-try:
-    from fast_healthchecks.checks.rabbitmq import RabbitMQHealthCheck
-except ImportError:
-    RabbitMQHealthCheck = Any  # ty: ignore[invalid-assignment]
 try:
     from fast_healthchecks.checks.redis import RedisHealthCheck
 except ImportError:

fast_healthchecks/integrations/base.py

@@ -11,7 +11,7 @@
 from fast_healthchecks.checks.types import Check
 from fast_healthchecks.models import HealthcheckReport, HealthCheckResult
 
-HandlerType: TypeAlias = Callable[["ProbeAsgiResponse"], Awaitable[dict[str, str]]]
+HandlerType: TypeAlias = Callable[["ProbeAsgiResponse"], Awaitable[dict[str, Any]]]
 
 
 class Probe(NamedTuple):
@@ -48,11 +48,11 @@ class ProbeAsgiResponse(NamedTuple):
     """A response from an ASGI probe.
 
     Args:
-        body: The body of the response.
-        status_code: The status code of the response.
+        data: The response data (healthcheck results).
+        healthy: Whether all healthchecks passed.
     """
 
-    data: dict[str, str]
+    data: dict[str, Any]
     healthy: bool
 
 

tests/unit/checks/postgresql/test_asyncpg.py

@@ -674,7 +674,7 @@ def test_from_dsn(
     exception: type[BaseException] | None,
 ) -> None:
     parse_result: ParseResult = urlparse(args[0])
-    query = {k: unquote(v) for k, v in (q.split("=") for q in parse_result.query.split("&"))}
+    query = {k: unquote(v) for k, v in (q.split("=", 1) for q in parse_result.query.split("&"))}
     files = [y for x, y in query.items() if x in {"sslcert", "sslkey", "sslrootcert"}]
 
     if exception is not None and isinstance(expected, str):

tests/unit/checks/postgresql/test_psycopg.py

@@ -1142,7 +1142,7 @@ def test_from_dsn(
     exception: type[BaseException] | None,
 ) -> None:
     parse_result: ParseResult = urlparse(args[0])
-    query = {k: unquote(v) for k, v in (q.split("=") for q in parse_result.query.split("&"))}
+    query = {k: unquote(v) for k, v in (q.split("=", 1) for q in parse_result.query.split("&"))}
     files = [y for x, y in query.items() if x in {"sslcert", "sslkey", "sslrootcert"}]
 
     if exception is not None and isinstance(expected, str):

tests/unit/checks/test__base.py

@@ -15,14 +15,14 @@ async def __call__(self) -> HealthCheckResult:
         return HealthCheckResult(name="dummy", healthy=True)
 
 
-def test_check_pydantinc_installed() -> None:
-    assert DummyCheck.check_pydantinc_installed() is None
+def test_check_pydantic_installed() -> None:
+    assert DummyCheck.check_pydantic_installed() is None
 
     with (
         patch("fast_healthchecks.checks._base.PYDANTIC_INSTALLED", new=False),
         pytest.raises(RuntimeError, match="Pydantic is not installed"),
     ):
-        DummyCheck.check_pydantinc_installed()
+        DummyCheck.check_pydantic_installed()
 
 
 @pytest.mark.parametrize(