aind-data-transfer-service 1.14.0__tar.gz → 1.15.0__tar.gz

{aind_data_transfer_service-1.14.0 → aind_data_transfer_service-1.15.0}/.flake8

@@ -3,5 +3,7 @@ exclude =
     .git,
     __pycache__,
     build,
+    venv,
+    .venv
     env
 max-complexity = 10

{aind_data_transfer_service-1.14.0/src/aind_data_transfer_service.egg-info → aind_data_transfer_service-1.15.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: aind-data-transfer-service
-Version: 1.14.0
+Version: 1.15.0
 Summary: Service that handles requests to upload data to the cloud
 Author: Allen Institute for Neural Dynamics
 License: MIT
@@ -38,6 +38,7 @@ Requires-Dist: wtforms; extra == "server"
 Requires-Dist: requests==2.25.0; extra == "server"
 Requires-Dist: openpyxl; extra == "server"
 Requires-Dist: python-logging-loki; extra == "server"
+Requires-Dist: authlib; extra == "server"
 Dynamic: license-file
 
 # aind-data-transfer-service

{aind_data_transfer_service-1.14.0 → aind_data_transfer_service-1.15.0}/docs/examples/example1.csv

@@ -1,4 +1,4 @@
 project_name, modality0.capsule_id, modality0, modality0.input_source, modality1, modality1.input_source, s3_bucket, subject_id, platform, acq_datetime, job_type
 Ephys Platform, , ecephys, dir/data_set_1, ,, default, 123454, ecephys, 2020-10-10 14:10:10, ecephys
-Behavior Platform, 1f999652-00a0-4c4b-99b5-64c2985ad070, behavior-videos, dir/data_set_2, MRI, dir/data_set_3, open, 123456, behavior, 10/13/2020 1:10:10 PM,
-Behavior Platform, , behavior-videos, dir/data_set_2, behavior, dir/data_set_3, private, 123456, behavior, 10/13/2020 1:10:10 PM,
+Behavior Platform, 1f999652-00a0-4c4b-99b5-64c2985ad070, behavior-videos, dir/data_set_2, MRI, dir/data_set_3, open, 123456, behavior, 10/13/2020 1:10:10 PM, default
+Behavior Platform, , behavior-videos, dir/data_set_2, behavior, dir/data_set_3, private, 123456, behavior, 10/13/2020 1:10:10 PM, default

aind_data_transfer_service-1.15.0/docs/examples/remove_source_folders.py

@@ -0,0 +1,80 @@
+"""
+WARNING: This deletes raw data. Please use caution.
+This example demonstrates how to remove the source folders after the data
+has been uploaded to S3.
+"""
+
+from datetime import datetime
+
+import requests
+from aind_data_schema_models.modalities import Modality
+from aind_data_schema_models.platforms import Platform
+
+from aind_data_transfer_service.models.core import (
+    SubmitJobRequestV2,
+    Task,
+    UploadJobConfigsV2,
+)
+
+# The job_type contains the default settings for compression and Code Ocean
+# pipelines.
+job_type = "ecephys"
+
+acq_datetime = datetime(2023, 4, 3, 18, 17, 7)
+
+remove_source_folders = Task(skip_task=False)
+
+ecephys_task = Task(
+    job_settings={
+        "input_source": (
+            "/allen/aind/scratch/svc_aind_upload/test_data_sets/"
+            "ecephys/655019_2023-04-03_18-17-07"
+        )
+    }
+)
+
+modality_transformation_settings = {"ecephys": ecephys_task}
+
+gather_preliminary_metadata = Task(
+    job_settings={
+        "metadata_dir": (
+            "/allen/aind/scratch/svc_aind_upload/test_data_sets/"
+            "ecephys/655019_2023-04-03_18-17-07"
+        )
+    }
+)
+
+
+upload_job_configs_v2 = UploadJobConfigsV2(
+    job_type=job_type,
+    project_name="Ephys Platform",
+    platform=Platform.ECEPHYS,
+    modalities=[Modality.ECEPHYS],
+    subject_id="655019",
+    acq_datetime=acq_datetime,
+    tasks={
+        "modality_transformation_settings": modality_transformation_settings,
+        "gather_preliminary_metadata": gather_preliminary_metadata,
+        "remove_source_folders": remove_source_folders
+    },
+)
+
+submit_request_v2 = SubmitJobRequestV2(
+    upload_jobs=[upload_job_configs_v2],
+)
+
+post_request_content = submit_request_v2.model_dump(
+    mode="json", exclude_none=True
+)
+
+# Please use the production endpoint for submitting jobs and the dev endpoint
+# for running tests.
+# endpoint = "http://aind-data-transfer-service"
+endpoint = "http://aind-data-transfer-service-dev"  # For testing
+
+submit_job_response = requests.post(
+    url=f"{endpoint}/api/v2/submit_jobs",
+    json=post_request_content,
+)
+print(submit_job_response.status_code)
+print(submit_job_response.json())

{aind_data_transfer_service-1.14.0 → aind_data_transfer_service-1.15.0}/docs/source/Contributing.rst

@@ -71,6 +71,7 @@ To run uvicorn locally:
    export ENV_NAME='local'
    export AWS_DEFAULT_REGION='us-west-2'
    export AIND_AIRFLOW_PARAM_PREFIX='/aind/dev/airflow/variables/job_types'
+   export AIND_SSO_SECRET_NAME='/aind/dev/data_transfer_service/sso/secrets'
    uvicorn aind_data_transfer_service.server:app --host 0.0.0.0 --port 5000 --reload
 
 You can now access aind-data-transfer-service at

{aind_data_transfer_service-1.14.0 → aind_data_transfer_service-1.15.0}/pyproject.toml

@@ -53,7 +53,8 @@ server = [
     'wtforms',
     'requests==2.25.0',
     'openpyxl',
-    'python-logging-loki'
+    'python-logging-loki',
+    'authlib'
 ]
 
 [tool.setuptools.packages.find]

{aind_data_transfer_service-1.14.0 → aind_data_transfer_service-1.15.0}/src/aind_data_transfer_service/__init__.py

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

{aind_data_transfer_service-1.14.0 → aind_data_transfer_service-1.15.0}/src/aind_data_transfer_service/configs/job_upload_template.py

@@ -2,7 +2,7 @@
 
 import datetime
 from io import BytesIO
-from typing import Any, Dict, List
+from typing import Any, ClassVar, Dict, List
 
 from aind_data_schema_models.modalities import Modality
 from aind_data_schema_models.platforms import Platform
@@ -10,16 +10,16 @@ from openpyxl import Workbook
 from openpyxl.styles import Font
 from openpyxl.utils import get_column_letter
 from openpyxl.worksheet.datavalidation import DataValidation
+from pydantic import BaseModel
 
 
-# TODO: convert to pydantic model
-class JobUploadTemplate:
+class JobUploadTemplate(BaseModel):
     """Class to configure and create xlsx job upload template"""
 
-    FILE_NAME = "job_upload_template.xlsx"
-    NUM_TEMPLATE_ROWS = 20
-    XLSX_DATETIME_FORMAT = "YYYY-MM-DDTHH:mm:ss"
-    HEADERS = [
+    FILE_NAME: ClassVar[str] = "job_upload_template.xlsx"
+    _NUM_TEMPLATE_ROWS: ClassVar[int] = 20
+    _XLSX_DATETIME_FORMAT: ClassVar[str] = "YYYY-MM-DDTHH:mm:ss"
+    _HEADERS: ClassVar[List[str]] = [
         "job_type",
         "project_name",
         "platform",
@@ -31,7 +31,7 @@ class JobUploadTemplate:
         "modality1",
         "modality1.input_source",
     ]
-    SAMPLE_JOBS = [
+    _SAMPLE_JOBS: ClassVar[List[List[Any]]] = [
         [
             "default",
             "Behavior Platform",
@@ -68,8 +68,8 @@ class JobUploadTemplate:
         ],
     ]
 
-    @property
-    def validators(self) -> List[Dict[str, Any]]:
+    @classmethod
+    def _get_validators(cls) -> List[Dict[str, Any]]:
         """
         Returns
         -------
@@ -82,36 +82,36 @@ class JobUploadTemplate:
                 "name": "platform",
                 "type": "list",
                 "options": list(Platform.abbreviation_map.keys()),
-                "column_indexes": [self.HEADERS.index("platform")],
+                "column_indexes": [cls._HEADERS.index("platform")],
             },
             {
                 "name": "modality",
                 "type": "list",
                 "options": list(Modality.abbreviation_map.keys()),
                 "column_indexes": [
-                    self.HEADERS.index("modality0"),
-                    self.HEADERS.index("modality1"),
+                    cls._HEADERS.index("modality0"),
+                    cls._HEADERS.index("modality1"),
                 ],
             },
             {
                 "name": "datetime",
                 "type": "date",
-                "column_indexes": [self.HEADERS.index("acq_datetime")],
+                "column_indexes": [cls._HEADERS.index("acq_datetime")],
             },
         ]
 
-    @property
-    def excel_sheet_filestream(self) -> BytesIO:
+    @classmethod
+    def create_excel_sheet_filestream(cls) -> BytesIO:
         """Create job template as xlsx filestream"""
         xl_io = BytesIO()
         workbook = Workbook()
         workbook.iso_dates = True
         worksheet = workbook.active
-        worksheet.append(self.HEADERS)
-        for job in self.SAMPLE_JOBS:
+        worksheet.append(cls._HEADERS)
+        for job in cls._SAMPLE_JOBS:
             worksheet.append(job)
         # data validators
-        for validator in self.validators:
+        for validator in cls._get_validators():
             dv_type = validator["type"]
             dv_name = validator["name"]
             dv_params = {
@@ -127,17 +127,17 @@ class JobUploadTemplate:
                 dv_params["prompt"] = f"Select a {dv_name} from the dropdown"
             elif dv_type == "date":
                 dv_params["prompt"] = "Provide a {} using {}".format(
-                    dv_name, self.XLSX_DATETIME_FORMAT
+                    dv_name, cls._XLSX_DATETIME_FORMAT
                 )
             dv = DataValidation(**dv_params)
             for i in validator["column_indexes"]:
                 col = get_column_letter(i + 1)
-                col_range = f"{col}2:{col}{self.NUM_TEMPLATE_ROWS}"
+                col_range = f"{col}2:{col}{cls._NUM_TEMPLATE_ROWS}"
                 dv.add(col_range)
                 if dv_type != "date":
                     continue
                 for (cell,) in worksheet[col_range]:
-                    cell.number_format = self.XLSX_DATETIME_FORMAT
+                    cell.number_format = cls._XLSX_DATETIME_FORMAT
             worksheet.add_data_validation(dv)
         # formatting
         bold = Font(bold=True)

{aind_data_transfer_service-1.14.0 → aind_data_transfer_service-1.15.0}/src/aind_data_transfer_service/models/core.py

@@ -290,11 +290,15 @@ class SubmitJobRequestV2(BaseSettings):
         # check against any jobs in the context
         current_jobs = (info.context or dict()).get("current_jobs", list())
         for job in current_jobs:
-            prefix = job.get("s3_prefix")
-            if (
-                prefix is not None
-                and prefix in jobs_map
-                and json.dumps(job, sort_keys=True) in jobs_map[prefix]
-            ):
-                raise ValueError(f"Job is already running/queued for {prefix}")
+            jobs_to_check = job.get("upload_jobs", [job])
+            for j in jobs_to_check:
+                prefix = j.get("s3_prefix")
+                if (
+                    prefix is not None
+                    and prefix in jobs_map
+                    and json.dumps(j, sort_keys=True) in jobs_map[prefix]
+                ):
+                    raise ValueError(
+                        f"Job is already running/queued for {prefix}"
+                    )
         return self

{aind_data_transfer_service-1.14.0 → aind_data_transfer_service-1.15.0}/src/aind_data_transfer_service/server.py

@@ -15,6 +15,7 @@ from aind_data_transfer_models import (
     __version__ as aind_data_transfer_models_version,
 )
 from aind_data_transfer_models.core import SubmitJobRequest, validation_context
+from authlib.integrations.starlette_client import OAuth
 from botocore.exceptions import ClientError
 from fastapi import Request
 from fastapi.responses import JSONResponse, StreamingResponse
@@ -23,6 +24,9 @@ from httpx import AsyncClient
 from openpyxl import load_workbook
 from pydantic import SecretStr, ValidationError
 from starlette.applications import Starlette
+from starlette.config import Config
+from starlette.middleware.sessions import SessionMiddleware
+from starlette.responses import RedirectResponse
 from starlette.routing import Route
 
 from aind_data_transfer_service import OPEN_DATA_BUCKET_NAME
@@ -95,6 +99,27 @@ def get_project_names() -> List[str]:
     return project_names
 
 
+def set_oauth() -> OAuth:
+    """Set up OAuth for the service"""
+    secrets_client = boto3.client("secretsmanager")
+    secret_response = secrets_client.get_secret_value(
+        SecretId=os.getenv("AIND_SSO_SECRET_NAME")
+    )
+    secret_value = json.loads(secret_response["SecretString"])
+    for secrets in secret_value:
+        os.environ[secrets] = secret_value[secrets]
+    config = Config()
+    oauth = OAuth(config)
+    oauth.register(
+        name="azure",
+        client_id=config("CLIENT_ID"),
+        client_secret=config("CLIENT_SECRET"),
+        server_metadata_url=config("AUTHORITY"),
+        client_kwargs={"scope": "openid email profile"},
+    )
+    return oauth
+
+
 def get_job_types(version: Optional[str] = None) -> List[str]:
     """Get a list of job_types"""
     params = get_parameter_infos(version)
@@ -228,7 +253,7 @@ async def validate_csv(request: Request):
                 data = csv_io.getvalue()
             csv_reader = csv.DictReader(io.StringIO(data))
             params = AirflowDagRunsRequestParameters(
-                dag_ids=["transform_and_upload_v2"],
+                dag_ids=["transform_and_upload_v2", "run_list_of_jobs"],
                 states=["running", "queued"],
             )
             _, current_jobs = await get_airflow_jobs(
@@ -324,7 +349,8 @@ async def validate_json_v2(request: Request):
     content = await request.json()
     try:
         params = AirflowDagRunsRequestParameters(
-            dag_ids=["transform_and_upload_v2"], states=["running", "queued"]
+            dag_ids=["transform_and_upload_v2", "run_list_of_jobs"],
+            states=["running", "queued"],
         )
         _, current_jobs = await get_airflow_jobs(params=params, get_confs=True)
         context = {
@@ -439,7 +465,8 @@ async def submit_jobs_v2(request: Request):
     content = await request.json()
     try:
         params = AirflowDagRunsRequestParameters(
-            dag_ids=["transform_and_upload_v2"], states=["running", "queued"]
+            dag_ids=["transform_and_upload_v2", "run_list_of_jobs"],
+            states=["running", "queued"],
         )
         _, current_jobs = await get_airflow_jobs(params=params, get_confs=True)
         context = {
@@ -987,8 +1014,7 @@ async def download_job_template(_: Request):
     """Get job template as xlsx filestream for download"""
 
     try:
-        job_template = JobUploadTemplate()
-        xl_io = job_template.excel_sheet_filestream
+        xl_io = JobUploadTemplate.create_excel_sheet_filestream()
         return StreamingResponse(
             io.BytesIO(xl_io.getvalue()),
             media_type=(
@@ -997,7 +1023,7 @@ async def download_job_template(_: Request):
             ),
             headers={
                 "Content-Disposition": (
-                    f"attachment; filename={job_template.FILE_NAME}"
+                    f"attachment; filename={JobUploadTemplate.FILE_NAME}"
                 )
             },
             status_code=200,
@@ -1089,6 +1115,60 @@ def get_parameter(request: Request):
         )
 
 
+async def admin(request: Request):
+    """Get admin page if authenticated, else redirect to login."""
+    user = request.session.get("user")
+    if os.getenv("ENV_NAME") == "local":
+        user = {"name": "local user"}
+    if user:
+        return templates.TemplateResponse(
+            name="admin.html",
+            context=(
+                {
+                    "request": request,
+                    "project_names_url": project_names_url,
+                    "user_name": user.get("name", "unknown"),
+                    "user_email": user.get("email", "unknown"),
+                }
+            ),
+        )
+    return RedirectResponse(url="/login")
+
+
+async def login(request: Request):
+    """Redirect to Azure login page"""
+    oauth = set_oauth()
+    redirect_uri = request.url_for("auth")
+    response = await oauth.azure.authorize_redirect(request, redirect_uri)
+    return response
+
+
+async def logout(request: Request):
+    """Logout user and clear session"""
+    request.session.pop("user", None)
+    return RedirectResponse(url="/")
+
+
+async def auth(request: Request):
+    """Authenticate user and store user info in session"""
+    oauth = set_oauth()
+    try:
+        token = await oauth.azure.authorize_access_token(request)
+        user = token.get("userinfo")
+        if not user:
+            raise ValueError("User info not found in access token.")
+        request.session["user"] = dict(user)
+    except Exception as error:
+        return JSONResponse(
+            content={
+                "message": "Error Logging In",
+                "data": {"error": f"{error.__class__.__name__}{error.args}"},
+            },
+            status_code=500,
+        )
+    return RedirectResponse(url="/admin")
+
+
 routes = [
     Route("/", endpoint=index, methods=["GET", "POST"]),
     Route("/api/validate_csv", endpoint=validate_csv_legacy, methods=["POST"]),
@@ -1131,6 +1211,11 @@ routes = [
         endpoint=download_job_template,
         methods=["GET"],
     ),
+    Route("/login", login, methods=["GET"]),
+    Route("/logout", logout, methods=["GET"]),
+    Route("/auth", auth, methods=["GET"]),
+    Route("/admin", admin, methods=["GET"]),
 ]
 
 app = Starlette(routes=routes)
+app.add_middleware(SessionMiddleware, secret_key=None)

aind_data_transfer_service-1.15.0/src/aind_data_transfer_service/templates/admin.html

@@ -0,0 +1,36 @@
+<!DOCTYPE html>
+<html>
+<head>
+  <meta charset="UTF-8">
+  <link href="https://cdn.jsdelivr.net/npm/bootstrap@5.3.3/dist/css/bootstrap.min.css" rel="stylesheet">
+  <script src="https://cdn.jsdelivr.net/npm/bootstrap@5.3.3/dist/js/bootstrap.bundle.min.js"></script>
+  <title>{% block title %} {% endblock %} AIND Data Transfer Service Admin</title>
+  <style>
+    body {
+      margin: 20px;
+      font-family: arial, sans-serif;
+    }
+    nav {
+      height: 40px;
+    }
+  </style>
+</head>
+<body>
+  <nav>
+    <a href="/">Submit Jobs</a> |
+    <a href="/jobs">Job Status</a> |
+    <a href="/job_params">Job Parameters</a> |
+    <a title="Download job template as .xslx" href="/api/job_upload_template" download>Job Submit Template</a> |
+    <a title="List of project names" href="{{ project_names_url }}" target="_blank">Project Names</a> |
+    <a title="For more information click here" href="https://aind-data-transfer-service.readthedocs.io"
+      target="_blank">Help</a> |
+    <a href="/admin">Admin</a> |
+    <a href="/logout">Log out</a>
+  </nav>
+  <div>
+    <h3>Admin</h3>
+    <div>Hello {{user_name}}, welcome to the admin page</div>
+    <div>Email: {{user_email}}</div>
+  </div>
+</body>
+</html>

{aind_data_transfer_service-1.14.0 → aind_data_transfer_service-1.15.0}/src/aind_data_transfer_service/templates/index.html

@@ -49,7 +49,8 @@
         <a href="/job_params">Job Parameters</a> |
         <a title="Download job template as .xslx" href= "/api/job_upload_template" download>Job Submit Template</a> |
         <a title="List of project names" href= "{{ project_names_url }}" target="_blank" >Project Names</a> |
-        <a title="For more information click here" href="https://aind-data-transfer-service.readthedocs.io"  target="_blank" >Help</a>
+        <a title="For more information click here" href="https://aind-data-transfer-service.readthedocs.io"  target="_blank" >Help</a> |
+        <a href="/admin">Admin</a>
     </nav>
     <br>
     <div>

{aind_data_transfer_service-1.14.0 → aind_data_transfer_service-1.15.0}/src/aind_data_transfer_service/templates/job_params.html

@@ -34,7 +34,8 @@
         <a href="/job_params">Job Parameters</a> |
         <a title="Download job template as .xslx" href= "/api/job_upload_template" download>Job Submit Template</a> |
         <a title="List of project names" href= "{{ project_names_url }}" target="_blank" >Project Names</a> |
-        <a title="For more information click here" href="https://aind-data-transfer-service.readthedocs.io"  target="_blank" >Help</a>
+        <a title="For more information click here" href="https://aind-data-transfer-service.readthedocs.io"  target="_blank" >Help</a> |
+        <a href="/admin">Admin</a>
     </nav>
     <div class="content">
         <h4 class="mb-2">

{aind_data_transfer_service-1.14.0 → aind_data_transfer_service-1.15.0}/src/aind_data_transfer_service/templates/job_status.html

@@ -32,7 +32,8 @@
         <a href="/job_params">Job Parameters</a> |
         <a title="Download job template as .xslx" href= "/api/job_upload_template" download>Job Submit Template</a> |
         <a title="List of project names" href= "{{ project_names_url }}" target="_blank" >Project Names</a> |
-        <a title="For more information click here" href="https://aind-data-transfer-service.readthedocs.io"  target="_blank" >Help</a>
+        <a title="For more information click here" href="https://aind-data-transfer-service.readthedocs.io"  target="_blank" >Help</a> |
+        <a href="/admin">Admin</a>
     </nav>
     <div class="content">
         <!-- display total entries -->

{aind_data_transfer_service-1.14.0 → aind_data_transfer_service-1.15.0/src/aind_data_transfer_service.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: aind-data-transfer-service
-Version: 1.14.0
+Version: 1.15.0
 Summary: Service that handles requests to upload data to the cloud
 Author: Allen Institute for Neural Dynamics
 License: MIT
@@ -38,6 +38,7 @@ Requires-Dist: wtforms; extra == "server"
 Requires-Dist: requests==2.25.0; extra == "server"
 Requires-Dist: openpyxl; extra == "server"
 Requires-Dist: python-logging-loki; extra == "server"
+Requires-Dist: authlib; extra == "server"
 Dynamic: license-file
 
 # aind-data-transfer-service

{aind_data_transfer_service-1.14.0 → aind_data_transfer_service-1.15.0}/src/aind_data_transfer_service.egg-info/SOURCES.txt

@@ -27,6 +27,7 @@ docs/examples/custom_codeocean_pipeline_settings.py
 docs/examples/custom_metadata_mapper_settings.py
 docs/examples/example1.csv
 docs/examples/hcr_example.py
+docs/examples/remove_source_folders.py
 docs/examples/skip_s3_check.py
 docs/examples/upload_with_custom_slurm_settings.py
 docs/examples/upload_with_notification.py
@@ -61,6 +62,7 @@ src/aind_data_transfer_service/hpc/models.py
 src/aind_data_transfer_service/models/__init__.py
 src/aind_data_transfer_service/models/core.py
 src/aind_data_transfer_service/models/internal.py
+src/aind_data_transfer_service/templates/admin.html
 src/aind_data_transfer_service/templates/index.html
 src/aind_data_transfer_service/templates/job_params.html
 src/aind_data_transfer_service/templates/job_status.html
@@ -81,6 +83,7 @@ tests/resources/airflow_dag_runs_response.json
 tests/resources/airflow_task_instances_response.json
 tests/resources/describe_parameters_response.json
 tests/resources/get_parameter_response.json
+tests/resources/get_secrets_response.json
 tests/resources/job_upload_template.xlsx
 tests/resources/legacy_sample.csv
 tests/resources/legacy_sample2.csv

{aind_data_transfer_service-1.14.0 → aind_data_transfer_service-1.15.0}/src/aind_data_transfer_service.egg-info/requires.txt

@@ -31,3 +31,4 @@ wtforms
 requests==2.25.0
 openpyxl
 python-logging-loki
+authlib

aind_data_transfer_service-1.15.0/tests/resources/get_secrets_response.json

@@ -0,0 +1,19 @@
+{
+    "ARN": "arn_value",
+    "Name": "secret_name",
+    "VersionId": "version_id",
+    "SecretString": "{\"CLIENT_ID\":\"client_id\",\"CLIENT_SECRET\":\"client_secret\",\"AUTHORITY\":\"https://authority\"}",
+    "VersionStages": ["AWSCURRENT"],
+    "CreatedDate": "2025-04-15T16:44:07.279000Z",
+    "ResponseMetadata": {
+        "RequestId": "request_id",
+        "HTTPStatusCode": 200,
+        "HTTPHeaders": {
+            "x-amzn-requestid": "2b090d64-c92d-48c5-a43a-abf5696c815e",
+            "content-type": "application/x-amz-json-1.1",
+            "content-length": "748",
+            "date": "Wed, 23 Apr 2025 21:19:04 GMT"
+        },
+        "RetryAttempts": 0
+    }
+}

{aind_data_transfer_service-1.14.0 → aind_data_transfer_service-1.15.0}/tests/test_core.py

@@ -434,21 +434,27 @@ class TestSubmitJobRequestV2(unittest.TestCase):
         submitted_job_request = SubmitJobRequestV2(
             upload_jobs=[self.example_upload_config]
         )
-        current_jobs = [
+        current_jobs_1 = [
             j.model_dump(mode="json", exclude_none=True)
             for j in submitted_job_request.upload_jobs
         ]
-        with self.assertRaises(ValidationError) as err:
-            with validation_context({"current_jobs": current_jobs}):
-                SubmitJobRequestV2(upload_jobs=[self.example_upload_config])
-        err_msg = json.loads(err.exception.json())[0]["msg"]
-        self.assertEqual(
-            (
-                "Value error, Job is already running/queued for "
-                "behavior_123456_2020-10-13_13-10-10"
-            ),
-            err_msg,
-        )
+        current_jobs_2 = [
+            submitted_job_request.model_dump(mode="json", exclude_none=True)
+        ]
+        for current_jobs in [current_jobs_1, current_jobs_2]:
+            with self.assertRaises(ValidationError) as err:
+                with validation_context({"current_jobs": current_jobs}):
+                    SubmitJobRequestV2(
+                        upload_jobs=[self.example_upload_config]
+                    )
+            err_msg = json.loads(err.exception.json())[0]["msg"]
+            self.assertEqual(
+                (
+                    "Value error, Job is already running/queued for "
+                    "behavior_123456_2020-10-13_13-10-10"
+                ),
+                err_msg,
+            )
 
 
 if __name__ == "__main__":

{aind_data_transfer_service-1.14.0 → aind_data_transfer_service-1.15.0}/tests/test_job_upload_template.py

@@ -47,11 +47,9 @@ class TestJobUploadTemplate(unittest.TestCase):
     def setUpClass(cls):
         """Set up test class"""
         expected_lines = cls._read_xl_helper(SAMPLE_JOB_TEMPLATE)
-        job_template = JobUploadTemplate()
         (template_lines, template_validators) = cls._read_xl_helper(
-            job_template.excel_sheet_filestream, True
+            JobUploadTemplate.create_excel_sheet_filestream(), True
         )
-        cls.job_template = job_template
         cls.expected_lines = expected_lines
         cls.template_lines = template_lines
         cls.template_validators = template_validators
@@ -67,12 +65,12 @@ class TestJobUploadTemplate(unittest.TestCase):
             for r in validator["ranges"]:
                 rb = (col, *_) = range_boundaries(r)
                 self.assertTupleEqual(
-                    (col, 2, col, JobUploadTemplate.NUM_TEMPLATE_ROWS), rb
+                    (col, 2, col, JobUploadTemplate._NUM_TEMPLATE_ROWS), rb
                 )
                 validator["column_indexes"].append(col - 1)
             del validator["ranges"]
         self.assertCountEqual(
-            self.job_template.validators, self.template_validators
+            JobUploadTemplate._get_validators(), self.template_validators
         )