PyObservability 5.0.2__py3-none-any.whl → 5.0.4__py3-none-any.whl

pyobservability/config/settings.py

@@ -3,7 +3,7 @@ import logging
 import os
 import pathlib
 import socket
-from typing import Any, Dict, Iterable, List
+from typing import Any, Dict, Iterable, List, Optional
 
 from pydantic import BaseModel, Field, FilePath, HttpUrl, PositiveInt
 from pydantic.aliases import AliasChoices
@@ -67,6 +67,80 @@ def detailed_log_config(filename: str | None = None, debug: bool = False) -> Dic
     }
 
 
+class TagModel(BaseModel):
+    """Represents a tag associated with a monitor.
+
+    >>> TagModel
+
+    """
+
+    id: int
+    monitor_id: int
+    tag_id: int
+    value: str
+    name: str
+    color: str
+
+
+class KumaConfig(BaseModel):
+    """Configuration settings for Uptime Kuma monitors.
+
+    >>> KumaConfig
+
+    """
+
+    id: int
+    name: str
+    description: Optional[str]
+    pathName: str
+    childrenIDs: List[int]
+    url: str
+    method: str
+    maxretries: int
+    weight: int
+    active: bool
+    forceInactive: bool
+    type: str
+    timeout: int
+    interval: int
+    retryInterval: int
+    resendInterval: int
+    invertKeyword: bool
+    expiryNotification: bool
+    ignoreTls: bool
+    upsideDown: bool
+    packetSize: int
+    maxredirects: int
+    accepted_statuscodes: List[str]
+    dns_resolve_type: str
+    dns_resolve_server: str
+    docker_container: str
+    notificationIDList: Dict[str, bool]
+    tags: List[TagModel]
+    maintenance: bool
+    mqttTopic: str
+    mqttSuccessMessage: str
+    grpcEnableTls: bool
+    gamedigGivenPortOnly: bool
+    httpBodyEncoding: str
+    jsonPath: Optional[str]
+    kafkaProducerBrokers: List[str]
+    kafkaProducerSsl: bool
+    kafkaProducerAllowAutoTopicCreation: bool
+    oauth_auth_method: str
+    mqttUsername: str
+    mqttPassword: str
+    kafkaProducerSaslOptions: Dict[str, str]
+    includeSensitiveData: bool
+    parent: Optional[int]
+    authMethod: Optional[str]
+    body: Optional[str]
+    basic_auth_user: Optional[str]
+    basic_auth_pass: Optional[str]
+    authWorkstation: Optional[str]
+    authDomain: Optional[str]
+
+
 class PydanticEnvConfig(BaseSettings):
     """Pydantic BaseSettings with custom order for loading environment variables.
 

pyobservability/github.py

@@ -1,6 +1,6 @@
 import logging
 from collections.abc import Generator
-from dataclasses import dataclass
+from dataclasses import dataclass, fields
 from typing import Any, Dict, List
 
 import requests
@@ -52,12 +52,19 @@ class Runner:
 
     """
 
-    id: int
-    name: str
-    os: str
-    status: str
-    busy: bool
-    labels: List[str]
+    id: int = None
+    name: str = None
+    os: str = None
+    status: str = None
+    busy: bool = None
+    labels: List[str] = None
+    version: str = None
+
+    def __post_init__(self):
+        """Add 'v' prefix only if it doesn't already exist in the version string."""
+        if self.version is not None:
+            if not self.version.startswith("v"):
+                self.version = f"v{self.version}"
 
 
 @dataclass
@@ -101,7 +108,12 @@ class GitHub:
                 (label["name"] for label in runner["labels"] if label["name"] != "self-hosted"),
                 key=lambda s: s.lower(),
             )
-            yield Runner(**{**runner, **{"labels": labels}})
+            kwargs = {**runner, **{"labels": labels}}
+            field_names = [f.name for f in fields(Runner)]
+            if missing := set(field_names) - set(kwargs.keys()):
+                LOGGER.warning("Missing field(s) in runner information: %s", missing)
+            kwargs = {k: v for k, v in kwargs.items() if k in field_names}
+            yield Runner(**kwargs)
 
     def runners(self) -> Runners | None:
         """Fetches the runners information from the GitHub API.

pyobservability/kuma.py

@@ -137,22 +137,25 @@ def extract_monitors(payload: Dict[int, Dict[str, Any]]) -> Generator[Dict[str,
     if current_host in replacements:
         current_host = ip_address() or current_host
 
-    for monitor in payload.values():
-        url = monitor.get("url")
-        host = urlparse(url).hostname if url else None
+    for monitor_ in payload.values():
+        monitor = settings.KumaConfig(**monitor_)
+        if not monitor.active:
+            LOGGER.warning("Monitor %s is disabled", monitor.name)
+            continue
+        host = urlparse(monitor.url).hostname if monitor.url else None
         if not host:
             continue
         # If any monitor has localhost, replace it with kuma host
         if host in replacements:
             # 1. Replace the host in the URL with the current host
-            url = url.replace(host, current_host)
+            monitor.url = monitor.url.replace(host, current_host)
             # 2. Update the host variable to reflect the new host
             host = current_host
         yield {
-            "name": monitor.get("name"),
-            "parent": grouped.get(monitor.get("id")),
-            "description": monitor.get("description"),
-            "url": url,
+            "name": monitor.name,
+            "parent": grouped.get(monitor.id),
+            "description": monitor.description,
+            "url": monitor.url,
             "host": host,
-            "tags": [tag.get("name") for tag in monitor.get("tags", []) if "name" in tag],
+            "tags": [tag.name for tag in monitor.tags if "name" in tag],
         }

pyobservability/static/app.js

@@ -1427,7 +1427,7 @@
         if (!PAG_RUNNERS_TAB) return; // Runners tab not enabled
 
         if (runnersDataLoaded) {
-            PAG_RUNNERS_TAB.setData(allRunnersRows, ["ID", "Name", "OS", "Status", "Busy", "Labels"]);
+            PAG_RUNNERS_TAB.setData(allRunnersRows, ["ID", "Name", "OS", "Status", "Busy", "Labels", "Version"]);
             return;
         }
 
@@ -1449,10 +1449,11 @@
                 OS: runner.os || "—",
                 Status: runner.status || "—",
                 Busy: runner.busy ? "Yes" : "No",
-                Labels: Array.isArray(runner.labels) ? runner.labels.join(", ") : (runner.labels || "—")
+                Labels: Array.isArray(runner.labels) ? runner.labels.join(", ") : (runner.labels || "—"),
+                Version: runner.version || "—"
             }));
 
-            PAG_RUNNERS_TAB.setData(allRunnersRows, ["ID", "Name", "OS", "Status", "Busy", "Labels"]);
+            PAG_RUNNERS_TAB.setData(allRunnersRows, ["ID", "Name", "OS", "Status", "Busy", "Labels", "Version"]);
         } catch (err) {
             console.error("Error loading runners data:", err);
             runnersMainThead.innerHTML = '<tr><th>Error</th></tr>';
@@ -1474,13 +1475,14 @@
                 OS: runner.os || "—",
                 Status: runner.status || "—",
                 Busy: runner.busy ? "Yes" : "No",
-                Labels: Array.isArray(runner.labels) ? runner.labels.join(", ") : (runner.labels || "—")
+                Labels: Array.isArray(runner.labels) ? runner.labels.join(", ") : (runner.labels || "—"),
+                Version: runner.version || "—"
             }));
 
             // Reapply current search filter if any
             const searchTerm = runnersSearchInput?.value?.toLowerCase() || '';
             if (!searchTerm) {
-                PAG_RUNNERS_TAB.setData(allRunnersRows, ["ID", "Name", "OS", "Status", "Busy", "Labels"]);
+                PAG_RUNNERS_TAB.setData(allRunnersRows, ["ID", "Name", "OS", "Status", "Busy", "Labels", "Version"]);
             } else {
                 const filtered = allRunnersRows.filter(row =>
                     row.ID.toString().toLowerCase().includes(searchTerm) ||
@@ -1488,9 +1490,10 @@
                     row.OS.toLowerCase().includes(searchTerm) ||
                     row.Status.toLowerCase().includes(searchTerm) ||
                     row.Busy.toLowerCase().includes(searchTerm) ||
-                    row.Labels.toLowerCase().includes(searchTerm)
+                    row.Labels.toLowerCase().includes(searchTerm) ||
+                    row.Version.toLowerCase().includes(searchTerm)
                 );
-                PAG_RUNNERS_TAB.setData(filtered, ["ID", "Name", "OS", "Status", "Busy", "Labels"]);
+                PAG_RUNNERS_TAB.setData(filtered, ["ID", "Name", "OS", "Status", "Busy", "Labels", "Version"]);
             }
         } catch (err) {
             console.error("Error refreshing runners data:", err);
@@ -1516,7 +1519,7 @@
             const searchTerm = e.target.value.toLowerCase();
 
             if (!searchTerm) {
-                PAG_RUNNERS_TAB.setData(allRunnersRows, ["ID", "Name", "OS", "Status", "Busy", "Labels"]);
+                PAG_RUNNERS_TAB.setData(allRunnersRows, ["ID", "Name", "OS", "Status", "Busy", "Labels", "Version"]);
             } else {
                 const filtered = allRunnersRows.filter(row =>
                     row.ID.toString().toLowerCase().includes(searchTerm) ||
@@ -1524,9 +1527,10 @@
                     row.OS.toLowerCase().includes(searchTerm) ||
                     row.Status.toLowerCase().includes(searchTerm) ||
                     row.Busy.toLowerCase().includes(searchTerm) ||
-                    row.Labels.toLowerCase().includes(searchTerm)
+                    row.Labels.toLowerCase().includes(searchTerm) ||
+                    row.Version.toLowerCase().includes(searchTerm)
                 );
-                PAG_RUNNERS_TAB.setData(filtered, ["ID", "Name", "OS", "Status", "Busy", "Labels"]);
+                PAG_RUNNERS_TAB.setData(filtered, ["ID", "Name", "OS", "Status", "Busy", "Labels", "Version"]);
             }
         });
     }

pyobservability/static_legacy/app.js

@@ -1359,7 +1359,7 @@
         if (!PAG_RUNNERS_TAB) return; // Runners tab not enabled
 
         if (runnersDataLoaded) {
-            PAG_RUNNERS_TAB.setData(allRunnersRows, ["ID", "Name", "OS", "Status", "Busy", "Labels"]);
+            PAG_RUNNERS_TAB.setData(allRunnersRows, ["ID", "Name", "OS", "Status", "Busy", "Labels", "Version"]);
             return;
         }
 
@@ -1381,10 +1381,11 @@
                 OS: runner.os || "—",
                 Status: runner.status || "—",
                 Busy: runner.busy ? "Yes" : "No",
-                Labels: Array.isArray(runner.labels) ? runner.labels.join(", ") : (runner.labels || "—")
+                Labels: Array.isArray(runner.labels) ? runner.labels.join(", ") : (runner.labels || "—"),
+                Version: runner.version || "—"
             }));
 
-            PAG_RUNNERS_TAB.setData(allRunnersRows, ["ID", "Name", "OS", "Status", "Busy", "Labels"]);
+            PAG_RUNNERS_TAB.setData(allRunnersRows, ["ID", "Name", "OS", "Status", "Busy", "Labels", "Version"]);
         } catch (err) {
             console.error("Error loading runners data:", err);
             runnersMainThead.innerHTML = '<tr><th>Error</th></tr>';
@@ -1406,13 +1407,14 @@
                 OS: runner.os || "—",
                 Status: runner.status || "—",
                 Busy: runner.busy ? "Yes" : "No",
-                Labels: Array.isArray(runner.labels) ? runner.labels.join(", ") : (runner.labels || "—")
+                Labels: Array.isArray(runner.labels) ? runner.labels.join(", ") : (runner.labels || "—"),
+                Version: runner.version || "—"
             }));
 
             // Reapply current search filter if any
             const searchTerm = runnersSearchInput?.value?.toLowerCase() || '';
             if (!searchTerm) {
-                PAG_RUNNERS_TAB.setData(allRunnersRows, ["ID", "Name", "OS", "Status", "Busy", "Labels"]);
+                PAG_RUNNERS_TAB.setData(allRunnersRows, ["ID", "Name", "OS", "Status", "Busy", "Labels", "Version"]);
             } else {
                 const filtered = allRunnersRows.filter(row =>
                     row.ID.toString().toLowerCase().includes(searchTerm) ||
@@ -1420,9 +1422,10 @@
                     row.OS.toLowerCase().includes(searchTerm) ||
                     row.Status.toLowerCase().includes(searchTerm) ||
                     row.Busy.toLowerCase().includes(searchTerm) ||
-                    row.Labels.toLowerCase().includes(searchTerm)
+                    row.Labels.toLowerCase().includes(searchTerm) ||
+                    row.Version.toLowerCase().includes(searchTerm)
                 );
-                PAG_RUNNERS_TAB.setData(filtered, ["ID", "Name", "OS", "Status", "Busy", "Labels"]);
+                PAG_RUNNERS_TAB.setData(filtered, ["ID", "Name", "OS", "Status", "Busy", "Labels", "Version"]);
             }
         } catch (err) {
             console.error("Error refreshing runners data:", err);
@@ -1448,7 +1451,7 @@
             const searchTerm = e.target.value.toLowerCase();
 
             if (!searchTerm) {
-                PAG_RUNNERS_TAB.setData(allRunnersRows, ["ID", "Name", "OS", "Status", "Busy", "Labels"]);
+                PAG_RUNNERS_TAB.setData(allRunnersRows, ["ID", "Name", "OS", "Status", "Busy", "Labels", "Version"]);
             } else {
                 const filtered = allRunnersRows.filter(row =>
                     row.ID.toString().toLowerCase().includes(searchTerm) ||
@@ -1456,9 +1459,10 @@
                     row.OS.toLowerCase().includes(searchTerm) ||
                     row.Status.toLowerCase().includes(searchTerm) ||
                     row.Busy.toLowerCase().includes(searchTerm) ||
-                    row.Labels.toLowerCase().includes(searchTerm)
+                    row.Labels.toLowerCase().includes(searchTerm) ||
+                    row.Version.toLowerCase().includes(searchTerm)
                 );
-                PAG_RUNNERS_TAB.setData(filtered, ["ID", "Name", "OS", "Status", "Busy", "Labels"]);
+                PAG_RUNNERS_TAB.setData(filtered, ["ID", "Name", "OS", "Status", "Busy", "Labels", "Version"]);
             }
         });
     }

pyobservability/templates/index.html

@@ -305,7 +305,7 @@
 <div id="runners-content" class="container">
     <section class="panel">
         <div class="runners-search">
-            <input type="text" id="runners-search-input" placeholder="Search GitHub Runners by id, name, os, status, or labels...">
+            <input type="text" id="runners-search-input" placeholder="Search GitHub Runners by id, name, os, status, labels, or version...">
         </div>
         <table class="table" id="runners-main-table">
             <thead></thead>

pyobservability/version.py

@@ -1 +1 @@
-__version__ = "5.0.2"
+__version__ = "5.0.4"

{pyobservability-5.0.2.dist-info → pyobservability-5.0.4.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: PyObservability
-Version: 5.0.2
+Version: 5.0.4
 Summary: Lightweight OS-agnostic observability UI for PyNinja
 Author-email: Vignesh Rao <svignesh1793@gmail.com>
 License: MIT License
@@ -41,17 +41,17 @@ Classifier: Topic :: System :: Monitoring
 Requires-Python: >=3.11
 Description-Content-Type: text/markdown
 License-File: LICENSE
-Requires-Dist: aiohttp==3.13.*
-Requires-Dist: fastapi==0.135.*
-Requires-Dist: FastAPI-UI-Auth==0.3.*
+Requires-Dist: aiohttp==3.14.*
+Requires-Dist: fastapi==0.138.*
+Requires-Dist: FastAPI-UI-Auth==0.4.*
 Requires-Dist: Jinja2==3.1.*
-Requires-Dist: prometheus_client==0.24.*
-Requires-Dist: pydantic==2.12.*
-Requires-Dist: pydantic-settings==2.13.*
+Requires-Dist: prometheus_client==0.25.*
+Requires-Dist: pydantic==2.13.*
+Requires-Dist: pydantic-settings==2.14.*
 Requires-Dist: python-dotenv==1.2.*
 Requires-Dist: python-socketio==5.16.*
-Requires-Dist: requests==2.32.*
-Requires-Dist: uvicorn[standard]==0.41.*
+Requires-Dist: requests==2.*
+Requires-Dist: uvicorn[standard]==0.49.*
 Requires-Dist: websocket-client==1.9.*
 Provides-Extra: dev
 Requires-Dist: pre-commit; extra == "dev"

pyobservability-5.0.4.dist-info/RECORD

@@ -0,0 +1,22 @@
+pyobservability/__init__.py,sha256=yVBLyTohBiBKp0Otyl04IggPh8mhg3Er25u6eFyxMto,2618
+pyobservability/github.py,sha256=cqCzwreGRWYwEKjKmkkccYouK5_MIR_n1LO_hOTliEU,3977
+pyobservability/kuma.py,sha256=OFgrLdX5lXz8VRMx19ZCV6AKGODZZVLW3su50in29dc,4988
+pyobservability/main.py,sha256=TnSdyjYZnJlbjoJhZtXA0LVjCCjZHxTP2mPl8Nvr6RI,7890
+pyobservability/monitor.py,sha256=F4DWwJ-i0f-jnvjLtlSiRoRfjeVTTRKzMZnaDbITX7k,8600
+pyobservability/prometheus.py,sha256=p1-qyd9vAX6mJzjXJh-xNSKJGsXsqT6Kzq4ngUFBai4,3197
+pyobservability/transport.py,sha256=Wsxfemu87zSExIyErRgEu4OfBW6XmLxzqiieQ-zfT_4,10087
+pyobservability/version.py,sha256=3nM3sU0hL2BMW8RKPuRUBMY441Ry8LtO9y1PnsRlqfA,22
+pyobservability/config/enums.py,sha256=RDUtpDJ31maBnR1wPYN10izsLiSFFlbmvIMyv4g0zNw,363
+pyobservability/config/settings.py,sha256=iQ8VO-8cVtJpAV4hphvqlwtMTnkOl2SxlbyMMyWvVd4,9567
+pyobservability/config/squire.py,sha256=AO1D5DokKsc1CgjKQLcJCehoQvaKhdgbv6p3e1xQZ-Y,590
+pyobservability/static/app.js,sha256=uunOgNLd4C8f0r8c-uar2I9AlJ4x4UfPKUNqUID7-gE,66313
+pyobservability/static/styles.css,sha256=PZQ9saVpN6bKs9je--UpDFHif8xassF07bAVVZy-_dM,16376
+pyobservability/static_legacy/app.js,sha256=UTkS2LUs52uy38kdI4oJu5E8-KhpIM3xrNoZIn7TOHg,63282
+pyobservability/static_legacy/styles.css,sha256=GfQr4AfMTAVld-OAT-9ptwQK8X9avL0ZXWW_0HGpy2M,10212
+pyobservability/templates/index.html,sha256=8yJssrH8kdykjJFoAy5PuBea_13wHfAwEwGX4z6EDE8,13102
+pyobservability-5.0.4.dist-info/licenses/LICENSE,sha256=_sOIKJWdD2o1WwwDIwYB2qTP2nlSWqT5Tyg9jr1Xa4w,1070
+pyobservability-5.0.4.dist-info/METADATA,sha256=FC3qlnAkCy9N0CDJecqzSpfuErnagbtKYPpGdir_kfY,9671
+pyobservability-5.0.4.dist-info/WHEEL,sha256=aeYiig01lYGDzBgS8HxWXOg3uV61G9ijOsup-k9o1sk,91
+pyobservability-5.0.4.dist-info/entry_points.txt,sha256=DSGIr_VA8Tb3FYa2iNUYpf55eAvuFCAoInNS4ngXaME,57
+pyobservability-5.0.4.dist-info/top_level.txt,sha256=p20T0EmihDYW1uMintRXr7X9bg3XWYKyoSbBHOVC1xI,16
+pyobservability-5.0.4.dist-info/RECORD,,

pyobservability-5.0.2.dist-info/RECORD

@@ -1,22 +0,0 @@
-pyobservability/__init__.py,sha256=yVBLyTohBiBKp0Otyl04IggPh8mhg3Er25u6eFyxMto,2618
-pyobservability/github.py,sha256=ORChfqUwLd4EycU9dXzlNMbGzF_YywVOdwRE3AMkeaU,3339
-pyobservability/kuma.py,sha256=x44YzGuKHnCKdzcp1iusRCCasN4y6L4p9RVdb1YDWdE,4850
-pyobservability/main.py,sha256=TnSdyjYZnJlbjoJhZtXA0LVjCCjZHxTP2mPl8Nvr6RI,7890
-pyobservability/monitor.py,sha256=F4DWwJ-i0f-jnvjLtlSiRoRfjeVTTRKzMZnaDbITX7k,8600
-pyobservability/prometheus.py,sha256=p1-qyd9vAX6mJzjXJh-xNSKJGsXsqT6Kzq4ngUFBai4,3197
-pyobservability/transport.py,sha256=Wsxfemu87zSExIyErRgEu4OfBW6XmLxzqiieQ-zfT_4,10087
-pyobservability/version.py,sha256=xFH0agSAen6eEDzd6JDo0wynm0lQWngI4rS0ugCXpkc,22
-pyobservability/config/enums.py,sha256=RDUtpDJ31maBnR1wPYN10izsLiSFFlbmvIMyv4g0zNw,363
-pyobservability/config/settings.py,sha256=6ddFsrujr3giiMalvRLqk5mVsSFAC4eUekXW6EfoGIk,7970
-pyobservability/config/squire.py,sha256=AO1D5DokKsc1CgjKQLcJCehoQvaKhdgbv6p3e1xQZ-Y,590
-pyobservability/static/app.js,sha256=FDwgxMqskJHU5C6Z9jTAJbFIbnaJ17zYctJMwCxAl-g,66007
-pyobservability/static/styles.css,sha256=PZQ9saVpN6bKs9je--UpDFHif8xassF07bAVVZy-_dM,16376
-pyobservability/static_legacy/app.js,sha256=EFhLWJnIA1v1JRpXhIcwUVS4KdmNN0gyWjQyWvS847c,62976
-pyobservability/static_legacy/styles.css,sha256=GfQr4AfMTAVld-OAT-9ptwQK8X9avL0ZXWW_0HGpy2M,10212
-pyobservability/templates/index.html,sha256=_Im-QfDHbNFHVERjjZICqpK0Ub4m5KXmwlmdKFe4g4Q,13093
-pyobservability-5.0.2.dist-info/licenses/LICENSE,sha256=_sOIKJWdD2o1WwwDIwYB2qTP2nlSWqT5Tyg9jr1Xa4w,1070
-pyobservability-5.0.2.dist-info/METADATA,sha256=4izyvOmiii_nywNOSd12tCVV3OSslmWtxhDYB6kvcaw,9674
-pyobservability-5.0.2.dist-info/WHEEL,sha256=aeYiig01lYGDzBgS8HxWXOg3uV61G9ijOsup-k9o1sk,91
-pyobservability-5.0.2.dist-info/entry_points.txt,sha256=DSGIr_VA8Tb3FYa2iNUYpf55eAvuFCAoInNS4ngXaME,57
-pyobservability-5.0.2.dist-info/top_level.txt,sha256=p20T0EmihDYW1uMintRXr7X9bg3XWYKyoSbBHOVC1xI,16
-pyobservability-5.0.2.dist-info/RECORD,,