Merge pull request #28 from ESA-PhiLab/single-data-path-bug

Remove bug, improve syntax for model bands

Author: aliFrancis

iris/project.py

@@ -186,7 +186,7 @@ def _init_paths_and_files(self, filename):
             ]))
         except Exception as error:
             raise Exception(
-                f'[ERROR] Could not extract id\nfrom path"{image_path}"\nwith regex "{regex_images}"!'
+                f'[ERROR] Could not extract id\nfrom path"{image_paths}"\nwith regex "{regex_images}"!'
             )
 
 
@@ -307,7 +307,7 @@ def get_image_bands(self, image_id):
             if isinstance(image[band], dict):
                 bands.extend([f'${band}.{subband}' for subband in image[band]])
             else:
-                bands.append(f'${band}')
+                bands.append(f'{band}')
         return bands
 
     def get_image_path(self, image_id):

iris/user/__init__.py

@@ -137,11 +137,10 @@ def show(user_id):
 def config():
     config = project.get_user_config(flask.session['user_id'])
     all_bands = project.get_image_bands(project.image_ids[0])
-    config['segmentation']['ai_model']['bands'] = {
-        band
-        for band in all_bands
-        if config['segmentation']['ai_model']['bands'] is None or band in config['segmentation']['ai_model']['bands']
-    }
+
+    # If no specific bands set for model, use all bands:
+    if config['segmentation']['ai_model']['bands'] is None:
+        config['segmentation']['ai_model']['bands'] = all_bands
 
     return flask.render_template(
         'user/config.html', config=config, all_bands=all_bands