Upload 2 files

Dockerfile

@@ -39,10 +39,12 @@ ENV PORT=7860
 
 EXPOSE 7860
 
+ENV GRADIO_SERVER_NAME=0.0.0.0
+ENV GRADIO_SERVER_PORT=7860
+
 # Health check hits the FastAPI /health endpoint
-HEALTHCHECK --interval=30s --timeout=10s --start-period=30s --retries=3 \
+HEALTHCHECK --interval=30s --timeout=10s --start-period=60s --retries=3 \
     CMD curl -fsS http://127.0.0.1:7860/health || exit 1
 
-# Run the FastAPI server — exposes /reset /step /state for OpenEnv validators
-CMD ["python", "-m", "uvicorn", "data_cleaning_env.server.app:app", \
-     "--host", "0.0.0.0", "--port", "7860"]
+# Combined mode: Gradio UI at /ui + OpenEnv API at / (reset, step, state, health)
+CMD ["python", "app.py", "--hf"]

app.py

@@ -729,9 +729,34 @@ with gr.Blocks(title="AutoDataLab — E-commerce Data Analyst") as demo:
 if __name__ == "__main__":
     import argparse
     ap = argparse.ArgumentParser()
-    ap.add_argument("--share", action="store_true")
-    ap.add_argument("--port",  type=int, default=7861)
-    ap.add_argument("--host",  default="0.0.0.0")
+    ap.add_argument("--share",  action="store_true")
+    ap.add_argument("--port",   type=int, default=7861)
+    ap.add_argument("--host",   default="0.0.0.0")
+    ap.add_argument("--hf",     action="store_true", help="HF Spaces mode: mount OpenEnv API + Gradio on same port")
     args = ap.parse_args()
-    demo.launch(server_name=args.host, server_port=args.port,
-                share=args.share, inbrowser=not args.share, css=CSS)
+
+    hf_mode = args.hf or os.environ.get("SPACE_ID") is not None  # auto-detect HF Spaces
+
+    if hf_mode:
+        # Mount Gradio UI on top of the OpenEnv FastAPI app so both work on port 7860
+        import uvicorn
+        from data_cleaning_env.models import DataCleaningAction, DataCleaningObservation
+        from data_cleaning_env.server.data_cleaning_env_environment import DataCleaningEnvironment
+        try:
+            from openenv.core.env_server.http_server import create_app as create_openenv_app
+            openenv_fastapi = create_openenv_app(
+                DataCleaningEnvironment, DataCleaningAction, DataCleaningObservation,
+                env_name="data_cleaning_env",
+            )
+            # Mount Gradio at /ui; OpenEnv API stays at root (/, /reset, /step, /state, /health)
+            combined_app = gr.mount_gradio_app(openenv_fastapi, demo, path="/ui", css=CSS)
+            print("Running combined OpenEnv API + Gradio UI on port 7860")
+            print("  API:  http://0.0.0.0:7860/health")
+            print("  UI:   http://0.0.0.0:7860/ui")
+            uvicorn.run(combined_app, host="0.0.0.0", port=7860)
+        except Exception as e:
+            print(f"[warn] Could not mount OpenEnv app ({e}), falling back to Gradio-only")
+            demo.launch(server_name="0.0.0.0", server_port=7860, share=False, css=CSS)
+    else:
+        demo.launch(server_name=args.host, server_port=args.port,
+                    share=args.share, inbrowser=not args.share, css=CSS)