Skip to content

Commit

Permalink
feat: updates to latest aind-data-transfer-models (#146)
Browse files Browse the repository at this point in the history
  • Loading branch information
jtyoung84 authored Sep 7, 2024
1 parent 67831d3 commit 69dace2
Show file tree
Hide file tree
Showing 2 changed files with 55 additions and 1 deletion.
2 changes: 1 addition & 1 deletion pyproject.toml
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ dependencies = [
'boto3',
'pydantic>=2.0,<2.9',
'pydantic-settings>=2.0',
'aind-data-transfer-models==0.7.0'
'aind-data-transfer-models==0.8.0'
]

[project.optional-dependencies]
Expand Down
54 changes: 54 additions & 0 deletions tests/test_server.py
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,7 @@
SubmitJobRequest,
V0036JobProperties,
)
from aind_data_transfer_models.trigger import TriggerConfigModel, ValidJobType
from fastapi.responses import StreamingResponse
from fastapi.testclient import TestClient
from pydantic import SecretStr
Expand Down Expand Up @@ -1604,6 +1605,59 @@ def test_submit_v1_jobs_200_session_settings_config_file(
)
self.assertEqual(200, submit_job_response.status_code)

@patch.dict(os.environ, EXAMPLE_ENV_VAR1, clear=True)
@patch("requests.post")
def test_submit_v1_jobs_200_trigger_capsule_configs(
self,
mock_post: MagicMock,
):
"""Tests suubmission when user adds trigger_capsule_configs"""

mock_response = Response()
mock_response.status_code = 200
mock_response._content = json.dumps({"message": "sent"}).encode(
"utf-8"
)
mock_post.return_value = mock_response
ephys_source_dir = PurePosixPath("shared_drive/ephys_data/690165")

s3_bucket = "private"
subject_id = "690165"
acq_datetime = datetime(2024, 2, 19, 11, 25, 17)
platform = Platform.ECEPHYS

trigger_capsule_settings = TriggerConfigModel(
job_type=ValidJobType.RUN_GENERIC_PIPELINE, capsule_id="abc-123"
)
ephys_config = ModalityConfigs(
modality=Modality.ECEPHYS,
source=ephys_source_dir,
)
project_name = "Ephys Platform"

upload_job_configs = BasicUploadJobConfigs(
project_name=project_name,
s3_bucket=s3_bucket,
platform=platform,
subject_id=subject_id,
acq_datetime=acq_datetime,
modalities=[ephys_config],
trigger_capsule_configs=trigger_capsule_settings,
)

upload_jobs = [upload_job_configs]
submit_request = SubmitJobRequest(upload_jobs=upload_jobs)

post_request_content = json.loads(
submit_request.model_dump_json(round_trip=True)
)

with TestClient(app) as client:
submit_job_response = client.post(
url="/api/v1/submit_jobs", json=post_request_content
)
self.assertEqual(200, submit_job_response.status_code)


if __name__ == "__main__":
unittest.main()

0 comments on commit 69dace2

Please sign in to comment.