Skip to content

Commit ca3d067

Browse files
committed
refactor: update batch_ids_validator to use tuple type directly and improve test assertions
1 parent f7b76cc commit ca3d067

File tree

3 files changed

+4
-7
lines changed

3 files changed

+4
-7
lines changed

packages/models-library/src/models_library/batch_operations.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ def create_batch_ids_validator(identifier_type: type[IdentifierT]) -> TypeAdapte
2828
"""
2929
return TypeAdapter(
3030
Annotated[
31-
list[identifier_type],
31+
list[identifier_type], # type: ignore[valid-type]
3232
BeforeValidator(_deduplicate_preserving_order),
3333
Field(
3434
min_length=1,

services/catalog/src/simcore_service_catalog/service/catalog_services.py

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -586,10 +586,7 @@ async def check_catalog_service_permissions(
586586
return access_rights
587587

588588

589-
ServiceKeyVersionTuple = tuple[ServiceKey, ServiceVersion]
590-
591-
592-
_BatchIdsValidator = create_batch_ids_validator(ServiceKeyVersionTuple)
589+
_BatchIdsValidator = create_batch_ids_validator(tuple[ServiceKey, ServiceVersion])
593590

594591

595592
async def batch_get_user_services(
@@ -598,7 +595,7 @@ async def batch_get_user_services(
598595
*,
599596
product_name: ProductName,
600597
user_id: UserID,
601-
ids: list[ServiceKeyVersionTuple],
598+
ids: list[tuple[ServiceKey, ServiceVersion]],
602599
) -> BatchGetUserServicesResult:
603600
"""Batch get user services.
604601

services/catalog/tests/unit/with_dbs/test_service_catalog_services.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -537,7 +537,7 @@ async def test_list_all_vs_latest_services(
537537
key_to_all_versions[item.key].append(item)
538538

539539
# For each service key, verify we have the expected number of versions
540-
for key, versions in key_to_all_versions.found_items():
540+
for key, versions in key_to_all_versions.items():
541541
assert len(versions) == num_versions_per_service
542542

543543
# Find this service in latest_found_items

0 commit comments

Comments
 (0)