✨ Add RPCNamespace settings for API server, director-v2, and payments services

Author: pcrespov

services/api-server/src/simcore_service_api_server/core/settings.py

@@ -3,6 +3,7 @@
 
 from common_library.basic_types import DEFAULT_FACTORY
 from models_library.basic_types import BootModeEnum, LogLevel
+from models_library.rabbitmq_basic_types import RPCNamespace
 from pydantic import (
     AliasChoices,
     Field,
@@ -129,6 +130,7 @@ class ApplicationSettings(BasicSettings):
         DirectorV2Settings | None,
         Field(json_schema_extra={"auto_default_from_env": True}),
     ]
+
     API_SERVER_LOG_CHECK_TIMEOUT_SECONDS: NonNegativeInt = 3 * 60
     API_SERVER_PROMETHEUS_INSTRUMENTATION_ENABLED: bool = True
     API_SERVER_HEALTH_CHECK_TASK_PERIOD_SECONDS: PositiveInt = 30
@@ -144,6 +146,11 @@ class ApplicationSettings(BasicSettings):
         ),
     ]
 
+    API_SERVER_WEBSERVER_RPC_NAMESPACE: Annotated[
+        RPCNamespace,
+        Field(description="Namespace to connect to correct webserver's RPC interface"),
+    ]
+
     @cached_property
     def debug(self) -> bool:
         """If True, debug tracebacks should be returned on errors."""

services/director-v2/src/simcore_service_director_v2/core/settings.py

@@ -15,6 +15,7 @@
     ClusterTypeInModel,
     NoAuthentication,
 )
+from models_library.rabbitmq_basic_types import RPCNamespace
 from pydantic import (
     AliasChoices,
     AnyUrl,
@@ -236,6 +237,11 @@ class AppSettings(BaseApplicationSettings, MixinLoggingSettings):
         description="settings for opentelemetry tracing",
     )
 
+    DIRECTOR_V2_WEBSERVER_RPC_NAMESPACE: Annotated[
+        RPCNamespace,
+        Field(description="Namespace to connect to correct webserver's RPC interface"),
+    ]
+
     @field_validator("LOG_LEVEL", mode="before")
     @classmethod
     def _validate_loglevel(cls, value: str) -> str:

services/docker-compose.yml

@@ -13,10 +13,12 @@ services:
     hostname: "{{.Node.Hostname}}-{{.Task.Slot}}"
     environment:
       API_SERVER_DEV_FEATURES_ENABLED: ${API_SERVER_DEV_FEATURES_ENABLED}
-      API_SERVER_LOG_FORMAT_LOCAL_DEV_ENABLED: ${LOG_FORMAT_LOCAL_DEV_ENABLED}
       API_SERVER_LOG_FILTER_MAPPING : ${LOG_FILTER_MAPPING}
+      API_SERVER_LOG_FORMAT_LOCAL_DEV_ENABLED: ${LOG_FORMAT_LOCAL_DEV_ENABLED}
       API_SERVER_LOGLEVEL: ${API_SERVER_LOGLEVEL}
       API_SERVER_PROFILING: ${API_SERVER_PROFILING}
+      API_SERVER_TRACING: ${API_SERVER_TRACING}
+      API_SERVER_WEBSERVER_RPC_NAMESPACE: ${WB_API_WEBSERVER_HOST}
 
       CATALOG_HOST: ${CATALOG_HOST}
       CATALOG_PORT: ${CATALOG_PORT}
@@ -39,12 +41,12 @@ services:
       STORAGE_HOST: ${STORAGE_HOST}
       STORAGE_PORT: ${STORAGE_PORT}
 
+      TRACING_OPENTELEMETRY_COLLECTOR_ENDPOINT: ${TRACING_OPENTELEMETRY_COLLECTOR_ENDPOINT}
+      TRACING_OPENTELEMETRY_COLLECTOR_PORT: ${TRACING_OPENTELEMETRY_COLLECTOR_PORT}
+
       WEBSERVER_HOST: ${WB_API_WEBSERVER_HOST}
       WEBSERVER_PORT: ${WB_API_WEBSERVER_PORT}
       WEBSERVER_SESSION_SECRET_KEY: ${WEBSERVER_SESSION_SECRET_KEY}
-      API_SERVER_TRACING: ${API_SERVER_TRACING}
-      TRACING_OPENTELEMETRY_COLLECTOR_ENDPOINT: ${TRACING_OPENTELEMETRY_COLLECTOR_ENDPOINT}
-      TRACING_OPENTELEMETRY_COLLECTOR_PORT: ${TRACING_OPENTELEMETRY_COLLECTOR_PORT}
 
     deploy:
       labels:
@@ -389,8 +391,10 @@ services:
       TRACING_OPENTELEMETRY_COLLECTOR_ENDPOINT: ${TRACING_OPENTELEMETRY_COLLECTOR_ENDPOINT}
       TRACING_OPENTELEMETRY_COLLECTOR_PORT: ${TRACING_OPENTELEMETRY_COLLECTOR_PORT}
 
+      DIRECTOR_V2_WEBSERVER_RPC_NAMESPACE: ${WEBSERVER_HOST}
       WEBSERVER_HOST: ${WEBSERVER_HOST}
       WEBSERVER_PORT: ${WEBSERVER_PORT}
+
     volumes:
       - "/var/run/docker.sock:/var/run/docker.sock"
     deploy:
@@ -466,23 +470,26 @@ services:
     networks:
       - default
     environment:
-      LOG_FORMAT_LOCAL_DEV_ENABLED: ${LOG_FORMAT_LOCAL_DEV_ENABLED}
       LOG_FILTER_MAPPING : ${LOG_FILTER_MAPPING}
+      LOG_FORMAT_LOCAL_DEV_ENABLED: ${LOG_FORMAT_LOCAL_DEV_ENABLED}
       PAYMENTS_ACCESS_TOKEN_EXPIRE_MINUTES: ${PAYMENTS_ACCESS_TOKEN_EXPIRE_MINUTES}
       PAYMENTS_ACCESS_TOKEN_SECRET_KEY: ${PAYMENTS_ACCESS_TOKEN_SECRET_KEY}
       PAYMENTS_AUTORECHARGE_DEFAULT_MONTHLY_LIMIT: ${PAYMENTS_AUTORECHARGE_DEFAULT_MONTHLY_LIMIT}
       PAYMENTS_AUTORECHARGE_DEFAULT_TOP_UP_AMOUNT: ${PAYMENTS_AUTORECHARGE_DEFAULT_TOP_UP_AMOUNT}
       PAYMENTS_AUTORECHARGE_ENABLED: ${PAYMENTS_AUTORECHARGE_ENABLED}
       PAYMENTS_AUTORECHARGE_MIN_BALANCE_IN_CREDITS: ${PAYMENTS_AUTORECHARGE_MIN_BALANCE_IN_CREDITS}
       PAYMENTS_BCC_EMAIL: ${PAYMENTS_BCC_EMAIL}
+      PAYMENTS_EMAIL: ${PAYMENTS_EMAIL}
       PAYMENTS_GATEWAY_API_SECRET: ${PAYMENTS_GATEWAY_API_SECRET}
       PAYMENTS_GATEWAY_URL: ${PAYMENTS_GATEWAY_URL}
       PAYMENTS_LOGLEVEL: ${PAYMENTS_LOGLEVEL}
       PAYMENTS_PASSWORD: ${PAYMENTS_PASSWORD}
-      PAYMENTS_STRIPE_URL: ${PAYMENTS_STRIPE_URL}
       PAYMENTS_STRIPE_API_SECRET: ${PAYMENTS_STRIPE_API_SECRET}
+      PAYMENTS_STRIPE_URL: ${PAYMENTS_STRIPE_URL}
       PAYMENTS_SWAGGER_API_DOC_ENABLED: ${PAYMENTS_SWAGGER_API_DOC_ENABLED}
+      PAYMENTS_TRACING: ${PAYMENTS_TRACING}
       PAYMENTS_USERNAME: ${PAYMENTS_USERNAME}
+      PAYMENTS_WEBSERVER_RPC_NAMESPACE: ${WEBSERVER_HOST}
       POSTGRES_DB: ${POSTGRES_DB}
       POSTGRES_HOST: ${POSTGRES_HOST}
       POSTGRES_PASSWORD: ${POSTGRES_PASSWORD}
@@ -495,13 +502,11 @@ services:
       RABBIT_USER: ${RABBIT_USER}
       RESOURCE_USAGE_TRACKER_HOST: ${RESOURCE_USAGE_TRACKER_HOST}
       RESOURCE_USAGE_TRACKER_PORT: ${RESOURCE_USAGE_TRACKER_EXTERNAL_PORT}
-      PAYMENTS_EMAIL: ${PAYMENTS_EMAIL}
       SMTP_HOST: ${SMTP_HOST}
       SMTP_PASSWORD: ${SMTP_PASSWORD}
       SMTP_PORT: ${SMTP_PORT}
       SMTP_PROTOCOL: ${SMTP_PROTOCOL}
       SMTP_USERNAME: ${SMTP_USERNAME}
-      PAYMENTS_TRACING: ${PAYMENTS_TRACING}
       TRACING_OPENTELEMETRY_COLLECTOR_ENDPOINT: ${TRACING_OPENTELEMETRY_COLLECTOR_ENDPOINT}
       TRACING_OPENTELEMETRY_COLLECTOR_PORT: ${TRACING_OPENTELEMETRY_COLLECTOR_PORT}
 

services/payments/src/simcore_service_payments/core/settings.py

@@ -4,6 +4,7 @@
 
 from common_library.basic_types import DEFAULT_FACTORY
 from models_library.basic_types import NonNegativeDecimal
+from models_library.rabbitmq_basic_types import RPCNamespace
 from pydantic import (
     AliasChoices,
     EmailStr,
@@ -200,3 +201,8 @@ class ApplicationSettings(_BaseApplicationSettings):
             description="optional email (see notifier_email service)",
         ),
     ]
+
+    PAYMENTS_WEBSERVER_RPC_NAMESPACE: Annotated[
+        RPCNamespace,
+        Field(description="Namespace to connect to correct webserver's RPC interface"),
+    ]