Skip to content

Commit

Permalink
platform
Browse files Browse the repository at this point in the history
  • Loading branch information
mekhlakapoor committed Oct 6, 2023
1 parent 5be1861 commit 18657f5
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 5 deletions.
5 changes: 2 additions & 3 deletions src/aind_data_transfer_service/configs/job_configs.py
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
"""This module adds classes to handle resolving common endpoints used in the
data transfer jobs."""
import re
from datetime import date, datetime, time
from datetime import datetime
from pathlib import Path
from typing import Any, Dict, List, Optional

Expand Down Expand Up @@ -159,14 +159,13 @@ class BasicUploadJobConfigs(BaseSettings):
def s3_prefix(self):
"""Construct s3_prefix from configs."""
return build_data_name(
label=f"{self.platform.value}_{self.subject_id}",
label=f"{self.platform.value.abbreviation}_{self.subject_id}",
creation_datetime=self.acq_datetime,
)

@validator("acq_datetime", pre=True)
def _parse_datetime(cls, datetime_str: str) -> datetime:
"""Parses datetime string to %YYYY-%MM-%DD HH:mm:ss"""
# TODO: do this in data transfer service
if re.match(BasicUploadJobConfigs._DATETIME_PATTERN1, datetime_str):
return datetime.strptime(datetime_str, "%Y-%m-%d %H:%M:%S")
elif re.match(BasicUploadJobConfigs._DATETIME_PATTERN2, datetime_str):
Expand Down
6 changes: 4 additions & 2 deletions src/aind_data_transfer_service/templates/index.html
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,9 @@
<body>
<nav>
<a href="/">Submit Jobs</a> |
<a href="/jobs">Job Status</a>
<a href="/jobs">Job Status</a> |
<a href="https://github.com/AllenNeuralDynamics/aind-data-transfer/tree/main">Upload Template</a>

</nav>
<h2>Submit Jobs</h2>
<form id="preview_form" method="post" enctype="multipart/form-data">
Expand Down Expand Up @@ -63,7 +65,7 @@ <h2>Submit Jobs</h2>
td.innerHTML = job.s3_bucket;
td = document.createElement('td');
tr.appendChild(td);
td.innerHTML = job.platform;
td.innerHTML = job.platform.abbreviation;
td = document.createElement('td');
tr.appendChild(td);
td.innerHTML = job.subject_id;
Expand Down

0 comments on commit 18657f5

Please sign in to comment.