Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

feat: adds input data mount field #116

Merged
merged 2 commits into from
Jun 5, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion pyproject.toml
Original file line number Diff line number Diff line change
Expand Up @@ -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]
Expand Down
4 changes: 4 additions & 0 deletions src/aind_data_transfer_service/configs/job_upload_template.py
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,7 @@ class JobUploadTemplate:
HEADERS = [
"project_name",
"process_capsule_id",
"input_data_mount",
"platform",
"acq_datetime",
"subject_id",
Expand All @@ -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",
Expand All @@ -46,6 +48,7 @@ class JobUploadTemplate:
[
"Ophys Platform - SLAP2",
None,
None,
Platform.SMARTSPIM.abbreviation,
datetime.datetime(2023, 3, 4, 16, 30, 0),
"654321",
Expand All @@ -56,6 +59,7 @@ class JobUploadTemplate:
[
"Ephys Platform",
None,
None,
Platform.ECEPHYS.abbreviation,
datetime.datetime(2023, 1, 30, 19, 1, 0),
"654321",
Expand Down
3 changes: 2 additions & 1 deletion src/aind_data_transfer_service/templates/index.html
Original file line number Diff line number Diff line change
Expand Up @@ -145,7 +145,7 @@ <h2>Submit Jobs</h2>
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++) {
Expand All @@ -155,6 +155,7 @@ <h2>Submit Jobs</h2>
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 },
Expand Down
Binary file modified tests/resources/job_upload_template.xlsx
Binary file not shown.
Loading