pythonkuma 0.4.0rc0__tar.gz → 0.5.0__tar.gz

{pythonkuma-0.4.0rc0 → pythonkuma-0.5.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: pythonkuma
-Version: 0.4.0rc0
+Version: 0.5.0
 Summary: Simple Python wrapper for Uptime Kuma
 Project-URL: Source, https://github.com/tr4nt0r/pythonkuma
 Project-URL: Documentation, https://tr4nt0r.github.io/pythonkuma
@@ -20,10 +20,9 @@ Description-Content-Type: text/markdown
 Simple Python wrapper for Uptime Kuma
 
 [![build](https://github.com/tr4nt0r/pythonkuma/workflows/Build/badge.svg)](https://github.com/tr4nt0r/pythonkuma/actions)
-[![codecov](https://codecov.io/gh/tr4nt0r/pythonkuma/graph/badge.svg?token=RM3MC4LP07)](https://codecov.io/gh/pythonkuma/pynecil)
+[![codecov](https://codecov.io/gh/tr4nt0r/pythonkuma/graph/badge.svg?token=YmUNsziQH0)](https://codecov.io/gh/tr4nt0r/pythonkuma)
 [![PyPI version](https://badge.fury.io/py/pythonkuma.svg)](https://badge.fury.io/py/pythonkuma)
 ![PyPI - Downloads](https://img.shields.io/pypi/dm/pythonkuma?style=flat&label=pypi%20downloads)
-[!["Buy Me A Coffee"](https://img.shields.io/badge/-buy_me_a%C2%A0coffee-gray?logo=buy-me-a-coffee)](https://www.buymeacoffee.com/tr4nt0r)
 [![GitHub Sponsor](https://img.shields.io/badge/GitHub-Sponsor-blue?logo=github)](https://github.com/sponsors/tr4nt0r)
 
 ---

{pythonkuma-0.4.0rc0 → pythonkuma-0.5.0}/README.md

@@ -3,10 +3,9 @@
 Simple Python wrapper for Uptime Kuma
 
 [![build](https://github.com/tr4nt0r/pythonkuma/workflows/Build/badge.svg)](https://github.com/tr4nt0r/pythonkuma/actions)
-[![codecov](https://codecov.io/gh/tr4nt0r/pythonkuma/graph/badge.svg?token=RM3MC4LP07)](https://codecov.io/gh/pythonkuma/pynecil)
+[![codecov](https://codecov.io/gh/tr4nt0r/pythonkuma/graph/badge.svg?token=YmUNsziQH0)](https://codecov.io/gh/tr4nt0r/pythonkuma)
 [![PyPI version](https://badge.fury.io/py/pythonkuma.svg)](https://badge.fury.io/py/pythonkuma)
 ![PyPI - Downloads](https://img.shields.io/pypi/dm/pythonkuma?style=flat&label=pypi%20downloads)
-[!["Buy Me A Coffee"](https://img.shields.io/badge/-buy_me_a%C2%A0coffee-gray?logo=buy-me-a-coffee)](https://www.buymeacoffee.com/tr4nt0r)
 [![GitHub Sponsor](https://img.shields.io/badge/GitHub-Sponsor-blue?logo=github)](https://github.com/sponsors/tr4nt0r)
 
 ---

{pythonkuma-0.4.0rc0 → pythonkuma-0.5.0}/pyproject.toml

@@ -37,19 +37,26 @@ include = [
     "/pythonkuma",
 ]
 
+[[tool.hatch.envs.hatch-test.matrix]]
+python = ["3.14", "3.13", "3.12"]
+
 [tool.hatch.envs.default]
 dependencies = [
-    "ruff==0.15.0",
+    "ruff==0.15.1",
     "aiohttp==3.13.3",
     "prometheus-client==0.24.1",
     "mashumaro==3.20",
-    "mkdocs-material==9.7.1",
+    "mkdocs-material==9.7.2",
     "mkdocstrings[python]==1.0.3",
+    "pytest-asyncio==1.3.0",
+    "pytest==9.0.2",
+    "pytest-cov==7.0.0",
+    "syrupy==5.1.0",
 ]
 
 [tool.hatch.envs.hatch-static-analysis]
 dependencies = [
-    "ruff==0.15.0",
+    "ruff==0.15.1",
 ]
 config-path = "none"
 
@@ -63,7 +70,10 @@ pythonpath = ["pythonkuma"]
 [tool.hatch.envs.hatch-test]
 extra-dependencies = [
     "pytest-cov==7.0.0",
+    "pytest-asyncio==1.3.0",
+    "syrupy==5.1.0",
 ]
+extra-args = ["--cov-report=xml", "-vv"]
 
 [tool.hatch.envs.default.scripts]
 docs-serve = "mkdocs serve"
@@ -83,6 +93,9 @@ indent-style = "space"
 select = ["ALL"]
 ignore = ["TRY003", "COM812", "N818", "C901"]
 
+[tool.ruff.lint.per-file-ignores]
+"tests/*" = ["S101", "TC002", "TC003"]
+
 [lint.per-file-ignores]
 "**/scripts/*" = [
   "INP001",

{pythonkuma-0.4.0rc0 → pythonkuma-0.5.0}/pythonkuma/__init__.py

@@ -5,12 +5,13 @@ from .exceptions import (
     UptimeKumaAuthenticationException,
     UptimeKumaConnectionException,
     UptimeKumaException,
+    UptimeKumaParseException,
 )
 from .models import MonitorStatus, MonitorType, UptimeKumaMonitor, UptimeKumaVersion
 from .update import UpdateChecker
 from .uptimekuma import UptimeKuma
 
-__version__ = "0.4.0rc0"
+__version__ = "0.5.0"
 
 __all__ = [
     "MonitorStatus",
@@ -22,5 +23,6 @@ __all__ = [
     "UptimeKumaConnectionException",
     "UptimeKumaException",
     "UptimeKumaMonitor",
+    "UptimeKumaParseException",
     "UptimeKumaVersion",
 ]

{pythonkuma-0.4.0rc0 → pythonkuma-0.5.0}/pythonkuma/exceptions.py

@@ -13,5 +13,9 @@ class UptimeKumaAuthenticationException(UptimeKumaException):
     """Uptime Kuma authentication exception."""
 
 
+class UptimeKumaParseException(UptimeKumaException):
+    """Exception raised when parsing of Prometheus metrics fails."""
+
+
 class UpdateException(Exception):
     """Exception raised for errors fetching latest release from github."""

{pythonkuma-0.4.0rc0 → pythonkuma-0.5.0}/pythonkuma/models.py

@@ -92,6 +92,8 @@ class UptimeKumaMonitor(UptimeKumaBaseModel):
     monitor_response_time_seconds_30d: float | None = None
     monitor_response_time_seconds_365d: float | None = None
 
+    monitor_tags: list[str]
+
 
 @dataclass
 class UptimeKumaVersion(UptimeKumaBaseModel):

{pythonkuma-0.4.0rc0 → pythonkuma-0.5.0}/pythonkuma/uptimekuma.py

@@ -13,9 +13,23 @@ from aiohttp import (
 from prometheus_client.parser import text_string_to_metric_families
 from yarl import URL
 
-from .exceptions import UptimeKumaAuthenticationException, UptimeKumaConnectionException
+from .exceptions import (
+    UptimeKumaAuthenticationException,
+    UptimeKumaConnectionException,
+    UptimeKumaParseException,
+)
 from .models import UptimeKumaMonitor, UptimeKumaVersion
 
+COMMON_LABELS = (
+    "monitor_id",
+    "monitor_name",
+    "monitor_type",
+    "monitor_url",
+    "monitor_hostname",
+    "monitor_port",
+    "window",
+)
+
 
 class UptimeKuma:
     """Uptime Kuma client."""
@@ -89,28 +103,39 @@ class UptimeKuma:
             raise UptimeKumaConnectionException(msg, str(url)) from e
         except ClientError as e:
             raise UptimeKumaConnectionException from e
-        else:
-            for metric in text_string_to_metric_families(await request.text()):
-                if metric.name == "app_version" and metric.samples:
-                    self.version = UptimeKumaVersion.from_dict(metric.samples[0].labels)
-                if not metric.name.startswith("monitor"):
-                    continue
-                for sample in metric.samples:
-                    key = (
-                        int(monitor_id)
-                        if (monitor_id := sample.labels.get("monitor_id"))
-                        else sample.labels["monitor_name"]
-                    )
-
-                    name = (
-                        f"{sample.name}_{window}"
-                        if (window := sample.labels.get("window"))
-                        else sample.name
-                    )
-
-                    monitors.setdefault(key, sample.labels).update({name: sample.value})
-
-            return {
-                key: UptimeKumaMonitor.from_dict(value)
-                for key, value in monitors.items()
-            }
+
+        try:
+            metrics = list(text_string_to_metric_families(await request.text()))
+        except ValueError as e:
+            raise UptimeKumaParseException from e
+
+        for metric in metrics:
+            if metric.name == "app_version" and metric.samples:
+                self.version = UptimeKumaVersion.from_dict(metric.samples[0].labels)
+            if not metric.name.startswith("monitor"):
+                continue
+            for sample in metric.samples:
+                key = (
+                    int(monitor_id)
+                    if (monitor_id := sample.labels.get("monitor_id"))
+                    else sample.labels["monitor_name"]
+                )
+
+                tags = [
+                    f"{k}:{v}" if v else k
+                    for k, v in sample.labels.items()
+                    if k not in COMMON_LABELS
+                ]
+                name = (
+                    f"{sample.name}_{window}"
+                    if (window := sample.labels.get("window"))
+                    else sample.name
+                )
+
+                monitors.setdefault(
+                    key, {**sample.labels, "monitor_tags": tags}
+                ).update({name: sample.value})
+
+        return {
+            key: UptimeKumaMonitor.from_dict(value) for key, value in monitors.items()
+        }