From 61b349b3248425e2d1e29b3c3fdf632d18c893fc Mon Sep 17 00:00:00 2001 From: jtyoung84 <104453205+jtyoung84@users.noreply.github.com> Date: Wed, 5 Jun 2024 16:35:12 -0700 Subject: [PATCH] feat: adds input data mount field (#116) * feat: adds input data mount field --- README.md | 1 + pyproject.toml | 2 +- .../configs/job_upload_template.py | 4 ++++ .../templates/index.html | 3 ++- tests/resources/job_upload_template.xlsx | Bin 6523 -> 6536 bytes 5 files changed, 8 insertions(+), 2 deletions(-) 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 39ec6f75592aeb41b12cbeafda72ff0cadda7115..0ffe39d39d9ff4b6fdf77fba98651a644803303a 100644 GIT binary patch delta 3257 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 Trq07hri`)T5v82t{GI+^LHp~u