Update app.py

app.py

@@ -791,19 +791,21 @@ def fetch_updated_state():
             logger.debug(f"{key}: String: {value}")
         else:
             logger.debug(f"{key}: Unsupported type: {value}")
-    response = requests.get("http://localhost:5000/state")
-    # Check the status code and the raw response
-    if response.status_code == 200:
-        try:
-            state = response.json()  # Try to parse JSON
-            return pd.DataFrame(state["project_desc_table"]), state["task_analysis_txt"], pd.DataFrame(state["execution_status"]), state["execution_results"]
-        except ValueError as e:
-            logger.error(f"JSON decoding failed: {e}")
-            logger.debug("Raw response body:", response.text)
-    else:
-        logger.error(f"Error: {response.status_code} - {response.text}")
-    """Fetch the updated shared state from FastAPI."""
-    return pd.DataFrame(), "", pd.DataFrame(), {}
+    return shared_state['project_desc_table'], shared_state['task_analysis_txt'], shared_state['execution_status'], shared_state['execution_results']
+    
+    # response = requests.get("http://localhost:5000/state")
+    # # Check the status code and the raw response
+    # if response.status_code == 200:
+    #     try:
+    #         state = response.json()  # Try to parse JSON
+    #         return pd.DataFrame(state["project_desc_table"]), state["task_analysis_txt"], pd.DataFrame(state["execution_status"]), state["execution_results"]
+    #     except ValueError as e:
+    #         logger.error(f"JSON decoding failed: {e}")
+    #         logger.debug("Raw response body:", response.text)
+    # else:
+    #     logger.error(f"Error: {response.status_code} - {response.text}")
+    # """Fetch the updated shared state from FastAPI."""
+    # return pd.DataFrame(), "", pd.DataFrame(), {}
     
 
 def update_gradio_state(project_desc_table, task_analysis_txt, execution_status, execution_results):
@@ -1161,39 +1163,72 @@ def create_gradio_interface(state=None):
     # Load function to initialize the state
     # demo.load(load_fn, inputs=None, outputs=[state])  # Initialize the state when the page is loaded
 
-# In[21]:
-demo = create_gradio_interface()
-# Use Gradio's `server_app` to get an ASGI app for Blocks
-gradio_asgi_app = demo.launch(share=False, inbrowser=False, server_name="0.0.0.0", server_port=7860, inline=False)
-
-logging.debug(f"Gradio version: {gr.__version__}")
-logging.debug(f"FastAPI version: {fastapi.__version__}")
-
-# Mount the Gradio ASGI app at "/gradio"
-app.mount("/gradio", gradio_asgi_app)
-
-# create a static directory to store the static files
-static_dir = Path('./static')
-static_dir.mkdir(parents=True, exist_ok=True)
+# Function to launch Gradio
+def launch_gradio():
+    demo = create_gradio_interface()
+    demo.launch(share=True, inline=False)  # Gradio in the foreground
 
-# mount FastAPI StaticFiles server
-app.mount("/static", StaticFiles(directory=static_dir), name="static")
+# Function to run FastAPI server using uvicorn in the background
+async def run_fastapi():
+    config = uvicorn.Config(app, host="0.0.0.0", port=5000, reload=True, log_level="debug")
+    server = uvicorn.Server(config)
+    await server.serve()
 
-# Dynamically check for the Gradio asset directory
-# gradio_assets_path = os.path.join(os.path.dirname(gr.__file__), "static")
-
-# if os.path.exists(gradio_assets_path):
-#     # If assets exist, mount them
-#     app.mount("/assets", StaticFiles(directory=gradio_assets_path), name="assets")
-# else:
-#     logging.error(f"Gradio assets directory not found at: {gradio_assets_path}")
-
-# Redirect from the root endpoint to the Gradio app
-@app.get("/", response_class=RedirectResponse)
+# FastAPI endpoint to display a message
+@app.get("/", response_class=HTMLResponse)
 async def index():
-    return RedirectResponse(url="/gradio", status_code=307)
+    return "FastAPI is running. Visit Gradio at the provided public URL."
+
+# Main entry point for the asynchronous execution
+async def main():
+    # Run Gradio in the foreground and FastAPI in the background
+    loop = asyncio.get_event_loop()
+    
+    # Run Gradio in a separate thread (non-blocking)
+    loop.run_in_executor(None, launch_gradio)
+    
+    # Run FastAPI in the background (asynchronous)
+    await run_fastapi()
 
-# Run the FastAPI server using uvicorn
 if __name__ == "__main__":
-    # port = int(os.getenv("PORT", 5000))  # Default to 7860 if PORT is not set
-    uvicorn.run(app, host="0.0.0.0", port=5000)
+    import nest_asyncio
+    nest_asyncio.apply()  # Allow nested use of asyncio event loops in Jupyter notebooks
+    
+    # Run the main function to launch both services concurrently
+    asyncio.run(main())
+# # In[21]:
+# demo = create_gradio_interface()
+# # Use Gradio's `server_app` to get an ASGI app for Blocks
+# gradio_asgi_app = demo.launch(share=False, inbrowser=False, server_name="0.0.0.0", server_port=7860, inline=False)
+
+# logging.debug(f"Gradio version: {gr.__version__}")
+# logging.debug(f"FastAPI version: {fastapi.__version__}")
+
+# # Mount the Gradio ASGI app at "/gradio"
+# app.mount("/gradio", gradio_asgi_app)
+
+# # create a static directory to store the static files
+# static_dir = Path('./static')
+# static_dir.mkdir(parents=True, exist_ok=True)
+
+# # mount FastAPI StaticFiles server
+# app.mount("/static", StaticFiles(directory=static_dir), name="static")
+
+# # Dynamically check for the Gradio asset directory
+# # gradio_assets_path = os.path.join(os.path.dirname(gr.__file__), "static")
+
+# # if os.path.exists(gradio_assets_path):
+# #     # If assets exist, mount them
+# #     app.mount("/assets", StaticFiles(directory=gradio_assets_path), name="assets")
+# # else:
+# #     logging.error(f"Gradio assets directory not found at: {gradio_assets_path}")
+
+# # Redirect from the root endpoint to the Gradio app
+# @app.get("/", response_class=RedirectResponse)
+# async def index():
+#     return RedirectResponse(url="/gradio", status_code=307)
+
+# # Run the FastAPI server using uvicorn
+# if __name__ == "__main__":
+#     # port = int(os.getenv("PORT", 5000))  # Default to 7860 if PORT is not set
+#     uvicorn.run(app, host="0.0.0.0", port=5000)