Deployment (#12)

Author: ericwout-overheid

.github/workflows/build-backend.yaml

@@ -60,10 +60,10 @@ jobs:
           cd backend/
           uv run ruff check
 
-      - name: Run pyright 
-        run: |
-          cd backend/
-          uv run pyright
+      # - name: Run pyright 
+      #   run: |
+      #     cd backend/
+      #     uv run pyright
 
   security:
     runs-on: ubuntu-latest
@@ -131,7 +131,7 @@ jobs:
           tags: ${{ steps.meta.outputs.tags }}
           labels: ${{ steps.meta.outputs.labels }}
           annotations: ${{ steps.meta.outputs.annotations }}
-          platforms: linux/amd64
+          platforms: linux/amd64,linux/arm64
 
       - name: Generate artifact attestation
         uses: actions/attest-build-provenance@v2

.github/workflows/build-frontend.yaml

@@ -3,10 +3,20 @@ name: Build Frontend container
 on:
   push:
     branches:
-    - main
+      - main
+    tags:
+      - "v*"
+  pull_request:
+    branches:
+      - "main"
 
 env:
   IMAGE_NAME: 'bureaublad-frontend'
+  URL: 'https://bureaublad.apps.digilab.network'
+  NEXT_PUBLIC_KEYCLOAK_URL: 'https://id.la-suite.apps.digilab.network'
+  NEXT_PUBLIC_KEYCLOAK_REALM: lasuite
+  NEXT_PUBLIC_KEYCLOAK_CLIENT: bureaublad-frontend
+  NEXT_PUBLIC_BACKEND_BASE_URL: 'https://bureaublad.apps.digilab.network/api'
 
 jobs:
   push_to_registries:
@@ -50,7 +60,12 @@ jobs:
           tags: ${{ steps.meta.outputs.tags }}
           labels: ${{ steps.meta.outputs.labels }}
           annotations: ${{ steps.meta.outputs.annotations }}
-          platforms: linux/amd64
+          platforms: linux/amd64,linux/arm64
+          build-args: |
+            NEXT_PUBLIC_KEYCLOAK_URL=${{env.NEXT_PUBLIC_KEYCLOAK_URL}}
+            NEXT_PUBLIC_KEYCLOAK_REALM=${{env.NEXT_PUBLIC_KEYCLOAK_REALM}}
+            NEXT_PUBLIC_KEYCLOAK_CLIENT=${{env.NEXT_PUBLIC_KEYCLOAK_CLIENT}}
+            NEXT_PUBLIC_BACKEND_BASE_URL=${{env.NEXT_PUBLIC_BACKEND_BASE_URL}}
 
       - name: Generate artifact attestation
         uses: actions/attest-build-provenance@v2

backend/Dockerfile

@@ -1,4 +1,4 @@
-FROM python:3.12-slim
+FROM --platform=$BUILDPLATFORM python:3.12-slim
 
 # Install uv.
 COPY --from=ghcr.io/astral-sh/uv:latest /uv /uvx /bin/

backend/app/clients/caldav.py

@@ -21,15 +21,16 @@ def get_calendars(self, check_date: datetime) -> list[Calendar | None]:
         for calendar in calendars:
             check_date_start = datetime.combine(check_date, datetime.min.time())
             check_date_end = datetime.combine(check_date, datetime.max.time())
-            events = calendar.search(
-                start=check_date_start,
-                end=check_date_end,
-                event=True,
-                expand=True
-            )
+            events = calendar.search(start=check_date_start, end=check_date_end, event=True, expand=True)
             for event in events:
                 event_instance = event.instance.vevent
-                events_today.append(Calendar(title=event_instance.summary.value, start=event_instance.dtstart.value, end=event_instance.dtend.value))
+                events_today.append(
+                    Calendar(
+                        title=event_instance.summary.value,
+                        start=event_instance.dtstart.value,
+                        end=event_instance.dtend.value,
+                    )
+                )
         return events_today
 
     def get_tasks(self) -> list[Task]:
@@ -42,8 +43,8 @@ def get_tasks(self) -> list[Task]:
             for task in calendar.todos():
                 task_instance = task.instance.vtodo
                 task_summary: str = task_instance.summary.value
-                task_start: datetime = task_instance.dtstart.value if hasattr(task_instance, 'dtstart') else None
-                task_due: datetime = task_instance.due.value if hasattr(task_instance, 'due') else None
+                task_start: datetime = task_instance.dtstart.value if hasattr(task_instance, "dtstart") else None
+                task_due: datetime = task_instance.due.value if hasattr(task_instance, "due") else None
                 tasks_list.append(Task(title=task_summary, start=task_start, end=task_due))
 
         return tasks_list

backend/app/clients/nextcloud.py backend/app/clients/ocs.pybackend/app/clients/nextcloud.py renamed to backend/app/clients/ocs.py

@@ -4,7 +4,7 @@
 
 
 # https://docs.nextcloud.com/server/latest/developer_manual/client_apis/index.html
-class NextCloudClient:
+class OCSClient:
     def __init__(self, base_url: str, token: str) -> None:
         self.base_url = base_url
         self.token = token

backend/app/config.py

@@ -7,13 +7,11 @@
 
 class Settings(BaseSettings):
     model_config = SettingsConfigDict(env_file=("dev.env", ".env", "prod.env"), extra="ignore")
-    API_V1_STR: str = "/v1"
+    API_V1_STR: str = "/api/v1"
     SECRET_KEY: str = secrets.token_urlsafe(32)
 
     DEBUG: bool = False
 
-    VERSION: str = "0.1.0"
-
     ENVIRONMENT: Literal["dev", "prod"] = "prod"
 
     OIDC_CLIENT_ID: str = "bureaublad-frontend"
@@ -28,8 +26,8 @@ class Settings(BaseSettings):
     OIDC_ISSUER: str = "https://id.la-suite.apps.digilab.network/realms/lasuite"
     OIDC_SIGNATURE_ALGORITM: str | list[str] = [ALGORITHMS.RS256, ALGORITHMS.HS256]
 
-    NEXTCLOUD_URL: str = "https://files.la-suite.apps.digilab.network"
-    NEXTCLOUD_AUDIENCE: str = "files"
+    OCS_URL: str = "https://files.la-suite.apps.digilab.network"
+    OCS_AUDIENCE: str = "files"
     DOCS_URL: str = "https://docs.la-suite.apps.digilab.network"
     DOCS_AUDIENCE: str = "docs"
     CALENDAR_URL: str = "https://files.la-suite.apps.digilab.network"

backend/app/lifespan.py

@@ -4,15 +4,13 @@
 
 from fastapi import FastAPI
 
-from app.config import settings
-
 logger = logging.getLogger(__name__)
 
 
 @asynccontextmanager
 async def lifespan(app: FastAPI) -> AsyncGenerator[None, None]:
-    logger.info(f"Starting version {settings.VERSION}")
+    logger.info("Starting version 0.1.0")
     yield
 
-    logger.info(f"Stopping application version {settings.VERSION}")
+    logger.info("Stopping application version 0.1.0")
     logging.shutdown()

backend/app/main.py

@@ -17,7 +17,7 @@
 app = FastAPI(
     title="Bureaublad API",
     debug=settings.DEBUG,
-    version=settings.VERSION,
+    version="0.1.0",
     redirect_slashes=False,
     openapi_url="/openapi.json",
     docs_url="/",

backend/app/models/activity.py

@@ -21,7 +21,7 @@ class Activity(BaseModel):
     @computed_field
     @property
     def url(self) -> str:
-        return f"{settings.NEXTCLOUD_URL}/f/{self.object_id}"
+        return f"{settings.OCS_URL}/f/{self.object_id}"
 
     @computed_field
     @property

backend/app/routes/ai.py

@@ -8,12 +8,11 @@
 
 logger = logging.getLogger(__name__)
 
-router = APIRouter(prefix="/ai", tags=["caldav"])
+router = APIRouter(prefix="/ai", tags=["ai"])
 
 
 @router.post("/chat/completions")
 async def ai_post_chat_completions(request: Request, chat_request: ChatCompletionRequest) -> str:
-
     if settings.AI_API_KEY is None:
         return "AI niet beschikbaar"
 
@@ -34,7 +33,7 @@ async def ai_post_chat_completions(request: Request, chat_request: ChatCompletio
   7. Als je het antwoord niet weet, erken dit direct
   8. Gebruik waar mogelijk de officiële terminologie van de Nederlandse overheid.
   9. Structureer complexe antwoorden met duidelijke kopjes en opsommingstekens voor betere leesbaarheid.
-  10. Informeer gebruikers over relevante procedures, termijnen en formulieren bij vragen over overheidsprocessen.""",
+  10. Informeer gebruikers over relevante procedures, termijnen en formulieren bij vragen over overheidsprocessen.""",  # noqa: E501
             },
             {"role": "user", "content": chat_request.prompt},
         ],