Release v1.18.0

.github/workflows/run_dev_tests.yml

@@ -10,7 +10,7 @@ jobs:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        python-version: [ '3.9', '3.10', '3.11' ]
+        python-version: [ '3.10', '3.11', '3.12' ]
     steps:
     - uses: actions/checkout@v4
     - name: Set up Python ${{ matrix.python-version }}

.github/workflows/run_main_tests.yml

@@ -11,7 +11,7 @@ jobs:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        python-version: [ '3.9', '3.10', '3.11' ]
+        python-version: [ '3.10', '3.11', '3.12' ]
     steps:
     - uses: actions/checkout@v4
     - name: Set up Python ${{ matrix.python-version }}

docker-compose.yml

@@ -0,0 +1,13 @@
+services:
+  aind-data-transfer-service-v2-local:
+    build: ./
+    ports:
+      - "5000:5000"
+    expose:
+      - "5000"
+    depends_on:
+      - aind-data-transfer-service-v1
+    env_file: "env/local.env"
+  aind-data-transfer-service-v1:
+    image: "ghcr.io/allenneuraldynamics/aind-data-transfer-service:1.17.2"
+    env_file: "env/legacy.env"

docs/examples/basic_upload.py

@@ -7,6 +7,9 @@
 
 import requests
 from aind_data_schema_models.modalities import Modality
+
+# Note, the platform field is optional and will be deprecated. If adding a
+# platform please use aind-data-transfer-service <= 1.17.2
 from aind_data_schema_models.platforms import Platform
 
 from aind_data_transfer_service.models.core import (

docs/examples/behavior_videos_compression.py

@@ -8,6 +8,9 @@
 
 import requests
 from aind_data_schema_models.modalities import Modality
+
+# Note, the platform field is optional and will be deprecated. If adding a
+# platform please use aind-data-transfer-service <= 1.17.2
 from aind_data_schema_models.platforms import Platform
 
 from aind_data_transfer_service.models.core import (

docs/examples/custom_codeocean_pipeline_settings.py

@@ -8,6 +8,9 @@
 
 import requests
 from aind_data_schema_models.modalities import Modality
+
+# Note, the platform field is optional and will be deprecated. If adding a
+# platform please use aind-data-transfer-service <= 1.17.2
 from aind_data_schema_models.platforms import Platform
 
 from aind_data_transfer_service.models.core import (

docs/examples/custom_metadata_mapper_settings.py

@@ -9,14 +9,19 @@
 
 import requests
 from aind_data_schema_models.modalities import Modality
+
+# Note, the platform field is optional and will be deprecated. If adding a
+# platform please use aind-data-transfer-service <= 1.17.2
 from aind_data_schema_models.platforms import Platform
 from aind_metadata_mapper.bergamo.models import (
     JobSettings as BergamoSessionSettings,
 )
 from aind_metadata_mapper.models import (
     JobSettings as GatherMetadataJobSettings,
 )
-from aind_metadata_mapper.models import SessionSettings
+from aind_metadata_mapper.models import (
+    SessionSettings,
+)
 
 from aind_data_transfer_service.models.core import (
     SubmitJobRequestV2,

docs/examples/hcr_example.py

@@ -4,6 +4,9 @@
 
 import requests
 from aind_data_schema_models.modalities import Modality
+
+# Note, the platform field is optional and will be deprecated. If adding a
+# platform please use aind-data-transfer-service <= 1.17.2
 from aind_data_schema_models.platforms import Platform
 
 from aind_data_transfer_service.models.core import (

docs/examples/remove_source_folders.py

@@ -8,6 +8,9 @@
 
 import requests
 from aind_data_schema_models.modalities import Modality
+
+# Note, the platform field is optional and will be deprecated. If adding a
+# platform please use aind-data-transfer-service <= 1.17.2
 from aind_data_schema_models.platforms import Platform
 
 from aind_data_transfer_service.models.core import (

docs/examples/skip_s3_check.py

@@ -8,6 +8,9 @@
 
 import requests
 from aind_data_schema_models.modalities import Modality
+
+# Note, the platform field is optional and will be deprecated. If adding a
+# platform please use aind-data-transfer-service <= 1.17.2
 from aind_data_schema_models.platforms import Platform
 
 from aind_data_transfer_service.models.core import (

docs/examples/upload_with_custom_slurm_settings.py

@@ -7,6 +7,9 @@
 
 import requests
 from aind_data_schema_models.modalities import Modality
+
+# Note, the platform field is optional and will be deprecated. If adding a
+# platform please use aind-data-transfer-service <= 1.17.2
 from aind_data_schema_models.platforms import Platform
 
 from aind_data_transfer_service.models.core import (

docs/examples/upload_with_notification.py

@@ -7,6 +7,9 @@
 
 import requests
 from aind_data_schema_models.modalities import Modality
+
+# Note, the platform field is optional and will be deprecated. If adding a
+# platform please use aind-data-transfer-service <= 1.17.2
 from aind_data_schema_models.platforms import Platform
 
 from aind_data_transfer_service.models.core import (

docs/source/conf.py

@@ -1,4 +1,5 @@
 """Configuration file for the Sphinx documentation builder."""
+
 #
 # For the full list of built-in configuration values, see the documentation:
 # https://www.sphinx-doc.org/en/master/usage/configuration.html

pyproject.toml

@@ -6,7 +6,7 @@ build-backend = "setuptools.build_meta"
 name = "aind-data-transfer-service"
 description = "Service that handles requests to upload data to the cloud"
 license = {text = "MIT"}
-requires-python = ">=3.9"
+requires-python = ">=3.10"
 authors = [
     {name = "Allen Institute for Neural Dynamics"}
 ]
@@ -17,7 +17,7 @@ readme = "README.md"
 dynamic = ["version"]
 
 dependencies = [
-    'aind-data-schema-models>=0.3.2,<1.0.0',
+    'aind-data-schema-models>=0.3.2',
     'email-validator',
     'pydantic>=2.0',
     'pydantic-settings>=2.0',
@@ -39,9 +39,7 @@ docs = [
 ]
 
 server = [
-    'aind-data-schema>=1.0.0,<2.0',
-    'aind-data-transfer-models==0.17.0',
-    'aind-metadata-mapper>=0.23.0',
+    'aind-data-schema==2.0.0',
     'boto3',
     'boto3-stubs[ssm]',
     'fastapi>=0.115.13', 

src/aind_data_transfer_service/__init__.py

@@ -1,7 +1,8 @@
 """Init package"""
+
 import os
 
-__version__ = "1.17.2"
+__version__ = "1.18.0"
 
 # Global constants
 OPEN_DATA_BUCKET_NAME = os.getenv("OPEN_DATA_BUCKET_NAME", "open")

src/aind_data_transfer_service/configs/csv_handler.py

@@ -7,8 +7,8 @@
 from typing import Any, Dict
 
 from aind_data_schema_models.modalities import Modality
-from aind_data_schema_models.platforms import Platform
 
+from aind_data_transfer_service.configs.platforms_v1 import Platform
 from aind_data_transfer_service.models.core import Task, UploadJobConfigsV2
 
 DATETIME_PATTERN2 = re.compile(
@@ -147,13 +147,18 @@ def map_csv_row_to_job(row: dict) -> UploadJobConfigsV2:
         "gather_preliminary_metadata": metadata_task,
         "check_s3_folder_exists": check_s3_folder_exists_task,
         "modality_transformation_settings": modality_tasks,
-        "codeocean_pipeline_settings": None
-        if codeocean_tasks == dict()
-        else codeocean_tasks,
+        "codeocean_pipeline_settings": (
+            None if codeocean_tasks == dict() else codeocean_tasks
+        ),
     }
+    platform = (
+        None
+        if job_configs.get("platform") is None
+        else Platform.from_abbreviation(job_configs["platform"])
+    )
     job_configs.update(
         {
-            "platform": Platform.from_abbreviation(job_configs["platform"]),
+            "platform": platform,
             "modalities": [
                 Modality.from_abbreviation(m) for m in modality_tasks.keys()
             ],