Skip to content

Commit ba892ea

Browse files
committed
@matusdrobuliak66 review: credits error
1 parent 4c28b38 commit ba892ea

File tree

2 files changed

+8
-3
lines changed

2 files changed

+8
-3
lines changed

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

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,7 @@
1515
from models_library.api_schemas_webserver.wallets import WalletGetWithAvailableCredits
1616
from models_library.projects_nodes_io import BaseFileLink
1717
from models_library.users import UserID
18+
from models_library.wallets import ZERO_CREDITS
1819
from pydantic import NonNegativeInt
1920
from pydantic.types import PositiveInt
2021
from servicelib.fastapi.requests_decorators import cancel_on_disconnect
@@ -232,8 +233,11 @@ async def get_job_outputs(
232233
if wallet is None:
233234
raise MissingWalletError(job_id=project.uuid)
234235
wallet_with_credits = await webserver_api.get_wallet(wallet_id=wallet.wallet_id)
235-
if wallet_with_credits.available_credits < 0.0:
236-
raise InsufficientCreditsError(wallet_name=wallet_with_credits.name)
236+
if wallet_with_credits.available_credits <= ZERO_CREDITS:
237+
raise InsufficientCreditsError(
238+
wallet_name=wallet_with_credits.name,
239+
wallet_credit_amount=wallet_with_credits.available_credits,
240+
)
237241

238242
outputs: dict[str, ResultsTypes] = await get_solver_output_results(
239243
user_id=user_id,

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

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,8 @@ class CustomBaseError(ApiServerBaseError):
66

77

88
class InsufficientCreditsError(CustomBaseError):
9-
msg_template = "Wallet '{wallet_name}' does not have any credits. Please add some before requesting solver ouputs"
9+
# NOTE: Same message as WalletNotEnoughCreditsError
10+
msg_template = "Wallet '{wallet_name}' has {wallet_credit_amount} credits. Please add some before requesting solver ouputs"
1011

1112

1213
class MissingWalletError(CustomBaseError):

0 commit comments

Comments
 (0)