Upload hub_dashboard_service.py

hub_dashboard_service.py

@@ -27,18 +27,9 @@ from pathlib import Path
 from typing import Dict, List, Optional
 
 import websocket
-from flask import Flask, jsonify, request, send_from_directory
+from flask import Flask, jsonify, request, send_from_directory, send_file
 from flask_cors import CORS
 
-# ── Ranker Logs Blueprint ─────────────────────────────────────────────────────
-# Import lazily so the service starts even if ranker_logs_api.py is absent.
-try:
-    from ranker_logs_api import ranker_logs_bp, init_ranker_logs_api as _init_bp
-    _RANKER_LOGS_BP_AVAILABLE = True
-except ImportError:
-    _RANKER_LOGS_BP_AVAILABLE = False
-    logger_import_warning = "ranker_logs_api.py not found — Blueprint endpoints disabled"
-
 # ── Logging ───────────────────────────────────────────────────────────────────────────
 logging.basicConfig(
     level=logging.INFO,
@@ -701,14 +692,139 @@ _hub_subscriber.start()
 app = Flask(__name__)
 CORS(app)
 
-# ── Register ranker logs Blueprint (powers /export, /clear, /asset/<a>, /level/<l>) ──
-if _RANKER_LOGS_BP_AVAILABLE:
-    _file_logger_adapter = FileBasedLoggerAdapter(log_dir=_LOG_DIR)
-    _init_bp(_file_logger_adapter)
-    app.register_blueprint(ranker_logs_bp)
-    logger.info("[Blueprint] ranker_logs_bp registered — all /api/ranker/logs/* endpoints active")
-else:
-    logger.warning("[Blueprint] ranker_logs_api.py not found — inline routes only")
+# ── Instantiate the file-based log adapter (used by all /api/ranker/logs/* routes) ──
+_log_adapter = FileBasedLoggerAdapter(log_dir=_LOG_DIR)
+
+
+# ══════════════════════════════════════════════════════════════════════════════════════
+# SECTION 4 — RANKER LOG ROUTES  (self-contained — no Blueprint dependency)
+# ══════════════════════════════════════════════════════════════════════════════════════
+#
+# FIX v2.4: These routes were previously delegated to ranker_logs_api.py Blueprint.
+# That Blueprint was never registered, so every /api/ranker/logs/* call returned 404.
+# Routes are now defined inline so hub_dashboard_service.py is fully self-contained.
+# FileBasedLoggerAdapter (above) satisfies the full RankerLogger interface by reading
+# the ranker's disk log files — no in-process ranker instance required.
+
+_TRAINING_RE_INLINE = re.compile(
+    r'step=(\d+)\s*\|\s*loss=([\d.]+)\s*\|\s*lr=([\d.eE+\-]+)\s*\|\s*assets=(\d+)'
+)
+_JSON_BLOB_RE_INLINE = re.compile(r'(\{.*\})\s*$')
+
+
+def _enrich_training(entry: dict) -> dict:
+    """Attach parsed `data` dict to TRAINING entries so dashboard KPI cards populate."""
+    if entry.get("category", "").upper() != "TRAINING":
+        return entry
+    if entry.get("data"):
+        return entry
+    msg = entry.get("message", "")
+    m = _TRAINING_RE_INLINE.search(msg)
+    if m:
+        entry["data"] = {
+            "step":        int(m.group(1)),
+            "loss":        float(m.group(2)),
+            "lr":          float(m.group(3)),
+            "asset_count": int(m.group(4)),
+        }
+        return entry
+    jm = _JSON_BLOB_RE_INLINE.search(msg)
+    if jm:
+        try:
+            blob = json.loads(jm.group(1))
+            if "step" in blob:
+                entry["data"] = {
+                    "step":        blob.get("step", 0),
+                    "loss":        blob.get("loss", 0.0),
+                    "lr":          blob.get("lr", 0.0),
+                    "asset_count": blob.get("asset_count", blob.get("assets", 0)),
+                }
+        except (ValueError, KeyError):
+            pass
+    return entry
+
+
+@app.route("/api/ranker/logs/recent", methods=["GET"])
+def api_logs_recent():
+    """GET /api/ranker/logs/recent?limit=50&category=TRAINING"""
+    try:
+        limit    = int(request.args.get("limit", 50))
+        category = request.args.get("category")
+        entries  = _log_adapter.get_recent(n=limit, category=category)
+        entries  = [_enrich_training(e) for e in entries]
+        return jsonify({
+            "logs":   entries,
+            "count":  len(entries),
+            "stats":  _log_adapter.get_stats(),
+        })
+    except Exception as exc:
+        logger.exception(f"[api_logs_recent] error: {exc}")
+        return jsonify({"logs": [], "count": 0, "error": str(exc)}), 200
+
+
+@app.route("/api/ranker/logs/stats", methods=["GET"])
+def api_logs_stats():
+    """GET /api/ranker/logs/stats"""
+    try:
+        return jsonify(_log_adapter.get_stats())
+    except Exception as exc:
+        logger.exception(f"[api_logs_stats] error: {exc}")
+        return jsonify({"total_events": 0, "by_level": {}, "by_category": {},
+                        "by_asset": {}, "errors": {}, "error": str(exc)}), 200
+
+
+@app.route("/api/ranker/logs/asset/<asset>", methods=["GET"])
+def api_logs_asset(asset: str):
+    """GET /api/ranker/logs/asset/V75?limit=30"""
+    try:
+        limit   = int(request.args.get("limit", 30))
+        entries = _log_adapter.get_by_asset(asset, n=limit)
+        return jsonify({"asset": asset, "logs": entries, "count": len(entries)})
+    except Exception as exc:
+        logger.exception(f"[api_logs_asset] error: {exc}")
+        return jsonify({"asset": asset, "logs": [], "count": 0, "error": str(exc)}), 200
+
+
+@app.route("/api/ranker/logs/level/<level>", methods=["GET"])
+def api_logs_level(level: str):
+    """GET /api/ranker/logs/level/ERROR?limit=50"""
+    try:
+        limit   = int(request.args.get("limit", 50))
+        entries = _log_adapter.get_by_level(level, n=limit)
+        return jsonify({"level": level.upper(), "logs": entries, "count": len(entries)})
+    except Exception as exc:
+        logger.exception(f"[api_logs_level] error: {exc}")
+        return jsonify({"level": level.upper(), "logs": [], "count": 0, "error": str(exc)}), 200
+
+
+@app.route("/api/ranker/logs/export", methods=["GET"])
+def api_logs_export():
+    """GET /api/ranker/logs/export?limit=500  → download JSON"""
+    try:
+        limit       = int(request.args.get("limit", 500))
+        export_path = Path("/tmp/ranker_logs_export.json")
+        _log_adapter.export_json(str(export_path), n=limit)
+        return send_file(
+            export_path,
+            mimetype="application/json",
+            as_attachment=True,
+            download_name="ranker_logs_export.json",
+        )
+    except Exception as exc:
+        logger.exception(f"[api_logs_export] error: {exc}")
+        return jsonify({"error": str(exc)}), 500
+
+
+@app.route("/api/ranker/logs/clear", methods=["POST"])
+def api_logs_clear():
+    """POST /api/ranker/logs/clear — no-op for file-based adapter"""
+    try:
+        _log_adapter.clear_buffer()
+        return jsonify({"status": "cleared"})
+    except Exception as exc:
+        return jsonify({"error": str(exc)}), 500
+
+
 
 
 @app.route("/")
@@ -767,10 +883,12 @@ def health():
 
 
 if __name__ == "__main__":
-    logger.info("=== K1RL QUASAR HUB DASHBOARD SERVICE v2.2 (FIXED) ===")
+    logger.info("=== K1RL QUASAR HUB DASHBOARD SERVICE v2.4 (SELF-CONTAINED) ===")
     logger.info(f"Dashboard: http://localhost:{_DASHBOARD_PORT}")
     logger.info(f"Log directory: {_LOG_DIR}")
     logger.info("Fixes applied:")
+    logger.info("  ✅ FIX v2.4: All /api/ranker/logs/* routes inline — no Blueprint dependency")
+    logger.info("  ✅ FIX v2.4: Training KPI enrichment (_enrich_training) applied on /recent")
     logger.info("  ✅ FIX #1: Now reading *.log* (includes rotated files)")
     logger.info("  ✅ FIX #2: Improved regex to catch all trade close formats")
     logger.info("  ✅ FIX #4: Dedicated exit_price regex (no optional-group ambiguity)")