PyObservability 2.0.0__py3-none-any.whl → 2.1.1__py3-none-any.whl

pyobservability/kuma.py

@@ -1,7 +1,7 @@
 import logging
 import time
-from collections import defaultdict
-from typing import Any, Dict, List
+from collections.abc import Generator
+from typing import Any, Dict
 from urllib.parse import urlparse
 
 import socketio
@@ -81,18 +81,16 @@ class UptimeKumaClient:
         return self.monitors
 
 
-async def extract_monitors(payload: Dict[int, Dict[str, Any]]) -> List[Dict[str, Any]]:
-    """Convert raw API payload into a list of dicts with name, url, tag_names, host.
+def extract_monitors(payload: Dict[int, Dict[str, Any]]) -> Generator[Dict[str, Any]]:
+    """Convert raw API payload into a list of dicts with name, url, tags, host.
 
     Args:
         payload: Raw payload from Uptime Kuma server.
 
-    Returns:
-        List[Dict[str, Any]]:
-        List of monitors with relevant fields.
+    Yields:
+        Dict[str, Any]:
+        Monitors with relevant fields.
     """
-    monitors = []
-
     grouped = {}
     for monitor in payload.values():
         if children_ids := monitor.get("childrenIDs"):
@@ -104,23 +102,10 @@ async def extract_monitors(payload: Dict[int, Dict[str, Any]]) -> List[Dict[str,
         host = urlparse(url).hostname if url else None
         if not host:
             continue
-        monitors.append(
-            {
-                "name": monitor.get("name"),
-                "parent": grouped.get(monitor.get("id")),
-                "url": url,
-                "host": host,
-                "tag_names": [tag.get("name") for tag in monitor.get("tags", []) if "name" in tag],
-            }
-        )
-    return monitors
-
-
-async def group_by_host(monitors: List[Dict[str, Any]]) -> Dict[str, Any]:
-    """Group monitors by host."""
-    grouped = defaultdict(list)
-
-    for monitor in monitors:
-        grouped[monitor["host"]].append(monitor)
-
-    return dict(grouped)
+        yield {
+            "name": monitor.get("name"),
+            "parent": grouped.get(monitor.get("id")),
+            "url": url,
+            "host": host,
+            "tags": [tag.get("name") for tag in monitor.get("tags", []) if "name" in tag],
+        }

pyobservability/main.py

@@ -13,7 +13,7 @@ from fastapi.staticfiles import StaticFiles
 from fastapi.templating import Jinja2Templates
 
 from pyobservability.config import enums, settings
-from pyobservability.kuma import UptimeKumaClient, extract_monitors, group_by_host
+from pyobservability.kuma import UptimeKumaClient, extract_monitors
 from pyobservability.transport import websocket_endpoint
 from pyobservability.version import __version__
 
@@ -41,8 +41,8 @@ async def index(request: Request):
         TemplateResponse:
         Rendered HTML template with targets and version.
     """
-    kuma_data = {} if all((settings.env.kuma_url, settings.env.kuma_username, settings.env.kuma_password)) else None
-    args = dict(request=request, service_map=kuma_data, targets=settings.env.targets, version=__version__)
+    kuma_data = [{}] if all((settings.env.kuma_url, settings.env.kuma_username, settings.env.kuma_password)) else None
+    args = dict(request=request, kuma_data=kuma_data, targets=settings.env.targets, version=__version__)
     if settings.env.username and settings.env.password:
         args["logout"] = uiauth.enums.APIEndpoints.fastapi_logout.value
     return templates.TemplateResponse("index.html", args)
@@ -52,20 +52,20 @@ async def kuma():
     """Kuma endpoint to retrieve monitors from Kuma server.
 
     Returns:
-        Dict[str, Any]:
-        Grouped monitors by host from Kuma server.
+        List[Dict[str, Any]]:
+        List of monitors from Kuma server after filtering the required fields.
     """
     try:
         kuma_data = UptimeKumaClient().get_monitors()
-        LOGGER.info("Retrieved payload from kuma server.")
+        LOGGER.info("Retrieved monitors from kuma server - %d found.", len(kuma_data))
     except RuntimeError:
         raise HTTPException(
             status_code=HTTPStatus.SERVICE_UNAVAILABLE.real,
             detail="Unable to retrieve data from kuma server.",
         )
-    json_monitors = await extract_monitors(kuma_data)
-    LOGGER.info("Extracted JSON monitors from kuma payload.")
-    return await group_by_host(json_monitors)
+    monitors = list(extract_monitors(kuma_data))
+    LOGGER.info("Processed [%d] monitors for UI payload.", len(monitors))
+    return monitors
 
 
 async def health() -> Dict[str, str]:

pyobservability/static/app.js

@@ -366,26 +366,24 @@
         });
     }
 
-    function normalizeServiceMap(serviceMap) {
+    function normalizeKumaMap(monitors) {
         const rows = [];
-        Object.entries(serviceMap || {}).forEach(([host, services]) => {
-            services.forEach(svc => {
-                rows.push({
-                    Node: host,
-                    Name: svc.name || "",
-                    Parent: svc.parent || "—",
-                    Tags: (svc.tag_names || []).join(", "),
-                    URL: `<a href="${svc.url}" target="_blank">${svc.url}</a>`
-                });
+        monitors.forEach(monitor => {
+            rows.push({
+                Node: monitor.host,
+                Name: monitor.name,
+                Parent: monitor.parent || "—",
+                Tags: (monitor.tags || []).join(", "),
+                URL: `<a href="${monitor.url}" target="_blank">${monitor.url}</a>`
             });
         });
         return rows;
     }
 
     function renderEndpoints() {
-        if (!window.SERVICE_MAP) return;
+        if (!window.KUMA_DATA) return;
 
-        const rows = normalizeServiceMap(window.SERVICE_MAP);
+        const rows = normalizeKumaMap(window.KUMA_DATA);
         const columns = ["Node", "Name", "Parent", "Tags", "URL"];
 
         PAG_ENDPOINTS.setData(rows, columns);
@@ -827,6 +825,9 @@
     function resetUI() {
         firstMessage = true;
         hideSpinners();
+        // Disable Kuma tab during loading if present
+        if (kumaTab) { kumaTab.disabled = true; }
+
         const EMPTY_DATA = Array(MAX_POINTS).fill(null);
         const EMPTY_LABELS = Array(MAX_POINTS).fill("");
 
@@ -940,6 +941,8 @@
         if (firstMessage) {
             hideSpinners();
             firstMessage = false;
+            // Enable Kuma tab once initial data is loaded
+            if (kumaTab) { kumaTab.disabled = false; }
         }
 
         const now = new Date().toLocaleTimeString();
@@ -1197,12 +1200,12 @@
 
         try {
             const response = await fetch('/kuma');
-            if (!response.ok) throw new Error('Failed to fetch service map');
+            if (!response.ok) throw new Error('Failed to fetch kuma map');
 
             kumaMapData = await response.json();
             kumaMapLoaded = true;
 
-            allKumaRows = normalizeServiceMap(kumaMapData);
+            allKumaRows = normalizeKumaMap(kumaMapData);
             PAG_KUMA_TAB.setData(allKumaRows, ["Node", "Name", "Parent", "Tags", "URL"]);
         } catch (err) {
             console.error("Error loading Kuma map:", err);
@@ -1273,5 +1276,7 @@
 
     // Initialize nodes view by default
     document.body.classList.add('nodes-view');
+    // Disable until first metrics load
+    if (kumaTab) { kumaTab.disabled = true; }
     initWebSocket();
 })();

pyobservability/static/styles.css

@@ -51,7 +51,7 @@ html, body {
     transition: all 0.2s;
 }
 
-.tab-btn:hover {
+.tab-btn:hover:not(:disabled) {
     color: #e6eef8;
 }
 
@@ -60,6 +60,11 @@ html, body {
     border-bottom-color: var(--accent);
 }
 
+.tab-btn:disabled {
+    opacity: 0.4;
+    cursor: not-allowed;
+}
+
 .brand {
     font-weight: 700;
     font-size: 18px;

pyobservability/templates/index.html

@@ -19,7 +19,7 @@
 <header class="topbar">
     <div class="brand">Node Monitor</div>
 
-    {% if service_map is not none %}
+    {% if kuma_data is not none %}
     <div class="tab-navigation">
         <button id="nodes-tab" class="tab-btn active">Nodes</button>
         <button id="kuma-tab" class="tab-btn">Uptime Kuma</button>
@@ -293,9 +293,9 @@
     window.MONITOR_TARGETS = {{ targets | tojson }};
 </script>
 
-{% if service_map is not none %}
+{% if kuma_data is not none %}
 <script>
-    window.SERVICE_MAP = {{ service_map | tojson }};
+    window.KUMA_DATA = {{ kuma_data | tojson }};
 </script>
 {% endif %}
 

pyobservability/version.py

@@ -1 +1 @@
-__version__ = "2.0.0"
+__version__ = "2.1.1"

{pyobservability-2.0.0.dist-info → pyobservability-2.1.1.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: PyObservability
-Version: 2.0.0
+Version: 2.1.1
 Summary: Lightweight OS-agnostic observability UI for PyNinja
 Author-email: Vignesh Rao <svignesh1793@gmail.com>
 License: MIT License
@@ -43,7 +43,7 @@ Description-Content-Type: text/markdown
 License-File: LICENSE
 Requires-Dist: aiohttp==3.13.*
 Requires-Dist: fastapi==0.128.*
-Requires-Dist: FastAPI-UI-Auth==0.2.1
+Requires-Dist: FastAPI-UI-Auth==0.2.*
 Requires-Dist: Jinja2==3.1.*
 Requires-Dist: pydantic==2.12.*
 Requires-Dist: pydantic-settings==2.12.*

pyobservability-2.1.1.dist-info/RECORD

@@ -0,0 +1,17 @@
+pyobservability/__init__.py,sha256=yVBLyTohBiBKp0Otyl04IggPh8mhg3Er25u6eFyxMto,2618
+pyobservability/kuma.py,sha256=4sB1M7-exzrObGGIh1yYQ22P40kHwsTfv4G1Xj9YYWw,3260
+pyobservability/main.py,sha256=sMcQRh4mmivs8Xssu_PcP698oc1AzmMt8Tv19BSdmdo,6152
+pyobservability/monitor.py,sha256=i_Xf_DB-qLOp1b9wryekjwHIM8AnMrGTkuEg7e08bcM,7539
+pyobservability/transport.py,sha256=S-84mgf-9yMj0H7VSAmueW9yosX_1XxdyNJC2EuQHQQ,8493
+pyobservability/version.py,sha256=zPJIgPGcoSNiD0qme18OnYJYE3A9VVytlhO-V5DaAW0,22
+pyobservability/config/enums.py,sha256=rQZh2Q4-9ItQTQgxsYjqw-jNePpWHhvQUrbrQJBG5CI,313
+pyobservability/config/settings.py,sha256=aCz1tZEg8fUA5gHCCDN_m3fgrH1axz2fvdalj4bszGs,6121
+pyobservability/static/app.js,sha256=rTj3WWTgkfHJR3qf19flGUJ-9OAeFtVX6Nm5vw51T0w,48862
+pyobservability/static/styles.css,sha256=pSVrSpeeDHaNsqI-WI3PrtnaPRiuU5rIrpB8g6OlHBc,9486
+pyobservability/templates/index.html,sha256=aqvHrxP_D2gSxYmsUkNMi1QH07pQNXh4VuXc51KBo5c,11826
+pyobservability-2.1.1.dist-info/licenses/LICENSE,sha256=_sOIKJWdD2o1WwwDIwYB2qTP2nlSWqT5Tyg9jr1Xa4w,1070
+pyobservability-2.1.1.dist-info/METADATA,sha256=1iEH3chJwsf8T2FKyXLA3xn4x6coVytWSSr83o_9G1w,7026
+pyobservability-2.1.1.dist-info/WHEEL,sha256=wUyA8OaulRlbfwMtmQsvNngGrxQHAvkKcvRmdizlJi0,92
+pyobservability-2.1.1.dist-info/entry_points.txt,sha256=DSGIr_VA8Tb3FYa2iNUYpf55eAvuFCAoInNS4ngXaME,57
+pyobservability-2.1.1.dist-info/top_level.txt,sha256=p20T0EmihDYW1uMintRXr7X9bg3XWYKyoSbBHOVC1xI,16
+pyobservability-2.1.1.dist-info/RECORD,,

pyobservability-2.0.0.dist-info/RECORD

@@ -1,17 +0,0 @@
-pyobservability/__init__.py,sha256=yVBLyTohBiBKp0Otyl04IggPh8mhg3Er25u6eFyxMto,2618
-pyobservability/kuma.py,sha256=RL6ZsK6ZE3vUufsUQ3r4gnH8uka0k8ARd41GP5YozbU,3634
-pyobservability/main.py,sha256=EbP6xkOvj2cV1cOEmmq6E6QsLOhbvKI_jdpfcWjSz-M,6124
-pyobservability/monitor.py,sha256=i_Xf_DB-qLOp1b9wryekjwHIM8AnMrGTkuEg7e08bcM,7539
-pyobservability/transport.py,sha256=S-84mgf-9yMj0H7VSAmueW9yosX_1XxdyNJC2EuQHQQ,8493
-pyobservability/version.py,sha256=_7OlQdbVkK4jad0CLdpI0grT-zEAb-qgFmH5mFzDXiA,22
-pyobservability/config/enums.py,sha256=rQZh2Q4-9ItQTQgxsYjqw-jNePpWHhvQUrbrQJBG5CI,313
-pyobservability/config/settings.py,sha256=aCz1tZEg8fUA5gHCCDN_m3fgrH1axz2fvdalj4bszGs,6121
-pyobservability/static/app.js,sha256=lE-Oybq50FNr_0SrZJFiJihiXyIcyhw7-SNbGA81ySQ,48675
-pyobservability/static/styles.css,sha256=P6Xg-IAXO3WNeBLGH9Q5HAdNeDMRbFcM5P_cq60Jf00,9405
-pyobservability/templates/index.html,sha256=WQNOT_uHfAvVqOnYc1olYdyrjM11tDpeKwTkbPQ853Q,11834
-pyobservability-2.0.0.dist-info/licenses/LICENSE,sha256=_sOIKJWdD2o1WwwDIwYB2qTP2nlSWqT5Tyg9jr1Xa4w,1070
-pyobservability-2.0.0.dist-info/METADATA,sha256=hu_7k6rRxUXitpfLhkAB6GZxMYQNDeqGaQAHJDKa0Ss,7026
-pyobservability-2.0.0.dist-info/WHEEL,sha256=wUyA8OaulRlbfwMtmQsvNngGrxQHAvkKcvRmdizlJi0,92
-pyobservability-2.0.0.dist-info/entry_points.txt,sha256=DSGIr_VA8Tb3FYa2iNUYpf55eAvuFCAoInNS4ngXaME,57
-pyobservability-2.0.0.dist-info/top_level.txt,sha256=p20T0EmihDYW1uMintRXr7X9bg3XWYKyoSbBHOVC1xI,16
-pyobservability-2.0.0.dist-info/RECORD,,