Merge branch 'master' into feature/mock-job-manager

Author: odeimaiz

.github/CODEOWNERS

@@ -29,7 +29,8 @@ Makefile                                           @pcrespov @sanderegg
 /services/clusters-keeper/                         @sanderegg
 /services/datcore-adapter/                         @sanderegg
 /services/director*/                               @sanderegg @pcrespov @GitHK
-/services/docker-compose*.yml                      @sanderegg @mrnicegyu11 @YuryHrytsuk
+/services/docker-compose.yml                       @sanderegg @mrnicegyu11 @YuryHrytsuk
+/services/docker-compose.*.yml                     @sanderegg
 /services/dynamic-sidecar/                         @GitHK
 /services/efs-guardian/                            @matusdrobuliak66
 /services/invitations/                             @pcrespov

Makefile

@@ -357,6 +357,8 @@ endef
 show-endpoints:
 	@$(_show_endpoints)
 
+export HOST_UV_CACHE_DIR := $(shell uv cache dir)
+
 up-devel: .stack-simcore-development.yml .init-swarm $(CLIENT_WEB_OUTPUT) ## Deploys local development stack, qx-compile+watch and ops stack (pass 'make ops_disabled=1 up-...' to disable)
 	# Start compile+watch front-end container [front-end]
 	@$(MAKE_C) services/static-webserver/client down compile-dev flags=--watch

packages/service-library/src/servicelib/aiohttp/rest_middlewares.py

@@ -24,10 +24,9 @@
 from .typing_extension import Handler, Middleware
 
 DEFAULT_API_VERSION = "v0"
-_FMSG_INTERNAL_ERROR_USER_FRIENDLY_WITH_OEC = (
+_FMSG_INTERNAL_ERROR_USER_FRIENDLY = (
     "We apologize for the inconvenience. "
-    "Our team has recorded the issue [SupportID={error_code}]. "
-    "If the issue persists please report it."
+    "The issue has been recorded, please report it if it persists."
 )
 
 
@@ -52,7 +51,7 @@ def _process_and_raise_unexpected_error(request: web.BaseRequest, err: Exception
             "request.path": f"{request.path}",
         }
 
-        user_error_msg = _FMSG_INTERNAL_ERROR_USER_FRIENDLY_WITH_OEC.format(
+        user_error_msg = _FMSG_INTERNAL_ERROR_USER_FRIENDLY.format(
             error_code=error_code
         )
         http_error = create_http_error(

packages/service-library/src/servicelib/fastapi/cancellation_middleware.py

@@ -20,7 +20,9 @@ async def _message_poller(
     while True:
         message = await receive()
         if message["type"] == "http.disconnect":
-            _logger.info("client disconnected, terminating request to %s!", request.url)
+            _logger.debug(
+                "client disconnected, terminating request to %s!", request.url
+            )
             raise _TerminateTaskGroupError
 
         # Puts the message in the queue
@@ -57,7 +59,6 @@ async def __call__(self, scope: Scope, receive: Receive, send: Send) -> None:
 
         # Let's make a shared queue for the request messages
         queue: asyncio.Queue[Message] = asyncio.Queue()
-
         request = Request(scope)
 
         with log_context(_logger, logging.DEBUG, f"cancellable request {request.url}"):
@@ -72,6 +73,8 @@ async def __call__(self, scope: Scope, receive: Receive, send: Send) -> None:
                     await handler_task
                     poller_task.cancel()
             except* _TerminateTaskGroupError:
-                _logger.info(
-                    "The client disconnected. request to %s was cancelled.", request.url
-                )
+                if not handler_task.done():
+                    _logger.info(
+                        "The client disconnected. request to %s was cancelled.",
+                        request.url,
+                    )

packages/service-library/tests/aiohttp/test_rest_middlewares.py

@@ -13,11 +13,9 @@
 import pytest
 from aiohttp import web
 from aiohttp.test_utils import TestClient
-from common_library.error_codes import parse_error_codes
 from common_library.json_serialization import json_dumps
 from servicelib.aiohttp import status
 from servicelib.aiohttp.rest_middlewares import (
-    _FMSG_INTERNAL_ERROR_USER_FRIENDLY_WITH_OEC,
     envelope_middleware_factory,
     error_middleware_factory,
 )
@@ -234,14 +232,6 @@ async def test_raised_unhandled_exception(
         assert not data
         assert error
 
-        # user friendly message with OEC reference
-        assert "OEC" in error["message"]
-        parsed_oec = parse_error_codes(error["message"]).pop()
-        assert (
-            _FMSG_INTERNAL_ERROR_USER_FRIENDLY_WITH_OEC.format(error_code=parsed_oec)
-            == error["message"]
-        )
-
         # avoids details
         assert not error.get("errors")
         assert not error.get("logs")

packages/service-library/tests/test_logging_errors.py

@@ -3,8 +3,7 @@
 import logging
 
 import pytest
-
-from common_library.error_codes import create_error_code
+from common_library.error_codes import create_error_code, parse_error_code_parts
 from common_library.errors_classes import OsparcErrorMixin
 from servicelib.logging_errors import (
     create_troubleshotting_log_kwargs,
@@ -22,7 +21,11 @@ class MyError(OsparcErrorMixin, RuntimeError):
     exc = exc_info.value
     error_code = create_error_code(exc)
 
-    assert exc.error_code() == error_code
+    eoc1_fingerprint, eoc1_snapshot = parse_error_code_parts(error_code)
+    eoc2_fingerprint, eoc2_snapshot = parse_error_code_parts(exc.error_code())
+
+    assert eoc1_fingerprint == eoc2_fingerprint
+    assert eoc1_snapshot <= eoc2_snapshot
 
     msg = f"Nice message to user [{error_code}]"
 
@@ -45,7 +48,7 @@ class MyError(OsparcErrorMixin, RuntimeError):
     assert log_kwargs["extra"] is not None
     assert (
         # pylint: disable=unsubscriptable-object
-        log_kwargs["extra"]["log_uid"]
+        log_kwargs["extra"].get("log_uid")
         == "123"
     ), "user_id is injected as extra from context"
 

services/agent/docker/boot.sh

@@ -24,15 +24,15 @@ if [ "${SC_BUILD_TARGET}" = "development" ]; then
   command -v python | sed 's/^/    /'
 
   cd services/agent
-  uv pip --quiet --no-cache-dir sync requirements/dev.txt
+  uv pip --quiet sync requirements/dev.txt
   cd -
   echo "$INFO" "PIP :"
   uv pip list
 fi
 
 if [ "${SC_BOOT_MODE}" = "debug" ]; then
   # NOTE: production does NOT pre-installs debugpy
-  uv pip install --no-cache-dir debugpy
+  uv pip install debugpy
 fi
 
 #

services/api-server/docker/boot.sh

@@ -19,15 +19,15 @@ if [ "${SC_BUILD_TARGET}" = "development" ]; then
   command -v python | sed 's/^/    /'
 
   cd services/api-server
-  uv pip --quiet --no-cache-dir sync requirements/dev.txt
+  uv pip --quiet sync requirements/dev.txt
   cd -
   echo "$INFO" "PIP :"
   uv pip list
 fi
 
 if [ "${SC_BOOT_MODE}" = "debug" ]; then
   # NOTE: production does NOT pre-installs debugpy
-  uv pip install --no-cache-dir debugpy
+  uv pip install debugpy
 fi
 
 # RUNNING application ----------------------------------------

services/autoscaling/docker/boot.sh

@@ -24,14 +24,14 @@ if [ "${SC_BUILD_TARGET}" = "development" ]; then
   command -v python | sed 's/^/    /'
 
   cd services/autoscaling
-  uv pip --quiet --no-cache-dir sync requirements/dev.txt
+  uv pip --quiet sync requirements/dev.txt
   cd -
   uv pip list
 fi
 
 if [ "${SC_BOOT_MODE}" = "debug" ]; then
   # NOTE: production does NOT pre-installs debugpy
-  uv pip install --no-cache-dir debugpy
+  uv pip install debugpy
 fi
 
 #

services/catalog/docker/boot.sh

@@ -19,15 +19,15 @@ if [ "${SC_BUILD_TARGET}" = "development" ]; then
   command -v python | sed 's/^/    /'
 
   cd services/catalog
-  uv pip --quiet --no-cache-dir sync requirements/dev.txt
+  uv pip --quiet sync requirements/dev.txt
   cd -
   echo "$INFO" "PIP :"
   uv pip list
 fi
 
 if [ "${SC_BOOT_MODE}" = "debug" ]; then
   # NOTE: production does NOT pre-installs debugpy
-  uv pip install --no-cache-dir debugpy
+  uv pip install debugpy
 fi
 
 # RUNNING application ----------------------------------------