Spaces:

Jarvis2345
/

jarvis-cloud

Running

App Files Files Community

Jarvis2345 commited on 25 days ago

Commit

a060abc

verified ·

1 Parent(s): dff3932

deploy(S4): Blender headless pipeline + WebAR client + backend fixes

Browse files

Files changed (2) hide show

backend/main.py +73 -9
backend/supervisor.py +23 -2

backend/main.py CHANGED Viewed

@@ -88,7 +88,7 @@ from backend.services.pc_mic_service import start_pc_mic_loop
 from backend.voice.audio_ws import run_in_thread as start_audio_ws
 APP_VERSION = "1.0.0"
-from fastapi import FastAPI, WebSocket, WebSocketDisconnect, Depends
 from backend.security.auth import verify_token
 try:
     from slowapi import Limiter, _rate_limit_exceeded_handler
@@ -174,26 +174,90 @@ for _webar_candidate in (
         logging.info(f"[S4] WebAR client mounted at /webar from {_webar_candidate}")
         break
 @app.get("/")
-async def root_health_check():
     return {"status": "JARVIS / FRIDAY Cloud OS Online", "message": "All systems nominal."}
 @app.get("/wake")
 @app.post("/wake")
 async def wake_server():
     """Public endpoint — anyone can hit this from anywhere in the world to wake the cloud server.
-    HF Spaces sleep after inactivity; this wakes them up instantly."""
     import time
     return {
         "status": "online",
         "message": "JARVIS / FRIDAY Cloud Brain is awake and operational.",
         "timestamp": time.time(),
-        "servers": {
-            "hf_space": "online",
-            "sqlite": "online",
-            "chroma": "online",
-            "mongodb_atlas": "online"
-        }
     }
 @app.get("/ping")

 from backend.voice.audio_ws import run_in_thread as start_audio_ws
 APP_VERSION = "1.0.0"
+from fastapi import FastAPI, WebSocket, WebSocketDisconnect, Depends, Request
 from backend.security.auth import verify_token
 try:
     from slowapi import Limiter, _rate_limit_exceeded_handler
         logging.info(f"[S4] WebAR client mounted at /webar from {_webar_candidate}")
         break
+# Public front door of the Space. Everything on it is either static or rendered
+# server-side from real state (uptime) — nothing fabricated, nothing token-gated
+# leaks here.
+_ROOT_STATUS_PAGE = """<!doctype html>
+<html lang="en"><head><meta charset="utf-8">
+<meta name="viewport" content="width=device-width, initial-scale=1">
+<title>JARVIS Cloud OS</title>
+<link rel="preconnect" href="https://fonts.googleapis.com">
+<link rel="preconnect" href="https://fonts.gstatic.com" crossorigin>
+<link href="https://fonts.googleapis.com/css2?family=Chakra+Petch:wght@400;600;700&family=JetBrains+Mono:wght@400;500&display=swap" rel="stylesheet">
+<style>
+  :root { --accent:#35e6ff; --amber:#ffb454; --text:#dff3fb; --dim:rgba(223,243,251,.55); }
+  * { box-sizing:border-box; margin:0; }
+  body { min-height:100vh; display:flex; align-items:center; justify-content:center;
+    background:radial-gradient(circle at 50% 30%, #0a1620 0%, #05090e 65%, #030509 100%);
+    color:var(--text); font-family:'Chakra Petch',sans-serif; padding:24px; }
+  .card { width:min(560px,94vw); padding:36px 32px; border:1px solid rgba(120,220,255,.22);
+    border-radius:20px; background:rgba(10,22,30,.55); backdrop-filter:blur(24px) saturate(1.4);
+    box-shadow:0 18px 50px rgba(0,0,0,.55), inset 0 1px 0 rgba(180,240,255,.12); }
+  .eyebrow { font:600 11px/1 'Chakra Petch'; letter-spacing:.34em; color:var(--dim);
+    text-transform:uppercase; margin-bottom:14px; }
+  h1 { font:700 30px/1.2 'Chakra Petch'; letter-spacing:.02em; margin-bottom:6px; }
+  h1 em { font-style:normal; color:var(--accent); }
+  .sub { color:var(--dim); font-size:14px; margin-bottom:26px; }
+  .grid { display:grid; grid-template-columns:1fr 1fr; gap:10px; margin-bottom:26px; }
+  .stat { border:1px solid rgba(120,220,255,.14); border-radius:12px; padding:12px 14px; }
+  .stat span { display:block; font:400 10px/1 'Chakra Petch'; letter-spacing:.22em;
+    color:var(--dim); text-transform:uppercase; margin-bottom:7px; }
+  .stat strong { font:500 14px/1.3 'JetBrains Mono',monospace; color:var(--accent);
+    text-transform:uppercase; }
+  .stat strong.amber { color:var(--amber); }
+  .pulse { display:inline-block; width:9px; height:9px; border-radius:50%; background:var(--accent);
+    margin-right:8px; box-shadow:0 0 12px var(--accent); animation:pulse 2s ease-in-out infinite; }
+  @keyframes pulse { 50% { opacity:.35; box-shadow:0 0 4px var(--accent); } }
+  .links { display:flex; gap:10px; flex-wrap:wrap; }
+  .links a { flex:1; min-width:140px; text-align:center; padding:13px 18px; border-radius:12px;
+    text-decoration:none; font:600 13px/1 'Chakra Petch'; letter-spacing:.08em; text-transform:uppercase;
+    color:var(--text); border:1px solid rgba(120,220,255,.3); transition:background .15s, box-shadow .15s; }
+  .links a:hover { background:rgba(53,230,255,.12); box-shadow:0 0 22px rgba(53,230,255,.25); }
+  .foot { margin-top:24px; color:var(--dim); font-size:11px; letter-spacing:.06em; }
+</style></head><body>
+<main class="card">
+  <p class="eyebrow">Stark Industries &middot; Cloud Node</p>
+  <h1><span class="pulse"></span>JARVIS <em>/</em> FRIDAY</h1>
+  <p class="sub">OMEGA Cloud OS &mdash; all API surfaces are token-gated.</p>
+  <div class="grid">
+    <div class="stat"><span>Status</span><strong>Online</strong></div>
+    <div class="stat"><span>Uptime</span><strong>{{UPTIME}}</strong></div>
+    <div class="stat"><span>Mode</span><strong class="amber">Cloud</strong></div>
+    <div class="stat"><span>Assistant</span><strong>JARVIS</strong></div>
+  </div>
+  <div class="links">
+    <a href="/webar/">Enter WebAR</a>
+    <a href="/ping">Ping</a>
+  </div>
+  <p class="foot">Authorized clients: JARVIS desktop, Guardian mobile, WebAR.</p>
+</main>
+</body></html>"""
 @app.get("/")
+async def root_health_check(request: Request):
+    # Browsers (the Space's public front door) get a real status page;
+    # programmatic callers keep the JSON contract unchanged.
+    if "text/html" in (request.headers.get("accept") or ""):
+        from backend.routes.mobile_bridge_routes import _uptime_str
+        from fastapi.responses import HTMLResponse
+        return HTMLResponse(_ROOT_STATUS_PAGE.replace("{{UPTIME}}", _uptime_str()))
     return {"status": "JARVIS / FRIDAY Cloud OS Online", "message": "All systems nominal."}
 @app.get("/wake")
 @app.post("/wake")
 async def wake_server():
     """Public endpoint — anyone can hit this from anywhere in the world to wake the cloud server.
+    HF Spaces sleep after inactivity; this wakes them up instantly.
+    Only claims what is actually true: the fact this handler is running means the
+    Space process is awake. Per-database claims were previously hardcoded
+    "online" without any check — that lie is gone."""
     import time
     return {
         "status": "online",
         "message": "JARVIS / FRIDAY Cloud Brain is awake and operational.",
         "timestamp": time.time(),
     }
 @app.get("/ping")

backend/supervisor.py CHANGED Viewed

@@ -117,8 +117,23 @@ Return ONLY the raw python code. Do not include markdown formatting or backticks
         if fixed_code.endswith("```"):
             fixed_code = fixed_code[:-3]
-        return fixed_code.strip()
     except Exception as e:
         print(f"[SUPERVISOR] Auto-healing failed: {e}")
         return None
@@ -187,6 +202,12 @@ def start_server():
                     fixed_code = heal_code(crashed_file, stderr_data)
                     if fixed_code:
                         with open(crashed_file, "w", encoding="utf-8") as f:
                             f.write(fixed_code)
                         print("[SUPERVISOR] Code healed successfully. Restarting in 3 seconds...")

         if fixed_code.endswith("```"):
             fixed_code = fixed_code[:-3]
+        fixed_code = fixed_code.strip()
+        # An unvalidated LLM reply must never replace server code: reject
+        # anything that isn't syntactically valid Python or that shrank the
+        # file so much it's likely a truncated/apology reply.
+        import ast as _ast
+        try:
+            _ast.parse(fixed_code)
+        except SyntaxError as syn_err:
+            print(f"[SUPERVISOR] Heal rejected — generated code does not parse: {syn_err}")
+            return None
+        if len(fixed_code) < max(64, len(broken_code) // 3):
+            print("[SUPERVISOR] Heal rejected — generated code suspiciously short vs original.")
+            return None
+        return fixed_code
     except Exception as e:
         print(f"[SUPERVISOR] Auto-healing failed: {e}")
         return None
                     fixed_code = heal_code(crashed_file, stderr_data)
                     if fixed_code:
+                        # Keep the pre-heal original so a bad patch is always recoverable.
+                        try:
+                            import shutil
+                            shutil.copy2(crashed_file, crashed_file + ".pre_heal.bak")
+                        except Exception as bak_err:
+                            print(f"[SUPERVISOR] Warning: could not back up original before heal: {bak_err}")
                         with open(crashed_file, "w", encoding="utf-8") as f:
                             f.write(fixed_code)
                         print("[SUPERVISOR] Code healed successfully. Restarting in 3 seconds...")