🎨 Clean up webserver exception types (ITISFoundation#5612)

Author: bisgaard-itis

services/api-server/src/simcore_service_api_server/api/routes/solvers_jobs_getters.py

@@ -37,7 +37,6 @@
 from ...services.solver_job_models_converters import create_job_from_project
 from ...services.solver_job_outputs import ResultsTypes, get_solver_output_results
 from ...services.storage import StorageApi, to_file_api_model
-from ...services.webserver import ProjectNotFoundError
 from ..dependencies.application import get_reverse_url_mapper
 from ..dependencies.authentication import get_current_user_id, get_product_name
 from ..dependencies.database import Engine, get_db_engine
@@ -385,21 +384,13 @@ async def get_job_wallet(
     version: VersionStr,
     job_id: JobID,
     webserver_api: Annotated[AuthSession, Depends(get_webserver_session)],
-):
+) -> WalletGetWithAvailableCredits | None:
     job_name = _compose_job_resource_name(solver_key, version, job_id)
     _logger.debug("Getting wallet for job '%s'", job_name)
 
-    try:
-        project_wallet = await webserver_api.get_project_wallet(project_id=job_id)
-        if project_wallet:
-            return await webserver_api.get_wallet(wallet_id=project_wallet.wallet_id)
-        return None
-
-    except ProjectNotFoundError:
-        return create_error_json_response(
-            f"Cannot find job={job_name}",
-            status_code=status.HTTP_404_NOT_FOUND,
-        )
+    if project_wallet := await webserver_api.get_project_wallet(project_id=job_id):
+        return await webserver_api.get_wallet(wallet_id=project_wallet.wallet_id)
+    return None
 
 
 @router.get(

services/api-server/src/simcore_service_api_server/api/routes/studies.py

@@ -8,9 +8,8 @@
 from ...models.pagination import OnePage, Page, PaginationParams
 from ...models.schemas.errors import ErrorGet
 from ...models.schemas.studies import Study, StudyID, StudyPort
-from ...services.webserver import AuthSession, ProjectNotFoundError
+from ...services.webserver import AuthSession
 from ..dependencies.webserver import get_webserver_session
-from ..errors.http_error import create_error_json_response
 from ._common import API_SERVER_DEV_FEATURES_ENABLED
 
 _logger = logging.getLogger(__name__)
@@ -76,15 +75,8 @@ async def get_study(
 
     New in *version 0.5.0* (only with API_SERVER_DEV_FEATURES_ENABLED=1)
     """
-    try:
-        project: ProjectGet = await webserver_api.get_project(project_id=study_id)
-        return _create_study_from_project(project)
-
-    except ProjectNotFoundError:
-        return create_error_json_response(
-            f"Cannot find study={study_id!r}.",
-            status_code=status.HTTP_404_NOT_FOUND,
-        )
+    project: ProjectGet = await webserver_api.get_project(project_id=study_id)
+    return _create_study_from_project(project)
 
 
 @router.post(
@@ -98,15 +90,8 @@ async def clone_study(
     study_id: StudyID,
     webserver_api: Annotated[AuthSession, Depends(get_webserver_session)],
 ):
-    try:
-        project: ProjectGet = await webserver_api.clone_project(project_id=study_id)
-        return _create_study_from_project(project)
-
-    except ProjectNotFoundError:
-        return create_error_json_response(
-            f"Cannot find study={study_id!r}.",
-            status_code=status.HTTP_404_NOT_FOUND,
-        )
+    project: ProjectGet = await webserver_api.clone_project(project_id=study_id)
+    return _create_study_from_project(project)
 
 
 @router.get(
@@ -123,14 +108,7 @@ async def list_study_ports(
 
     New in *version 0.5.0* (only with API_SERVER_DEV_FEATURES_ENABLED=1)
     """
-    try:
-        project_ports: list[StudyPort] = await webserver_api.get_project_metadata_ports(
-            project_id=study_id
-        )
-        return OnePage[StudyPort](items=project_ports)
-
-    except ProjectNotFoundError:
-        return create_error_json_response(
-            f"Cannot find study={study_id!r}.",
-            status_code=status.HTTP_404_NOT_FOUND,
-        )
+    project_ports: list[StudyPort] = await webserver_api.get_project_metadata_ports(
+        project_id=study_id
+    )
+    return OnePage[StudyPort](items=project_ports)

services/api-server/src/simcore_service_api_server/services/webserver.py

@@ -33,7 +33,6 @@
 from models_library.rest_pagination import Page
 from models_library.utils.fastapi_encoders import jsonable_encoder
 from pydantic import PositiveInt
-from pydantic.errors import PydanticErrorMixin
 from servicelib.aiohttp.long_running_tasks.server import TaskStatus
 from simcore_service_api_server.models.schemas.solvers import SolverKeyId
 from simcore_service_api_server.models.schemas.studies import StudyPort
@@ -57,16 +56,6 @@
 
 _logger = logging.getLogger(__name__)
 
-
-class WebServerValueError(PydanticErrorMixin, ValueError):
-    ...
-
-
-class ProjectNotFoundError(WebServerValueError):
-    code = "webserver.project_not_found"
-    msg_template = "Project '{project_id}' not found"
-
-
 _exception_mapper = partial(service_exception_mapper, "Webserver")
 
 _JOB_STATUS_MAP: Mapping = {