Data lookup and crop fix

app.py

@@ -25,6 +25,7 @@ CONFIG = {}
 V = 1
 V_IGNORE = []  # Debug, Warning, Error
 MODEL_PATH = ""
+FARM_NAME = ""
 
 # ===============================================================================
 # The Main App
@@ -128,6 +129,7 @@ def find_model_path(real_path):
 )
 def update_session(farm_name, session):
     global MODEL_PATH
+    global FARM_NAME
     session = farm_name
     if farm_name is None or farm_name == "":
         session = ""
@@ -149,6 +151,7 @@ def update_session(farm_name, session):
 
         if os.path.exists(real_path):
             session = farm_name
+            FARM_NAME = farm_name
             image = SUCCESS_IMAGE
         else:
             session = ""
@@ -213,6 +216,7 @@ def get_analysis(
         list of dicts of analysis files
     """
     global MODEL_PATH
+    global FARM_NAME
     print("\nAnalysis callback triggered")
 
     if n_clicks == 0 or n_clicks is None:
@@ -233,6 +237,7 @@ def get_analysis(
         comparison="diff",
         output=None,
         match_raster=None,
+        farm_name=FARM_NAME,
     )
 
     print(MODEL_PATH)

libs/dashapp.py

@@ -72,11 +72,11 @@ def read_shape_file(
     return geo_df
 
 
-def find_match_raster(model_path):
+def find_match_raster(model_path, farm_name):
     # navigate one directory up in model_path
-    root = os.path.dirname(model_path)
-    root = os.path.dirname(root)
-    root = os.path.dirname(root)
+    while not os.path.basename(model_path) == farm_name:
+        model_path = os.path.dirname(model_path)
+    root = model_path
     print("Looking for a matching raster in:", root)
     for root, dirs, _ in os.walk(root):
         # print(root,dirs,"\n\n")
@@ -91,11 +91,12 @@ def find_match_raster(model_path):
     return None
 
 
-def find_shape_file(model_path):
-    # navigate one directory up in model_path
-    root = os.path.dirname(model_path)
-    root = os.path.dirname(root)
-    root = os.path.dirname(root)
+def find_shape_file(model_path, farm_name):
+    # navigate one directory up in model_path until you reach the farm_name directory
+    while not os.path.basename(model_path) == farm_name:
+        model_path = os.path.dirname(model_path)
+    print("Looking for a shape file in:", model_path)
+    root = model_path
     print("Looking for a shape file in:", root)
     for root, dirs, files in os.walk(root):
         # print(root,dirs,"\n\n")
@@ -327,6 +328,7 @@ def analyse(
     output: str = None,
     agg_history: str = "mean",
     agg_window: str = "mean",
+    farm_name: str = None,
     **kwargs,
 ) -> Dict[str, str]:
     """Main function to run the script.
@@ -351,6 +353,8 @@ def analyse(
         Aggregation method to use for the historic years. Possible values: 'mean', 'median', 'max', 'min', 'std', None. Default: 'mean'.
     agg_window : str
         Aggregation method to use for the window. Possible values: 'mean', 'median', 'max', 'min', 'std', None. Default: 'mean'.
+    farm_name : str
+        Name of the farm. Should be provided. Default: None.
 
     Returns
     -------
@@ -366,7 +370,7 @@ def analyse(
         os.makedirs(output)
 
     if match_raster is None:
-        match_raster = find_match_raster(input)
+        match_raster = find_match_raster(input, farm_name)
     print("match_raster is:", match_raster)
 
     if match_raster is not None:
@@ -471,7 +475,7 @@ def analyse(
     )
 
     # Search for a shape file ending with .shp
-    shape_file = find_shape_file(input)
+    shape_file = find_shape_file(input, farm_name)
     print("Shape file:", shape_file)
 
     # Save the rasters
@@ -510,86 +514,80 @@ def analyse(
         try:
             with fiona.open(shape_file, "r") as shapefile:
                 shapes = [feature["geometry"] for feature in shapefile]
+        except Exception as e:
+            print("Error reading shape file:", e)
 
-            try:
-                with rasterio.open(historic_raster) as src:
-                    out_image, transformed = rasterio.mask.mask(
-                        src, shapes, crop=True, filled=True
-                    )
-                    out_profile = src.profile.copy()
-                out_profile.update(
-                    {
-                        "width": out_image.shape[2],
-                        "height": out_image.shape[1],
-                        "transform": transformed,
-                    }
-                )
-                with rasterio.open(historic_raster, "w", **out_profile) as dst:
-                    dst.write(out_image)
-            except Exception as e:
-                print("Failed to crop historic raster", historic_raster)
-                print(e)
-
-            try:
-                with rasterio.open(current_raster) as src:
-                    out_image, transformed = rasterio.mask.mask(
-                        src, shapes, crop=True, filled=True
-                    )
-                    out_profile = src.profile.copy()
-                out_profile.update(
-                    {
-                        "width": out_image.shape[2],
-                        "height": out_image.shape[1],
-                        "transform": transformed,
-                    }
+        try:
+            with rasterio.open(historic_raster) as src:
+                out_image, transformed = rasterio.mask.mask(
+                    src, shapes, crop=True, filled=True
                 )
-                with rasterio.open(current_raster, "w", **out_profile) as dst:
-                    dst.write(out_image)
-            except Exception as e:
-                print("Failed to crop current raster", current_raster)
-                print(e)
-
-            try:
-                with rasterio.open(delta_raster) as src:
-                    out_image, transformed = rasterio.mask.mask(
-                        src, shapes, crop=True, filled=True
-                    )
-                    out_profile = src.profile.copy()
-                out_profile.update(
-                    {
-                        "width": out_image.shape[2],
-                        "height": out_image.shape[1],
-                        "transform": transformed,
-                    }
+                out_profile = src.profile.copy()
+            out_profile.update(
+                {
+                    "width": out_image.shape[2],
+                    "height": out_image.shape[1],
+                    "transform": transformed,
+                }
+            )
+            with rasterio.open(historic_raster, "w", **out_profile) as dst:
+                dst.write(out_image)
+        except Exception as e:
+            print("Error clipping historic raster:", e)
+
+        try:
+            with rasterio.open(current_raster) as src:
+                out_image, transformed = rasterio.mask.mask(
+                    src, shapes, crop=True, filled=True
                 )
-                with rasterio.open(delta_raster, "w", **out_profile) as dst:
-                    dst.write(out_image)
-            except Exception as e:
-                print("Failed to crop delta raster", delta_raster)
-                print(e)
-
-            try:
-                with rasterio.open(quant_raster) as src:
-                    out_image, transformed = rasterio.mask.mask(
-                        src, shapes, crop=True, filled=True
-                    )
-                    out_profile = src.profile.copy()
-                out_profile.update(
-                    {
-                        "width": out_image.shape[2],
-                        "height": out_image.shape[1],
-                        "transform": transformed,
-                    }
+                out_profile = src.profile.copy()
+            out_profile.update(
+                {
+                    "width": out_image.shape[2],
+                    "height": out_image.shape[1],
+                    "transform": transformed,
+                }
+            )
+            with rasterio.open(current_raster, "w", **out_profile) as dst:
+                dst.write(out_image)
+        except Exception as e:
+            print("Error clipping current raster:", e)
+
+        try:
+            with rasterio.open(delta_raster) as src:
+                out_image, transformed = rasterio.mask.mask(
+                    src, shapes, crop=True, filled=True
                 )
-                with rasterio.open(quant_raster, "w", **out_profile) as dst:
-                    dst.write(out_image)
-            except Exception as e:
-                print("Failed to crop quantile raster", quant_raster)
-                print(e)
+                out_profile = src.profile.copy()
+            out_profile.update(
+                {
+                    "width": out_image.shape[2],
+                    "height": out_image.shape[1],
+                    "transform": transformed,
+                }
+            )
+            with rasterio.open(delta_raster, "w", **out_profile) as dst:
+                dst.write(out_image)
+        except Exception as e:
+            print("Error clipping delta raster:", e)
 
+        try:
+            with rasterio.open(quant_raster) as src:
+                out_image, transformed = rasterio.mask.mask(
+                    src, shapes, crop=True, filled=True
+                )
+                out_profile = src.profile.copy()
+            out_profile.update(
+                {
+                    "width": out_image.shape[2],
+                    "height": out_image.shape[1],
+                    "transform": transformed,
+                }
+            )
+            with rasterio.open(quant_raster, "w", **out_profile) as dst:
+                dst.write(out_image)
         except Exception as e:
-            print("Could not open shape file:", shape_file)
-            print(e)
+            print("Error clipping quantile raster:", e)
 
         # current_data, _ = rasterio.mask.mask(current_data, shapes, crop=True)
         # historic_data, _ = rasterio.mask.mask(historic_data, shapes, crop=True)
@@ -663,6 +661,7 @@ def perform_analysis(
     agg_history: str = "mean",
     agg_window: str = "mean",
     comparison: str = "diff",
+    farm_name: str = None,
     **args,
 ) -> Dict[str, str]:
     """Perform the analysis.
@@ -708,6 +707,7 @@ def perform_analysis(
         layer=layer,
         output=output,
         match_raster=match_raster,
+        farm_name=farm_name,
     )
     return files