Merge branch 'master' into chatbot-improvements

Author: matusdrobuliak66

.github/workflows/ci-testing-deploy.yml

@@ -1810,7 +1810,7 @@ jobs:
         with:
           python-version: ${{ matrix.python }}
           cache-dependency-glob: "**/e2e/requirements/requirements.txt"
-      - uses: actions/setup-node@v5.0.0
+      - uses: actions/setup-node@v6.0.0
         with:
           node-version: ${{ matrix.node }}
           cache: "npm"

.github/workflows/codeql-analysis.yml

@@ -29,10 +29,10 @@ jobs:
         uses: actions/checkout@v5
 
       - name: Initialize CodeQL tools for scanning
-        uses: github/codeql-action/init@v3
+        uses: github/codeql-action/init@v4
         with:
           languages: ${{ matrix.language }}
           config-file: ./.github/codeql/codeql-config.yml
 
       - name: Perform CodeQL Analysis
-        uses: github/codeql-action/analyze@v3
+        uses: github/codeql-action/analyze@v4

packages/service-library/src/servicelib/rabbitmq/rpc_interfaces/dynamic_scheduler/services.py

@@ -90,13 +90,11 @@ async def stop_dynamic_service(
     rabbitmq_rpc_client: RabbitMQRPCClient,
     *,
     dynamic_service_stop: DynamicServiceStop,
-    timeout_s: NonNegativeInt,
 ) -> None:
     result = await rabbitmq_rpc_client.request(
         DYNAMIC_SCHEDULER_RPC_NAMESPACE,
         _RPC_METHOD_NAME_ADAPTER.validate_python("stop_dynamic_service"),
         dynamic_service_stop=dynamic_service_stop,
-        timeout_s=timeout_s,
     )
     assert result is None  # nosec
 

services/agent/src/simcore_service_agent/main.py

@@ -5,11 +5,10 @@
 from fastapi import FastAPI
 from servicelib.fastapi.logging_lifespan import create_logging_shutdown_event
 from servicelib.tracing import TracingConfig
+from simcore_service_agent._meta import APP_NAME
 from simcore_service_agent.core.application import create_app
 from simcore_service_agent.core.settings import ApplicationSettings
 
-from ._meta import APP_NAME
-
 _logger = logging.getLogger(__name__)
 
 _NOISY_LOGGERS: Final[tuple[str, ...]] = (

services/api-server/src/simcore_service_api_server/main.py

@@ -7,11 +7,10 @@
 from fastapi import FastAPI
 from servicelib.fastapi.logging_lifespan import create_logging_shutdown_event
 from servicelib.tracing import TracingConfig
+from simcore_service_api_server._meta import APP_NAME
 from simcore_service_api_server.core.application import create_app
 from simcore_service_api_server.core.settings import ApplicationSettings
 
-from ._meta import APP_NAME
-
 _logger = logging.getLogger(__name__)
 
 _NOISY_LOGGERS: Final[tuple[str, ...]] = (

services/autoscaling/src/simcore_service_autoscaling/main.py

@@ -7,11 +7,10 @@
 from fastapi import FastAPI
 from servicelib import tracing
 from servicelib.fastapi.logging_lifespan import create_logging_shutdown_event
+from simcore_service_autoscaling._meta import APP_NAME
 from simcore_service_autoscaling.core.application import create_app
 from simcore_service_autoscaling.core.settings import ApplicationSettings
 
-from ._meta import APP_NAME
-
 _logger = logging.getLogger(__name__)
 
 _NOISY_LOGGERS: Final[tuple[str, ...]] = (

services/director-v2/src/simcore_service_director_v2/api/routes/dynamic_services.py

@@ -3,7 +3,6 @@
 from typing import Annotated, Final
 
 import httpx
-from common_library.json_serialization import json_dumps
 from fastapi import APIRouter, Depends, Header, HTTPException, Request
 from fastapi.responses import RedirectResponse
 from models_library.api_schemas_directorv2.dynamic_services import (
@@ -25,11 +24,6 @@
 from servicelib.utils import logged_gather
 from starlette import status
 from starlette.datastructures import URL
-from tenacity import RetryCallState, TryAgain
-from tenacity.asyncio import AsyncRetrying
-from tenacity.before_sleep import before_sleep_log
-from tenacity.stop import stop_after_delay
-from tenacity.wait import wait_fixed
 
 from ...api.dependencies.catalog import get_catalog_client
 from ...api.dependencies.database import get_repository
@@ -186,9 +180,6 @@ async def stop_dynamic_service(
     node_uuid: NodeID,
     director_v0_client: Annotated[DirectorV0Client, Depends(get_director_v0_client)],
     scheduler: Annotated[DynamicSidecarsScheduler, Depends(get_scheduler)],
-    dynamic_services_settings: Annotated[
-        DynamicServicesSettings, Depends(get_dynamic_services_settings)
-    ],
     *,
     can_save: bool | None = True,
 ) -> NoContentResponse | RedirectResponse:
@@ -209,34 +200,6 @@ async def stop_dynamic_service(
     if await scheduler.is_service_awaiting_manual_intervention(node_uuid):
         raise HTTPException(status.HTTP_409_CONFLICT, detail="waiting_for_intervention")
 
-    # Service was marked for removal, the scheduler will
-    # take care of stopping cleaning up all allocated resources:
-    # services, containers, volumes and networks.
-    # Once the service is no longer being tracked this can return
-    dynamic_services_scheduler_settings: DynamicServicesSchedulerSettings = (
-        dynamic_services_settings.DYNAMIC_SCHEDULER
-    )
-
-    def _log_error(retry_state: RetryCallState):
-        logger.error(
-            "Service with %s could not be untracked after %s",
-            f"{node_uuid=}",
-            f"{json_dumps(retry_state.retry_object.statistics)}",
-        )
-
-    async for attempt in AsyncRetrying(
-        wait=wait_fixed(1.0),
-        stop=stop_after_delay(
-            dynamic_services_scheduler_settings.DYNAMIC_SIDECAR_WAIT_FOR_SERVICE_TO_STOP
-        ),
-        before_sleep=before_sleep_log(logger=logger, log_level=logging.INFO),
-        reraise=False,
-        retry_error_callback=_log_error,
-    ):
-        with attempt:
-            if scheduler.is_service_tracked(node_uuid):
-                raise TryAgain
-
     return NoContentResponse()
 
 

services/director-v2/src/simcore_service_director_v2/core/dynamic_services_settings/scheduler.py

@@ -137,9 +137,9 @@ class DynamicServicesSchedulerSettings(BaseCustomSettings):
     DYNAMIC_SIDECAR_WAIT_FOR_SERVICE_TO_STOP: PositiveFloat = Field(
         60.0 * _MINUTE,
         description=(
-            "When stopping a service, depending on the amount of data to store, "
+            "When stopping a LEGACY service, depending on the amount of data to store, "
             "the operation might be very long. Also all relative created resources: "
-            "services, containsers, volumes and networks need to be removed. "
+            "services, containers, volumes and networks need to be removed. "
         ),
     )
 

services/docker-compose.devel.yml

@@ -3,7 +3,7 @@
 # NOTES:
 # - port 3000 used for ptsv
 #
-x-common-environment: &common-environment
+x-common_environment: &common_environment
   # Enforces *_DEBUG option in all services. ONLY allowed in devel-mode!
   DEBUG : "true"
   # Enforces app to boot debug mode (see docker/boot.sh). ONLY allowed in devel-mode!
@@ -13,7 +13,7 @@ x-common-environment: &common-environment
 services:
   api-server:
     environment:
-      <<: *common-environment
+      <<: *common_environment
       API_SERVER_PROFILING : ${API_SERVER_PROFILING}
       API_SERVER_LOGLEVEL: DEBUG
     volumes:
@@ -23,7 +23,7 @@ services:
 
   api-worker:
     environment:
-      <<: *common-environment
+      <<: *common_environment
       API_SERVER_PROFILING : ${API_SERVER_PROFILING}
       API_SERVER_LOGLEVEL: DEBUG
     volumes:
@@ -33,7 +33,7 @@ services:
 
   autoscaling:
     environment:
-      <<: *common-environment
+      <<: *common_environment
       AUTOSCALING_LOGLEVEL: DEBUG
 
     volumes:
@@ -43,7 +43,7 @@ services:
 
   invitations:
     environment:
-      <<: *common-environment
+      <<: *common_environment
       INVITATIONS_LOGLEVEL: DEBUG
     volumes:
       - ./invitations:/devel/services/invitations
@@ -52,7 +52,7 @@ services:
 
   payments:
     environment:
-      <<: *common-environment
+      <<: *common_environment
       PAYMENTS_LOGLEVEL: DEBUG
     volumes:
       - ./payments:/devel/services/payments
@@ -61,7 +61,7 @@ services:
 
   dynamic-schdlr:
     environment:
-      <<: *common-environment
+      <<: *common_environment
       DYNAMIC_SCHEDULER_PROFILING : ${DYNAMIC_SCHEDULER_PROFILING}
       DYNAMIC_SCHEDULER_LOGLEVEL: DEBUG
     volumes:
@@ -73,7 +73,7 @@ services:
 
   catalog:
     environment:
-      <<: *common-environment
+      <<: *common_environment
       CATALOG_PROFILING : ${CATALOG_PROFILING}
       DYNAMIC_SIDECAR_MOUNT_PATH_DEV : ${PWD}/services/dynamic-sidecar
       CATALOG_LOGLEVEL: DEBUG
@@ -84,7 +84,7 @@ services:
 
   notifications:
     environment:
-      <<: *common-environment
+      <<: *common_environment
       NOTIFICATIONS_PROFILING : ${NOTIFICATIONS_PROFILING}
       NOTIFICATIONS_LOGLEVEL: DEBUG
     volumes:
@@ -94,7 +94,7 @@ services:
 
   clusters-keeper:
     environment:
-      <<: *common-environment
+      <<: *common_environment
       CLUSTERS_KEEPER_LOGLEVEL: DEBUG
     volumes:
       - ./clusters-keeper:/devel/services/clusters-keeper
@@ -103,7 +103,7 @@ services:
 
   datcore-adapter:
     environment:
-      <<: *common-environment
+      <<: *common_environment
       DATCORE_ADAPTER_LOGLEVEL: DEBUG
     volumes:
       - ./datcore-adapter:/devel/services/datcore-adapter
@@ -121,7 +121,7 @@ services:
 
   director-v2:
     environment:
-      <<: *common-environment
+      <<: *common_environment
       DIRECTOR_V2_PROFILING : ${DIRECTOR_V2_PROFILING}
       DYNAMIC_SIDECAR_MOUNT_PATH_DEV : ${PWD}/services/dynamic-sidecar
       DIRECTOR_V2_LOGLEVEL: DEBUG
@@ -133,7 +133,7 @@ services:
 
   efs-guardian:
     environment:
-      <<: *common-environment
+      <<: *common_environment
       EFS_GUARDIAN_LOGLEVEL: DEBUG
     volumes:
       - ./efs-guardian:/devel/services/efs-guardian
@@ -155,7 +155,7 @@ services:
       - ../packages:/devel/packages
       - ${HOST_UV_CACHE_DIR}:/home/scu/.cache/uv
     environment: &webserver_environment_devel
-      <<: *common-environment
+      <<: *common_environment
       DEBUG: 1 # NOTE: gunicorn expects an int not a boolean
       WEBSERVER_LOGLEVEL: DEBUG
       WEBSERVER_PROFILING: ${WEBSERVER_PROFILING}
@@ -192,7 +192,7 @@ services:
       - ${ETC_HOSTNAME:-/etc/hostname}:/home/scu/hostname:ro
 
     environment:
-      <<: *common-environment
+      <<: *common_environment
       SIDECAR_LOGLEVEL: DEBUG
     ports:
       - "3000"
@@ -202,7 +202,7 @@ services:
   dask-scheduler:
     volumes: *dask-sidecar_volumes_devel
     environment:
-      <<: *common-environment
+      <<: *common_environment
       SIDECAR_LOGLEVEL: DEBUG
     ports:
       - "3000"
@@ -212,7 +212,7 @@ services:
 
   resource-usage-tracker:
     environment:
-      <<: *common-environment
+      <<: *common_environment
       RESOURCE_USAGE_TRACKER_LOGLEVEL: DEBUG
     volumes:
       - ./resource-usage-tracker:/devel/services/resource-usage-tracker
@@ -225,7 +225,7 @@ services:
       - ../packages:/devel/packages
       - ${HOST_UV_CACHE_DIR}:/home/scu/.cache/uv
     environment:
-      <<: *common-environment
+      <<: *common_environment
       STORAGE_PROFILING : ${STORAGE_PROFILING}
       STORAGE_LOGLEVEL: DEBUG
 
@@ -235,7 +235,7 @@ services:
       - ../packages:/devel/packages
       - ${HOST_UV_CACHE_DIR}:/home/scu/.cache/uv
     environment:
-      <<: *common-environment
+      <<: *common_environment
       STORAGE_PROFILING : ${STORAGE_PROFILING}
       STORAGE_LOGLEVEL: DEBUG
 
@@ -245,13 +245,13 @@ services:
       - ../packages:/devel/packages
       - ${HOST_UV_CACHE_DIR}:/home/scu/.cache/uv
     environment:
-      <<: *common-environment
+      <<: *common_environment
       STORAGE_PROFILING : ${STORAGE_PROFILING}
       STORAGE_LOGLEVEL: DEBUG
 
   agent:
     environment:
-      <<: *common-environment
+      <<: *common_environment
       AGENT_LOGLEVEL: DEBUG
     volumes:
       - ./agent:/devel/services/agent

services/docker-compose.local.yml

@@ -12,6 +12,8 @@
 #
 x-common-environment: &common_environment
   SWARM_STACK_NAME : ${SWARM_STACK_NAME:-simcore_local}
+
+
 services:
   api-server:
     environment:
@@ -297,8 +299,3 @@ services:
         - traefik.http.routers.${SWARM_STACK_NAME}_whoami.rule=PathPrefix(`/whoami`)
         - traefik.http.routers.${SWARM_STACK_NAME}_whoami.entrypoints=traefik_monitor
         - traefik.http.routers.${SWARM_STACK_NAME}_whoami.middlewares=${SWARM_STACK_NAME}_gzip@swarm
-
-networks:
-  docker-api-network:
-    driver_opts:
-      {} # override 'encrypted' locally, some WSL versions have issues with encrypted networks SEE https://github.com/microsoft/WSL/issues/10029