diff --git a/README.md b/README.md index 8a68899..163116e 100644 --- a/README.md +++ b/README.md @@ -26,6 +26,7 @@ What each column means in the job submission template: - **project_name**: Project name. A full list can be downloaded at [Project Names](http://aind-metadata-service/project_names) - **process_capsule_id**: Optional Code Ocean capsule or pipeline to run when data is uploaded +- **input_data_mount**: Optional data mount when running a custom pipeline - **platform**: For a list of platforms click [here](https://github.com/AllenNeuralDynamics/aind-data-schema/blob/main/src/aind_data_schema/models/platforms.py). - **acq_datetime**: The time that the data was acquired - **subject_id**: The unique id of the subject diff --git a/pyproject.toml b/pyproject.toml index 1cd4e72..0b1317e 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -21,7 +21,7 @@ dependencies = [ 'pydantic>=2.0', 'pydantic-settings>=2.0', 'aind-data-schema==0.33.3', - 'aind-data-transfer-models==0.4.0' + 'aind-data-transfer-models==0.5.0' ] [project.optional-dependencies] diff --git a/src/aind_data_transfer_service/configs/job_upload_template.py b/src/aind_data_transfer_service/configs/job_upload_template.py index 2debb7a..7da80b1 100644 --- a/src/aind_data_transfer_service/configs/job_upload_template.py +++ b/src/aind_data_transfer_service/configs/job_upload_template.py @@ -21,6 +21,7 @@ class JobUploadTemplate: HEADERS = [ "project_name", "process_capsule_id", + "input_data_mount", "platform", "acq_datetime", "subject_id", @@ -34,6 +35,7 @@ class JobUploadTemplate: [ "Behavior Platform", "1f999652-00a0-4c4b-99b5-64c2985ad070", + "data_mount", Platform.BEHAVIOR.abbreviation, datetime.datetime(2023, 10, 4, 4, 0, 0), "123456", @@ -46,6 +48,7 @@ class JobUploadTemplate: [ "Ophys Platform - SLAP2", None, + None, Platform.SMARTSPIM.abbreviation, datetime.datetime(2023, 3, 4, 16, 30, 0), "654321", @@ -56,6 +59,7 @@ class JobUploadTemplate: [ "Ephys Platform", None, + None, Platform.ECEPHYS.abbreviation, datetime.datetime(2023, 1, 30, 19, 1, 0), "654321", diff --git a/src/aind_data_transfer_service/templates/index.html b/src/aind_data_transfer_service/templates/index.html index 9c5dcfc..6ca3842 100644 --- a/src/aind_data_transfer_service/templates/index.html +++ b/src/aind_data_transfer_service/templates/index.html @@ -145,7 +145,7 @@

Submit Jobs

let jobsLength = jobs.length; var table = document.createElement('table'), tr, td, row; addTableRow( - [ "project_name", "process_capsule_id", "s3_bucket", "platform", "subject_id", "acq_datetime", "metadata_dir", "modality", "modality.source" ], + [ "project_name", "process_capsule_id", "input_data_mount", "s3_bucket", "platform", "subject_id", "acq_datetime", "metadata_dir", "modality", "modality.source" ], table, tr, td, true ); for (row = 0; row < jobsLength; row++) { @@ -155,6 +155,7 @@

Submit Jobs

addTableRow( [ { value: job.project_name, rowspan: modalitiesLength }, { value: job.process_capsule_id ?? "", rowspan: modalitiesLength }, + { value: job.input_data_mount ?? "", rowspan: modalitiesLength }, { value: job.s3_bucket, rowspan: modalitiesLength }, { value: job.platform.abbreviation, rowspan: modalitiesLength }, { value: job.subject_id, rowspan: modalitiesLength }, diff --git a/tests/resources/job_upload_template.xlsx b/tests/resources/job_upload_template.xlsx index 39ec6f7..0ffe39d 100644 Binary files a/tests/resources/job_upload_template.xlsx and b/tests/resources/job_upload_template.xlsx differ