Spaces:

dschandra
/

Civil_Work_Planner

Sleeping

App Files Files Community

dschandra commited on 20 days ago

Commit

29da1ae

verified ·

1 Parent(s): f7261de

Update app.py

Browse files

Files changed (1) hide show

app.py +58 -29

app.py CHANGED Viewed

@@ -13,7 +13,7 @@ from reportlab.lib.pagesizes import letter
 from reportlab.pdfgen import canvas
 from fastapi import FastAPI, Form, File, UploadFile
 from fastapi.middleware.cors import CORSMiddleware
-from fastapi.responses import JSONResponse
 from fastapi.staticfiles import StaticFiles
 from dotenv import load_dotenv
@@ -314,7 +314,7 @@ def gradio_interface(boq_file, weather, workforce, location, project_title):
         if not update_result:
             logger.warning("Failed to update record with PDF URL, but record was created")
-        image_content_id = upload_file_to_salesforce(fileLf_path, f"{project_title}_Gantt_Chart.png", record_id)
         image_url = None
         if image_content_id:
             sf = get_salesforce_connection()
@@ -332,31 +332,6 @@ def gradio_interface(boq_file, weather, workforce, location, project_title):
             shutil.rmtree(temp_dir)
             logger.debug(f"Cleaned up temporary directory: {temp_dir}")
-# Create Gradio interface
-demo = gr.Blocks(theme="default")
-with demo:
-    gr.Markdown("## AI Civil Work Planner")
-    gr.Markdown("Generate a project timeline (Gantt chart) and risk tags based on BOQ data and site parameters.")
-    with gr.Row():
-        with gr.Column():
-            boq_file = gr.File(label="Upload BOQ Data (CSV format)")
-            weather = gr.Dropdown(label="Weather", choices=["sunny", "rainy", "cloudy"], value="sunny")
-            workforce = gr.Number(label="Workforce Size", value=10, precision=0)
-            location = gr.Textbox(label="Location", placeholder="Enter project location")
-            project_title = gr.Textbox(label="Project Title", placeholder="Enter project title")
-            submit_btn = gr.Button("Generate Timeline")
-        with gr.Column():
-            output_image = gr.Image(label="Gantt Chart")
-            risk_tags = gr.Textbox(label="Risk Tags and Salesforce Status")
-    submit_btn.click(
-        fn=gradio_interface,
-        inputs=[boq_file, weather, workforce, location, project_title],
-        outputs=[output_image, risk_tags],
-    )
 # Create a FastAPI app with CORS support
 app = FastAPI()
 app.add_middleware(
@@ -370,6 +345,32 @@ app.add_middleware(
 # Mount directory for temporary files (e.g., Gantt chart PNGs)
 app.mount("/static", StaticFiles(directory=tempfile.gettempdir()), name="static")
 # Health check endpoint to verify server status
 @app.get("/health")
 async def health_check():
@@ -475,6 +476,34 @@ async def api_gradio_interface(
             shutil.rmtree(temp_dir)
             logger.debug(f"Cleaned up temporary directory: {temp_dir}")
 if __name__ == "__main__":
-    # Run Gradio UI
-    demo.launch(server_name="0.0.0.0", server_port=7860)

 from reportlab.pdfgen import canvas
 from fastapi import FastAPI, Form, File, UploadFile
 from fastapi.middleware.cors import CORSMiddleware
+from fastapi.responses import JSONResponse, HTMLResponse
 from fastapi.staticfiles import StaticFiles
 from dotenv import load_dotenv
         if not update_result:
             logger.warning("Failed to update record with PDF URL, but record was created")
+        image_content_id = upload_file_to_salesforce(file_path, f"{project_title}_Gantt_Chart.png", record_id)
         image_url = None
         if image_content_id:
             sf = get_salesforce_connection()
             shutil.rmtree(temp_dir)
             logger.debug(f"Cleaned up temporary directory: {temp_dir}")
 # Create a FastAPI app with CORS support
 app = FastAPI()
 app.add_middleware(
 # Mount directory for temporary files (e.g., Gantt chart PNGs)
 app.mount("/static", StaticFiles(directory=tempfile.gettempdir()), name="static")
+# Fallback route for root path (in case Gradio is not used)
+@app.get("/", response_class=HTMLResponse)
+async def root():
+    return """
+    <html>
+        <head>
+            <title>AI Civil Work Planner API</title>
+        </head>
+        <body>
+            <h1>AI Civil Work Planner API</h1>
+            <p>The web interface is available via Gradio or use the API endpoint at <code>/api/gradio_interface</code>.</p>
+            <p>Example using curl:</p>
+            <pre>
+curl -X POST \
+  -F "boq_file=@path/to/your/boq_data.csv" \
+  -F "weather=sunny" \
+  -F "workforce=10" \
+  -F "location=New York" \
+  -F "project_title=Test Project" \
+  http://your-server:7860/api/gradio_interface
+            </pre>
+            <p>For more details, contact the administrator.</p>
+        </body>
+    </html>
+    """
 # Health check endpoint to verify server status
 @app.get("/health")
 async def health_check():
             shutil.rmtree(temp_dir)
             logger.debug(f"Cleaned up temporary directory: {temp_dir}")
+# Create Gradio interface
+demo = gr.Blocks(theme="default")
+with demo:
+    gr.Markdown("## AI Civil Work Planner")
+    gr.Markdown("Generate a project timeline (Gantt chart) and risk tags based on BOQ data and site parameters.")
+    with gr.Row():
+        with gr.Column():
+            boq_file = gr.File(label="Upload BOQ Data (CSV format)")
+            weather = gr.Dropdown(label="Weather", choices=["sunny", "rainy", "cloudy"], value="sunny")
+            workforce = gr.Number(label="Workforce Size", value=10, precision=0)
+            location = gr.Textbox(label="Location", placeholder="Enter project location")
+            project_title = gr.Textbox(label="Project Title", placeholder="Enter project title")
+            submit_btn = gr.Button("Generate Timeline")
+        with gr.Column():
+            output_image = gr.Image(label="Gantt Chart")
+            risk_tags = gr.Textbox(label="Risk Tags and Salesforce Status")
+    submit_btn.click(
+        fn=gradio_interface,
+        inputs=[boq_file, weather, workforce, location, project_title],
+        outputs=[output_image, risk_tags],
+    )
+# Mount Gradio app on FastAPI
+app = gr.mount_gradio_app(app, demo, path="/gradio")
 if __name__ == "__main__":
+    import uvicorn
+    uvicorn.run(app, host="0.0.0.0", port=7860)