[refactor] rename predictor.py, move ROOT folder to /tmp to avoid RO filesystem errors

src/app.py

@@ -9,8 +9,8 @@ from geojson_pydantic import FeatureCollection, Feature, Polygon
 from pydantic import BaseModel, ValidationError
 
 from src import app_logger
-from src.prediction_api.predictor import base_predict
-from src.utilities.constants import CUSTOM_RESPONSE_MESSAGES, MODEL_NAME, ZOOM
+from src.prediction_api.samgeo_predictors import samgeo_fast_predict
+from src.utilities.constants import CUSTOM_RESPONSE_MESSAGES, MODEL_NAME, ZOOM, SOURCE_TYPE
 from src.utilities.utilities import base64_decode
 
 PolygonFeatureCollectionModel = FeatureCollection[Feature[Polygon, Dict]]
@@ -22,17 +22,18 @@ class LatLngTupleLeaflet(BaseModel):
 
 
 class RequestBody(BaseModel):
+    model: str = MODEL_NAME
     ne: LatLngTupleLeaflet
+    source_type: str = SOURCE_TYPE
     sw: LatLngTupleLeaflet
-    model: str = MODEL_NAME
     zoom: float = ZOOM
 
 
 class ResponseBody(BaseModel):
-    request_id: str = None
     duration_run: float = None
-    message: str = None
     geojson: Dict = None
+    message: str = None
+    request_id: str = None
 
 
 def get_response(status: int, start_time: float, request_id: str, response_body: ResponseBody = None) -> str:
@@ -67,15 +68,17 @@ def get_response(status: int, start_time: float, request_id: str, response_body:
 def get_parsed_bbox_points(request_input: RequestBody) -> Dict:
     model_name = request_input["model"] if "model" in request_input else MODEL_NAME
     zoom = request_input["zoom"] if "zoom" in request_input else ZOOM
+    source_type = request_input["source_type"] if "zoom" in request_input else SOURCE_TYPE
     app_logger.info(f"try to validate input request {request_input}...")
-    request_body = RequestBody(ne=request_input["ne"], sw=request_input["sw"], model=model_name, zoom=zoom)
+    request_body = RequestBody(ne=request_input["ne"], sw=request_input["sw"], model=model_name, zoom=zoom, source_type=source_type)
     return {
         "bbox": [
             request_body.ne.lat, request_body.sw.lat,
             request_body.ne.lng, request_body.sw.lng
         ],
         "model": request_body.model,
-        "zoom": request_body.zoom
+        "zoom": request_body.zoom,
+        "source_type": request_body.source_type
     }
 
 
@@ -108,7 +111,9 @@ def lambda_handler(event: dict, context: LambdaContext):
         try:
             body_request = get_parsed_bbox_points(body)
             app_logger.info(f"validation ok - body_request:{body_request}, starting prediction...")
-            output_geojson_dict = base_predict(bbox=body_request["bbox"], model_name=body_request["model"], zoom=body_request["zoom"])
+            output_geojson_dict = samgeo_fast_predict(
+                bbox=body_request["bbox"], model_name=body_request["model"], zoom=body_request["zoom"], source_type=body_request["source_type"]
+            )
 
             # raise ValidationError in case this is not a valid geojson by GeoJSON specification rfc7946
             PolygonFeatureCollectionModel(**output_geojson_dict)

src/prediction_api/{predictor.py → samgeo_predictors.py}

@@ -2,23 +2,23 @@
 import json
 
 from src import app_logger
-from src.utilities.constants import ROOT, MODEL_NAME, ZOOM
+from src.utilities.constants import ROOT, MODEL_NAME, ZOOM, SOURCE_TYPE
 from src.utilities.type_hints import input_floatlist, input_floatlist2
 
 
-def base_predict(bbox: input_floatlist, zoom: float = ZOOM, model_name: str = MODEL_NAME, root_folder: str = ROOT) -> dict:
+def samgeo_fast_predict(bbox: input_floatlist, zoom: float = ZOOM, model_name: str = MODEL_NAME, root_folder: str = ROOT, source_type: str = SOURCE_TYPE) -> dict:
     import tempfile
     from samgeo import tms_to_geotiff
     from samgeo.fast_sam import SamGeo
 
-    with tempfile.NamedTemporaryFile(prefix="satellite_", suffix=".tif", dir=root_folder) as image_input_tmp:
+    with tempfile.NamedTemporaryFile(prefix=f"{source_type}_", suffix=".tif", dir=root_folder) as image_input_tmp:
         app_logger.info(f"start tms_to_geotiff using bbox:{bbox}, type:{type(bbox)}, download image to {image_input_tmp.name} ...")
         for coord in bbox:
             app_logger.info(f"coord:{coord}, type:{type(coord)}.")
 
         # bbox: image input coordinate
-        tms_to_geotiff(output=image_input_tmp.name, bbox=bbox, zoom=zoom, source="Satellite", overwrite=True)
-        app_logger.info(f"geotiff created, start to initialize samgeo instance (read model {model_name} from {root_folder})...")
+        tms_to_geotiff(output=image_input_tmp.name, bbox=bbox, zoom=zoom, source=source_type, overwrite=True)
+        app_logger.info(f"geotiff created, start to initialize SamGeo instance (read model {model_name} from {root_folder})...")
 
         predictor = SamGeo(
             model_type=model_name,
@@ -26,7 +26,7 @@ def base_predict(bbox: input_floatlist, zoom: float = ZOOM, model_name: str = MO
             automatic=False,
             sam_kwargs=None,
         )
-        app_logger.info(f"initialized samgeo instance, start to use SamGeo.set_image({image_input_tmp.name})...")
+        app_logger.info(f"initialized SamGeo instance, start to use SamGeo.set_image({image_input_tmp.name})...")
         predictor.set_image(image_input_tmp.name)
 
         with tempfile.NamedTemporaryFile(prefix="output_", suffix=".tif", dir=root_folder) as image_output_tmp:

src/utilities/constants.py

@@ -2,7 +2,7 @@
 CHANNEL_EXAGGERATIONS_LIST = [2.5, 1.1, 2.0]
 INPUT_CRS_STRING = "EPSG:4326"
 OUTPUT_CRS_STRING = "EPSG:3857"
-ROOT = "/home/user"
+ROOT = "/tmp"
 NODATA_VALUES = -32768
 SKIP_CONDITIONS_LIST = [{"skip_key": "confidence", "skip_value": 0.5, "skip_condition": "major"}]
 FEATURE_SQUARE_TEMPLATE = [
@@ -24,3 +24,4 @@ CUSTOM_RESPONSE_MESSAGES = {
 }
 MODEL_NAME = "FastSAM-s.pt"
 ZOOM = 13
+SOURCE_TYPE = "Satellite"