♻️ Move service extras to catalog

services/catalog/openapi.json

@@ -190,6 +190,60 @@
         }
       }
     },
+    "/v0/services/{service_key}/{service_version}/extras": {
+      "get": {
+        "tags": [
+          "services"
+        ],
+        "summary": "Get Service Extras",
+        "operationId": "get_service_extras_v0_services__service_key___service_version__extras_get",
+        "parameters": [
+          {
+            "name": "service_key",
+            "in": "path",
+            "required": true,
+            "schema": {
+              "type": "string",
+              "pattern": "^simcore/services/((comp|dynamic|frontend))/([a-z0-9][a-z0-9_.-]*/)*([a-z0-9-_]+[a-z0-9])$",
+              "title": "Service Key"
+            }
+          },
+          {
+            "name": "service_version",
+            "in": "path",
+            "required": true,
+            "schema": {
+              "type": "string",
+              "pattern": "^(0|[1-9]\\d*)(\\.(0|[1-9]\\d*)){2}(-(0|[1-9]\\d*|\\d*[-a-zA-Z][-\\da-zA-Z]*)(\\.(0|[1-9]\\d*|\\d*[-a-zA-Z][-\\da-zA-Z]*))*)?(\\+[-\\da-zA-Z]+(\\.[-\\da-zA-Z-]+)*)?$",
+              "title": "Service Version"
+            }
+          }
+        ],
+        "responses": {
+          "200": {
+            "description": "Successful Response",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "type": "object",
+                  "title": "Response Get Service Extras V0 Services  Service Key   Service Version  Extras Get"
+                }
+              }
+            }
+          },
+          "422": {
+            "description": "Validation Error",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/HTTPValidationError"
+                }
+              }
+            }
+          }
+        }
+      }
+    },
     "/v0/services/{service_key}/{service_version}/specifications": {
       "get": {
         "tags": [

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

@@ -0,0 +1,18 @@
+from typing import Annotated, Any
+
+from fastapi import APIRouter, Depends
+from models_library.services import ServiceKey, ServiceVersion
+
+from ...services.director import DirectorApi
+from ..dependencies.director import get_director_api
+
+router = APIRouter()
+
+
+@router.get("/{service_key:path}/{service_version}/extras")
+async def get_service_extras(
+    service_key: ServiceKey,
+    service_version: ServiceVersion,
+    director_client: Annotated[DirectorApi, Depends(get_director_api)],
+) -> dict[str, Any]:
+    return await director_client.get_service_extras(service_key, service_version)

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

@@ -7,6 +7,7 @@
     _meta,
     _services,
     _services_access_rights,
+    _services_extras,
     _services_labels,
     _services_ports,
     _services_resources,
@@ -44,6 +45,11 @@
     tags=_SERVICE_TAGS,
     prefix=_SERVICE_PREFIX,
 )
+v0_router.include_router(
+    _services_extras.router,
+    tags=_SERVICE_TAGS,
+    prefix=_SERVICE_PREFIX,
+)
 v0_router.include_router(
     _services_specifications.router,
     tags=_SERVICE_TAGS,

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

@@ -50,9 +50,7 @@ def create_app(settings: ApplicationSettings | None = None) -> FastAPI:
         setup_tracing(app, settings.CATALOG_TRACING, APP_NAME)
 
     # STARTUP-EVENT
-    app.add_event_handler(
-        "startup", create_on_startup(app, tracing_settings=settings.CATALOG_TRACING)
-    )
+    app.add_event_handler("startup", create_on_startup(app))
 
     # PLUGIN SETUP
     setup_function_services(app)

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

@@ -5,7 +5,6 @@
 from fastapi import FastAPI
 from servicelib.fastapi.db_asyncpg_engine import close_db_connection, connect_to_db
 from servicelib.logging_utils import log_context
-from settings_library.tracing import TracingSettings
 
 from .._meta import APP_FINISHED_BANNER_MSG, APP_STARTED_BANNER_MSG
 from ..db.events import setup_default_product
@@ -27,9 +26,7 @@ def _flush_finished_banner() -> None:
     print(APP_FINISHED_BANNER_MSG, flush=True)  # noqa: T201
 
 
-def create_on_startup(
-    app: FastAPI, tracing_settings: TracingSettings | None
-) -> EventCallable:
+def create_on_startup(app: FastAPI) -> EventCallable:
     async def _() -> None:
         _flush_started_banner()
 
@@ -40,7 +37,7 @@ async def _() -> None:
 
         if app.state.settings.CATALOG_DIRECTOR:
             # setup connection to director
-            await setup_director(app, tracing_settings=tracing_settings)
+            await setup_director(app)
 
             # FIXME: check director service is in place and ready. Hand-shake??
             # SEE https://github.com/ITISFoundation/osparc-simcore/issues/1728

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

@@ -7,7 +7,14 @@
 )
 from models_library.basic_types import LogLevel
 from models_library.services_resources import ResourcesDict, ResourceValue
-from pydantic import AliasChoices, ByteSize, Field, PositiveInt, TypeAdapter
+from pydantic import (
+    AliasChoices,
+    ByteSize,
+    Field,
+    NonNegativeInt,
+    PositiveInt,
+    TypeAdapter,
+)
 from servicelib.logging_utils_filtering import LoggerName, MessageSubstring
 from settings_library.application import BaseApplicationSettings
 from settings_library.base import BaseCustomSettings
@@ -103,3 +110,6 @@ class ApplicationSettings(BaseApplicationSettings, MixinLoggingSettings):
         json_schema_extra={"auto_default_from_env": True},
         description="settings for opentelemetry tracing",
     )
+
+    DIRECTOR_DEFAULT_MAX_MEMORY: NonNegativeInt = Field(default=0)
+    DIRECTOR_DEFAULT_MAX_NANO_CPUS: NonNegativeInt = Field(default=0)

services/catalog/src/simcore_service_catalog/services/access_rights.py

@@ -6,8 +6,7 @@
 import operator
 from collections.abc import Callable
 from datetime import UTC, datetime
-from typing import Any, cast
-from urllib.parse import quote_plus
+from typing import cast
 
 import arrow
 from fastapi import FastAPI
@@ -36,12 +35,8 @@ async def _is_old_service(app: FastAPI, service: ServiceMetaDataPublished) -> bo
     # NOTE: https://github.com/ITISFoundation/osparc-simcore/pull/6003#discussion_r1658200909
     # get service build date
     client = get_director_api(app)
-    data = cast(
-        dict[str, Any],
-        await client.get(
-            f"/service_extras/{quote_plus(service.key)}/{service.version}"
-        ),
-    )
+
+    data = await client.get_service_extras(service.key, service.version)
     if not data or "build_date" not in data:
         return True
     service_build_data = arrow.get(data["build_date"]).datetime