pythonkuma 0.4.1__tar.gz → 0.5.1__tar.gz

{pythonkuma-0.4.1 → pythonkuma-0.5.1}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: pythonkuma
-Version: 0.4.1
+Version: 0.5.1
 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.1 → pythonkuma-0.5.1}/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.1 → pythonkuma-0.5.1}/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",
-    "aiohttp==3.13.3",
-    "prometheus-client==0.24.1",
+    "ruff==0.15.12",
+    "aiohttp==3.13.5",
+    "prometheus-client==0.25.0",
     "mashumaro==3.20",
-    "mkdocs-material==9.7.1",
-    "mkdocstrings[python]==1.0.3",
+    "mkdocs-material==9.7.6",
+    "mkdocstrings[python]==1.0.4",
+    "pytest-asyncio==1.3.0",
+    "pytest==9.0.3",
+    "pytest-cov==7.1.0",
+    "syrupy==5.1.0",
 ]
 
 [tool.hatch.envs.hatch-static-analysis]
 dependencies = [
-    "ruff==0.15.0",
+    "ruff==0.15.12",
 ]
 config-path = "none"
 
@@ -62,8 +69,11 @@ pythonpath = ["pythonkuma"]
 
 [tool.hatch.envs.hatch-test]
 extra-dependencies = [
-    "pytest-cov==7.0.0",
+    "pytest-cov==7.1.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.1 → pythonkuma-0.5.1}/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.1"
+__version__ = "0.5.1"
 
 __all__ = [
     "MonitorStatus",
@@ -22,5 +23,6 @@ __all__ = [
     "UptimeKumaConnectionException",
     "UptimeKumaException",
     "UptimeKumaMonitor",
+    "UptimeKumaParseException",
     "UptimeKumaVersion",
 ]

{pythonkuma-0.4.1 → pythonkuma-0.5.1}/pythonkuma/models.py

@@ -21,37 +21,45 @@ class MonitorStatus(IntEnum):
 class MonitorType(StrEnum):
     """Monitors type."""
 
+    # General monitor type
     HTTP = "http"
+    KEYWORD = "keyword"
     PORT = "port"
     PING = "ping"
-    KEYWORD = "keyword"
     DNS = "dns"
-    PUSH = "push"
-    STEAM = "steam"
-    MQTT = "mqtt"
-    SQLSERVER = "sqlserver"
-    JSON_QUERY = "json-query"
-    GROUP = "group"
     DOCKER = "docker"
-    GRPC_KEYWORD = "grpc-keyword"
+    SYSTEM_SERVICE = "system-service"
     REAL_BROWSER = "real-browser"
-    GAMEDIG = "gamedig"
+    # Special
+    GROUP = "group"
+    # Passive monitor type
+    PUSH = "push"
+    MANUAL = "manual"
+    # Specific monitor type
+    GLOBALPING = "globalping"
+    GRPC_KEYWORD = "grpc-keyword"
+    JSON_QUERY = "json-query"
     KAFKA_PRODUCER = "kafka-producer"
-    POSTGRES = "postgres"
-    MYSQL = "mysql"
-    MONGODB = "mongodb"
-    RADIUS = "radius"
-    REDIS = "redis"
-    TAILSCALE_PING = "tailscale-ping"
+    MQTT = "mqtt"
+    RABBIT_MQ = "rabbitmq"
+    SIP_OPTIONS = "sip-options"
     SMTP = "smtp"
     SNMP = "snmp"
-    RABBIT_MQ = "rabbitmq"
-    MANUAL = "manual"
-    UNKNOWN = "unknown"
+    TAILSCALE_PING = "tailscale-ping"
     WEBSOCKET_UPGRADE = "websocket-upgrade"
-    SYSTEM_SERVICE = "system-service"
-    GLOBALPING = "globalping"
-    SIP_OPTIONS = "sip-options"
+    # Database monitor type
+    SQLSERVER = "sqlserver"
+    MONGODB = "mongodb"
+    MYSQL = "mysql"
+    ORACLEDB = "oracledb"
+    POSTGRES = "postgres"
+    REDIS = "redis"
+    RADIUS = "radius"
+    # Game server
+    GAMEDIG = "gamedig"
+    STEAM = "steam"
+    # other
+    UNKNOWN = "unknown"
 
     @classmethod
     def _missing_(cls, _: object) -> Self:
@@ -92,6 +100,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.1 → pythonkuma-0.5.1}/pythonkuma/uptimekuma.py

@@ -20,6 +20,16 @@ from .exceptions import (
 )
 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."""
@@ -111,13 +121,20 @@ class UptimeKuma:
                     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).update({name: sample.value})
+                monitors.setdefault(
+                    key, {**sample.labels, "monitor_tags": tags}
+                ).update({name: sample.value})
 
         return {
             key: UptimeKumaMonitor.from_dict(value) for key, value in monitors.items()