rm envs and api specs

Author: pcrespov

.env-devel

@@ -380,7 +380,6 @@ WEBSERVER_GUNICORN_CMD_ARGS=--timeout=180
 WEBSERVER_HOST=webserver
 WEBSERVER_LOGIN={}
 WEBSERVER_LOGLEVEL=INFO
-WEBSERVER_META_MODELING=1
 WEBSERVER_NOTIFICATIONS=1
 WEBSERVER_PAYMENTS={}
 WEBSERVER_PORT=8080
@@ -398,4 +397,3 @@ WEBSERVER_STUDIES_DISPATCHER={}
 WEBSERVER_TAGS=1
 WEBSERVER_TRACING=null
 WEBSERVER_USERS={}
-WEBSERVER_VERSION_CONTROL=1

api/specs/web-server/_version_control.py

@@ -59,7 +59,6 @@
         "_statics",
         "_storage",
         "_trash",
-        "_version_control",
         "_workspaces",
         # maintenance ----
         "_admin",

api/specs/web-server/openapi.py

@@ -811,13 +811,11 @@ services:
       WEBSERVER_NOTIFICATIONS: ${WEBSERVER_NOTIFICATIONS}
       WEBSERVER_CLUSTERS: ${WEBSERVER_CLUSTERS}
       WEBSERVER_GROUPS: ${WEBSERVER_GROUPS}
-      WEBSERVER_META_MODELING: ${WEBSERVER_META_MODELING}
       WEBSERVER_PRODUCTS: ${WEBSERVER_PRODUCTS}
       WEBSERVER_PUBLICATIONS: ${WEBSERVER_PUBLICATIONS}
       WEBSERVER_SOCKETIO: ${WEBSERVER_SOCKETIO}
       WEBSERVER_TAGS: ${WEBSERVER_TAGS}
       WEBSERVER_USERS: ${WEBSERVER_USERS}
-      WEBSERVER_VERSION_CONTROL: ${WEBSERVER_VERSION_CONTROL}
       WEBSERVER_FOLDERS: ${WEBSERVER_FOLDERS}
 
     deploy:
@@ -908,7 +906,6 @@ services:
       WEBSERVER_LICENSES: null
       WEBSERVER_LOGIN: ${WB_DB_EL_LOGIN}
       WEBSERVER_PAYMENTS: ${WB_DB_EL_PAYMENTS}
-      WEBSERVER_META_MODELING: ${WB_DB_EL_META_MODELING}
       WEBSERVER_NOTIFICATIONS: ${WB_DB_EL_NOTIFICATIONS}
       WEBSERVER_PRODUCTS: ${WB_DB_EL_PRODUCTS}
       WEBSERVER_PROJECTS: ${WB_DB_EL_PROJECTS}
@@ -921,7 +918,6 @@ services:
       WEBSERVER_TAGS: ${WB_DB_EL_TAGS}
       WEBSERVER_TRACING: ${WB_DB_EL_TRACING}
       WEBSERVER_USERS: ${WB_DB_EL_USERS}
-      WEBSERVER_VERSION_CONTROL: ${WB_DB_EL_VERSION_CONTROL}
       WEBSERVER_WALLETS: ${WB_DB_EL_WALLETS}
 
       # WEBSERVER_RABBITMQ
@@ -1011,7 +1007,6 @@ services:
       WEBSERVER_INVITATIONS: ${WB_GC_INVITATIONS}
       WEBSERVER_LICENSES: null
       WEBSERVER_LOGIN: ${WB_GC_LOGIN}
-      WEBSERVER_META_MODELING: ${WB_GC_META_MODELING}
       WEBSERVER_NOTIFICATIONS: ${WB_GC_NOTIFICATIONS}
       WEBSERVER_PAYMENTS: ${WB_GC_PAYMENTS}
       WEBSERVER_PRODUCTS: ${WB_GC_PRODUCTS}
@@ -1024,7 +1019,6 @@ services:
       WEBSERVER_TAGS: ${WB_GC_TAGS}
       WEBSERVER_TRACING: ${WB_GC_TRACING}
       WEBSERVER_USERS: ${WB_GC_USERS}
-      WEBSERVER_VERSION_CONTROL: ${WB_GC_VERSION_CONTROL}
       WEBSERVER_WALLETS: ${WB_GC_WALLETS}
 
       # WEBSERVER_RABBITMQ

services/docker-compose.yml

@@ -4,14 +4,12 @@
 
 from aiohttp import web
 from common_library.basic_types import DEFAULT_FACTORY
-from common_library.pydantic_fields_extension import is_nullable
 from models_library.basic_types import LogLevel, PortInt, VersionTag
 from models_library.utils.change_case import snake_to_camel
 from pydantic import (
     AliasChoices,
     AnyHttpUrl,
     TypeAdapter,
-    ValidationInfo,
     field_validator,
     model_validator,
 )
@@ -358,15 +356,13 @@ class ApplicationSettings(BaseApplicationSettings, MixinLoggingSettings):
     WEBSERVER_DB_LISTENER: bool = True
     WEBSERVER_FOLDERS: bool = True
     WEBSERVER_GROUPS: bool = True
-    WEBSERVER_META_MODELING: bool = False
     WEBSERVER_NOTIFICATIONS: bool = True
     WEBSERVER_PRODUCTS: bool = True
     WEBSERVER_PROFILING: bool = False
     WEBSERVER_PUBLICATIONS: bool = True
     WEBSERVER_REMOTE_DEBUG: bool = True
     WEBSERVER_SOCKETIO: bool = True
     WEBSERVER_TAGS: bool = True
-    WEBSERVER_VERSION_CONTROL: bool = False
     WEBSERVER_WALLETS: bool = True
     WEBSERVER_WORKSPACES: bool = True
 
@@ -397,31 +393,31 @@ def _build_vcs_release_url_if_unset(cls, values):
 
         return values
 
-    @field_validator(
-        # List of plugins under-development (keep up-to-date)
-        # TODO: consider mark as dev-feature in field extras of Config attr.
-        # Then they can be automtically advertised
-        "WEBSERVER_META_MODELING",
-        "WEBSERVER_VERSION_CONTROL",
-        mode="before",
-    )
-    @classmethod
-    def _enable_only_if_dev_features_allowed(cls, v, info: ValidationInfo):
-        """Ensures that plugins 'under development' get programatically
-        disabled if WEBSERVER_DEV_FEATURES_ENABLED=False
-        """
-        if info.data["WEBSERVER_DEV_FEATURES_ENABLED"]:
-            return v
-        if v:
-            _logger.warning(
-                "%s still under development and will be disabled.", info.field_name
-            )
-
-        return (
-            None
-            if info.field_name and is_nullable(dict(cls.model_fields)[info.field_name])
-            else False
-        )
+    # @field_validator(
+    #     # List of plugins under-development (keep up-to-date)
+    #     # TODO: consider mark as dev-feature in field extras of Config attr.
+    #     # Then they can be automtically advertised
+    #     "WEBSERVER_META_MODELING",
+    #     "WEBSERVER_VERSION_CONTROL",
+    #     mode="before",
+    # )
+    # @classmethod
+    # def _enable_only_if_dev_features_allowed(cls, v, info: ValidationInfo):
+    #     """Ensures that plugins 'under development' get programatically
+    #     disabled if WEBSERVER_DEV_FEATURES_ENABLED=False
+    #     """
+    #     if info.data["WEBSERVER_DEV_FEATURES_ENABLED"]:
+    #         return v
+    #     if v:
+    #         _logger.warning(
+    #             "%s still under development and will be disabled.", info.field_name
+    #         )
+
+    #     return (
+    #         None
+    #         if info.field_name and is_nullable(dict(cls.model_fields)[info.field_name])
+    #         else False
+    #     )
 
     @field_validator("WEBSERVER_LOGLEVEL")
     @classmethod
@@ -461,12 +457,14 @@ def _get_disabled_public_plugins(self) -> list[str]:
             "WEBSERVER_EXPORTER",
             "WEBSERVER_FOLDERS",
             "WEBSERVER_LICENSES",
-            "WEBSERVER_META_MODELING",
             "WEBSERVER_PAYMENTS",
             "WEBSERVER_SCICRUNCH",
-            "WEBSERVER_VERSION_CONTROL",
         }
-        return [_ for _ in public_plugin_candidates if not self.is_enabled(_)]
+        return [_ for _ in public_plugin_candidates if not self.is_enabled(_)] + [
+            # Permanently disabled
+            "WEBSERVER_META_MODELING",
+            "WEBSERVER_VERSION_CONTROL",
+        ]
 
     def _export_by_alias(self, **kwargs) -> dict[str, Any]:
         #  This is a small helper to assist export functions since aliases are no longer used by

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

@@ -164,7 +164,6 @@ def convert_to_app_config(app_settings: ApplicationSettings) -> AppConfigDict:
         "director-v2": {"enabled": app_settings.is_enabled("WEBSERVER_DIRECTOR_V2")},
         "exporter": {"enabled": app_settings.WEBSERVER_EXPORTER is not None},
         "groups": {"enabled": app_settings.WEBSERVER_GROUPS},
-        "meta_modeling": {"enabled": app_settings.WEBSERVER_META_MODELING},
         "products": {"enabled": app_settings.WEBSERVER_PRODUCTS},
         "publications": {"enabled": app_settings.WEBSERVER_PUBLICATIONS},
         "remote_debug": {"enabled": app_settings.WEBSERVER_REMOTE_DEBUG},
@@ -180,7 +179,6 @@ def convert_to_app_config(app_settings: ApplicationSettings) -> AppConfigDict:
         },
         "tags": {"enabled": app_settings.WEBSERVER_TAGS},
         "users": {"enabled": app_settings.WEBSERVER_USERS is not None},
-        "version_control": {"enabled": app_settings.WEBSERVER_VERSION_CONTROL},
         "wallets": {"enabled": app_settings.WEBSERVER_WALLETS},
         "folders": {"enabled": app_settings.WEBSERVER_FOLDERS},
         "workspaces": {"enabled": app_settings.WEBSERVER_WORKSPACES},
@@ -313,7 +311,6 @@ def _set_if_disabled(field_name, section):
     for settings_name in (
         "WEBSERVER_GARBAGE_COLLECTOR",
         "WEBSERVER_GROUPS",
-        "WEBSERVER_META_MODELING",
         "WEBSERVER_PRODUCTS",
         "WEBSERVER_PROJECTS",
         "WEBSERVER_PUBLICATIONS",
@@ -324,7 +321,6 @@ def _set_if_disabled(field_name, section):
         "WEBSERVER_STUDIES_DISPATCHER",
         "WEBSERVER_TAGS",
         "WEBSERVER_USERS",
-        "WEBSERVER_VERSION_CONTROL",
         "WEBSERVER_WALLETS",
         "WEBSERVER_FOLDERS",
     ):

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

@@ -71,9 +71,6 @@ def test_settings_to_client_statics_plugins(
     for name in disable_plugins:
         monkeypatch.setenv(name, "null")
 
-    monkeypatch.setenv("WEBSERVER_VERSION_CONTROL", "0")
-    disable_plugins.add("WEBSERVER_VERSION_CONTROL")
-
     monkeypatch.setenv("WEBSERVER_FOLDERS", "0")
     disable_plugins.add("WEBSERVER_FOLDERS")
 
@@ -105,30 +102,30 @@ def test_settings_to_client_statics_plugins(
     assert set(statics["pluginsDisabled"]) == (disable_plugins)
 
 
-@pytest.mark.parametrize("is_dev_feature_enabled", [True, False])
-@pytest.mark.parametrize(
-    "plugin_name",
-    ["WEBSERVER_META_MODELING", "WEBSERVER_VERSION_CONTROL"],
-    # NOTE: this is the list in _enable_only_if_dev_features_allowed
-)
-def test_disabled_plugins_settings_to_client_statics(
-    is_dev_feature_enabled: bool,
-    mock_webserver_service_environment: EnvVarsDict,
-    monkeypatch: pytest.MonkeyPatch,
-    plugin_name: str,
-):
-    monkeypatch.setenv(
-        "WEBSERVER_DEV_FEATURES_ENABLED", f"{is_dev_feature_enabled}".lower()
-    )
-
-    settings = ApplicationSettings.create_from_envs()
-    statics = settings.to_client_statics()
-
-    # checks whether it is shown to the front-end depending on the value of WEBSERVER_DEV_FEATURES_ENABLED
-    if is_dev_feature_enabled:
-        assert plugin_name not in set(statics["pluginsDisabled"])
-    else:
-        assert plugin_name in set(statics["pluginsDisabled"])
+# @pytest.mark.parametrize("is_dev_feature_enabled", [True, False])
+# @pytest.mark.parametrize(
+#     "plugin_name",
+#     ["WEBSERVER_META_MODELING", "WEBSERVER_VERSION_CONTROL"],
+#     # NOTE: this is the list in _enable_only_if_dev_features_allowed
+# )
+# def test_disabled_plugins_settings_to_client_statics(
+#     is_dev_feature_enabled: bool,
+#     mock_webserver_service_environment: EnvVarsDict,
+#     monkeypatch: pytest.MonkeyPatch,
+#     plugin_name: str,
+# ):
+#     monkeypatch.setenv(
+#         "WEBSERVER_DEV_FEATURES_ENABLED", f"{is_dev_feature_enabled}".lower()
+#     )
+
+#     settings = ApplicationSettings.create_from_envs()
+#     statics = settings.to_client_statics()
+
+#     # checks whether it is shown to the front-end depending on the value of WEBSERVER_DEV_FEATURES_ENABLED
+#     if is_dev_feature_enabled:
+#         assert plugin_name not in set(statics["pluginsDisabled"])
+#     else:
+#         assert plugin_name in set(statics["pluginsDisabled"])
 
 
 @pytest.mark.filterwarnings("error")

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

@@ -48,7 +48,6 @@ def app_environment(
             "WEBSERVER_GARBAGE_COLLECTOR": "null",
             "WEBSERVER_GROUPS": "1",
             "WEBSERVER_LOGIN": "null",
-            "WEBSERVER_META_MODELING": "0",
             "WEBSERVER_PAYMENTS": "null",
             "WEBSERVER_PRODUCTS": "1",
             "WEBSERVER_PUBLICATIONS": "0",
@@ -59,7 +58,6 @@ def app_environment(
             "WEBSERVER_SOCKETIO": "0",
             "WEBSERVER_TAGS": "1",
             "WEBSERVER_TRACING": "null",
-            "WEBSERVER_VERSION_CONTROL": "0",
             "WEBSERVER_WALLETS": "0",
             "STUDIES_ACCESS_ANONYMOUS_ALLOWED": "1",
         },

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

@@ -192,15 +192,13 @@ def app_environment(
             "WEBSERVER_DIAGNOSTICS": "null",
             "WEBSERVER_EXPORTER": "null",
             "WEBSERVER_GARBAGE_COLLECTOR": "null",
-            "WEBSERVER_META_MODELING": "0",
             "WEBSERVER_NOTIFICATIONS": "0",
             "WEBSERVER_PUBLICATIONS": "0",
             "WEBSERVER_REMOTE_DEBUG": "0",
             "WEBSERVER_SOCKETIO": "0",
             "WEBSERVER_STUDIES_ACCESS_ENABLED": "0",
             "WEBSERVER_TAGS": "0",
             "WEBSERVER_TRACING": "null",
-            "WEBSERVER_VERSION_CONTROL": "0",
             "WEBSERVER_WALLETS": "0",
             # set INVITATIONS_* variables using those in .env-devel
             **{