chore: Updating long execution name generation (#408)

* Updating execution name * Fixes db test
chanzuckerberg · Jan 13, 2025 · 9517e81 · 9517e81
1 parent 32bde07
commit 9517e81
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 3 deletions.
diff --git a/ingestion_tools/scripts/enqueue_runs.py b/ingestion_tools/scripts/enqueue_runs.py
@@ -443,11 +443,13 @@ def queue(
 
                     dataset_id = dataset.name
                     deposition_id = deposition.name
-                    execution_name = f"{int(time.time())}-dep{deposition_id}-ds{dataset_id}-run{run.name}"
+                    prefix = f"{int(time.time())}-dep{deposition_id}-ds{dataset_id}"
+                    execution_name = f"{prefix}-run{run.name}"
 
                     # execution name greater than 80 chars causes boto ValidationException
                     if len(execution_name) > 80:
-                        execution_name = execution_name[-80:]
+                        run_size = 80 - len(prefix)
+                        execution_name = f"{prefix}-run{run.name[-run_size:]}"
 
                     wdl_args = {
                         "config_file": config_file,

diff --git a/ingestion_tools/scripts/tests/db_import/test_db_tomo_import.py b/ingestion_tools/scripts/tests/db_import/test_db_tomo_import.py
@@ -63,7 +63,7 @@ def expected_tomograms_by_run(http_prefix: str) -> dict[str, dict[float, list[di
         "voxel_spacing": 12.3,
         "fiducial_alignment_status": "FIDUCIAL",
         "reconstruction_method": "WBP",
-        "reconstruction_software": "IMOD",
+        "reconstruction_software": "AreTomo 1.0",
         "processing": "raw",
         "processing_software": "tomo3D",
         "tomogram_version": "1",