Skip to content

Commit f35588d

Browse files
committed
@sanderegg review: relative imports and casting
1 parent 435f286 commit f35588d

File tree

3 files changed

+7
-11
lines changed

3 files changed

+7
-11
lines changed

services/catalog/src/simcore_service_catalog/api/rest/_services_access_rights.py

Lines changed: 4 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,6 @@
88
from models_library.services import ServiceKey, ServiceVersion
99

1010
from ..._constants import RESPONSE_MODEL_POLICY
11-
from ...models.services_db import ServiceAccessRightsAtDB
1211
from ...repository.services import ServicesRepository
1312
from .._dependencies.repository import get_repository
1413
from .._dependencies.services import AccessInfo, check_service_read_access
@@ -33,12 +32,10 @@ async def get_service_access_rights(
3332
],
3433
x_simcore_products_name: Annotated[str, Header(...)],
3534
):
36-
service_access_rights: list[ServiceAccessRightsAtDB] = (
37-
await services_repo.get_service_access_rights(
38-
key=service_key,
39-
version=service_version,
40-
product_name=x_simcore_products_name,
41-
)
35+
service_access_rights = await services_repo.get_service_access_rights(
36+
key=service_key,
37+
version=service_version,
38+
product_name=x_simcore_products_name,
4239
)
4340

4441
gids_with_access_rights = {}

services/catalog/src/simcore_service_catalog/core/background_tasks.py

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -22,16 +22,15 @@
2222
from models_library.services_types import ServiceKey, ServiceVersion
2323
from packaging.version import Version
2424
from pydantic import ValidationError
25-
from simcore_service_catalog.api._dependencies.director import get_director_client
26-
from simcore_service_catalog.service import manifest
2725
from sqlalchemy.exc import SQLAlchemyError
2826
from sqlalchemy.ext.asyncio import AsyncEngine
2927

28+
from ..api._dependencies.director import get_director_client
3029
from ..models.services_db import ServiceAccessRightsAtDB, ServiceMetaDataDBCreate
3130
from ..repository.groups import GroupsRepository
3231
from ..repository.projects import ProjectsRepository
3332
from ..repository.services import ServicesRepository
34-
from ..service import access_rights
33+
from ..service import access_rights, manifest
3534

3635
_logger = logging.getLogger(__name__)
3736

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,14 +22,14 @@
2222
CatalogForbiddenError,
2323
CatalogItemNotFoundError,
2424
)
25-
from simcore_service_catalog.repository.groups import GroupsRepository
2625

2726
from ..clients.director import DirectorClient
2827
from ..models.services_db import (
2928
ServiceAccessRightsAtDB,
3029
ServiceMetaDataDBPatch,
3130
ServiceWithHistoryDBGet,
3231
)
32+
from ..repository.groups import GroupsRepository
3333
from ..repository.services import ServicesRepository
3434
from . import manifest
3535
from .compatibility import evaluate_service_compatibility_map

0 commit comments

Comments
 (0)