Merge branch 'main' into renovate/actions-checkout-5.x

Author: Veikkosuhonen

.github/workflows/test.yaml

@@ -9,7 +9,7 @@ jobs:
 
     steps:
       - uses: actions/checkout@v5
-      - uses: actions/setup-node@v4
+      - uses: actions/setup-node@v5
         with:
           node-version: '20'
           cache: 'npm'

README.md

@@ -8,6 +8,10 @@ Some key features include:
 - Custom system prompts managed by teachers
 - Retrieval-augmented generation: teachers can bring their own source material for a course
 
+<!-- This badge enables weekly refreshes to CurreChat deepwiki page (deepwiki/gptwrapper) -->
+
+[![Ask DeepWiki](https://deepwiki.com/badge.svg)](https://deepwiki.com/UniversityOfHelsinkiCS/gptwrapper)
+
 ## Development
 
 Quickstart:
@@ -34,6 +38,7 @@ Azure is used for OpenAI LLMs.
 Create an AI foundry resource (or something) and create deployment for the models you want to use (gpt-5 for example). Always set the deployment name to the acual model name. So for model gpt-5, the deployment name should be gpt-5.
 
 Then populate .env with the following:
+
 ```
 AZURE_RESOURCE=<name-of-the-resource-you-created>
 AZURE_API_KEY=<asd>
@@ -44,6 +49,7 @@ AZURE_API_KEY=<asd>
 S3 is used for storing user-uploaded files and their processed versions.
 
 Create an S3 bucket and populate .env with the following:
+
 ```
 S3_HOST=<host-url>
 S3_BUCKET=<name-of-the-bucket-you-created>
@@ -56,6 +62,7 @@ S3_SECRET_KEY=<secret-key>
 ### Debugging in production
 
 In browser console, run
+
 ```
 toggleDevtools()
 ```
@@ -65,6 +72,7 @@ toggleDevtools()
 Getting `Error: Cannot find module @rollup/rollup-linux-arm64-musl` on MacOS?
 This is likely because you ran `npm i` locally.
 Try removing package-lock.json locally and running
+
 ```
 docker compose build
 ```
@@ -76,6 +84,7 @@ If then you're getting `concurrently not found`, prepend the `npm run dev` scrip
 Playwright e2e tests are located in `e2e`. `playwright.config.ts` is also important.
 
 Run the tests with
+
 ```bash
 npm run e2e
 ```
@@ -85,15 +94,17 @@ To run just one test, mark it with `.only`:
 ```ts
 test.only('test name', async ({ page }) => {
   // test code
-});
+})
 ```
 
 When writing new spec file, make sure to import the test function from the fixtures file, like this:
+
 ```ts
 import { teacherTest as test } from './fixtures'
 ```
 
 So that the global foreach function runs for your tests. For different user roles (`studentTest`, `teacherTest`, `adminTest`), import the corresponding test function:
+
 ```ts
 import { studentTest as test } from './fixtures'
 ```

compose.yaml

@@ -42,26 +42,25 @@ services:
       - redis_data:/data
 
   # Comment out if you use local ollama. Set OLLAMA_URL=host.docker.internal:11434 if using recent Docker Desktop.
-  ollama:
-    image: ollama/ollama
-    ports:
-      - 11434:11434 # expose the Ollama API to the host
-    volumes:
-      - ollama_data:/root/.ollama # persistent model storage
-    entrypoint: ["/bin/bash", "-c", "\
-      ollama serve & \
-      sleep 5 && \
-      ollama pull qwen2.5vl:7b && \
-      wait"]
+  # ollama:
+  #   image: ollama/ollama
+  #   ports:
+  #     - 11434:11434 # expose the Ollama API to the host
+  #   volumes:
+  #     - ollama_data:/root/.ollama # persistent model storage
+  #   entrypoint: ["/bin/bash", "-c", "\
+  #     ollama serve & \
+  #     sleep 5 && \
+  #     ollama pull qwen2.5vl:7b && \
+  #     wait"]
 
   dalai:
-  #   # image: toska/dalai:latest
     build:
       context: ./dalai
       dockerfile: dev.Dockerfile
     environment:
-    # - OLLAMA_URL=http://host.docker.internal:11434
-      - OLLAMA_URL=http://ollama:11434
+      - OLLAMA_URL=http://host.docker.internal:11434
+      #  - OLLAMA_URL=http://ollama:11434
       - REDIS_HOST=redis
       - REDIS_PORT=6379
       - S3_HOST=http://minio:9000
@@ -72,7 +71,7 @@ services:
       - dalai_data:/app
     container_name: gptwrapper_dalai
     depends_on:
-    - redis
+      - redis
 
   minio:
     image: minio/minio:latest
@@ -112,7 +111,6 @@ services:
 volumes:
   pg_data:
   redis_data:
-  chromadb_data:
   ollama_data:
   dalai_data:
   minio-data:

dalai/logger.ts

@@ -0,0 +1,46 @@
+import { token } from 'morgan'
+import winston from 'winston'
+import LokiTransport from 'winston-loki'
+
+type Transport = winston.transport
+
+const transports: Transport[] = []
+
+const LOKI_HOST = `https://api-toska.apps.ocp-prod-0.k8s.it.helsinki.fi/lokki`
+
+const LOKI_TOKEN = process.env.LOKI_TOKEN ?? ''
+
+const levels = {
+  error: 0,
+  warn: 1,
+  info: 2,
+  http: 3,
+  verbose: 4,
+  debug: 5,
+  silly: 6,
+}
+
+const prodFormat = winston.format.printf(({ level, ...rest }) =>
+  JSON.stringify({
+    level: levels[level],
+    ...rest,
+  }),
+)
+
+transports.push(new winston.transports.Console({ format: prodFormat }))
+
+transports.push(
+  new LokiTransport({
+    host: LOKI_HOST,
+    headers: {
+      token: LOKI_TOKEN,
+    },
+    labels: {
+      app: 'dalai',
+    },
+  }),
+)
+
+const logger = winston.createLogger({ transports })
+
+export default logger