Update app.py

app.py

@@ -3,67 +3,66 @@ import gradio as gr
 import subprocess, os, sys, time
 import urllib.request, urllib.error
 from fastapi import Request
-from fastapi.responses import Response
+from fastapi.responses import Response, HTMLResponse
 
-SECOND_PORT = 9001
-FLASK_DIR = os.path.join(os.path.dirname(os.path.abspath(__file__)), "flask-app")
+PORT = 9001
+FM_DIR = os.path.join(os.path.dirname(os.path.abspath(__file__)), "file-manager")
 
-# --- Launch YOUR flask-app as a background process on its own port ---
-# cwd=FLASK_DIR so its templates/relative paths resolve correctly.
-subprocess.Popen(
-    [sys.executable, "app.py"],
-    cwd=FLASK_DIR,
-    stdout=sys.stdout,
-    stderr=sys.stderr,
-)
+# --- Launch the file manager as a background child process ---
+proc = {"p": None}
+def start_fm():
+    if proc["p"] and proc["p"].poll() is None:
+        proc["p"].terminate()
+        try:
+            proc["p"].wait(timeout=5)
+        except Exception:
+            proc["p"].kill()
+    proc["p"] = subprocess.Popen([sys.executable, "app.py"], cwd=FM_DIR,
+                                 stdout=sys.stdout, stderr=sys.stderr)
 
-# --- Required ZeroGPU function (top level) ---
+start_fm()
+
+# --- Required ZeroGPU gate (unused, but mandatory to boot) ---
 @spaces.GPU
 def gpu_function():
-    import torch
-    return "GPU OK" if torch.cuda.is_available() else "GPU function executed"
+    return "ok"
 
-# --- Gradio owns the ONLY public port 7860 ---
 with gr.Blocks() as demo:
-    gr.Markdown("Host running. Your Flask app is on 9001, bridged at /app")
-    gr.Button("GPU check").click(gpu_function, outputs=gr.Textbox())
+    gr.Markdown("Self-editing computer. File manager at /fm, hot-reload at /reload")
 
 demo.queue()
-demo.launch(
-    server_name="0.0.0.0",
-    server_port=7860,
-    ssr_mode=False,            # prevents the Node SSR shutdown
-    prevent_thread_lock=True,  # returns control so we can mount the proxy after launch
-)
+demo.launch(server_name="0.0.0.0", server_port=7860,
+            ssr_mode=False, prevent_thread_lock=True)
 
-app = demo.app  # Gradio's FastAPI app on 7860
+app = demo.app
 
-# --- A session-aware, redirect-aware proxy: /app/... -> 127.0.0.1:9001/app/... ---
-class NoRedirect(urllib.request.HTTPRedirectHandler):
-    def redirect_request(self, *args, **kwargs):
-        return None  # pass 3xx straight to the browser so cookies stick
+# --- Hot-reload: respawn ONLY the file-manager process, no Space rebuild ---
+@app.get("/reload")
+def reload_fm():
+    start_fm()
+    time.sleep(1)
+    return HTMLResponse('Reloaded file-manager process. <a href="/fm/">back to /fm</a>')
 
-@app.api_route("/app", methods=["GET", "POST"])
-@app.api_route("/app/{path:path}", methods=["GET", "POST"])
-async def proxy_to_flask(request: Request, path: str = ""):
-    url = f"http://127.0.0.1:{SECOND_PORT}/app/{path}"
+# --- Proxy: /fm/... -> 127.0.0.1:9001/fm/... (methods + body forwarded) ---
+@app.api_route("/fm", methods=["GET", "POST"])
+@app.api_route("/fm/{path:path}", methods=["GET", "POST"])
+async def proxy(request: Request, path: str = ""):
+    url = f"http://127.0.0.1:{PORT}/fm/{path}"
     if request.url.query:
         url += "?" + request.url.query
     body = await request.body()
-    fwd_headers = {k: v for k, v in request.headers.items() if k.lower() != "host"}
-    req = urllib.request.Request(url, data=body or None, method=request.method, headers=fwd_headers)
+    fwd = {k: v for k, v in request.headers.items() if k.lower() != "host"}
+    req = urllib.request.Request(url, data=body or None, method=request.method, headers=fwd)
     try:
-        opener = urllib.request.build_opener(NoRedirect)
-        with opener.open(req) as r:
-            resp_body, status, headers = r.read(), r.status, r.headers
+        with urllib.request.urlopen(req) as r:
+            data, status, headers = r.read(), r.status, r.headers
     except urllib.error.HTTPError as e:
-        resp_body, status, headers = e.read(), e.code, e.headers
+        data, status, headers = e.read(), e.code, e.headers
     except urllib.error.URLError:
-        return Response(content=b"flask-app not up yet on 9001", status_code=502)
-    out_headers = {k: v for k, v in headers.items()
-                   if k.lower() in ("set-cookie", "location", "content-type")}
-    return Response(content=resp_body, status_code=status, headers=out_headers)
+        return Response(content=b"file-manager not up yet on 9001", status_code=502)
+    out = {k: v for k, v in headers.items()
+           if k.lower() in ("set-cookie", "location", "content-type")}
+    return Response(content=data, status_code=status, headers=out)
 
-# --- Keep the process alive (launch returned control) ---
 while True:
     time.sleep(3600)