PyObservability 0.0.0a0__py3-none-any.whl → 0.0.0a1__py3-none-any.whl

pyobservability/main.py

@@ -1,13 +1,17 @@
-# app/main.py
-import asyncio
+import logging
+import os
 import pathlib
-from fastapi import FastAPI, WebSocket, WebSocketDisconnect, Request
+
+import dotenv
+from fastapi import FastAPI, Request, WebSocket, WebSocketDisconnect
 from fastapi.staticfiles import StaticFiles
 from fastapi.templating import Jinja2Templates
+
 from pyobservability.monitor import Monitor
-import os
-from dotenv import load_dotenv
-load_dotenv()
+
+dotenv.load_dotenv()
+
+LOGGER = logging.getLogger("uvicorn.default")
 
 app = FastAPI(title="Monitor UI")
 root = pathlib.Path(__file__).parent
@@ -18,13 +22,24 @@ app.mount("/static", StaticFiles(directory=static_dir), name="static")
 
 monitor = Monitor(poll_interval=float(os.getenv("POLL_INTERVAL", 2)))
 
+
 @app.get("/")
 async def index(request: Request):
-    # pass configured targets to the template so frontend can prebuild UI
+    """Pass configured targets to the template so frontend can prebuild UI.
+
+    Args:
+        request: FastAPI request object.
+    """
     return templates.TemplateResponse("index.html", {"request": request, "targets": monitor.targets})
 
+
 @app.websocket("/ws")
 async def websocket_endpoint(websocket: WebSocket):
+    """Websocket endpoint to render the metrics.
+
+    Args:
+        websocket: FastAPI websocket object.
+    """
     await websocket.accept()
     await monitor.start()
     q = monitor.subscribe()
@@ -39,6 +54,7 @@ async def websocket_endpoint(websocket: WebSocket):
         monitor.unsubscribe(q)
         try:
             await websocket.close()
-        except:
+        except Exception as err:
+            LOGGER.warning(err)
             pass
     await monitor.stop()

pyobservability/monitor.py

@@ -1,12 +1,16 @@
 # app/monitor.py
 
 import asyncio
-import os
 import json
+import logging
+import os
+from asyncio import CancelledError
 from typing import Any, Dict, List
+from urllib.parse import urlparse
+
 import aiohttp
-from asyncio import CancelledError
 
+LOGGER = logging.getLogger("uvicorn.default")
 
 ###############################################################################
 # ENDPOINT DEFINITIONS (PyNinja Correct)
@@ -52,7 +56,7 @@ ENDPOINTS = {
     "certificates": {
         "path": "/get-certificates",
         "params": {},
-    }
+    },
 }
 
 
@@ -60,7 +64,14 @@ ENDPOINTS = {
 # LOAD TARGETS FROM ENV
 ###############################################################################
 
+
 def load_targets_from_env() -> List[Dict[str, Any]]:
+    """Loads monitor targets from environment variables and parses it.
+
+    Returns:
+        List[Dict[str, Any]]:
+        Returns the parsed list of the monitor targets.
+    """
     raw = os.getenv("MONITOR_TARGETS", "[]")
 
     try:
@@ -74,11 +85,13 @@ def load_targets_from_env() -> List[Dict[str, Any]]:
         if isinstance(entry, str):
             parsed.append({"name": entry, "base_url": entry, "apikey": None})
         elif isinstance(entry, dict):
-            parsed.append({
-                "name": entry.get("name") or entry["base_url"],
-                "base_url": entry["base_url"],
-                "apikey": entry.get("apikey")
-            })
+            parsed.append(
+                {
+                    "name": entry.get("name") or entry["base_url"],
+                    "base_url": entry["base_url"],
+                    "apikey": entry.get("apikey"),
+                }
+            )
 
     return parsed
 
@@ -87,6 +100,7 @@ def load_targets_from_env() -> List[Dict[str, Any]]:
 # MONITOR CLASS
 ###############################################################################
 
+
 class Monitor:
 
     def __init__(self, poll_interval: float = 2.0):
@@ -145,11 +159,15 @@ class Monitor:
                 if resp.status == 200:
                     try:
                         return await resp.json()
-                    except Exception:
-                        return {"detail": await resp.text()}
-                return {"error": f"HTTP {resp.status}"}
-        except Exception as e:
-            return {"error": str(e)}
+                    except Exception as err:
+                        LOGGER.debug(err)
+                        return "NO DATA"
+                parsed = urlparse(url)
+                LOGGER.debug("Exception on '%s' - [%d]: %s", parsed.path, resp.status, await resp.text())
+                return "NO DATA"
+        except Exception as err:
+            LOGGER.debug(err)
+            return "NO DATA"
 
     ############################################################################
     # PER-TARGET POLLING
@@ -159,24 +177,14 @@ class Monitor:
         apikey = target.get("apikey")
         session = self.sessions[base]
 
-        result = {
-            "name": target["name"],
-            "base_url": base,
-            "metrics": {}
-        }
+        result = {"name": target["name"], "base_url": base, "metrics": {}}
 
         # Fire ALL requests concurrently
         tasks = {}
 
         for key, cfg in ENDPOINTS.items():
             tasks[key] = asyncio.create_task(
-                self._fetch(
-                    session,
-                    base,
-                    cfg["path"],
-                    apikey=apikey,
-                    params=cfg["params"]
-                )
+                self._fetch(session, base, cfg["path"], apikey=apikey, params=cfg["params"])
             )
 
         # Wait for all endpoints
@@ -184,7 +192,7 @@ class Monitor:
 
         for (key, _), resp in zip(tasks.items(), raw_results):
             if isinstance(resp, Exception):
-                result["metrics"][key] = {"error": str(resp)}
+                result["metrics"][key] = "NO DATA"
                 continue
             if isinstance(resp, dict):
                 result["metrics"][key] = resp.get("detail", resp)
@@ -203,6 +211,7 @@ class Monitor:
         out = []
         for r in results:
             if isinstance(r, Exception):
+                LOGGER.error("%s", r)
                 out.append({"error": str(r)})
             else:
                 out.append(r)
@@ -215,11 +224,7 @@ class Monitor:
         while not self._stop.is_set():
             metrics = await self._poll_all()
 
-            payload = {
-                "type": "metrics",
-                "ts": asyncio.get_event_loop().time(),
-                "data": metrics
-            }
+            payload = {"type": "metrics", "ts": asyncio.get_event_loop().time(), "data": metrics}
 
             for q in list(self._ws_subscribers):
                 try:

pyobservability/static/app.js

@@ -27,8 +27,9 @@
   const servicesTableBody = document.querySelector("#services-table tbody");
   const svcFilter = document.getElementById("svc-filter");
 
-  const dockerStatsEl = document.getElementById("docker-stats");
-  const containersList = document.getElementById("containers-list");
+  const dockerTable = document.getElementById("docker-table");
+  const dockerTableHead = dockerTable.querySelector("thead");
+  const dockerTableBody = dockerTable.querySelector("tbody");
 
   const disksTableBody = document.querySelector("#disks-table tbody");
   const certsEl = document.getElementById("certificates");
@@ -182,8 +183,8 @@
     loadEl.textContent = "—";
 
     servicesTableBody.innerHTML = "";
-    dockerStatsEl.textContent = "—";
-    containersList.innerHTML = "";
+    dockerTableHead.innerHTML = "";
+    dockerTableBody.innerHTML = "";
     disksTableBody.innerHTML = "";
     certsEl.textContent = "—";
   }
@@ -209,6 +210,19 @@
     return Number.isFinite(n) ? n : null;
   }
 
+  function formatStringOrObject(x) {
+    if (x == null) return "—";
+    if (typeof x === "string" || typeof x === "number") return x;
+    return Object.entries(x)
+      .map(([k,v]) => `${k}: ${v}`)
+      .join("\n");
+  }
+
+  function round2(x) {
+    const n = Number(x);
+    return Number.isFinite(n) ? n.toFixed(2) : "—";
+  }
+
   // ------------------------------------------------------------
   // METRICS HANDLER
   // ------------------------------------------------------------
@@ -221,14 +235,22 @@
 
       // ------------------- BASIC INFO -------------------
       ipEl.textContent = m.ip?.ip || m.ip || "—";
-      gpuEl.textContent = JSON.stringify(m.gpu ?? "—", null, 2);
-      diskEl.textContent = m.disk ? JSON.stringify(m.disk, null, 0) : "—";
+      gpuEl.textContent = formatStringOrObject(m.gpu ?? m.cpu ?? "—");
+      if (m.disk) {
+        const total = m.disk.total ?? "—";
+        const used  = m.disk.used ?? "—";
+        const free  = m.disk.free ?? "—";
+        diskEl.textContent = `Total: ${total}\nUsed: ${used}\nFree: ${free}`;
+      } else {
+        diskEl.textContent = "—";
+      }
 
       // ------------------- MEMORY -------------------
       if (m.memory) {
         const used = m.memory.ram_used || m.memory.used || "";
         const percent = m.memory.ram_usage ?? m.memory.usage ?? m.memory.percent ?? "—";
-        memEl.textContent = `used: ${used} (${percent}%)`;
+        const totalMem = m.memory.ram_total ?? m.memory.total ?? "—";
+        memEl.textContent = `Total: ${totalMem}\nUsed: ${used}\nPercent: ${percent}%`;
         pushPoint(memChart, num(percent));
       }
 
@@ -278,7 +300,7 @@
           const m5  = load.m5 ?? load[1];
           const m15 = load.m15 ?? load[2];
 
-          loadEl.textContent = `${m1} / ${m5} / ${m15}`;
+          loadEl.textContent = `${round2(m1)} / ${round2(m5)} / ${round2(m15)}`;
           pushPoint(loadChart, num(m1) ?? 0);
         } else {
           loadEl.textContent = load;
@@ -309,16 +331,28 @@
       }
 
       // ------------------- DOCKER -------------------
-      if (m.docker_stats)
-        dockerStatsEl.textContent = JSON.stringify(m.docker_stats, null, 2);
-
-      if (Array.isArray(m.containers)) {
-        containersList.innerHTML = "";
-        for (const c of m.containers) {
-          const li = document.createElement("li");
-          li.textContent = c["Container Name"] || c.name || JSON.stringify(c);
-          containersList.appendChild(li);
+      const dockerList = m.docker_stats;
+
+      if (Array.isArray(dockerList) && dockerTableHead && dockerTableBody) {
+        dockerTableHead.innerHTML = "";
+        dockerTableBody.innerHTML = "";
+
+        if (dockerList.length > 0) {
+          // Table header
+          const columns = Object.keys(dockerList[0]);
+          dockerTableHead.innerHTML =
+            "<tr>" + columns.map(c => `<th>${c}</th>`).join("") + "</tr>";
+
+          // Table rows
+          dockerList.forEach(c => {
+            const row = "<tr>" +
+              columns.map(col => `<td>${c[col] ?? ""}</td>`).join("") +
+              "</tr>";
+            dockerTableBody.insertAdjacentHTML("beforeend", row);
+          });
         }
+      } else {
+        console.warn("Cannot render Docker table:", dockerList, dockerTableHead, dockerTableBody);
       }
 
       // ------------------- DISKS -------------------

pyobservability/static/styles.css

@@ -44,7 +44,7 @@ html,body { height:100%; margin:0; font-family: Inter, system-ui, -apple-system,
 .core-mini .label { color:var(--muted); font-size:11px; }
 .core-mini .value { font-weight:700; margin-top:6px; }
 
-.tables-row { display:grid; grid-template-columns: repeat(2, 1fr); gap:12px; }
+.tables-row { display:grid; grid-template-columns:1fr; grid-auto-rows:auto; gap:12px; }
 .table { width:100%; border-collapse:collapse; font-size:13px; }
 .table th, .table td { padding:8px; border-bottom:1px solid rgba(255,255,255,0.03); text-align:left; }
 .pre { background:rgba(255,255,255,0.02); padding:8px; border-radius:6px; overflow:auto; white-space:pre-wrap; font-family:monospace; font-size:13px; }

pyobservability/templates/index.html

@@ -91,9 +91,10 @@
       <div class="panel">
         <div class="panel-header"><h3>Docker / Containers</h3></div>
         <div class="panel-body">
-          <pre id="docker-stats" class="pre"></pre>
-          <h4>Containers</h4>
-          <ul id="containers-list" class="list"></ul>
+          <table class="table" id="docker-table">
+            <thead></thead>
+            <tbody></tbody>
+          </table>
         </div>
       </div>
 

pyobservability/version.py

@@ -1 +1 @@
-__version__ = "0.0.0a0"
+__version__ = "0.0.0a1"

{pyobservability-0.0.0a0.dist-info → pyobservability-0.0.0a1.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: PyObservability
-Version: 0.0.0a0
+Version: 0.0.0a1
 Summary: Lightweight OS-agnostic observability UI for PyNinja
 Author-email: Vignesh Rao <svignesh1793@gmail.com>
 License: MIT License
@@ -41,11 +41,11 @@ Classifier: Topic :: System :: Monitoring
 Requires-Python: >=3.11
 Description-Content-Type: text/markdown
 License-File: LICENSE
-Requires-Dist: fastapi
-Requires-Dist: uvicorn[standard]
 Requires-Dist: aiohttp
+Requires-Dist: fastapi
 Requires-Dist: jinja2
 Requires-Dist: python-dotenv
+Requires-Dist: uvicorn[standard]
 Provides-Extra: dev
 Requires-Dist: sphinx==5.1.1; extra == "dev"
 Requires-Dist: pre-commit; extra == "dev"

pyobservability-0.0.0a1.dist-info/RECORD

@@ -0,0 +1,12 @@
+pyobservability/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
+pyobservability/main.py,sha256=XzH2XNuxU9lbFSnQXsJqJ2ytrd6nnzbTf7B0n0UQuW0,1637
+pyobservability/monitor.py,sha256=nnL6odqO3BF-XH1wek0leyMKXw7NB8qrwp6aAh-xJyA,7694
+pyobservability/version.py,sha256=PvT0JaYWREcshCnUiHC2CMpUMuTV359GmoET7cuhPiU,24
+pyobservability/static/app.js,sha256=poc7eReoiRUbyI5JKnPwxSqmSNCuOge4aZKCITFy7eo,13494
+pyobservability/static/styles.css,sha256=t6r1C0ueBanipgRRjdu18nmq6RbSGLK5bhpf0BdMOpQ,3245
+pyobservability/templates/index.html,sha256=PsN3aq-7Q6RzGeshoNH5v37G3sHoI2saJq6mfuA6JYs,3977
+pyobservability-0.0.0a1.dist-info/licenses/LICENSE,sha256=_sOIKJWdD2o1WwwDIwYB2qTP2nlSWqT5Tyg9jr1Xa4w,1070
+pyobservability-0.0.0a1.dist-info/METADATA,sha256=Ze1eq09JsbqSTcpPFIrvMQxKJubLqKxzAxcMhLIzbzw,2663
+pyobservability-0.0.0a1.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+pyobservability-0.0.0a1.dist-info/top_level.txt,sha256=p20T0EmihDYW1uMintRXr7X9bg3XWYKyoSbBHOVC1xI,16
+pyobservability-0.0.0a1.dist-info/RECORD,,

pyobservability-0.0.0a0.dist-info/RECORD

@@ -1,12 +0,0 @@
-pyobservability/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-pyobservability/main.py,sha256=yegGcq_OTHGIeJOiJecxnNSBYQ_Hf2MRjJs4KgNZsrQ,1385
-pyobservability/monitor.py,sha256=H_8-c5_S0QNWlGnMktEm1Z64T8HK2nXQ803V1scr6Ok,7393
-pyobservability/version.py,sha256=MVtVCT-b01z6f8XUlOsWWZynQ9Wv001Mk-_erJHty6Y,24
-pyobservability/static/app.js,sha256=dLxyB25ttKaSE1RLpCaqeLXRRwcWyre0icMDZUV6CvU,12351
-pyobservability/static/styles.css,sha256=lUQ74-frlBuNcf6u_8KHUKcNsdMmb0vSxBBaDLPwGEI,3236
-pyobservability/templates/index.html,sha256=6x_fCqTcgcA7eInq49VMsoAGW-Ks80k0by8LeP1rkvI,3988
-pyobservability-0.0.0a0.dist-info/licenses/LICENSE,sha256=_sOIKJWdD2o1WwwDIwYB2qTP2nlSWqT5Tyg9jr1Xa4w,1070
-pyobservability-0.0.0a0.dist-info/METADATA,sha256=E_g2OFzx8C103vvcVThDjaVvJjpBsj86Y9caIH4EZ6E,2663
-pyobservability-0.0.0a0.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-pyobservability-0.0.0a0.dist-info/top_level.txt,sha256=p20T0EmihDYW1uMintRXr7X9bg3XWYKyoSbBHOVC1xI,16
-pyobservability-0.0.0a0.dist-info/RECORD,,