✨ Refactor imports: move DirectorApi and RabbitMQ references to clients module; add new RabbitMQ client

Author: pcrespov

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 ...service.director import DirectorApi
+from ...clients.director import DirectorApi
 
 
 def get_director_api(

services/catalog/src/simcore_service_catalog/api/_dependencies/services.py

@@ -12,11 +12,11 @@
 from pydantic import ValidationError
 from servicelib.fastapi.dependencies import get_app
 
+from ...clients.director import DirectorApi
 from ...core.settings import ApplicationSettings
 from ...repository.groups import GroupsRepository
 from ...repository.services import ServicesRepository
 from ...service import manifest
-from ...service.director import DirectorApi
 from .database import get_repository
 from .director import get_director_api
 

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

@@ -20,10 +20,10 @@
     LIST_SERVICES_CACHING_TTL,
     RESPONSE_MODEL_POLICY,
 )
+from ...clients.director import DirectorApi
 from ...models.services_db import ServiceAccessRightsAtDB, ServiceMetaDataDBGet
 from ...repository.groups import GroupsRepository
 from ...repository.services import ServicesRepository
-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

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 ...service.director import DirectorApi
+from ...clients.director import DirectorApi
 from .._dependencies.director import get_director_api
 
 router = APIRouter()

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 ...service.director import DirectorApi
+from ...clients.director import DirectorApi
 from .._dependencies.director import get_director_api
 
 router = APIRouter()

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

@@ -23,8 +23,8 @@
 from pydantic import TypeAdapter
 
 from ..._constants import RESPONSE_MODEL_POLICY, SIMCORE_SERVICE_SETTINGS_LABELS
+from ...clients.director import DirectorApi
 from ...repository.services import ServicesRepository
-from ...service.director import DirectorApi
 from ...service.function_services import is_function_service
 from ...utils.service_resources import (
     merge_service_resources_with_user_specs,

services/catalog/src/simcore_service_catalog/api/rpc/events.py

@@ -5,7 +5,7 @@
 from fastapi_lifespan_manager import State
 from models_library.api_schemas_catalog import CATALOG_RPC_NAMESPACE
 
-from ...service.rabbitmq import get_rabbitmq_rpc_server
+from ...clients.rabbitmq import get_rabbitmq_rpc_server
 from . import _services
 
 _logger = logging.getLogger(__name__)