chore: resolve changes from conflict resolution

Author: olevski

.github/workflows/acceptance-tests.yml

@@ -33,7 +33,7 @@ jobs:
       extra-values: ${{ steps.deploy-comment.outputs.extra-values}}
     steps:
       - id: deploy-comment
-        uses: SwissDataScienceCenter/renku-actions/[email protected].1
+        uses: SwissDataScienceCenter/renku-actions/[email protected].2
         with:
           string: /deploy
           pr_ref: ${{ github.event.number }}
@@ -63,7 +63,7 @@ jobs:
           body: |
             You can access the deployment of this PR at https://renku-ci-ds-${{ github.event.number }}.dev.renku.ch
       - name: Build and deploy
-        uses: SwissDataScienceCenter/renku-actions/[email protected].1
+        uses: SwissDataScienceCenter/renku-actions/[email protected].2
         env:
           RANCHER_PROJECT_ID: ${{ secrets.CI_RANCHER_PROJECT }}
           DOCKER_PASSWORD: ${{ secrets.RENKU_DOCKER_PASSWORD }}
@@ -87,15 +87,15 @@ jobs:
           renku_notebooks: "${{ needs.check-deploy.outputs.renku-notebooks }}"
           renku_data_services: "@${{ github.head_ref }}"
           amalthea: "${{ needs.check-deploy.outputs.amalthea }}"
-          amalthea-sessions: "${{ needs.check-deploy.outputs.amalthea-sessions }}"
+          amalthea_sessions: "${{ needs.check-deploy.outputs.amalthea-sessions }}"
           extra_values: "${{ needs.check-deploy.outputs.extra-values }}"
 
   selenium-acceptance-tests:
     needs: [check-deploy, deploy-pr]
     if: github.event.action != 'closed' && needs.check-deploy.outputs.pr-contains-string == 'true' && needs.check-deploy.outputs.test-enabled == 'true'
     runs-on: ubuntu-22.04
     steps:
-      - uses: SwissDataScienceCenter/renku-actions/[email protected].1
+      - uses: SwissDataScienceCenter/renku-actions/[email protected].2
         with:
           kubeconfig: ${{ secrets.RENKUBOT_DEV_KUBECONFIG }}
           renku-release: renku-ci-ds-${{ github.event.number }}
@@ -122,7 +122,7 @@ jobs:
     steps:
       - name: Extract Renku repository reference
         run: echo "RENKU_REFERENCE=`echo '${{ needs.check-deploy.outputs.renku }}' | cut -d'@' -f2`" >> $GITHUB_ENV
-      - uses: SwissDataScienceCenter/renku-actions/[email protected].1
+      - uses: SwissDataScienceCenter/renku-actions/[email protected].2
         with:
           e2e-target: ${{ matrix.tests }}
           renku-reference: ${{ env.RENKU_REFERENCE }}
@@ -150,7 +150,7 @@ jobs:
           body: |
             Tearing down the temporary RenkuLab deplyoment for this PR.
       - name: renku teardown
-        uses: SwissDataScienceCenter/renku-actions/[email protected].1
+        uses: SwissDataScienceCenter/renku-actions/[email protected].2
         env:
           HELM_RELEASE_REGEX: "^renku-ci-ds-${{ github.event.number }}$"
           GITLAB_TOKEN: ${{ secrets.DEV_GITLAB_TOKEN }}

.github/workflows/test_publish.yml

@@ -63,53 +63,6 @@ jobs:
             ${{ steps.docker_image.outputs.image_repository }}:${{ steps.docker_image.outputs.image_tag }}
             ${{ steps.docker_image.outputs.image_repository }}:${{ env.DEVCONTAINER_IMAGE_TAG_MAIN }}
 
-  style-checks:
-    runs-on: ubuntu-latest
-    needs:
-      - build-devcontainer
-    steps:
-      - uses: actions/checkout@v4
-        with:
-          fetch-depth: 0
-      - name: Docker image metadata
-        id: meta
-        uses: docker/metadata-action@v5
-        with:
-          images: ${{ env.DEVCONTAINER_REGISTRY }}/${{ env.DEVCONTAINER_IMAGE_NAME }}
-          tags: |
-            type=ref,event=pr,prefix=cache-pr-,priority=600
-            type=ref,event=branch,prefix=cache-,priority=500
-            type=ref,event=tag,prefix=cache-,priority=500
-          flavor: |
-            latest=false
-      - name: Extract Docker image name
-        id: docker_image
-        env:
-          IMAGE_TAGS: ${{ steps.meta.outputs.tags }}
-        run: |
-          IMAGE=$(echo "$IMAGE_TAGS" | cut -d" " -f1)
-          IMAGE_REPOSITORY=$(echo "$IMAGE" | cut -d":" -f1)
-          IMAGE_TAG=$(echo "$IMAGE" | cut -d":" -f2)
-          echo "image=$IMAGE" >> "$GITHUB_OUTPUT"
-          echo "image_repository=$IMAGE_REPOSITORY" >> "$GITHUB_OUTPUT"
-          echo "image_tag=$IMAGE_TAG" >> "$GITHUB_OUTPUT"
-      - uses: docker/login-action@v3
-        with:
-          registry: ghcr.io
-          username: ${{ github.actor }}
-          password: ${{ secrets.GITHUB_TOKEN }}
-      - name: Pre-build devcontainer
-        uses: devcontainers/[email protected]
-        continue-on-error: true
-        with:
-          push: always
-          skipContainerUserIdUpdate: false
-          imageName: ${{ steps.docker_image.outputs.image_repository }}
-          imageTag: ${{ steps.docker_image.outputs.image_tag }}
-          cacheFrom: |
-            ${{ steps.docker_image.outputs.image_repository }}:${{ steps.docker_image.outputs.image_tag }}
-            ${{ steps.docker_image.outputs.image_repository }}:${{ env.DEVCONTAINER_IMAGE_TAG_MAIN }}
-
   style-checks:
     runs-on: ubuntu-latest
     needs:
@@ -142,6 +95,7 @@ jobs:
           push: never
           skipContainerUserIdUpdate: false
           cacheFrom: ${{ needs.build-devcontainer.outputs.image_repository }}:${{ needs.build-devcontainer.outputs.image_tag }}
+
   test-main:
     runs-on: ubuntu-latest
     needs:

components/renku_data_services/crc/db.py

@@ -12,11 +12,10 @@
 from functools import wraps
 from typing import Any, Concatenate, Optional, ParamSpec, TypeVar, cast
 
-from sqlalchemy import NullPool, create_engine, delete, select, true
+from sqlalchemy import NullPool, create_engine, delete, false, select, true
 from sqlalchemy.ext.asyncio import AsyncSession
 from sqlalchemy.orm import Session, selectinload, sessionmaker
 from sqlalchemy.sql import Select, and_, not_, or_
-from sqlalchemy.sql.expression import false, true
 
 import renku_data_services.base_models as base_models
 from renku_data_services import errors

components/renku_data_services/notebooks/api/amalthea_patches/init_containers.py

@@ -15,6 +15,7 @@
     # NOTE: If these are directly imported then you get circular imports.
     from renku_data_services.notebooks.api.classes.server import UserServer
 
+
 async def git_clone_container_v2(server: "UserServer") -> dict[str, Any] | None:
     """Returns the specification for the container that clones the user's repositories for new operator."""
     amalthea_session_work_volume: str = "amalthea-volume"
@@ -104,7 +105,6 @@ async def git_clone_container_v2(server: "UserServer") -> dict[str, Any] | None:
                 },
             )
 
-
     # Set up git repositories
     for idx, repo in enumerate(repositories):
         obj_env = f"{prefix}REPOSITORIES_{idx}_"
@@ -153,6 +153,7 @@ async def git_clone_container_v2(server: "UserServer") -> dict[str, Any] | None:
         "env": env,
     }
 
+
 async def git_clone_container(server: "UserServer") -> dict[str, Any] | None:
     """Returns the specification for the container that clones the user's repositories."""
     repositories = await server.repositories()
@@ -241,7 +242,6 @@ async def git_clone_container(server: "UserServer") -> dict[str, Any] | None:
                 },
             )
 
-
     # Set up git repositories
     for idx, repo in enumerate(repositories):
         obj_env = f"{prefix}REPOSITORIES_{idx}_"

components/renku_data_services/notebooks/api/schemas/server_options.py

@@ -6,10 +6,10 @@
 
 from marshmallow import Schema, fields
 
+from renku_data_services.crc.models import ResourceClass
 from renku_data_services.notebooks.api.schemas.custom_fields import ByteSizeField, CpuField, GpuField
 from renku_data_services.notebooks.config.dynamic import CPUEnforcement
 from renku_data_services.notebooks.errors.programming import ProgrammingError
-from renku_data_services.crc.models import ResourceClass
 
 
 @dataclass

components/renku_data_services/notebooks/api/schemas/servers_get.py

@@ -6,7 +6,6 @@
 from enum import Enum
 from typing import Any, Union, cast
 
-from kubernetes.utils.quantity import parse_quantity
 from marshmallow import EXCLUDE, Schema, fields, pre_load, validate
 
 from renku_data_services.notebooks.api.classes.server_manifest import UserServerManifest
@@ -403,9 +402,7 @@ def get_status(server: UserServerManifest, started: datetime) -> dict[str, dict[
 
             hibernation_date_str = annotations.get("renku.io/hibernationDate")
 
-            hibernated_seconds_threshold = (
-                server.manifest.spec.culling.hibernatedSecondsThreshold
-            )
+            hibernated_seconds_threshold = server.manifest.spec.culling.hibernatedSecondsThreshold
 
             if hibernation_date_str and hibernated_seconds_threshold > 0 and not is_user_anonymous(server):
                 hibernation_date = datetime.fromisoformat(hibernation_date_str)

components/renku_data_services/notebooks/apispec.py

@@ -1,6 +1,6 @@
 # generated by datamodel-codegen:
 #   filename:  api.spec.yaml
-#   timestamp: 2024-08-28T09:26:11+00:00
+#   timestamp: 2024-08-28T11:41:22+00:00
 
 from __future__ import annotations
 
@@ -341,35 +341,6 @@ class ServerStatus(BaseAPISpec):
     warnings: Optional[List[ServerStatusWarning]] = None
 
 
-class SessionPostRequest(BaseAPISpec):
-    project_id: str = Field(
-        ...,
-        description="ULID identifier",
-        max_length=26,
-        min_length=26,
-        pattern="^[A-Z0-9]{26}$",
-    )
-    launcher_id: str = Field(
-        ...,
-        description="ULID identifier",
-        max_length=26,
-        min_length=26,
-        pattern="^[A-Z0-9]{26}$",
-    )
-    storage: int = Field(
-        1, description="The size of disk storage for the session, in gigabytes"
-    )
-    resource_class_id: Optional[int] = None
-
-
-class SessionStatus(BaseAPISpec):
-    details: Optional[List[SessionStatusDetail]] = None
-    message: Optional[str] = None
-    state: State3
-    will_hibernate_at: Optional[datetime] = None
-    will_delete_at: Optional[datetime] = None
-
-
 class SessionResources(BaseAPISpec):
     requests: Optional[SessionResourcesRequests] = None
 

components/renku_data_services/notebooks/blueprints.py

@@ -3,10 +3,10 @@
 import base64
 import json as json_lib
 import logging
-from math import floor
 import os
 from dataclasses import dataclass
 from datetime import UTC, datetime
+from math import floor
 from pathlib import Path
 from typing import Any
 from urllib.parse import urljoin, urlparse
@@ -784,23 +784,23 @@ async def _handler(
             internal_gitlab_user: APIUser,
             body: apispec.SessionPostRequest,
         ) -> JSONResponse:
+            # gitlab_client = NotebooksGitlabClient(self.nb_config.git.url, internal_gitlab_user.access_token)
+            launcher = await self.session_repo.get_launcher(user, ULID.from_str(body.launcher_id))
+            project = await self.project_repo.get_project(user=user, project_id=launcher.project_id)
             server_name = renku_2_make_server_name(
-                safe_username=user.id, project_id=body.project_id, launcher_id=body.launcher_id
+                safe_username=user.id, project_id=str(launcher.project_id), launcher_id=body.launcher_id
             )
             existing_session = await self.nb_config.k8s_v2_client.get_server(server_name, user.id)
             if existing_session is not None and existing_session.spec is not None:
                 return json(existing_session.as_apispec().model_dump(exclude_none=True, mode="json"))
-            gitlab_client = NotebooksGitlabClient(self.nb_config.git.url, internal_gitlab_user.access_token)
-            project = await self.project_repo.get_project(user=user, project_id=ULID.from_str(body.project_id))
-            launcher = await self.session_repo.get_launcher(user, ULID.from_str(body.launcher_id))
             environment = launcher.environment
             image = environment.container_image
             default_resource_class = await self.rp_repo.get_default_resource_class()
             if default_resource_class.id is None:
                 raise errors.ProgrammingError(message="The default reosurce class has to have an ID", quiet=True)
             resource_class_id = body.resource_class_id or default_resource_class.id
             parsed_server_options = await self.nb_config.crc_validator.validate_class_storage(
-                user, resource_class_id, body.storage
+                user, resource_class_id, body.disk_storage
             )
             work_dir = Path("/home/jovyan/work")
             user_secrets: K8sUserSecrets | None = None
@@ -816,7 +816,7 @@ async def _handler(
             server = Renku2UserServer(
                 user=user,
                 image=image,
-                project_id=body.project_id,
+                project_id=str(launcher.project_id),
                 launcher_id=body.launcher_id,
                 server_name=server_name,
                 server_options=parsed_server_options,
@@ -857,7 +857,7 @@ async def _handler(
 
             parsed_server_url = urlparse(server.server_url)
             annotations: dict[str, str] = {
-                "renku.io/project_id": body.project_id,
+                "renku.io/project_id": str(launcher.project_id),
                 "renku.io/launcher_id": body.launcher_id,
                 "renku.io/resource_class_id": str(body.resource_class_id or default_resource_class.id),
             }
@@ -874,7 +874,7 @@ async def _handler(
                         port=environment.port,
                         storage=Storage(
                             className=self.nb_config.sessions.storage.pvs_storage_class,
-                            size=str(body.storage) + "Gi",
+                            size=str(body.disk_storage) + "G",
                             mountPath=environment.mount_directory.as_posix(),
                         ),
                         workingDir=environment.working_directory.as_posix(),

components/renku_data_services/notebooks/config/dynamic.py

@@ -13,6 +13,7 @@
 
 latest_version: str = "1.25.3"
 
+
 def _parse_str_as_bool(val: Union[str, bool]) -> bool:
     if isinstance(val, str):
         return val.lower() == "true"
@@ -409,14 +410,14 @@ def from_env(cls) -> Self:
     def _for_testing(cls) -> Self:
         return cls(
             culling=_SessionCullingConfig.from_env(),
-            git_proxy=_GitProxyConfig(renku_client_secret="not-defined"),
+            git_proxy=_GitProxyConfig(renku_client_secret="not-defined"),  # nosec B106
             git_rpc_server=_GitRpcServerConfig.from_env(),
             git_clone=_GitCloneConfig.from_env(),
             ingress=_SessionIngress(host="localhost"),
             ca_certs=_CustomCaCertsConfig.from_env(),
             oidc=_SessionOidcConfig(
                 client_id="not-defined",
-                client_secret="not-defined",
+                client_secret="not-defined",  # nosec B106
                 token_url="http://not.defined",
                 auth_url="http://not.defined",
                 issuer_url="http://not.defined",

components/renku_data_services/notebooks/cr_base.py

@@ -1,8 +1,6 @@
 """Base models for K8s CRD specifications."""
 
-from pydantic import BaseModel, Field
-
-
+from pydantic import BaseModel
 
 
 class BaseCRD(BaseModel):
@@ -12,4 +10,3 @@ class Config:
         """Do not exclude unknown properties."""
 
         extra = "allow"
-

components/renku_data_services/notebooks/crs.py

@@ -171,6 +171,14 @@ def as_apispec(self) -> apispec.SessionResponse:
                 url = urljoin(f"{scheme}://{self.spec.ingress.host}", self.spec.session.urlPath)
         else:
             url = self.status.url
+        ready_containers = 0
+        total_containers = 0
+        if self.status.initContainerCounts is not None:
+            ready_containers += self.status.initContainerCounts.ready or 0
+            total_containers += self.status.initContainerCounts.total or 0
+        if self.status.containerCounts is not None:
+            ready_containers += self.status.containerCounts.ready or 0
+            total_containers += self.status.containerCounts.total or 0
         return apispec.SessionResponse(
             image=self.spec.session.image,
             name=self.metadata.name,
@@ -183,8 +191,9 @@ def as_apispec(self) -> apispec.SessionResponse:
             ),
             started=self.metadata.creationTimestamp,
             status=apispec.SessionStatus(
-                details=[],
                 state=apispec.State3.running,
+                ready_containers=ready_containers,
+                total_containers=total_containers,
             ),
             url=url,
             project_id=str(self.project_id),