update from main

Author: didierkrux

.github/workflows/rag-sync.yml

@@ -5,7 +5,7 @@ on:
   push:
     branches: [main]
     paths:
-      - 'devcon/cms/**'
+      - 'devcon/content/**'
       - 'devconnect/cms/**'
 
   # Manual trigger
@@ -45,7 +45,7 @@ jobs:
         with:
           filters: |
             devcon:
-              - 'devcon/cms/**'
+              - 'devcon/content/**'
             devconnect:
               - 'devconnect/cms/**'
 
@@ -91,7 +91,7 @@ jobs:
           npx tsx scripts/sync-documents.ts \
             --source-type github \
             --source-repo devcon \
-            --path ../devcon/cms
+            --path ../devcon/content/en
 
   sync-devconnect:
     name: Sync Devconnect Content

.github/workflows/run-of-show-devcon8.yml

@@ -0,0 +1,28 @@
+name: Run of Show (devcon8)
+
+on:
+  workflow_dispatch:
+
+concurrency:
+  group: run-of-show-devcon8
+  cancel-in-progress: true
+
+jobs:
+  generate:
+    defaults:
+      run:
+        working-directory: ./devcon-api
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@master
+      - uses: actions/setup-node@v4
+        with:
+          node-version: "20"
+      - uses: pnpm/action-setup@v4
+      - run: pnpm install
+      - run: pnpm run-of-show:devcon8
+        env:
+          PRETALX_API_KEY_MUMBAI: ${{ secrets.PRETALX_API_KEY_MUMBAI }}
+          ROS_GOOGLE_CLIENT_EMAIL: ${{ secrets.ROS_GOOGLE_CLIENT_EMAIL }}
+          ROS_GOOGLE_PRIVATE_KEY: ${{ secrets.ROS_GOOGLE_PRIVATE_KEY }}
+          ROS_SPREADSHEET_ID: ${{ secrets.ROS_SPREADSHEET_ID }}

.github/workflows/run-of-show-test-devcon-8.yml

@@ -0,0 +1,28 @@
+name: Run of Show (test-devcon-8)
+
+on:
+  workflow_dispatch:
+
+concurrency:
+  group: run-of-show-test-devcon-8
+  cancel-in-progress: true
+
+jobs:
+  generate:
+    defaults:
+      run:
+        working-directory: ./devcon-api
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@master
+      - uses: actions/setup-node@v4
+        with:
+          node-version: "20"
+      - uses: pnpm/action-setup@v4
+      - run: pnpm install
+      - run: pnpm run-of-show:test
+        env:
+          PRETALX_API_KEY_MUMBAI: ${{ secrets.PRETALX_API_KEY_MUMBAI }}
+          ROS_GOOGLE_CLIENT_EMAIL: ${{ secrets.ROS_GOOGLE_CLIENT_EMAIL }}
+          ROS_GOOGLE_PRIVATE_KEY: ${{ secrets.ROS_GOOGLE_PRIVATE_KEY }}
+          ROS_SPREADSHEET_ID: ${{ secrets.ROS_SPREADSHEET_ID }}

.github/workflows/sync-pretalx-devcon-mumbai-playground.yml

@@ -5,6 +5,11 @@ on:
     - cron: "0 23 30 * *"
   workflow_dispatch:
 
+# Serialize runs so two syncs can't race to commit the same data files.
+concurrency:
+  group: pretalx-sync-devcon-mumbai-playground
+  cancel-in-progress: false
+
 jobs:
   build:
     defaults:
@@ -28,7 +33,10 @@ jobs:
           add: "devcon-api/data"
           default_author: github_actions
           message: "[action] Pretalx Sync (devcon-mumbai-playground)"
-          pull: "--rebase --autostash"
+          # Sync output is the source of truth (regenerated from Pretalx, incl. a
+          # changing `version` timestamp), so on a rebase conflict keep ours.
+          # `-X theirs` favours the replayed local commit during `pull --rebase`.
+          pull: "--rebase --autostash -X theirs"
       - name: Sync sessions to RAG DB
         working-directory: ./devcon-ai
         env:

.github/workflows/sync-pretalx-devcon8.yml

@@ -0,0 +1,45 @@
+name: Pretalx Sync (devcon8)
+
+on:
+  schedule:
+    - cron: "0 23 30 * *"
+  workflow_dispatch:
+
+# Serialize runs so two syncs can't race to commit the same data files.
+concurrency:
+  group: pretalx-sync-devcon8
+  cancel-in-progress: false
+
+jobs:
+  build:
+    defaults:
+      run:
+        working-directory: ./devcon-api
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@master
+      - uses: actions/setup-node@v4
+        with:
+          node-version: "20"
+      - uses: pnpm/action-setup@v4
+      - run: pnpm install
+      - run: pnpm sync:pretalx:devcon8
+        env:
+          PRETALX_API_KEY_MUMBAI: ${{ secrets.PRETALX_API_KEY_MUMBAI }}
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+          EMAIL_SECRET: ${{ secrets.EMAIL_SECRET }}
+      - uses: EndBug/add-and-commit@v9
+        with:
+          add: "devcon-api/data"
+          default_author: github_actions
+          message: "[action] Pretalx Sync (devcon8)"
+          pull: "--rebase --autostash -X theirs"
+      - name: Sync sessions to RAG DB
+        working-directory: ./devcon-ai
+        env:
+          SUPABASE_URL: ${{ secrets.SUPABASE_URL }}
+          SUPABASE_SERVICE_KEY: ${{ secrets.SUPABASE_SERVICE_KEY }}
+          OPENAI_API_KEY: ${{ secrets.OPENAI_API_KEY }}
+        run: |
+          pnpm install
+          pnpm sync:sessions --event devcon8

.github/workflows/sync-pretalx-test-devcon-8.yml

@@ -0,0 +1,48 @@
+name: Pretalx Sync (test-devcon-8)
+
+on:
+  schedule:
+    - cron: "0 23 30 * *"
+  workflow_dispatch:
+
+# Serialize runs so two syncs can't race to commit the same data files.
+concurrency:
+  group: pretalx-sync-test-devcon-8
+  cancel-in-progress: false
+
+jobs:
+  build:
+    defaults:
+      run:
+        working-directory: ./devcon-api
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@master
+      - uses: actions/setup-node@v4
+        with:
+          node-version: "20"
+      - uses: pnpm/action-setup@v4
+      - run: pnpm install
+      - run: pnpm sync:pretalx:test
+        env:
+          PRETALX_API_KEY_MUMBAI: ${{ secrets.PRETALX_API_KEY_MUMBAI }}
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+          EMAIL_SECRET: ${{ secrets.EMAIL_SECRET }}
+      - uses: EndBug/add-and-commit@v9
+        with:
+          add: "devcon-api/data"
+          default_author: github_actions
+          message: "[action] Pretalx Sync (test-devcon-8)"
+          # Sync output is the source of truth (regenerated from Pretalx, incl. a
+          # changing `version` timestamp), so on a rebase conflict keep ours.
+          # `-X theirs` favours the replayed local commit during `pull --rebase`.
+          pull: "--rebase --autostash -X theirs"
+      - name: Sync sessions to RAG DB
+        working-directory: ./devcon-ai
+        env:
+          SUPABASE_URL: ${{ secrets.SUPABASE_URL }}
+          SUPABASE_SERVICE_KEY: ${{ secrets.SUPABASE_SERVICE_KEY }}
+          OPENAI_API_KEY: ${{ secrets.OPENAI_API_KEY }}
+        run: |
+          pnpm install
+          pnpm sync:sessions --event test-devcon-8

.github/workflows/sync-pretalx.yml

@@ -5,6 +5,11 @@ on:
     - cron: "0 23 30 * *"
   workflow_dispatch:
 
+# Serialize runs so two syncs can't race to commit the same data files.
+concurrency:
+  group: pretalx-sync-devcon-7
+  cancel-in-progress: false
+
 jobs:
   build:
     defaults:
@@ -21,6 +26,9 @@ jobs:
       - run: pnpm sync:pretalx
         env:
           PRETALX_API_KEY: ${{ secrets.PRETALX_API_KEY }}
+          # devcon-7 migrated to the mum.speakat.xyz instance; its config now
+          # reads PRETALX_API_KEY_MUMBAI (speak.devcon.org is retired).
+          PRETALX_API_KEY_MUMBAI: ${{ secrets.PRETALX_API_KEY_MUMBAI }}
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
           EMAIL_SECRET: ${{ secrets.EMAIL_SECRET }}
           GOOGLE_CLIENT_EMAIL: ${{ secrets.GOOGLE_CLIENT_EMAIL }}
@@ -31,7 +39,10 @@ jobs:
           add: "devcon-api/data"
           default_author: github_actions
           message: "[action] Pretalx Sync"
-          pull: "--rebase --autostash"
+          # Sync output is the source of truth (regenerated from Pretalx, incl. a
+          # changing `version` timestamp), so on a rebase conflict keep ours.
+          # `-X theirs` favours the replayed local commit during `pull --rebase`.
+          pull: "--rebase --autostash -X theirs"
       - name: Sync sessions to RAG DB
         working-directory: ./devcon-ai
         env:

devcon-ai/package.json

@@ -8,7 +8,7 @@
     "build": "tsc",
     "start": "node dist/server.js",
     "typecheck": "tsc --noEmit",
-    "sync:devcon": "tsx scripts/sync-documents.ts --source-type github --source-repo devcon --path ../devcon/cms",
+    "sync:devcon": "tsx scripts/sync-documents.ts --source-type github --source-repo devcon --path ../devcon/content/en",
     "sync:devconnect": "tsx scripts/sync-documents.ts --source-type github --source-repo devconnect --path ../devconnect/cms",
     "sync:sessions": "tsx scripts/sync-sessions.ts",
     "test:providers": "tsx scripts/test-providers.ts"

devcon-ai/scripts/sync-documents.ts

@@ -261,6 +261,9 @@ async function sync() {
 
   const openai = new OpenAI({
     apiKey: process.env.OPENAI_API_KEY!,
+    // Pin to real OpenAI — the SDK otherwise inherits OPENAI_BASE_URL from the
+    // env (a chat proxy in dev), which 401s on embedding requests.
+    baseURL: "https://api.openai.com/v1",
   });
 
   // Find all markdown files

devcon-ai/scripts/sync-sessions.ts

@@ -262,6 +262,9 @@ async function sync() {
 
   const openai = new OpenAI({
     apiKey: process.env.OPENAI_API_KEY!,
+    // Pin to real OpenAI — the SDK otherwise inherits OPENAI_BASE_URL from the
+    // env (a chat proxy in dev), which 401s on embedding requests.
+    baseURL: "https://api.openai.com/v1",
   });
 
   // Load sessions from the committed data files