fixes

Author: pcrespov

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

@@ -10,6 +10,7 @@
 from models_library.clusters import ClusterID
 from pydantic.types import PositiveInt
 
+from ...errors.http_error import create_error_json_response
 from ...errors.services_exception_handlers import DEFAULT_BACKEND_SERVICE_STATUS_CODES
 from ...models.basic_types import VersionStr
 from ...models.schemas.errors import ErrorGet
@@ -33,7 +34,6 @@
 from ..dependencies.authentication import get_current_user_id, get_product_name
 from ..dependencies.services import get_api_client
 from ..dependencies.webserver import AuthSession, get_webserver_session
-from ..errors.http_error import create_error_json_response
 from ._common import API_SERVER_DEV_FEATURES_ENABLED
 from ._jobs import start_project, stop_project
 

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

@@ -232,12 +232,10 @@ async def get_job_outputs(
     if product_price is not None:
         wallet = await webserver_api.get_project_wallet(project_id=project.uuid)
         if wallet is None:
-            msg = f"Job {project.uuid} does not have an associated wallet."
-            raise MissingWalletError(msg)
+            raise MissingWalletError(job_id=project.uuid)
         wallet_with_credits = await webserver_api.get_wallet(wallet_id=wallet.wallet_id)
         if wallet_with_credits.available_credits < 0.0:
-            msg = f"Wallet '{wallet_with_credits.name}' does not have any credits. Please add some before requesting solver ouputs"
-            raise InsufficientCreditsError(msg)
+            raise InsufficientCreditsError(wallet_name=wallet_with_credits.name)
 
     outputs: dict[str, ResultsTypes] = await get_solver_output_results(
         user_id=user_id,

services/api-server/src/simcore_service_api_server/errors/exception_handlers.py

@@ -7,7 +7,7 @@
 
 from ..core.settings import ApplicationSettings
 from ..models.custom_errors import CustomBaseError
-from ..services.log_streaming import LogDistributionBaseException
+from ..models.log_errors import LogDistributionBaseError
 from ._custom_errors_handlers import custom_error_handler
 from ._exception_handlers_factory import make_handler_for_exception
 from ._http_exception_handlers import http_error_handler
@@ -25,7 +25,7 @@ def setup(app: FastAPI):
     app.add_exception_handler(HTTPException, http_error_handler)
     app.add_exception_handler(HttpxException, handle_httpx_client_exceptions)
     app.add_exception_handler(RequestValidationError, http422_error_handler)
-    app.add_exception_handler(LogDistributionBaseException, log_handling_error_handler)
+    app.add_exception_handler(LogDistributionBaseError, log_handling_error_handler)
     app.add_exception_handler(CustomBaseError, custom_error_handler)
 
     # SEE https://docs.python.org/3/library/exceptions.html#exception-hierarchy

services/api-server/src/simcore_service_api_server/models/custom_errors.py

@@ -6,11 +6,11 @@ class CustomBaseError(ApiServerBaseError):
 
 
 class InsufficientCreditsError(CustomBaseError):
-    pass
+    msg_template = "Wallet '{wallet_name}' does not have any credits. Please add some before requesting solver ouputs"
 
 
 class MissingWalletError(CustomBaseError):
-    pass
+    msg_template = "Job {job_id} does not have an associated wallet."
 
 
 class ApplicationSetupError(CustomBaseError):