Skip to content

Commit 2d490ea

Browse files
fix
1 parent 1805845 commit 2d490ea

File tree

5 files changed

+7
-8
lines changed

5 files changed

+7
-8
lines changed

packages/models-library/src/models_library/api_schemas_webserver/computations.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -94,7 +94,7 @@ class ComputationRunIterationsLatestListQueryParams(ComputationRunListQueryParam
9494
class ComputationRunIterationsListQueryParams(ComputationRunListQueryParams):
9595
include_children: bool = Field(
9696
default=False,
97-
description="If true, all tasks of the project and its children are returned (Currently supported only for root projects)",
97+
description="If true, all computational runs of the project and its children are returned (Currently supported only for root projects)",
9898
)
9999

100100

packages/service-library/src/servicelib/rabbitmq/rpc_interfaces/resource_usage_tracker/errors.py

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,8 @@ class WalletTransactionError(OsparcErrorMixin, Exception):
3535
msg_template = "{msg}"
3636

3737

38-
class CreditTransactionNotFoundError(OsparcErrorMixin, Exception): ...
38+
class CreditTransactionNotFoundError(OsparcErrorMixin, Exception):
39+
msg_template = "Credit transaction for service run id {service_run_id} not found."
3940

4041

4142
### Pricing Plans Error

services/director/src/simcore_service_director/registry_proxy.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -226,7 +226,7 @@ async def _setup_registry(app: FastAPI) -> None:
226226
reraise=True,
227227
)
228228
async def _wait_until_registry_responsive(app: FastAPI) -> None:
229-
await _basic_auth_registry_request(app, path="", method="HEAD", timeout=1.0)
229+
await _basic_auth_registry_request(app, path="", method="HEAD", timeout=10.0)
230230

231231
with log_context(_logger, logging.INFO, msg="Connecting to docker registry"):
232232
await _wait_until_registry_responsive(app)

services/resource-usage-tracker/src/simcore_service_resource_usage_tracker/services/modules/db/credit_transactions_db.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -229,5 +229,5 @@ async def get_transaction_current_credits_by_service_run_id(
229229
result = await conn.execute(select_stmt)
230230
row = result.first()
231231
if row is None:
232-
raise CreditTransactionNotFoundError
232+
raise CreditTransactionNotFoundError(service_run_id=service_run_id)
233233
return Decimal(row[0])

services/web/server/src/simcore_service_webserver/director_v2/_computations_service.py

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -249,9 +249,7 @@ async def list_computations_latest_iteration_tasks(
249249
limit=20,
250250
)
251251
# Build a dict: project_uuid -> workbench
252-
project_uuid_to_workbench = {
253-
prj["project_uuid"]: prj["workbench"] for prj in project_dicts
254-
}
252+
project_uuid_to_workbench = {prj["uuid"]: prj["workbench"] for prj in project_dicts}
255253

256254
_service_run_ids = [item.service_run_id for item in _tasks_get.items]
257255
_is_product_billable = await is_product_billable(app, product_name=product_name)
@@ -281,7 +279,7 @@ async def list_computations_latest_iteration_tasks(
281279
started_at=item.started_at,
282280
ended_at=item.ended_at,
283281
log_download_link=item.log_download_link,
284-
node_name=project_uuid_to_workbench[f"{item.project_uuid}"]["workbench"][
282+
node_name=project_uuid_to_workbench[f"{item.project_uuid}"][
285283
f"{item.node_id}"
286284
].get("label", ""),
287285
osparc_credits=credits_or_none,

0 commit comments

Comments
 (0)