refactor: remove v1 legacy code (#1185)

Author: olevski

bases/renku_data_services/data_api/app.py

@@ -25,7 +25,7 @@
 from renku_data_services.data_api.dependencies import DependencyManager
 from renku_data_services.data_connectors.blueprints import DataConnectorsBP
 from renku_data_services.namespace.blueprints import GroupsBP
-from renku_data_services.notebooks.blueprints import NotebooksBP, NotebooksNewBP
+from renku_data_services.notebooks.blueprints import NotebooksNewBP
 from renku_data_services.notifications.blueprints import NotificationsBP
 from renku_data_services.platform.blueprints import PlatformConfigBP, PlatformUrlRedirectBP
 from renku_data_services.project.blueprints import ProjectsBP, ProjectSessionSecretBP
@@ -193,17 +193,6 @@ def register_all_handlers(app: Sanic, dm: DependencyManager) -> Sanic:
         authenticator=dm.authenticator,
         internal_gitlab_authenticator=dm.gitlab_authenticator,
     )
-    notebooks = NotebooksBP(
-        name="notebooks_old",
-        url_prefix=url_prefix,
-        authenticator=dm.authenticator,
-        nb_config=dm.config.nb_config,
-        internal_gitlab_authenticator=dm.gitlab_authenticator,
-        rp_repo=dm.rp_repo,
-        user_repo=dm.kc_user_repo,
-        storage_repo=dm.storage_repo,
-        git_provider_helper=dm.git_provider_helper,
-    )
     notebooks_new = NotebooksNewBP(
         name="notebooks",
         url_prefix=url_prefix,
@@ -291,7 +280,6 @@ def register_all_handlers(app: Sanic, dm: DependencyManager) -> Sanic:
             oauth2_clients.blueprint(),
             oauth2_connections.blueprint(),
             repositories.blueprint(),
-            notebooks.blueprint(),
             notebooks_new.blueprint(),
             platform_config.blueprint(),
             search.blueprint(),

bases/renku_data_services/data_api/config.py

@@ -10,7 +10,6 @@
 from renku_data_services.authz.config import AuthzConfig
 from renku_data_services.db_config.config import DBConfig
 from renku_data_services.notebooks.config import NotebooksConfig
-from renku_data_services.notebooks.config.dynamic import ServerOptionsConfig
 from renku_data_services.secrets.config import PublicSecretsConfig
 from renku_data_services.session.config import BuildsConfig
 from renku_data_services.solr.solr_client import SolrClientConfig
@@ -36,7 +35,6 @@ class Config:
     trusted_proxies: TrustedProxiesConfig
     keycloak: KeycloakConfig | None
     user_preferences: UserPreferencesConfig
-    server_options: ServerOptionsConfig
     gitlab_url: str | None
     log_cfg: LoggingConfig
     version: str
@@ -80,7 +78,6 @@ def from_env(cls, db: DBConfig | None = None) -> Self:
             trusted_proxies=TrustedProxiesConfig.from_env(),
             keycloak=keycloak,
             user_preferences=UserPreferencesConfig.from_env(),
-            server_options=ServerOptionsConfig.from_env(),
             gitlab_url=gitlab_url,
             log_cfg=LoggingConfig.from_env(),
             alertmanager_webhook_role=os.environ.get("ALERTMANAGER_WEBHOOK_ROLE", "alertmanager-webhook"),

bases/renku_data_services/data_api/dependencies.py

@@ -29,11 +29,6 @@
 from renku_data_services.crc import models as crc_models
 from renku_data_services.crc.constants import DEFAULT_RUNTIME_PLATFORM
 from renku_data_services.crc.db import ClusterRepository, ResourcePoolRepository, UserRepository
-from renku_data_services.crc.server_options import (
-    ServerOptions,
-    ServerOptionsDefaults,
-    generate_default_resource_pool,
-)
 from renku_data_services.data_api.config import Config
 from renku_data_services.data_connectors.db import (
     DataConnectorRepository,
@@ -90,6 +85,14 @@
             gpu=0,
             default=True,
         ),
+        crc_models.UnsavedResourceClass(
+            name="medium",
+            cpu=0.75,
+            memory=1,
+            max_storage=20,
+            gpu=0,
+            default=False,
+        ),
         crc_models.UnsavedResourceClass(
             name="large",
             cpu=1.0,
@@ -197,19 +200,6 @@ def load_apispec() -> dict[str, Any]:
     def __post_init__(self) -> None:
         self.spec = self.load_apispec()
 
-        if self.default_resource_pool_file is not None:
-            with open(self.default_resource_pool_file) as f:
-                self.default_resource_pool = crc_models.UnsavedResourcePool(**safe_load(f))
-        if (
-            self.config.server_options.defaults_path is not None
-            and self.config.server_options.ui_choices_path is not None
-        ):
-            with open(self.config.server_options.ui_choices_path) as f:
-                options = ServerOptions.model_validate(safe_load(f))
-            with open(self.config.server_options.defaults_path) as f:
-                defaults = ServerOptionsDefaults.model_validate(safe_load(f))
-            self.default_resource_pool = generate_default_resource_pool(options, defaults)
-
     @classmethod
     def from_env(cls) -> DependencyManager:
         """Create a config from environment variables."""

components/renku_data_services/namespace/apispec_enhanced.py

@@ -4,15 +4,30 @@
 
 from pydantic import field_validator
 
+from renku_data_services.namespace.apispec import GroupsGetParametersQuery as _GroupsGetParametersQuery
 from renku_data_services.namespace.apispec import NamespacesGetParametersQuery as _NamespacesGetParametersQuery
 
 
 class NamespacesGetParametersQuery(_NamespacesGetParametersQuery):
     """The query parameters for listing namespaces."""
 
+    class Config(_NamespacesGetParametersQuery.Config):
+        """Pydantic configuration."""
+
+        extra = "forbid"
+
     @field_validator("kinds", mode="before")
     @classmethod
     def _convert_to_kinds_to_list(cls, value: Any) -> list[str]:
         if isinstance(value, list):
             return value
         return [str(value)]
+
+
+class GroupsGetParametersQuery(_GroupsGetParametersQuery):
+    """The query parameters for listing groups."""
+
+    class Config(_GroupsGetParametersQuery.Config):
+        """Pydantic configuration."""
+
+        extra = "forbid"

components/renku_data_services/namespace/blueprints.py

@@ -33,7 +33,7 @@ def get_all(self) -> BlueprintFactoryResponse:
         """List all groups."""
 
         @authenticate(self.authenticator)
-        @validate_query(query=apispec.GroupsGetParametersQuery)
+        @validate_query(query=apispec_enhanced.GroupsGetParametersQuery)
         @paginate
         async def _get_all(
             _: Request,