Skip to content

feat: async routes #34

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.

Sign up for GitHub

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

Closed
mekhlakapoor wants to merge 1 commit into from
Closed

feat: async routes #34

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
37 changes: 21 additions & 16 deletions aind-slims-service-server/src/aind_slims_service_server/route.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
"""Module to handle endpoint responses"""

from typing import Any, Dict, List, Optional

from asyncio import to_thread
from fastapi import APIRouter, Depends, Path, Query, status
from slims.slims import Slims

Expand Down Expand Up @@ -40,7 +40,7 @@
status_code=status.HTTP_200_OK,
response_model=HealthCheck,
)
def get_health() -> HealthCheck:
async def get_health() -> HealthCheck:
"""
## Endpoint to perform a healthcheck on.

Expand All @@ -54,7 +54,7 @@ def get_health() -> HealthCheck:
"/ecephys_sessions",
response_model=List[SlimsEcephysData],
)
def get_ecephys_sessions(
async def get_ecephys_sessions(
subject_id: Optional[str] = Query(
None,
alias="subject_id",
Expand Down Expand Up @@ -128,9 +128,8 @@ def get_ecephys_sessions(
## Ecephys session metadata
Retrieves Ecephys session information from SLIMS.
"""
slims_ecephys_sessions = EcephysSessionHandler(
session=session
).get_ephys_data_from_slims(
slims_ecephys_sessions = await to_thread(
EcephysSessionHandler(session=session).get_ephys_data_from_slims,
subject_id=subject_id,
session_name=session_name,
start_date_greater_than_or_equal=start_date_gte,
Expand All @@ -143,7 +142,7 @@ def get_ecephys_sessions(
"/aind_instruments/{input_id}",
response_model=List[Dict[str, Any]],
)
def get_aind_instrument(
async def get_aind_instrument(
input_id: str = Path(
...,
openapi_examples={
Expand All @@ -169,12 +168,14 @@ def get_aind_instrument(
Retrieves AIND Instrument information from SLIMS.
"""
handler = InstrumentSessionHandler(session)
instrument_data = handler.get_instrument_data(input_id, partial_match)
instrument_data = await to_thread(
handler.get_instrument_data, input_id, partial_match
)
return instrument_data


@router.get("/smartspim_imaging", response_model=List[SlimsSpimData])
def get_smartspim_imaging(
async def get_smartspim_imaging(
subject_id: Optional[str] = Query(
None,
alias="subject_id",
Expand Down Expand Up @@ -238,7 +239,8 @@ def get_smartspim_imaging(
Retrieves SmartSPIM imaging information from SLIMS.
"""
handler = ImagingSessionHandler(session)
spim_data = handler.get_spim_data_from_slims(
spim_data = await to_thread(
handler.get_spim_data_from_slims,
subject_id=subject_id,
start_date_greater_than_or_equal=start_date_gte,
end_date_less_than_or_equal=end_date_lte,
Expand All @@ -247,7 +249,7 @@ def get_smartspim_imaging(


@router.get("/histology", response_model=List[SlimsHistologyData])
def get_histology_data(
async def get_histology_data(
subject_id: Optional[str] = Query(
None,
alias="subject_id",
Expand Down Expand Up @@ -311,7 +313,8 @@ def get_histology_data(
Retrieves histology information from SLIMS.
"""
handler = HistologySessionHandler(session)
histology_data = handler.get_histology_data_from_slims(
histology_data = await to_thread(
handler.get_histology_data_from_slims,
subject_id=subject_id,
start_date_greater_than_or_equal=start_date_gte,
end_date_less_than_or_equal=end_date_lte,
Expand All @@ -322,7 +325,7 @@ def get_histology_data(
@router.get(
"/water_restriction", response_model=List[SlimsWaterRestrictionData]
)
def get_water_restriction_data(
async def get_water_restriction_data(
subject_id: Optional[str] = Query(
None,
alias="subject_id",
Expand Down Expand Up @@ -386,7 +389,8 @@ def get_water_restriction_data(
Retrieves water restriction information from SLIMS.
"""
handler = WaterRestrictionSessionHandler(session)
water_restriction_data = handler.get_water_restriction_data_from_slims(
water_restriction_data = await to_thread(
handler.get_water_restriction_data_from_slims,
subject_id=subject_id,
start_date_greater_than_or_equal=start_date_gte,
end_date_less_than_or_equal=end_date_lte,
Expand All @@ -395,7 +399,7 @@ def get_water_restriction_data(


@router.get("/viral_injections", response_model=List[SlimsViralInjectionData])
def get_viral_injections(
async def get_viral_injections(
subject_id: Optional[str] = Query(
None,
alias="subject_id",
Expand Down Expand Up @@ -459,7 +463,8 @@ def get_viral_injections(
Retrieves viral injection information from SLIMS.
"""
handler = ViralInjectionSessionHandler(session)
viral_injection_data = handler.get_viral_injection_info_from_slims(
viral_injection_data = await to_thread(
handler.get_viral_injection_info_from_slims,
subject_id=subject_id,
start_date_greater_than_or_equal=start_date_gte,
end_date_less_than_or_equal=end_date_lte,
Expand Down