pythonkuma 0.3.2__tar.gz → 0.4.0rc0__tar.gz

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

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: pythonkuma
-Version: 0.3.2
+Version: 0.4.0rc0
 Summary: Simple Python wrapper for Uptime Kuma
 Project-URL: Source, https://github.com/tr4nt0r/pythonkuma
 Project-URL: Documentation, https://tr4nt0r.github.io/pythonkuma

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

@@ -39,17 +39,17 @@ include = [
 
 [tool.hatch.envs.default]
 dependencies = [
-    "ruff==0.14.5",
-    "aiohttp==3.13.2",
-    "prometheus-client==0.23.1",
-    "mashumaro==3.17",
-    "mkdocs-material==9.7.0",
-    "mkdocstrings[python]==0.30.1",
+    "ruff==0.15.0",
+    "aiohttp==3.13.3",
+    "prometheus-client==0.24.1",
+    "mashumaro==3.20",
+    "mkdocs-material==9.7.1",
+    "mkdocstrings[python]==1.0.3",
 ]
 
 [tool.hatch.envs.hatch-static-analysis]
 dependencies = [
-    "ruff==0.14.5",
+    "ruff==0.15.0",
 ]
 config-path = "none"
 

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

@@ -10,7 +10,7 @@ from .models import MonitorStatus, MonitorType, UptimeKumaMonitor, UptimeKumaVer
 from .update import UpdateChecker
 from .uptimekuma import UptimeKuma
 
-__version__ = "0.3.2"
+__version__ = "0.4.0rc0"
 
 __all__ = [
     "MonitorStatus",

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

@@ -48,6 +48,10 @@ class MonitorType(StrEnum):
     RABBIT_MQ = "rabbitmq"
     MANUAL = "manual"
     UNKNOWN = "unknown"
+    WEBSOCKET_UPGRADE = "websocket-upgrade"
+    SYSTEM_SERVICE = "system-service"
+    GLOBALPING = "globalping"
+    SIP_OPTIONS = "sip-options"
 
     @classmethod
     def _missing_(cls, _: object) -> Self:
@@ -80,6 +84,13 @@ class UptimeKumaMonitor(UptimeKumaBaseModel):
     monitor_url: str | None = field(
         metadata={"deserialize": lambda v: None if v == "null" else v}
     )
+    monitor_uptime_ratio_1d: float | None = None
+    monitor_uptime_ratio_30d: float | None = None
+    monitor_uptime_ratio_365d: float | None = None
+
+    monitor_response_time_seconds_1d: float | None = None
+    monitor_response_time_seconds_30d: float | None = None
+    monitor_response_time_seconds_365d: float | None = None
 
 
 @dataclass

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

@@ -102,10 +102,14 @@ class UptimeKuma:
                         else sample.labels["monitor_name"]
                     )
 
-                    monitors.setdefault(key, sample.labels).update(
-                        {sample.name: sample.value}
+                    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()