Update main.py

main.py

@@ -2,15 +2,18 @@
 from fastapi import FastAPI, File, UploadFile, HTTPException, Request
 from fastapi.responses import StreamingResponse, HTMLResponse
 from fastapi.templating import Jinja2Templates
-from pydantic import BaseModel, field_validator
-from typing import Optional, Dict
+from fastapi.staticfiles import StaticFiles
+from typing import Dict
 import pandas as pd
 import io
 import asyncio
+import numpy as np
 from concurrent.futures import ThreadPoolExecutor
 
+from api.models import SingleAssessment
+from api.batch import process_single_row, process_single_row_multihazard
 from spatial_queries import get_terrain_metrics, distance_to_water
-from vulnerability import calculate_vulnerability_index
+from vulnerability import calculate_vulnerability_index, calculate_multi_hazard_vulnerability
 from gee_auth import initialize_gee
 from height_predictor.inference import get_predictor
 from height_predictor.get_height_gba import GlobalBuildingAtlasHeight
@@ -34,6 +37,9 @@ except Exception as e:
 # APP INITIALIZATION
 app = FastAPI(title="Flood Vulnerability Assessment API", version="1.0")
 
+# Mount static files directory
+app.mount("/static", StaticFiles(directory="static"), name="static")
+
 # Frontend templates setup
 templates = Jinja2Templates(directory="templates")
 
@@ -43,35 +49,6 @@ executor = ThreadPoolExecutor(max_workers=10)
 gba_getter = GlobalBuildingAtlasHeight()
 
 
-# DATA MODEL
-class SingleAssessment(BaseModel):
-    latitude: float
-    longitude: float
-    height: Optional[float] = 0.0
-    basement: Optional[float] = 0.0
-
-    @field_validator('latitude')
-    @classmethod
-    def check_lat(cls, v: float) -> float:
-        if not -90 <= v <= 90:
-            raise ValueError('Latitude must be between -90 and 90')
-        return v
-
-    @field_validator('longitude')
-    @classmethod
-    def check_lon(cls, v: float) -> float:
-        if not -180 <= v <= 180:
-            raise ValueError('Longitude must be between -180 and 180')
-        return v
-
-    @field_validator('basement')
-    @classmethod
-    def check_basement(cls, v: float) -> float:
-        if v > 0:
-            raise ValueError('Basement height must be 0 or negative (e.g., -1, -2, -3)')
-        return v
-
-
 # FRONTEND ROUTE
 @app.get("/", response_class=HTMLResponse)
 async def home(request: Request):
@@ -143,81 +120,7 @@ async def predict_height(data: SingleAssessment) -> Dict:
         raise HTTPException(status_code=500, detail=str(e))
 
 
-def process_single_row(row, use_predicted_height=False, use_gba_height=False):
-    """Process a single row from CSV - used for parallel processing."""
-    try:
-        lat = row['latitude']
-        lon = row['longitude']
-        height = row.get('height', 0.0)
-        basement = row.get('basement', 0.0)
-        if use_gba_height:
-            try:
-                result = gba_getter.get_height_m(lat, lon, buffer_m=5.0)
-                if result.get('status') == 'success' and result.get('predicted_height') is not None:
-                    h = result['predicted_height']
-                    if h >= 0:  # Only use valid positive heights
-                        height = h
-            except Exception as e:
-                print(f"GBA height failed for {lat},{lon}: {e}")
-        elif use_predicted_height:
-            try:
-                predictor = get_predictor()
-                pred = predictor.predict_from_coordinates(lat, lon)
-                if pred['status'] == 'success' and pred['predicted_height'] is not None:
-                     height = pred['predicted_height']
-            except Exception as e:
-                print(f"Height prediction failed for {lat},{lon}: {e}")
-
-        terrain = get_terrain_metrics(lat, lon)
-        water_dist = distance_to_water(lat, lon)
-
-        result = calculate_vulnerability_index(
-            lat=lat,
-            lon=lon,
-            height=height,
-            basement=basement,
-            terrain_metrics=terrain,
-            water_distance=water_dist
-        )
-
-        # CSV output - essential columns
-        return {
-            'latitude': lat,
-            'longitude': lon,
-            'height': height,
-            'basement': basement,
-            'vulnerability_index': result['vulnerability_index'],
-            'ci_lower_95': result['confidence_interval']['lower_bound_95'],
-            'ci_upper_95': result['confidence_interval']['upper_bound_95'],
-            'vulnerability_level': result['risk_level'],
-            'confidence': result['uncertainty_analysis']['confidence'],
-            'confidence_interpretation': result['uncertainty_analysis']['interpretation'],
-            'elevation_m': result['elevation_m'],
-            'tpi_m': result['relative_elevation_m'],
-            'slope_degrees': result['slope_degrees'],
-            'distance_to_water_m': result['distance_to_water_m'],
-            'quality_flags': ','.join(result['uncertainty_analysis']['data_quality_flags']) if result['uncertainty_analysis']['data_quality_flags'] else ''
-        }
-
-    except Exception as e:
-        return {
-            'latitude': row.get('latitude'),
-            'longitude': row.get('longitude'),
-            'height': row.get('height', 0.0),
-            'basement': row.get('basement', 0.0),
-            'error': str(e),
-            'vulnerability_index': None,
-            'ci_lower_95': None,
-            'ci_upper_95': None,
-            'risk_level': None,
-            'confidence': None,
-            'confidence_interpretation': None,
-            'elevation_m': None,
-            'tpi_m': None,
-            'slope_degrees': None,
-            'distance_to_water_m': None,
-            'quality_flags': ''
-        }
+# Batch processing functions moved to api/batch.py
 
 
 @app.post("/assess_batch")
@@ -232,8 +135,6 @@ async def assess_batch(file: UploadFile = File(...), use_predicted_height:bool=F
                 status_code=400,
                 detail="CSV must contain 'latitude' and 'longitude' columns"
             )
-
-        import numpy as np
         df = df[(np.abs(df['latitude']) <= 90) & (np.abs(df['longitude']) <= 180)]
         if len(df) == 0:
             raise HTTPException(status_code=400, detail="No valid coordinates in CSV (lat -90..90, lon -180..180)")
@@ -280,7 +181,6 @@ async def assess_batch_multihazard(file: UploadFile = File(...), use_predicted_h
             )
 
         loop = asyncio.get_event_loop()
-        from vulnerability import calculate_multi_hazard_vulnerability
         results = await loop.run_in_executor(
             executor,
             lambda: [process_single_row_multihazard(row, use_predicted_height, use_gba_height) for _, row in df.iterrows()]
@@ -345,79 +245,7 @@ async def explain_assessment(data: SingleAssessment) -> Dict:
         raise HTTPException(status_code=500, detail=f"Assessment failed: {e}")
 
 
-def process_single_row_multihazard(row, use_predicted_height=False, use_gba_height=False):
-    """Process a single row with multi-hazard assessment."""
-    try:
-        from vulnerability import calculate_multi_hazard_vulnerability
-
-        lat = row['latitude']
-        lon = row['longitude']
-        height = row.get('height', 0.0)
-        basement = row.get('basement', 0.0)
-
-        if use_gba_height:
-            try:
-                result = gba_getter.get_height_m(lat, lon, buffer_m=5.0)
-                if result.get('status') == 'success' and result.get('predicted_height') is not None:
-                    h = result['predicted_height']
-                    if h >= 0:  # Only use valid positive heights
-                        height = h
-            except Exception as e:
-                print(f"GBA height failed for {lat},{lon}: {e}")
-        elif use_predicted_height:
-             try:
-                predictor = get_predictor()
-                pred = predictor.predict_from_coordinates(lat, lon)
-                if pred['status'] == 'success' and pred['predicted_height'] is not None:
-                    height = pred['predicted_height']
-             except Exception as e:
-                print(f"Height prediction failed for {lat},{lon}: {e}")
-
-        terrain = get_terrain_metrics(lat, lon)
-        water_dist = distance_to_water(lat, lon)
-
-        result = calculate_multi_hazard_vulnerability(
-            lat=lat,
-            lon=lon,
-            height=height,
-            basement=basement,
-            terrain_metrics=terrain,
-            water_distance=water_dist
-        )
-
-        return {
-            'latitude': lat,
-            'longitude': lon,
-            'height': height,
-            'basement': basement,
-            'vulnerability_index': result['vulnerability_index'],
-            'ci_lower_95': result['confidence_interval']['lower_bound_95'],
-            'ci_upper_95': result['confidence_interval']['upper_bound_95'],
-            'vulnerability_level': result['risk_level'],
-            'confidence': result['uncertainty_analysis']['confidence'],
-            'confidence_interpretation': result['uncertainty_analysis']['interpretation'],
-            'elevation_m': result['elevation_m'],
-            'tpi_m': result['relative_elevation_m'],
-            'slope_degrees': result['slope_degrees'],
-            'distance_to_water_m': result['distance_to_water_m'],
-            'dominant_hazard': result['dominant_hazard'],
-            'fluvial_risk': result['hazard_breakdown']['fluvial_riverine'],
-            'coastal_risk': result['hazard_breakdown']['coastal_surge'],
-            'pluvial_risk': result['hazard_breakdown']['pluvial_drainage'],
-            'combined_risk': result['hazard_breakdown']['combined_index'],
-            'quality_flags': ','.join(result['uncertainty_analysis']['data_quality_flags'])
-                     if result['uncertainty_analysis']['data_quality_flags'] else ''
-        }
-
-    except Exception as e:
-        return {
-            'latitude': row.get('latitude'),
-            'longitude': row.get('longitude'),
-            'height': row.get('height', 0.0),
-            'basement': row.get('basement', 0.0),
-            'error': str(e),
-            'vulnerability_index': None
-        }
+# Multi-hazard batch processing moved to api/batch.py
 
 
 @app.post("/assess_multihazard")
@@ -426,7 +254,6 @@ async def assess_multihazard(data: SingleAssessment) -> Dict:
     loop = asyncio.get_event_loop()
 
     try:
-        from vulnerability import calculate_multi_hazard_vulnerability
 
         # Run slow terrain + water queries in a background thread
         terrain, water_dist = await loop.run_in_executor(