Merge pull request #420 from AllenNeuralDynamics/release-v2.1.2

release v2.1.2

Author: jtyoung84

src/aind_data_transfer_service/__init__.py

@@ -8,7 +8,7 @@
 import yaml
 from pythonjsonlogger import json as log_json
 
-__version__ = "2.1.1"
+__version__ = "2.1.2"
 
 
 # We want to standardize the timestamp format to UTC and ISO-8601, which

src/aind_data_transfer_service/log_handler.py

@@ -1,9 +1,12 @@
 """Module to handle logging submit job requests"""
 
 import logging
+from datetime import datetime
 from enum import Enum
 from typing import Any
 
+from aind_data_schema_models.data_name_patterns import build_data_name
+
 
 class EventType(str, Enum):
     """Enum for event types in structured logging"""
@@ -13,6 +16,22 @@ class EventType(str, Enum):
     STAGE_FAILURE = "stage_failure"
 
 
+def compute_label(upload_job: dict) -> str:
+    """Hack to compute acquisition_name from raw user input. This can be
+    cleaned up in the next major release."""
+    subject_id = upload_job.get("subject_id")
+    acq_datetime = datetime.fromisoformat(upload_job.get("acq_datetime"))
+    platform = upload_job.get("platform")
+    if platform is not None:
+        label = f"{platform['abbreviation']}_{subject_id}"
+    else:
+        label = subject_id
+    return build_data_name(
+        label=label,
+        creation_datetime=acq_datetime,
+    )
+
+
 def log_submit_job_request(
     content: Any, event_type: EventType | None = None
 ) -> None:
@@ -35,7 +54,7 @@ def log_submit_job_request(
     ):
         for row in upload_jobs:
             subject_id = row.get("subject_id")
-            acquisition_name = row.get("s3_prefix")
+            acquisition_name = compute_label(row)
             extra_info = {
                 "subject_id": subject_id,
                 "acquisition_name": acquisition_name,

tests/test_log_handler.py

@@ -20,7 +20,9 @@ class TestLogHandler(unittest.TestCase):
     def test_log_submit_job_request(self, mock_log: MagicMock):
         """Tests log_submit_job_request"""
         content = {
-            "upload_jobs": [{"s3_prefix": "abc-123", "subject_id": "123456"}]
+            "upload_jobs": [
+                {"acq_datetime": "2026-10-10T00:01:02", "subject_id": "123456"}
+            ]
         }
         log_submit_job_request(
             content=content, event_type=EventType.STAGE_START
@@ -30,7 +32,7 @@ def test_log_submit_job_request(self, mock_log: MagicMock):
             extra={
                 "event_type": EventType.STAGE_START,
                 "subject_id": "123456",
-                "acquisition_name": "abc-123",
+                "acquisition_name": "123456_2026-10-10_00-01-02",
             },
         )