Skip to content

Commit 19653ee

Browse files
committed
fixes
1 parent a2a86d3 commit 19653ee

File tree

4 files changed

+7
-9
lines changed

4 files changed

+7
-9
lines changed

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@
1010
from models_library.clusters import ClusterID
1111
from pydantic.types import PositiveInt
1212

13+
from ...errors.http_error import create_error_json_response
1314
from ...errors.services_exception_handlers import DEFAULT_BACKEND_SERVICE_STATUS_CODES
1415
from ...models.basic_types import VersionStr
1516
from ...models.schemas.errors import ErrorGet
@@ -33,7 +34,6 @@
3334
from ..dependencies.authentication import get_current_user_id, get_product_name
3435
from ..dependencies.services import get_api_client
3536
from ..dependencies.webserver import AuthSession, get_webserver_session
36-
from ..errors.http_error import create_error_json_response
3737
from ._common import API_SERVER_DEV_FEATURES_ENABLED
3838
from ._jobs import start_project, stop_project
3939

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

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -232,12 +232,10 @@ async def get_job_outputs(
232232
if product_price is not None:
233233
wallet = await webserver_api.get_project_wallet(project_id=project.uuid)
234234
if wallet is None:
235-
msg = f"Job {project.uuid} does not have an associated wallet."
236-
raise MissingWalletError(msg)
235+
raise MissingWalletError(job_id=project.uuid)
237236
wallet_with_credits = await webserver_api.get_wallet(wallet_id=wallet.wallet_id)
238237
if wallet_with_credits.available_credits < 0.0:
239-
msg = f"Wallet '{wallet_with_credits.name}' does not have any credits. Please add some before requesting solver ouputs"
240-
raise InsufficientCreditsError(msg)
238+
raise InsufficientCreditsError(wallet_name=wallet_with_credits.name)
241239

242240
outputs: dict[str, ResultsTypes] = await get_solver_output_results(
243241
user_id=user_id,

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77

88
from ..core.settings import ApplicationSettings
99
from ..models.custom_errors import CustomBaseError
10-
from ..services.log_streaming import LogDistributionBaseException
10+
from ..models.log_errors import LogDistributionBaseError
1111
from ._custom_errors_handlers import custom_error_handler
1212
from ._exception_handlers_factory import make_handler_for_exception
1313
from ._http_exception_handlers import http_error_handler
@@ -25,7 +25,7 @@ def setup(app: FastAPI):
2525
app.add_exception_handler(HTTPException, http_error_handler)
2626
app.add_exception_handler(HttpxException, handle_httpx_client_exceptions)
2727
app.add_exception_handler(RequestValidationError, http422_error_handler)
28-
app.add_exception_handler(LogDistributionBaseException, log_handling_error_handler)
28+
app.add_exception_handler(LogDistributionBaseError, log_handling_error_handler)
2929
app.add_exception_handler(CustomBaseError, custom_error_handler)
3030

3131
# SEE https://docs.python.org/3/library/exceptions.html#exception-hierarchy

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,11 +6,11 @@ class CustomBaseError(ApiServerBaseError):
66

77

88
class InsufficientCreditsError(CustomBaseError):
9-
pass
9+
msg_template = "Wallet '{wallet_name}' does not have any credits. Please add some before requesting solver ouputs"
1010

1111

1212
class MissingWalletError(CustomBaseError):
13-
pass
13+
msg_template = "Job {job_id} does not have an associated wallet."
1414

1515

1616
class ApplicationSetupError(CustomBaseError):

0 commit comments

Comments
 (0)