Merge branch 'main' of github.com:weecology/BOEM into main

weecology · Nov 27, 2024 · 0167774 · 0167774
2 parents 776027e + 073c904
commit 0167774
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 5 deletions.
diff --git a/conf/config.yaml b/conf/config.yaml
@@ -62,11 +62,12 @@ pipeline_evaluation:
   image_dir:
 
 reporting:
-  image_dir:
-  report_dir:
+  image_dir: /blue/ewhite/b.weinstein/BOEM/reporting/samples
+  report_dir: /blue/ewhite/b.weinstein/BOEM/reporting/reports
+  metadata_dir: /blue/ewhite/b.weinstein/BOEM/reporting/metadata
 
 active_learning:
-  image_dir: /blue/ewhite/b.weinstein/BOEM/sample_flight/JPG_2024_Jan27/annotated
+  image_dir: /blue/ewhite/b.weinstein/BOEM/sample_flight/JPG_2024_Jan27
   strategy: 'target-labels'
   n_images: 10
   patch_size: 2000
@@ -82,7 +83,7 @@ active_learning:
   pool_limit: 500
 
 active_testing:
-  image_dir: /blue/ewhite/b.weinstein/BOEM/sample_flight/JPG_2024_Jan27/annotated
+  image_dir: /blue/ewhite/b.weinstein/BOEM/sample_flight/JPG_2024_Jan27
   strategy: 'random'
   n_images: 10
   m: 

diff --git a/src/pipeline.py b/src/pipeline.py
@@ -45,10 +45,11 @@ def run(self):
                 annotated_images_dir=self.config.label_studio.annotated_images_dir,
             )
             if new_annotations is None:
-                print("No new annotations, exiting")
                 if self.config.force_upload:
+                    print("No new annotations, but force_upload is set to True, continuing")
                     self.skip_training = True
                 else:
+                    print("No new annotations, exiting")
                     return None
             else:   
                 print(f"New annotations found: {len(new_annotations)}")