✨ Refactor imports: update service module paths for consistency

pcrespov · pcrespov · commit 0269190518ab · 2025-04-08T18:32:37.000+02:00
diff --git a/services/catalog/src/simcore_service_catalog/api/_dependencies/director.py b/services/catalog/src/simcore_service_catalog/api/_dependencies/director.py
@@ -3,7 +3,7 @@
 from fastapi import Depends, FastAPI
 from servicelib.fastapi.dependencies import get_app
 
-from ...services.director import DirectorApi
+from ...service.director import DirectorApi
 
 
 def get_director_api(
diff --git a/services/catalog/src/simcore_service_catalog/api/_dependencies/services.py b/services/catalog/src/simcore_service_catalog/api/_dependencies/services.py
@@ -15,8 +15,8 @@
 from ...core.settings import ApplicationSettings
 from ...db.repositories.groups import GroupsRepository
 from ...db.repositories.services import ServicesRepository
-from ...services import manifest
-from ...services.director import DirectorApi
+from ...service import manifest
+from ...service.director import DirectorApi
 from .database import get_repository
 from .director import get_director_api
 
diff --git a/services/catalog/src/simcore_service_catalog/api/rest/_services.py b/services/catalog/src/simcore_service_catalog/api/rest/_services.py
@@ -23,7 +23,7 @@
 from ...db.repositories.groups import GroupsRepository
 from ...db.repositories.services import ServicesRepository
 from ...models.services_db import ServiceAccessRightsAtDB, ServiceMetaDataDBGet
-from ...services.director import DirectorApi
+from ...service.director import DirectorApi
 from .._dependencies.database import get_repository
 from .._dependencies.director import get_director_api
 from .._dependencies.services import get_service_from_manifest
diff --git a/services/catalog/src/simcore_service_catalog/api/rest/_services_extras.py b/services/catalog/src/simcore_service_catalog/api/rest/_services_extras.py
@@ -4,7 +4,7 @@
 from models_library.api_schemas_directorv2.services import ServiceExtras
 from models_library.services import ServiceKey, ServiceVersion
 
-from ...services.director import DirectorApi
+from ...service.director import DirectorApi
 from .._dependencies.director import get_director_api
 
 router = APIRouter()
diff --git a/services/catalog/src/simcore_service_catalog/api/rest/_services_labels.py b/services/catalog/src/simcore_service_catalog/api/rest/_services_labels.py
@@ -3,7 +3,7 @@
 from fastapi import APIRouter, Depends
 from models_library.services import ServiceKey, ServiceVersion
 
-from ...services.director import DirectorApi
+from ...service.director import DirectorApi
 from .._dependencies.director import get_director_api
 
 router = APIRouter()
diff --git a/services/catalog/src/simcore_service_catalog/api/rest/_services_resources.py b/services/catalog/src/simcore_service_catalog/api/rest/_services_resources.py
@@ -24,8 +24,8 @@
 
 from ..._constants import RESPONSE_MODEL_POLICY, SIMCORE_SERVICE_SETTINGS_LABELS
 from ...db.repositories.services import ServicesRepository
-from ...services.director import DirectorApi
-from ...services.function_services import is_function_service
+from ...service.director import DirectorApi
+from ...service.function_services import is_function_service
 from ...utils.service_resources import (
     merge_service_resources_with_user_specs,
     parse_generic_resource,
diff --git a/services/catalog/src/simcore_service_catalog/api/rest/_services_specifications.py b/services/catalog/src/simcore_service_catalog/api/rest/_services_specifications.py
@@ -12,7 +12,7 @@
 from ..._constants import RESPONSE_MODEL_POLICY
 from ...db.repositories.groups import GroupsRepository
 from ...db.repositories.services import ServicesRepository
-from ...services.function_services import is_function_service
+from ...service.function_services import is_function_service
 from .._dependencies.database import get_repository
 from .._dependencies.services import get_default_service_specifications
 
diff --git a/services/catalog/src/simcore_service_catalog/api/rpc/_services.py b/services/catalog/src/simcore_service_catalog/api/rpc/_services.py
@@ -26,7 +26,7 @@
 from simcore_service_catalog.db.repositories.groups import GroupsRepository
 
 from ...db.repositories.services import ServicesRepository
-from ...services import services_api
+from ...service import services_api
 from .._dependencies.director import get_director_api
 
 _logger = logging.getLogger(__name__)
diff --git a/services/catalog/src/simcore_service_catalog/api/rpc/routes.py b/services/catalog/src/simcore_service_catalog/api/rpc/routes.py
@@ -5,7 +5,7 @@
 from fastapi_lifespan_manager import State
 from models_library.api_schemas_catalog import CATALOG_RPC_NAMESPACE
 
-from ...services.rabbitmq import get_rabbitmq_rpc_server
+from ...service.rabbitmq import get_rabbitmq_rpc_server
 from . import _services
 
 _logger = logging.getLogger(__name__)
diff --git a/services/catalog/src/simcore_service_catalog/core/background_tasks.py b/services/catalog/src/simcore_service_catalog/core/background_tasks.py
@@ -23,15 +23,15 @@
 from packaging.version import Version
 from pydantic import ValidationError
 from simcore_service_catalog.api._dependencies.director import get_director_api
-from simcore_service_catalog.services import manifest
+from simcore_service_catalog.service import manifest
 from sqlalchemy.exc import SQLAlchemyError
 from sqlalchemy.ext.asyncio import AsyncEngine
 
 from ..db.repositories.groups import GroupsRepository
 from ..db.repositories.projects import ProjectsRepository
 from ..db.repositories.services import ServicesRepository
 from ..models.services_db import ServiceAccessRightsAtDB, ServiceMetaDataDBCreate
-from ..services import access_rights
+from ..service import access_rights
 
 _logger = logging.getLogger(__name__)
 
diff --git a/services/catalog/src/simcore_service_catalog/core/events.py b/services/catalog/src/simcore_service_catalog/core/events.py
@@ -14,9 +14,9 @@
 from .._meta import APP_FINISHED_BANNER_MSG, APP_STARTED_BANNER_MSG
 from ..api.rpc.routes import rpc_api_lifespan
 from ..repository.events import database_lifespan
-from ..services.director import director_lifespan
-from ..services.function_services import function_services_lifespan
-from ..services.rabbitmq import rabbitmq_lifespan
+from ..service.director import director_lifespan
+from ..service.function_services import function_services_lifespan
+from ..service.rabbitmq import rabbitmq_lifespan
 from .background_tasks import background_task_lifespan
 from .settings import ApplicationSettings
 
diff --git a/services/catalog/src/simcore_service_catalog/service/__init__.py b/services/catalog/src/simcore_service_catalog/service/__init__.py
diff --git a/services/catalog/src/simcore_service_catalog/service/access_rights.py b/services/catalog/src/simcore_service_catalog/service/access_rights.py
diff --git a/services/catalog/src/simcore_service_catalog/service/compatibility.py b/services/catalog/src/simcore_service_catalog/service/compatibility.py
@@ -1,6 +1,4 @@
-""" Manages service compatibility policies
-
-"""
+"""Manages service compatibility policies"""
 
 from models_library.products import ProductName
 from models_library.services_history import Compatibility, CompatibleService
diff --git a/services/catalog/src/simcore_service_catalog/service/director.py b/services/catalog/src/simcore_service_catalog/service/director.py
diff --git a/services/catalog/src/simcore_service_catalog/service/function_services.py b/services/catalog/src/simcore_service_catalog/service/function_services.py
diff --git a/services/catalog/src/simcore_service_catalog/service/manifest.py b/services/catalog/src/simcore_service_catalog/service/manifest.py
diff --git a/services/catalog/src/simcore_service_catalog/service/rabbitmq.py b/services/catalog/src/simcore_service_catalog/service/rabbitmq.py
diff --git a/services/catalog/src/simcore_service_catalog/service/services_api.py b/services/catalog/src/simcore_service_catalog/service/services_api.py
@@ -28,8 +28,8 @@
     ServiceMetaDataDBPatch,
     ServiceWithHistoryDBGet,
 )
-from ..services import manifest
-from ..services.director import DirectorApi
+from ..service import manifest
+from ..service.director import DirectorApi
 from .compatibility import evaluate_service_compatibility_map
 from .function_services import is_function_service
 
diff --git a/services/catalog/tests/unit/test_services_compatibility.py b/services/catalog/tests/unit/test_services_compatibility.py
@@ -13,7 +13,7 @@
 from pytest_mock import MockerFixture, MockType
 from simcore_service_catalog.db.repositories.services import ServicesRepository
 from simcore_service_catalog.models.services_db import ReleaseDBGet
-from simcore_service_catalog.services.compatibility import (
+from simcore_service_catalog.service.compatibility import (
     _get_latest_compatible_version,
     evaluate_service_compatibility_map,
 )
diff --git a/services/catalog/tests/unit/test_services_director.py b/services/catalog/tests/unit/test_services_director.py
@@ -16,7 +16,7 @@
 from pytest_simcore.helpers.typing_env import EnvVarsDict
 from respx.router import MockRouter
 from simcore_service_catalog.api._dependencies.director import get_director_api
-from simcore_service_catalog.services.director import DirectorApi
+from simcore_service_catalog.service.director import DirectorApi
 
 
 @pytest.fixture
diff --git a/services/catalog/tests/unit/test_services_function_services.py b/services/catalog/tests/unit/test_services_function_services.py
@@ -8,7 +8,7 @@
 
 import pytest
 from models_library.api_schemas_catalog.services import ServiceMetaDataPublished
-from simcore_service_catalog.services.function_services import (
+from simcore_service_catalog.service.function_services import (
     is_function_service,
     iter_service_docker_data,
 )
diff --git a/services/catalog/tests/unit/test_services_manifest.py b/services/catalog/tests/unit/test_services_manifest.py
@@ -14,8 +14,8 @@
 from pytest_simcore.helpers.typing_env import EnvVarsDict
 from respx.router import MockRouter
 from simcore_service_catalog.api._dependencies.director import get_director_api
-from simcore_service_catalog.services import manifest
-from simcore_service_catalog.services.director import DirectorApi
+from simcore_service_catalog.service import manifest
+from simcore_service_catalog.service.director import DirectorApi
 
 
 @pytest.fixture
diff --git a/services/catalog/tests/unit/with_dbs/test_services_access_rights.py b/services/catalog/tests/unit/with_dbs/test_services_access_rights.py
@@ -11,7 +11,7 @@
 from pydantic import TypeAdapter
 from simcore_service_catalog.db.repositories.services import ServicesRepository
 from simcore_service_catalog.models.services_db import ServiceAccessRightsAtDB
-from simcore_service_catalog.services.access_rights import (
+from simcore_service_catalog.service.access_rights import (
     evaluate_auto_upgrade_policy,
     evaluate_default_policy,
     reduce_access_rights,
diff --git a/services/catalog/tests/unit/with_dbs/test_services_services_api.py b/services/catalog/tests/unit/with_dbs/test_services_services_api.py
@@ -19,8 +19,8 @@
 from simcore_service_catalog.api._dependencies.director import get_director_api
 from simcore_service_catalog.db.repositories.groups import GroupsRepository
 from simcore_service_catalog.db.repositories.services import ServicesRepository
-from simcore_service_catalog.services import manifest, services_api
-from simcore_service_catalog.services.director import DirectorApi
+from simcore_service_catalog.service import manifest, services_api
+from simcore_service_catalog.service.director import DirectorApi
 from sqlalchemy.ext.asyncio import AsyncEngine
 
 pytest_simcore_core_services_selection = [
