diff --git a/robot-server/robot_server/client_data/router.py b/robot-server/robot_server/client_data/router.py index 515729529f7..847c5da59a9 100644 --- a/robot-server/robot_server/client_data/router.py +++ b/robot-server/robot_server/client_data/router.py @@ -4,7 +4,7 @@ from typing import Annotated, Literal import fastapi -from server_utils.fastapi_utils.light_router import FastBuildRouter +from server_utils.fastapi_utils.light_router import LightRouter from robot_server.client_data.store import ( ClientData, @@ -19,7 +19,7 @@ get_client_data_publisher, ) -router = FastBuildRouter() +router = LightRouter() Key = Annotated[ diff --git a/robot-server/robot_server/commands/router.py b/robot-server/robot_server/commands/router.py index c286c14ade1..4d23bb73fbe 100644 --- a/robot-server/robot_server/commands/router.py +++ b/robot-server/robot_server/commands/router.py @@ -2,7 +2,7 @@ from typing import Annotated, Final, List, Literal, Optional, cast from fastapi import Depends, Query, status -from server_utils.fastapi_utils.light_router import FastBuildRouter +from server_utils.fastapi_utils.light_router import LightRouter from opentrons.protocol_engine import CommandIntent from opentrons.protocol_engine.errors import CommandDoesNotExistError @@ -26,7 +26,7 @@ _DEFAULT_COMMAND_LIST_LENGTH: Final = 20 -commands_router = FastBuildRouter() +commands_router = LightRouter() class CommandNotFound(ErrorDetails): diff --git a/robot-server/robot_server/data_files/router.py b/robot-server/robot_server/data_files/router.py index 61c5b39932c..ba5cac2f7fd 100644 --- a/robot-server/robot_server/data_files/router.py +++ b/robot-server/robot_server/data_files/router.py @@ -6,7 +6,7 @@ from fastapi import UploadFile, File, Form, Depends, Response, status from opentrons.protocol_reader import FileHasher, FileReaderWriter -from server_utils.fastapi_utils.light_router import FastBuildRouter +from server_utils.fastapi_utils.light_router import LightRouter from robot_server.service.json_api import ( SimpleBody, @@ -33,7 +33,7 @@ from ..protocols.dependencies import get_file_hasher, get_file_reader_writer from ..service.dependencies import get_current_time, get_unique_id -datafiles_router = FastBuildRouter() +datafiles_router = LightRouter() class MultipleDataFileSources(ErrorDetails): diff --git a/robot-server/robot_server/deck_configuration/router.py b/robot-server/robot_server/deck_configuration/router.py index 79cde2c1fb7..ce80acafb2a 100644 --- a/robot-server/robot_server/deck_configuration/router.py +++ b/robot-server/robot_server/deck_configuration/router.py @@ -6,7 +6,7 @@ import fastapi from starlette.status import HTTP_422_UNPROCESSABLE_ENTITY -from server_utils.fastapi_utils.light_router import FastBuildRouter +from server_utils.fastapi_utils.light_router import LightRouter from opentrons_shared_data.deck.types import DeckDefinitionV5 @@ -22,7 +22,7 @@ from .store import DeckConfigurationStore -router = FastBuildRouter() +router = LightRouter() @PydanticResponse.wrap_route( diff --git a/robot-server/robot_server/error_recovery/settings/router.py b/robot-server/robot_server/error_recovery/settings/router.py index d811bf719de..d3c4467a301 100644 --- a/robot-server/robot_server/error_recovery/settings/router.py +++ b/robot-server/robot_server/error_recovery/settings/router.py @@ -4,14 +4,14 @@ from typing import Annotated import fastapi -from server_utils.fastapi_utils.light_router import FastBuildRouter +from server_utils.fastapi_utils.light_router import LightRouter from robot_server.service.json_api import PydanticResponse, RequestModel, SimpleBody from .models import RequestData, ResponseData from .store import ErrorRecoverySettingStore, get_error_recovery_setting_store -router = FastBuildRouter() +router = LightRouter() _PATH = "/errorRecovery/settings" diff --git a/robot-server/robot_server/instruments/router.py b/robot-server/robot_server/instruments/router.py index bb3469c9d64..d0cc4a212ed 100644 --- a/robot-server/robot_server/instruments/router.py +++ b/robot-server/robot_server/instruments/router.py @@ -2,7 +2,7 @@ from typing import Annotated, Optional, Dict, List, cast from fastapi import status, Depends -from server_utils.fastapi_utils.light_router import FastBuildRouter +from server_utils.fastapi_utils.light_router import LightRouter from opentrons.hardware_control.instruments.ot3.instrument_calibration import ( PipetteOffsetSummary, @@ -51,7 +51,7 @@ from opentrons.hardware_control import OT3HardwareControlAPI -instruments_router = FastBuildRouter() +instruments_router = LightRouter() def _pipette_dict_to_pipette_res( diff --git a/robot-server/robot_server/labware_offsets/router.py b/robot-server/robot_server/labware_offsets/router.py index 31786ea9db7..6aca03e4b18 100644 --- a/robot-server/robot_server/labware_offsets/router.py +++ b/robot-server/robot_server/labware_offsets/router.py @@ -6,7 +6,7 @@ from typing import Annotated, Literal import fastapi -from server_utils.fastapi_utils.light_router import FastBuildRouter +from server_utils.fastapi_utils.light_router import LightRouter from opentrons.protocol_engine import LabwareOffset, LabwareOffsetCreate, ModuleModel from opentrons.types import DeckSlotName @@ -26,7 +26,7 @@ from .fastapi_dependencies import get_labware_offset_store -router = FastBuildRouter() +router = LightRouter() @PydanticResponse.wrap_route( diff --git a/robot-server/robot_server/maintenance_runs/router/__init__.py b/robot-server/robot_server/maintenance_runs/router/__init__.py index 8971f6c7229..b017a0a6adf 100644 --- a/robot-server/robot_server/maintenance_runs/router/__init__.py +++ b/robot-server/robot_server/maintenance_runs/router/__init__.py @@ -1,12 +1,12 @@ """Maintenance Runs router.""" -from server_utils.fastapi_utils.light_router import FastBuildRouter +from server_utils.fastapi_utils.light_router import LightRouter from .base_router import base_router from .commands_router import commands_router from .labware_router import labware_router -maintenance_runs_router = FastBuildRouter() +maintenance_runs_router = LightRouter() maintenance_runs_router.include_router(base_router) maintenance_runs_router.include_router(commands_router) diff --git a/robot-server/robot_server/maintenance_runs/router/base_router.py b/robot-server/robot_server/maintenance_runs/router/base_router.py index 5131140f177..3dd2060c2cd 100644 --- a/robot-server/robot_server/maintenance_runs/router/base_router.py +++ b/robot-server/robot_server/maintenance_runs/router/base_router.py @@ -10,7 +10,7 @@ from fastapi import Depends, status from pydantic import BaseModel, Field -from server_utils.fastapi_utils.light_router import FastBuildRouter +from server_utils.fastapi_utils.light_router import LightRouter from robot_server.errors.error_responses import ErrorDetails, ErrorBody from robot_server.service.dependencies import get_current_time, get_unique_id @@ -43,7 +43,7 @@ from robot_server.service.notifications import get_pe_notify_publishers log = logging.getLogger(__name__) -base_router = FastBuildRouter() +base_router = LightRouter() # TODO (spp, 2023-04-10): move all error types from maintenance & regular runs diff --git a/robot-server/robot_server/maintenance_runs/router/commands_router.py b/robot-server/robot_server/maintenance_runs/router/commands_router.py index 3335ed5e40f..0bb3d64c192 100644 --- a/robot-server/robot_server/maintenance_runs/router/commands_router.py +++ b/robot-server/robot_server/maintenance_runs/router/commands_router.py @@ -4,7 +4,7 @@ from typing_extensions import Final, Literal from fastapi import Depends, Query, status -from server_utils.fastapi_utils.light_router import FastBuildRouter +from server_utils.fastapi_utils.light_router import LightRouter from opentrons.protocol_engine import ( CommandPointer, @@ -40,7 +40,7 @@ _DEFAULT_COMMAND_LIST_LENGTH: Final = 20 -commands_router = FastBuildRouter() +commands_router = LightRouter() class CommandNotFound(ErrorDetails): diff --git a/robot-server/robot_server/maintenance_runs/router/labware_router.py b/robot-server/robot_server/maintenance_runs/router/labware_router.py index 29f7d041808..100fafe910a 100644 --- a/robot-server/robot_server/maintenance_runs/router/labware_router.py +++ b/robot-server/robot_server/maintenance_runs/router/labware_router.py @@ -3,7 +3,7 @@ import logging from fastapi import Depends, status -from server_utils.fastapi_utils.light_router import FastBuildRouter +from server_utils.fastapi_utils.light_router import LightRouter from opentrons.protocol_engine import LabwareOffsetCreate, LabwareOffset from opentrons.protocols.models import LabwareDefinition @@ -17,7 +17,7 @@ from .base_router import RunNotFound, RunNotIdle, get_run_data_from_url log = logging.getLogger(__name__) -labware_router = FastBuildRouter() +labware_router = LightRouter() @PydanticResponse.wrap_route( diff --git a/robot-server/robot_server/modules/router.py b/robot-server/robot_server/modules/router.py index ec8c4d8b1d6..8bbf8a6ae7a 100644 --- a/robot-server/robot_server/modules/router.py +++ b/robot-server/robot_server/modules/router.py @@ -2,7 +2,7 @@ from typing import Annotated, List, Dict from fastapi import Depends, status -from server_utils.fastapi_utils.light_router import FastBuildRouter +from server_utils.fastapi_utils.light_router import LightRouter from opentrons.hardware_control import HardwareControlAPI from opentrons.hardware_control.modules import module_calibration @@ -23,7 +23,7 @@ from .module_identifier import ModuleIdentifier from .module_data_mapper import ModuleDataMapper -modules_router = FastBuildRouter() +modules_router = LightRouter() @PydanticResponse.wrap_route( diff --git a/robot-server/robot_server/protocols/router.py b/robot-server/robot_server/protocols/router.py index 5d991fb79fc..574f9621004 100644 --- a/robot-server/robot_server/protocols/router.py +++ b/robot-server/robot_server/protocols/router.py @@ -25,7 +25,7 @@ ) from fastapi.responses import PlainTextResponse from pydantic import BaseModel, Field -from server_utils.fastapi_utils.light_router import FastBuildRouter +from server_utils.fastapi_utils.light_router import LightRouter from opentrons.protocol_reader import ( ProtocolReader, @@ -151,7 +151,7 @@ class ProtocolLinks(BaseModel): ) -protocols_router = FastBuildRouter() +protocols_router = LightRouter() @PydanticResponse.wrap_route( diff --git a/robot-server/robot_server/robot/control/router.py b/robot-server/robot_server/robot/control/router.py index f2ab0aa239c..037ef1dc96a 100644 --- a/robot-server/robot_server/robot/control/router.py +++ b/robot-server/robot_server/robot/control/router.py @@ -2,7 +2,7 @@ from typing import Annotated, TYPE_CHECKING from fastapi import status, Depends -from server_utils.fastapi_utils.light_router import FastBuildRouter +from server_utils.fastapi_utils.light_router import LightRouter from opentrons_shared_data.robot.types import RobotType from opentrons_shared_data.robot.types import RobotTypeEnum @@ -24,7 +24,7 @@ if TYPE_CHECKING: from opentrons.hardware_control.ot3api import OT3API # noqa: F401 -control_router = FastBuildRouter() +control_router = LightRouter() async def _get_estop_status_response( diff --git a/robot-server/robot_server/robot/router.py b/robot-server/robot_server/robot/router.py index cba11f329e7..6c6dd6acc05 100644 --- a/robot-server/robot_server/robot/router.py +++ b/robot-server/robot_server/robot/router.py @@ -1,8 +1,8 @@ """Router for /robot endpoints.""" -from server_utils.fastapi_utils.light_router import FastBuildRouter +from server_utils.fastapi_utils.light_router import LightRouter from .control.router import control_router -robot_router = FastBuildRouter() +robot_router = LightRouter() robot_router.include_router(router=control_router) diff --git a/robot-server/robot_server/router.py b/robot-server/robot_server/router.py index ee1d767f823..ab5af067637 100644 --- a/robot-server/robot_server/router.py +++ b/robot-server/robot_server/router.py @@ -1,6 +1,6 @@ """Application routes.""" from fastapi import Depends, status -from server_utils.fastapi_utils.light_router import FastBuildRouter +from server_utils.fastapi_utils.light_router import LightRouter from .constants import V1_TAG @@ -28,15 +28,15 @@ from .subsystems.router import subsystems_router from .system.router import system_router -router = FastBuildRouter() +router = LightRouter() # Legacy routes router.include_router( router=legacy_routes, tags=[V1_TAG], # todo(mm, 2024-12-19): This `responses` setting is preventing us from - # porting legacy_routes from fastapi.APIRouter to our FastBuildRouter. - # Either teach FastBuildRouter how to handle `responses` or stop doing + # porting legacy_routes from fastapi.APIRouter to our LightRouter. + # Either teach LightRouter how to handle `responses` or stop doing # a custom 422 response on these endpoints. responses={ status.HTTP_422_UNPROCESSABLE_ENTITY: { @@ -50,8 +50,8 @@ dependencies=[Depends(check_version_header)], responses={ # todo(mm, 2024-12-19): This `responses` setting is preventing us from - # porting health_router from fastapi.APIRouter to our FastBuildRouter. - # Either teach FastBuildRouter how to handle `responses` or stop doing + # porting health_router from fastapi.APIRouter to our LightRouter. + # Either teach LightRouter how to handle `responses` or stop doing # a custom 422 response on these endpoints. status.HTTP_422_UNPROCESSABLE_ENTITY: { "model": LegacyErrorResponse, diff --git a/robot-server/robot_server/runs/router/__init__.py b/robot-server/robot_server/runs/router/__init__.py index 82198a75f98..fa8be0cee67 100644 --- a/robot-server/robot_server/runs/router/__init__.py +++ b/robot-server/robot_server/runs/router/__init__.py @@ -1,5 +1,5 @@ """Runs router.""" -from server_utils.fastapi_utils.light_router import FastBuildRouter +from server_utils.fastapi_utils.light_router import LightRouter from .base_router import base_router from .commands_router import commands_router @@ -7,7 +7,7 @@ from .labware_router import labware_router from .error_recovery_policy_router import error_recovery_policy_router -runs_router = FastBuildRouter() +runs_router = LightRouter() runs_router.include_router(base_router) runs_router.include_router(commands_router) diff --git a/robot-server/robot_server/runs/router/actions_router.py b/robot-server/robot_server/runs/router/actions_router.py index 631e7192166..0bfb16185c7 100644 --- a/robot-server/robot_server/runs/router/actions_router.py +++ b/robot-server/robot_server/runs/router/actions_router.py @@ -5,7 +5,7 @@ from typing import Annotated, Literal, Union from fastapi import Depends, status -from server_utils.fastapi_utils.light_router import FastBuildRouter +from server_utils.fastapi_utils.light_router import LightRouter from robot_server.errors.error_responses import ErrorDetails, ErrorBody from robot_server.service.dependencies import get_current_time, get_unique_id @@ -39,7 +39,7 @@ ) log = logging.getLogger(__name__) -actions_router = FastBuildRouter() +actions_router = LightRouter() class RunActionNotAllowed(ErrorDetails): diff --git a/robot-server/robot_server/runs/router/base_router.py b/robot-server/robot_server/runs/router/base_router.py index 6bd7999a946..8e478c08de9 100644 --- a/robot-server/robot_server/runs/router/base_router.py +++ b/robot-server/robot_server/runs/router/base_router.py @@ -10,7 +10,7 @@ from fastapi import Depends, status, Query from pydantic import BaseModel, Field -from server_utils.fastapi_utils.light_router import FastBuildRouter +from server_utils.fastapi_utils.light_router import LightRouter from opentrons_shared_data.errors import ErrorCodes @@ -89,7 +89,7 @@ from robot_server.service.notifications import get_pe_notify_publishers log = logging.getLogger(__name__) -base_router = FastBuildRouter() +base_router = LightRouter() _DEFAULT_COMMAND_ERROR_LIST_LENGTH: Final = 20 diff --git a/robot-server/robot_server/runs/router/commands_router.py b/robot-server/robot_server/runs/router/commands_router.py index cc016288425..b2cbb79b2bb 100644 --- a/robot-server/robot_server/runs/router/commands_router.py +++ b/robot-server/robot_server/runs/router/commands_router.py @@ -3,7 +3,7 @@ from typing import Annotated, Final, Literal, Optional, Union from fastapi import Depends, Query, status -from server_utils.fastapi_utils.light_router import FastBuildRouter +from server_utils.fastapi_utils.light_router import LightRouter from opentrons.protocol_engine import ( CommandPointer, @@ -45,7 +45,7 @@ _DEFAULT_COMMAND_LIST_LENGTH: Final = 20 -commands_router = FastBuildRouter() +commands_router = LightRouter() class CommandNotFound(ErrorDetails): diff --git a/robot-server/robot_server/runs/router/error_recovery_policy_router.py b/robot-server/robot_server/runs/router/error_recovery_policy_router.py index 2f301501d6d..2b1c786b9d4 100644 --- a/robot-server/robot_server/runs/router/error_recovery_policy_router.py +++ b/robot-server/robot_server/runs/router/error_recovery_policy_router.py @@ -5,7 +5,7 @@ from typing import Annotated from fastapi import status, Depends -from server_utils.fastapi_utils.light_router import FastBuildRouter +from server_utils.fastapi_utils.light_router import LightRouter from robot_server.errors.error_responses import ErrorBody from robot_server.service.json_api.request import RequestModel @@ -21,7 +21,7 @@ from ..error_recovery_models import ErrorRecoveryPolicy -error_recovery_policy_router = FastBuildRouter() +error_recovery_policy_router = LightRouter() @PydanticResponse.wrap_route( diff --git a/robot-server/robot_server/runs/router/labware_router.py b/robot-server/robot_server/runs/router/labware_router.py index a737657f884..06c16f8b71a 100644 --- a/robot-server/robot_server/runs/router/labware_router.py +++ b/robot-server/robot_server/runs/router/labware_router.py @@ -9,7 +9,7 @@ LabwareDefinition as SD_LabwareDefinition, ) -from server_utils.fastapi_utils.light_router import FastBuildRouter +from server_utils.fastapi_utils.light_router import LightRouter from opentrons.protocol_engine import LabwareOffsetCreate, LabwareOffset from opentrons.protocols.models import LabwareDefinition @@ -28,7 +28,7 @@ from .base_router import RunNotFound, RunStopped, RunNotIdle, get_run_data_from_url log = logging.getLogger(__name__) -labware_router = FastBuildRouter() +labware_router = LightRouter() @PydanticResponse.wrap_route( diff --git a/robot-server/robot_server/service/labware/router.py b/robot-server/robot_server/service/labware/router.py index 59b0b844dff..6d44f2faeee 100644 --- a/robot-server/robot_server/service/labware/router.py +++ b/robot-server/robot_server/service/labware/router.py @@ -7,7 +7,7 @@ from typing_extensions import Literal, NoReturn from fastapi import Depends, status -from server_utils.fastapi_utils.light_router import FastBuildRouter +from server_utils.fastapi_utils.light_router import LightRouter from opentrons_shared_data.errors import ErrorCodes from robot_server.errors.error_responses import ErrorDetails, ErrorBody @@ -16,7 +16,7 @@ from robot_server.service.errors import RobotServerError, CommonErrorDef -router = FastBuildRouter() +router = LightRouter() class LabwareCalibrationEndpointsRemoved(ErrorDetails): diff --git a/robot-server/robot_server/subsystems/router.py b/robot-server/robot_server/subsystems/router.py index e13499e757a..950cf0505e2 100644 --- a/robot-server/robot_server/subsystems/router.py +++ b/robot-server/robot_server/subsystems/router.py @@ -6,7 +6,7 @@ from fastapi import status, Depends, Response, Request from typing_extensions import Literal -from server_utils.fastapi_utils.light_router import FastBuildRouter +from server_utils.fastapi_utils.light_router import LightRouter from robot_server.service.json_api import ( SimpleMultiBody, @@ -47,7 +47,7 @@ if TYPE_CHECKING: from opentrons.hardware_control.ot3api import OT3API # noqa: F401 -subsystems_router = FastBuildRouter() +subsystems_router = LightRouter() def status_route_for(subsystem: SubSystem) -> str: