fix path errors on data upload

VITObelgium · Nov 7, 2024 · 83c2400 · 83c2400
1 parent b8ec095
commit 83c2400
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 3 deletions.
diff --git a/server/guppy/endpoints/endpoint_utils.py b/server/guppy/endpoints/endpoint_utils.py
@@ -202,7 +202,7 @@ def validate_layer_and_get_file_path(db: Session, layer_name: str) -> str:
         if not layer:
             raise HTTPException(status_code=404, detail=f"Layer not found: {layer_name}")
         file_path = layer.file_path
-        if not os.path.exists(file_path):
+        if file_path and not os.path.exists(file_path):
             raise HTTPException(status_code=404, detail=f"File not found: {file_path}")
         if file_path.endswith('.mbtiles') and os.path.exists(layer.data_path):
             file_path = layer.data_path

diff --git a/server/guppy/endpoints/endpoints_upload.py b/server/guppy/endpoints/endpoints_upload.py
@@ -45,7 +45,7 @@ def upload_file(layer_name: str, label: str, file: UploadFile, data: UploadFile
 
     if data:
         data_location, tmp_data_location = create_location_paths_and_check_if_exists(d_ext, sanitized_dataname, sanitized_layer_name, is_raster=True)
-        write_input_file_to_disk(data, tmp_data_location)
+        write_input_file_to_disk(data, data_location)
 
     is_mbtile = create_preprocessed_layer_file(ext, file_location, sanitized_filename, sanitized_layer_name, tmp_file_location, max_zoom)
 

diff --git a/server/guppy/endpoints/upload_utils.py b/server/guppy/endpoints/upload_utils.py
@@ -175,7 +175,7 @@ def create_location_paths_and_check_if_exists(ext: str, sanitized_filename: str,
 
     """
     if ext.lower() in ['.tif', '.tiff', '.asc', ]:
-        tmp_file_location = f"{cfg.deploy.content}/tifs/uploaded/{sanitized_layer_name}_{sanitized_filename}_tmp.{ext}"
+        tmp_file_location = f"{cfg.deploy.content}/tifs/uploaded/{sanitized_layer_name}_{sanitized_filename}_tmp{ext}"
         file_location = f"{cfg.deploy.content}/tifs/uploaded/{sanitized_layer_name}_{sanitized_filename}.tif"
         if os.path.exists(file_location):
             raise create_error(message=f"Upload failed: File {sanitized_layer_name}_{sanitized_filename}.tif already exists.", code=400)