Merge branch 'master' into fix/public-api-solvers-pagination

Author: pcrespov

.env-devel

@@ -379,6 +379,7 @@ WEBSERVER_EMAIL={}
 WEBSERVER_EXPORTER={}
 WEBSERVER_FOLDERS=1
 WEBSERVER_FRONTEND={}
+WEBSERVER_FUNCTIONS=1
 WEBSERVER_GARBAGE_COLLECTOR=null
 WEBSERVER_GROUPS=1
 WEBSERVER_GUNICORN_CMD_ARGS=--timeout=180

services/docker-compose.yml

@@ -847,6 +847,7 @@ services:
       WEBSERVER_ANNOUNCEMENTS: ${WEBSERVER_ANNOUNCEMENTS}
       WEBSERVER_NOTIFICATIONS: ${WEBSERVER_NOTIFICATIONS}
       WEBSERVER_CLUSTERS: ${WEBSERVER_CLUSTERS}
+      WEBSERVER_FUNCTIONS: 0
       WEBSERVER_GROUPS: ${WEBSERVER_GROUPS}
       WEBSERVER_PRODUCTS: ${WEBSERVER_PRODUCTS}
       WEBSERVER_PUBLICATIONS: ${WEBSERVER_PUBLICATIONS}
@@ -892,6 +893,8 @@ services:
       WEBSERVER_HOST: ${WB_API_WEBSERVER_HOST}
       WEBSERVER_PORT: ${WB_API_WEBSERVER_PORT}
       WEBSERVER_STATICWEB: "null"
+      WEBSERVER_FUNCTIONS: ${WEBSERVER_FUNCTIONS}
+
 
     networks: *webserver_networks
 
@@ -937,6 +940,7 @@ services:
       WEBSERVER_EXPORTER: ${WB_DB_EL_EXPORTER}
       WEBSERVER_FOLDERS: ${WB_DB_EL_FOLDERS}
       WEBSERVER_FRONTEND: ${WB_DB_EL_FRONTEND}
+      WEBSERVER_FUNCTIONS: 0
       WEBSERVER_GARBAGE_COLLECTOR: ${WB_DB_EL_GARBAGE_COLLECTOR}
       WEBSERVER_GROUPS: ${WB_DB_EL_GROUPS}
       WEBSERVER_INVITATIONS: ${WB_DB_EL_INVITATIONS}
@@ -1049,6 +1053,7 @@ services:
       WEBSERVER_EXPORTER: ${WB_GC_EXPORTER}
       WEBSERVER_FOLDERS: ${WB_GC_FOLDERS}
       WEBSERVER_FRONTEND: ${WB_GC_FRONTEND}
+      WEBSERVER_FUNCTIONS: 0
       WEBSERVER_GARBAGE_COLLECTOR: ${WB_GC_GARBAGE_COLLECTOR}
       WEBSERVER_GROUPS: ${WB_GC_GROUPS}
       WEBSERVER_HOST: ${WEBSERVER_HOST}

services/web/server/src/simcore_service_webserver/application_settings.py

@@ -108,9 +108,9 @@ class ApplicationSettings(BaseApplicationSettings, MixinLoggingSettings):
     WEBSERVER_FUNCTIONS: Annotated[
         bool,
         Field(
-            json_schema_extra={_X_FEATURE_UNDER_DEVELOPMENT: True},
+            description="Metamodeling functions plugin",
         ),
-    ] = True
+    ] = False
 
     WEBSERVER_LOGLEVEL: Annotated[
         LogLevel,

services/web/server/src/simcore_service_webserver/exception_handling/_factory.py

@@ -14,9 +14,9 @@
 _logger = logging.getLogger(__name__)
 
 
-_STATUS_CODE_TO_HTTP_ERRORS: dict[
-    int, type[web.HTTPError]
-] = get_all_aiohttp_http_exceptions(web.HTTPError)
+_STATUS_CODE_TO_HTTP_ERRORS: dict[int, type[web.HTTPError]] = (
+    get_all_aiohttp_http_exceptions(web.HTTPError)
+)
 
 
 class _DefaultDict(dict):
@@ -40,7 +40,8 @@ def create_error_response(error: ErrorGet, status_code: int) -> web.Response:
     return web.json_response(
         data={"error": error.model_dump(exclude_unset=True, mode="json")},
         dumps=json_dumps,
-        reason=error.message,
+        # NOTE: Multiline not allowed in HTTP reason attribute (aiohttp now raises ValueError)
+        reason=error.message.replace("\n", " ") if error.message else None,
         status=status_code,
     )
 

services/web/server/src/simcore_service_webserver/exporter/exceptions.py

@@ -6,4 +6,5 @@ class SDSException(HTTPBadRequest):  # pylint: disable=too-many-ancestors
     """Basic exception for errors raised inside the module"""
 
     def __init__(self, message: str):
-        super().__init__(reason=message)
+        # Multiline not allowed in HTTP reason attribute
+        super().__init__(reason=message.replace("\n", " ") if message else None)

services/web/server/tests/unit/isolated/test_application_settings.py

@@ -141,13 +141,11 @@ class DevSettings(ApplicationSettings):
 
     if is_dev_feature_enabled:
         assert settings.WEBSERVER_DEV_FEATURES_ENABLED is True
-        assert settings.WEBSERVER_FUNCTIONS is True
 
         assert settings.TEST_FOO is True
         assert settings.TEST_BAR == 42
     else:
         assert settings.WEBSERVER_DEV_FEATURES_ENABLED is False
-        assert settings.WEBSERVER_FUNCTIONS is False
 
         assert settings.TEST_FOO is False
         assert settings.TEST_BAR is None

services/web/server/tests/unit/with_dbs/04/conftest.py

@@ -4,12 +4,19 @@
 
 
 import pytest
+from pytest_simcore.helpers.monkeypatch_envs import setenvs_from_dict
 
 
 @pytest.fixture
 def app_environment(
     app_environment: dict[str, str], monkeypatch: pytest.MonkeyPatch
 ) -> dict[str, str]:
     # NOTE: overrides app_environment
-    monkeypatch.setenv("WEBSERVER_GARBAGE_COLLECTOR", "null")
-    return app_environment | {"WEBSERVER_GARBAGE_COLLECTOR": "null"}
+    return setenvs_from_dict(
+        monkeypatch,
+        {
+            **app_environment,
+            "WEBSERVER_GARBAGE_COLLECTOR": "null",
+            "WEBSERVER_FUNCTIONS": "0",  # needs rabbitmq
+        },
+    )

services/web/server/tests/unit/with_dbs/04/functions_rpc/conftest.py

@@ -22,7 +22,6 @@ def app_environment(
         monkeypatch,
         {
             **app_environment,  # WARNING: AFTER env_devel_dict because HOST are set to 127.0.0.1 in here
-            "WEBSERVER_DEV_FEATURES_ENABLED": "1",
             "WEBSERVER_FUNCTIONS": "1",
         },
     )

services/web/server/tests/unit/with_dbs/04/studies_dispatcher/conftest.py

@@ -22,10 +22,11 @@ def app_environment(app_environment: EnvVarsDict, monkeypatch: pytest.MonkeyPatc
         {
             "WEBSERVER_ACTIVITY": "null",
             "WEBSERVER_CATALOG": "null",
-            "WEBSERVER_NOTIFICATIONS": "0",
             "WEBSERVER_DIAGNOSTICS": "null",
             "WEBSERVER_EXPORTER": "null",
+            "WEBSERVER_FUNCTIONS": "0",
             "WEBSERVER_GROUPS": "1",
+            "WEBSERVER_NOTIFICATIONS": "0",
             "WEBSERVER_PRODUCTS": "1",
             "WEBSERVER_PUBLICATIONS": "0",
             "WEBSERVER_RABBITMQ": "null",