Merge pull request #12 from digitalearthafrica/fix-plugin

Add error handling for `ValueError` for when conducting polygon drill
digitalearthafrica · Nov 1, 2023 · 6536649 · 6536649
2 parents a02a776 + 82e6611
commit 6536649
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 1 deletion.
diff --git a/deafrica_conflux/cli/run_from_queue.py b/deafrica_conflux/cli/run_from_queue.py
@@ -256,6 +256,15 @@ def run_from_sqs_queue(
                         sqs_client=sqs_client,
                     )
                     success_flag = False
+                except ValueError as valueerror:
+                    _log.exception(f"Found {dataset_id} has ValueError: {str(valueerror)}")
+                    _log.error(f"Moving {dataset_id} to deadletter queue {dead_letter_queue_url}")
+                    move_to_dead_letter_queue(
+                        dead_letter_queue_url=dead_letter_queue_url,
+                        message_body=dataset_id,
+                        sqs_client=sqs_client,
+                    )
+                    success_flag = False
             else:
                 _log.info(f"{dataset_id} already exists, skipping")
 

diff --git a/deafrica_conflux/cli/run_from_txt.py b/deafrica_conflux/cli/run_from_txt.py
@@ -210,6 +210,9 @@ def run_from_txt(
             except RasterioIOError as ioerror:
                 _log.exception(f"Found {dataset_id} has RasterioIOError: {str(ioerror)}")
                 failed_dataset_ids.append(dataset_id)
+            except ValueError as valueerror:
+                _log.exception(f"Found {dataset_id} has ValueError: {str(valueerror)}")
+                failed_dataset_ids.append(dataset_id)
             else:
                 _log.info(f"{dataset_id} successful")
         else:

diff --git a/deafrica_conflux/group_polygons.py b/deafrica_conflux/group_polygons.py
@@ -114,7 +114,7 @@ def split_polygons_by_region(
     # Filter to remove regions with no intersecting polygons.
     filtered_regions = [region for region in regions_ if region.iloc[0].intersecting_polygons_ids]
 
-    filtered_regions_gdf = pd.concat(filtered_regions, ignore_index=True)
+    filtered_regions_gdf = pd.concat(filtered_regions, ignore_index=False)
 
     if not check_dir_exists(output_directory):
         if check_if_s3_uri(output_directory):