Spaces:

Ramkan7
/

Patch_Hawk

Sleeping

App Files Files Community

kanishcr7 commited on Apr 8

Commit

76a58d5

1 Parent(s): 00ed537

Merged Proxy: Streamlit Dashboard now primary UI on port 7860

Browse files

Files changed (3) hide show

requirements.txt +1 -0
server/app.py +51 -38
start.sh +13 -2

requirements.txt CHANGED Viewed

@@ -1,6 +1,7 @@
 # Core
 openenv-core[ui]>=0.2.0
 openai>=1.0.0
 numpy>=1.24.0
 PyYAML>=6.0
 python-dotenv>=1.0.0

 # Core
 openenv-core[ui]>=0.2.0
 openai>=1.0.0
+httpx>=0.25.0
 numpy>=1.24.0
 PyYAML>=6.0
 python-dotenv>=1.0.0

server/app.py CHANGED Viewed

@@ -30,7 +30,10 @@ from openenv.core import create_app
 from patchhawk.agent.environment import PatchHawkEnv
 from patchhawk.env_models import PatchHawkAction, PatchHawkObservation
-from fastapi.responses import HTMLResponse
 def _env_factory() -> PatchHawkEnv:
@@ -51,44 +54,54 @@ def create_openenv_app():
 app = create_openenv_app()
-@app.get("/", response_class=HTMLResponse)
-def root_dashboard():
-    return """
-    <!DOCTYPE html>
-    <html>
-    <head>
-        <title>PatchHawk | Autonomous DevSecOps SOC</title>
-        <style>
-            body { font-family: 'Segoe UI', Tahoma, Geneva, Verdana, sans-serif; background-color: #0d1117; color: #c9d1d9; display: flex; flex-direction: column; align-items: center; justify-content: center; height: 100vh; margin: 0; }
-            .container { background: #161b22; padding: 40px; border-radius: 12px; border: 1px solid #30363d; box-shadow: 0 10px 30px rgba(0,0,0,0.5); text-align: center; max-width: 600px; }
-            h1 { color: #58a6ff; margin-bottom: 10px; }
-            p { font-size: 1.1em; color: #8b949e; line-height: 1.6; }
-            .status { display: inline-block; padding: 5px 15px; border-radius: 20px; background: #238636; color: white; font-weight: bold; margin: 20px 0; }
-            .links { display: flex; gap: 10px; justify-content: center; margin-top: 30px; }
-            .btn { text-decoration: none; padding: 12px 25px; border-radius: 6px; font-weight: bold; transition: 0.3s; }
-            .btn-blue { background: #1f6feb; color: white; }
-            .btn-blue:hover { background: #388bfd; }
-            .btn-outline { border: 1px solid #30363d; color: #58a6ff; }
-            .btn-outline:hover { background: #30363d; }
-            .badge { background: #30363d; padding: 4px 10px; border-radius: 4px; font-family: monospace; }
-        </style>
-    </head>
-    <body>
-        <div class="container">
-            <h1>🦅 PatchHawk SOC</h1>
-            <p>Autonomous Supply-Chain Vulnerability & Patching Agent</p>
-            <div class="status">● ENVIRONMENT LIVE</div>
-            <p>The OpenEnv API Spec is running correctly at <span class="badge">port: 7860</span>.</p>
-            <div class="links">
-                <a href="/web" class="btn btn-blue">Open Env Explorer</a>
-                <a href="/docs" class="btn btn-outline">API Docs (Swagger)</a>
-            </div>
-            <p style="margin-top:20px; font-size:0.9em;">Evaluation URL: <span class="badge">/reset</span></p>
-        </div>
-    </body>
-    </html>
     """
 def main(port: int | None = None) -> None:

 from patchhawk.agent.environment import PatchHawkEnv
 from patchhawk.env_models import PatchHawkAction, PatchHawkObservation
+from fastapi.responses import HTMLResponse, StreamingResponse
+import httpx
+from starlette.requests import Request
+from starlette.background import BackgroundTask
 def _env_factory() -> PatchHawkEnv:
 app = create_openenv_app()
+# ── Streamlit Proxy Configuration ─────────────────────────────────────
+STREAMLIT_URL = "http://localhost:8501"
+@app.api_route("/{path:path}", methods=["GET", "POST", "PUT", "DELETE", "OPTIONS"])
+async def proxy_streamlit(request: Request, path: str):
     """
+    Proxies all requests not handled by OpenEnv routes to the local Streamlit server.
+    This ensures the Streamlit Dashboard is the primary UI on port 7860.
+    """
+    # Skip proxying for OpenEnv specific routes so the grader still works
+    openenv_routes = ["reset", "step", "docs", "openapi.json", "web", "assets"]
+    if any(path.startswith(r) for r in openenv_routes) or path == "":
+        if path == "":
+             # Redirect root to Streamlit
+             pass
+        else:
+            # Let FastAPI handle it
+            return
+    client = httpx.AsyncClient(base_url=STREAMLIT_URL)
+    url = httpx.URL(path=request.url.path, query=request.url.query.encode("utf-8"))
+    # Filter out headers that might cause issues with the proxy
+    headers = {k: v for k, v in request.headers.items() if k.lower() not in ["host", "connection"]}
+    # Handle the request body
+    body = await request.body()
+    # Forward the request to Streamlit
+    rp_resp = await client.request(
+        method=request.method,
+        url=url,
+        headers=headers,
+        content=body,
+        follow_redirects=True,
+    )
+    return StreamingResponse(
+        rp_resp.aiter_raw(),
+        status_code=rp_resp.status_code,
+        headers=dict(rp_resp.headers),
+        background=BackgroundTask(client.aclose)
+    )
+@app.get("/", response_class=HTMLResponse)
+async def root_redirect(request: Request):
+    """Force the root to proxy to Streamlit."""
+    return await proxy_streamlit(request, "")
 def main(port: int | None = None) -> None:

start.sh CHANGED Viewed

@@ -3,6 +3,17 @@
 echo "Starting OpenEnv API server on port 7860..."
 uvicorn server.app:app --host 0.0.0.0 --port 7860 &
-# Start the Streamlit Dashboard (User UI)
 echo "Starting Streamlit Dashboard on port 8501..."
-streamlit run patchhawk/app/dashboard.py --server.port 8501 --server.address 0.0.0.0

 echo "Starting OpenEnv API server on port 7860..."
 uvicorn server.app:app --host 0.0.0.0 --port 7860 &
+# Start the Streamlit Dashboard (User UI) in the background with Proxy-friendly settings
 echo "Starting Streamlit Dashboard on port 8501..."
+streamlit run patchhawk/app/dashboard.py \
+    --server.port 8501 \
+    --server.address 0.0.0.0 \
+    --server.enableCORS false \
+    --server.enableXsrfProtection false \
+    --server.headless true \
+    --browser.gatherUsageStats false &
+# Start the OpenEnv API server (Hackathon Compliance) on Port 7860
+# This server now PROXIES all UI requests to Streamlit on 8501
+echo "Starting OpenEnv API server on port 7860..."
+uvicorn server.app:app --host 0.0.0.0 --port 7860