squashme: fixups from rebasing

Author: olevski

components/renku_data_services/authn/dummy.py

@@ -7,6 +7,7 @@
 from typing import Optional
 
 from sanic import Request
+from ulid import ULID
 
 import renku_data_services.base_models as base_models
 
@@ -39,10 +40,22 @@ class DummyAuthenticator:
     """
 
     token_field = "Authorization"  # nosec: B105
+    anon_id_header_key: str = "Renku-Auth-Anon-Id"
+    anon_id_cookie_name: str = "Renku-Auth-Anon-Id"
 
-    @staticmethod
-    async def authenticate(access_token: str, request: Request) -> base_models.APIUser:
+    async def authenticate(self, access_token: str, request: Request) -> base_models.APIUser:
         """Indicates whether the user has successfully logged in."""
+        access_token = request.headers.get(self.token_field) or ""
+        if not access_token or len(access_token) == 0:
+            # Try to get an anonymous user ID if the validation of keycloak credentials failed
+            anon_id = request.headers.get(self.anon_id_header_key)
+            if anon_id is None:
+                anon_id = request.cookies.get(self.anon_id_cookie_name)
+            if anon_id is None:
+                anon_id = f"anon-{str(ULID())}"
+            return base_models.AnonymousAPIUser(id=str(anon_id))
+
+        access_token = access_token.removeprefix("Bearer ").removeprefix("bearer ")
         user_props = {}
         with contextlib.suppress(Exception):
             user_props = json.loads(access_token)

components/renku_data_services/notebooks/api.spec.yaml

@@ -439,24 +439,27 @@ components:
       - registered
       type: object
     ErrorResponse:
-      properties:
-        error:
-          "$ref": "#/components/schemas/ErrorResponseNested"
-      required:
-      - error
       type: object
-    ErrorResponseNested:
       properties:
-        code:
-          type: integer
-        detail:
-          type: string
-        message:
-          type: string
+        error:
+          type: object
+          properties:
+            code:
+              type: integer
+              minimum: 0
+              exclusiveMinimum: true
+              example: 1404
+            detail:
+              type: string
+              example: "A more detailed optional message showing what the problem was"
+            message:
+              type: string
+              example: "Something went wrong - please try again later"
+          required:
+            - "code"
+            - "message"
       required:
-      - code
-      - message
-      type: object
+        - "error"
     Generated:
       properties:
         enabled:

components/renku_data_services/notebooks/apispec.py

@@ -1,6 +1,6 @@
 # generated by datamodel-codegen:
 #   filename:  api.spec.yaml
-#   timestamp: 2024-09-19T14:52:52+00:00
+#   timestamp: 2024-09-23T08:31:51+00:00
 
 from __future__ import annotations
 
@@ -34,10 +34,16 @@ class DefaultCullingThresholds(BaseAPISpec):
     registered: CullingThreshold
 
 
-class ErrorResponseNested(BaseAPISpec):
-    code: int
-    detail: Optional[str] = None
-    message: str
+class Error(BaseAPISpec):
+    code: int = Field(..., example=1404, gt=0)
+    detail: Optional[str] = Field(
+        None, example="A more detailed optional message showing what the problem was"
+    )
+    message: str = Field(..., example="Something went wrong - please try again later")
+
+
+class ErrorResponse(BaseAPISpec):
+    error: Error
 
 
 class Generated(BaseAPISpec):
@@ -293,10 +299,6 @@ class SessionsImagesGetParametersQuery(BaseAPISpec):
     image_url: str
 
 
-class ErrorResponse(BaseAPISpec):
-    error: ErrorResponseNested
-
-
 class LaunchNotebookRequest(BaseAPISpec):
     project_id: str
     launcher_id: str

components/renku_data_services/session/db.py

@@ -5,7 +5,6 @@
 from collections.abc import Callable
 from contextlib import AbstractAsyncContextManager, nullcontext
 from datetime import UTC, datetime
-from pathlib import PurePosixPath
 from typing import Any
 
 from sqlalchemy import select