checkdk-cli 0.2.6__tar.gz → 0.2.8__tar.gz

{checkdk_cli-0.2.6 → checkdk_cli-0.2.8}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: checkdk-cli
-Version: 0.2.6
+Version: 0.2.8
 Summary: checkDK CLI – AI-powered Docker/Kubernetes issue detector and pod failure predictor
 Author-email: checkDK Team <team@checkdk.app>
 License: MIT
@@ -30,7 +30,6 @@ Requires-Dist: rich>=13.0.0
 Requires-Dist: requests>=2.31.0
 Requires-Dist: pyyaml>=6.0
 Requires-Dist: python-dotenv>=1.0.0
-Requires-Dist: websocket-client>=1.6.0
 Provides-Extra: dev
 Requires-Dist: pytest>=7.4.0; extra == "dev"
 Requires-Dist: black>=23.0.0; extra == "dev"

{checkdk_cli-0.2.6 → checkdk_cli-0.2.8}/checkdk_cli.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: checkdk-cli
-Version: 0.2.6
+Version: 0.2.8
 Summary: checkDK CLI – AI-powered Docker/Kubernetes issue detector and pod failure predictor
 Author-email: checkDK Team <team@checkdk.app>
 License: MIT
@@ -30,7 +30,6 @@ Requires-Dist: rich>=13.0.0
 Requires-Dist: requests>=2.31.0
 Requires-Dist: pyyaml>=6.0
 Requires-Dist: python-dotenv>=1.0.0
-Requires-Dist: websocket-client>=1.6.0
 Provides-Extra: dev
 Requires-Dist: pytest>=7.4.0; extra == "dev"
 Requires-Dist: black>=23.0.0; extra == "dev"

{checkdk_cli-0.2.6 → checkdk_cli-0.2.8}/checkdk_cli.egg-info/requires.txt

@@ -3,7 +3,6 @@ rich>=13.0.0
 requests>=2.31.0
 pyyaml>=6.0
 python-dotenv>=1.0.0
-websocket-client>=1.6.0
 
 [dev]
 pytest>=7.4.0

{checkdk_cli-0.2.6 → checkdk_cli-0.2.8}/checkdkcli/__init__.py

@@ -1,3 +1,3 @@
 """checkDK CLI package."""
 
-__version__ = "0.2.6"
+__version__ = "0.2.8"

{checkdk_cli-0.2.6 → checkdk_cli-0.2.8}/checkdkcli/commands/init.py

@@ -34,18 +34,10 @@ def init_cmd() -> None:
 
     existing.append(f"CHECKDK_API_URL={api_url}")
 
-    default_ws = os.getenv("CHECKDK_WS_URL", "wss://m7fijvmhiq.us-east-1.awsapprunner.com")
-    ws_url = console.input(
-        f"  WebSocket URL (for monitor) [[dim]{default_ws}[/]]: "
-    ).strip() or default_ws
-    existing = [l for l in existing if not l.startswith("CHECKDK_WS_URL=")]
-    existing.append(f"CHECKDK_WS_URL={ws_url}")
-
     env_path.write_text("\n".join(existing) + "\n")
 
     console.print(
         f"\n[bold green]✓ Saved to:[/] {env_path}\n"
-        f"  [dim]CHECKDK_API_URL={api_url}[/]\n"
-        f"  [dim]CHECKDK_WS_URL={ws_url}[/]\n\n"
-        "Tip: You can also set these as shell environment variables."
+        f"  [dim]CHECKDK_API_URL={api_url}[/]\n\n"
+        "Tip: You can also set this as a shell environment variable."
     )

{checkdk_cli-0.2.6 → checkdk_cli-0.2.8}/checkdkcli/commands/monitor.py

@@ -1,20 +1,24 @@
-"""checkdk monitor - real-time container/pod health monitoring over WebSocket."""
+"""checkdk monitor - real-time container/pod health monitoring via REST polling.
+
+Polls the /predict endpoint on each interval instead of using a WebSocket
+connection, which is blocked by the App Runner infrastructure layer.
+"""
 
 from __future__ import annotations
 
-import json
 import subprocess
 import sys
 import time
 from typing import Optional
 
 import click
+import requests
 from rich.console import Console
 from rich.live import Live
 from rich.table import Table
 from rich.text import Text
 
-from ..client import get_ws_url
+from ..client import get_api_url
 
 _console = Console()
 
@@ -25,6 +29,12 @@ def _risk_color(label: str) -> str:
     )
 
 
+def _level_color(level: str) -> str:
+    return {"low": "green", "medium": "yellow", "high": "red", "critical": "bold red"}.get(
+        level.lower(), "white"
+    )
+
+
 def _docker_stats(container: str) -> Optional[dict]:
     """Return one snapshot from docker stats --no-stream."""
     try:
@@ -63,23 +73,59 @@ def _k8s_stats(pod: str, namespace: str) -> Optional[dict]:
     return {"cpu": _pct(parts[1]), "memory": _pct(parts[2])}
 
 
+def _predict(api_url: str, stats: dict, platform: str, service: str, no_ai: bool) -> Optional[dict]:
+    """POST to /predict and return the prediction dict, or None on error."""
+    try:
+        resp = requests.post(
+            f"{api_url}/predict",
+            json={
+                "cpu": stats["cpu"],
+                "memory": stats["memory"],
+                "disk": 50.0,
+                "latency": 10.0,
+                "restarts": 0,
+                "probe_failures": 0,
+                "cpu_pressure": 0,
+                "mem_pressure": 0,
+                "age": 60,
+                "service": service,
+                "platform": platform,
+                "no_ai": no_ai,
+            },
+            timeout=15,
+        )
+        resp.raise_for_status()
+        data = resp.json()
+        pred = data.get("prediction", {})
+        return {
+            "label":      pred.get("label", "unknown"),
+            "confidence": pred.get("confidence", 0.0),
+            "risk_level": pred.get("risk_level", "unknown"),
+        }
+    except Exception as exc:
+        _console.log(f"[dim red]Predict error: {exc}[/]")
+        return None
+
+
 def _build_table(history: list[dict]) -> Table:
     t = Table(title="checkDK Real-Time Monitor", expand=True)
     t.add_column("#",          style="dim",    width=4)
     t.add_column("CPU %",      style="cyan",   width=8)
     t.add_column("MEM %",      style="cyan",   width=8)
     t.add_column("Risk Label", width=12)
+    t.add_column("Risk Level", width=12)
     t.add_column("Confidence", width=12)
     t.add_column("Time",       style="dim")
     for i, row in enumerate(history[-20:], 1):
         label = row.get("label", "unknown")
+        level = row.get("risk_level", "unknown")
         conf  = row.get("confidence", 0.0)
-        col   = _risk_color(label)
         t.add_row(
             str(i),
             f"{row.get('cpu', 0):.1f}",
             f"{row.get('mem', 0):.1f}",
-            Text(label, style=f"bold {col}"),
+            Text(label, style=f"bold {_risk_color(label)}"),
+            Text(level, style=_level_color(level)),
             f"{conf:.2f}",
             row.get("ts", ""),
         )
@@ -97,37 +143,24 @@ def monitor_cmd() -> None:
               help="Stop after N seconds (0 = run until Ctrl-C)")
 @click.option("--interval", default=5, show_default=True, type=int,
               help="Polling interval in seconds")
-def monitor_docker(container: str, duration: int, interval: int) -> None:
+@click.option("--no-ai", is_flag=True, default=False,
+              help="Skip LLM analysis (faster, ML prediction only)")
+def monitor_docker(container: str, duration: int, interval: int, no_ai: bool) -> None:
     """Stream live Docker container metrics and predict failure risk.
 
     \b
     Example:
         checkdk monitor docker my-container
         checkdk monitor docker api --duration 120 --interval 3
+        checkdk monitor docker api --no-ai
     """
-    try:
-        import websocket  # noqa: F401
-    except ImportError:
-        _console.print("[bold red]Missing dependency:[/] install websocket-client")
-        _console.print("  pip install websocket-client")
-        sys.exit(1)
-
-    import websocket as ws_lib
-
-    ws_url = get_ws_url() + "/ws/monitor"
+    api_url = get_api_url()
     history: list[dict] = []
     start = time.time()
 
-    _console.print(f"[bold]Monitoring container:[/] [cyan]{container}[/]  [dim]{ws_url}[/]")
+    _console.print(f"[bold]Monitoring container:[/] [cyan]{container}[/]  [dim]{api_url}/predict[/]")
     _console.print("[dim]Press Ctrl-C to stop.[/]\n")
 
-    try:
-        sock = ws_lib.create_connection(ws_url, timeout=10)
-    except Exception as exc:
-        _console.print(f"[bold red]Cannot connect to WebSocket:[/] {exc}")
-        _console.print("[yellow]Is the backend running with WebSocket support?[/]")
-        sys.exit(1)
-
     try:
         with Live(_build_table(history), refresh_per_second=1) as live:
             while True:
@@ -137,29 +170,20 @@ def monitor_docker(container: str, duration: int, interval: int) -> None:
                 if stats is None:
                     time.sleep(interval)
                     continue
-                payload = {
-                    "cpu_usage": stats["cpu"], "memory_usage": stats["memory"],
-                    "disk_usage": 50.0, "network_latency": 0.0,
-                    "restart_count": 0, "probe_failures": 0,
-                    "cpu_pressure": 0, "memory_pressure": 0,
-                    "pod_age_minutes": 60,
-                }
-                sock.send(json.dumps(payload))
-                raw = sock.recv()
-                resp = json.loads(raw)
-                history.append({
-                    "cpu": stats["cpu"], "mem": stats["memory"],
-                    "label": resp.get("label", "?"),
-                    "confidence": resp.get("confidence", 0.0),
-                    "ts": time.strftime("%H:%M:%S"),
-                })
-                live.update(_build_table(history))
+                pred = _predict(api_url, stats, platform="docker", service=container, no_ai=no_ai)
+                if pred:
+                    history.append({
+                        "cpu":        stats["cpu"],
+                        "mem":        stats["memory"],
+                        "label":      pred["label"],
+                        "risk_level": pred["risk_level"],
+                        "confidence": pred["confidence"],
+                        "ts":         time.strftime("%H:%M:%S"),
+                    })
+                    live.update(_build_table(history))
                 time.sleep(interval)
     except KeyboardInterrupt:
         pass
-    finally:
-        try: sock.close()
-        except: pass
     _console.print("\n[bold green]Monitor stopped.[/]")
 
 
@@ -168,35 +192,24 @@ def monitor_docker(container: str, duration: int, interval: int) -> None:
 @click.option("--namespace", "-n", default="default", show_default=True)
 @click.option("--duration", default=0, type=int, help="Stop after N seconds (0 = Ctrl-C)")
 @click.option("--interval", default=5, show_default=True, type=int)
-def monitor_k8s(pod: str, namespace: str, duration: int, interval: int) -> None:
+@click.option("--no-ai", is_flag=True, default=False,
+              help="Skip LLM analysis (faster, ML prediction only)")
+def monitor_k8s(pod: str, namespace: str, duration: int, interval: int, no_ai: bool) -> None:
     """Stream live Kubernetes pod metrics and predict failure risk.
 
     \b
     Example:
         checkdk monitor k8s my-pod -n production
         checkdk monitor k8s api-pod --duration 120
+        checkdk monitor k8s api-pod --no-ai
     """
-    try:
-        import websocket  # noqa: F401
-    except ImportError:
-        _console.print("[bold red]Missing dependency:[/] install websocket-client")
-        sys.exit(1)
-
-    import websocket as ws_lib
-
-    ws_url = get_ws_url() + "/ws/monitor"
+    api_url = get_api_url()
     history: list[dict] = []
     start = time.time()
 
-    _console.print(f"[bold]Monitoring pod:[/] [cyan]{pod}[/] (ns: {namespace})  [dim]{ws_url}[/]")
+    _console.print(f"[bold]Monitoring pod:[/] [cyan]{pod}[/] (ns: {namespace})  [dim]{api_url}/predict[/]")
     _console.print("[dim]Press Ctrl-C to stop.[/]\n")
 
-    try:
-        sock = ws_lib.create_connection(ws_url, timeout=10)
-    except Exception as exc:
-        _console.print(f"[bold red]Cannot connect to WebSocket:[/] {exc}")
-        sys.exit(1)
-
     try:
         with Live(_build_table(history), refresh_per_second=1) as live:
             while True:
@@ -206,27 +219,18 @@ def monitor_k8s(pod: str, namespace: str, duration: int, interval: int) -> None:
                 if stats is None:
                     time.sleep(interval)
                     continue
-                payload = {
-                    "cpu_usage": stats["cpu"], "memory_usage": stats["memory"],
-                    "disk_usage": 50.0, "network_latency": 0.0,
-                    "restart_count": 0, "probe_failures": 0,
-                    "cpu_pressure": 0, "memory_pressure": 0,
-                    "pod_age_minutes": 60,
-                }
-                sock.send(json.dumps(payload))
-                raw = sock.recv()
-                resp = json.loads(raw)
-                history.append({
-                    "cpu": stats["cpu"], "mem": stats["memory"],
-                    "label": resp.get("label", "?"),
-                    "confidence": resp.get("confidence", 0.0),
-                    "ts": time.strftime("%H:%M:%S"),
-                })
-                live.update(_build_table(history))
+                pred = _predict(api_url, stats, platform="kubernetes", service=pod, no_ai=no_ai)
+                if pred:
+                    history.append({
+                        "cpu":        stats["cpu"],
+                        "mem":        stats["memory"],
+                        "label":      pred["label"],
+                        "risk_level": pred["risk_level"],
+                        "confidence": pred["confidence"],
+                        "ts":         time.strftime("%H:%M:%S"),
+                    })
+                    live.update(_build_table(history))
                 time.sleep(interval)
     except KeyboardInterrupt:
         pass
-    finally:
-        try: sock.close()
-        except: pass
     _console.print("\n[bold green]Monitor stopped.[/]")

{checkdk_cli-0.2.6 → checkdk_cli-0.2.8}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "checkdk-cli"
-version = "0.2.6"
+version = "0.2.8"
 description = "checkDK CLI – AI-powered Docker/Kubernetes issue detector and pod failure predictor"
 readme = "README.md"
 requires-python = ">=3.10"
@@ -34,7 +34,6 @@ dependencies = [
     "requests>=2.31.0",
     "pyyaml>=6.0",
     "python-dotenv>=1.0.0",
-    "websocket-client>=1.6.0",
 ]
 
 [project.urls]