Merge branch 'main' into main

Author: louiscantu

.dockerignore

@@ -4,7 +4,6 @@ node_modules
 npm-debug.log
 .next
 .git
-scripts
 docs
 .github
 *.md

.env.example

@@ -33,7 +33,7 @@ OPENAI_API_KEY=sk-xxxxxxxxx
 # AZURE_ENDPOINT=https://docs-test-001.openai.azure.com
 
 # Azure's API version, follows the YYYY-MM-DD format
-# AZURE_API_VERSION=2024-02-01
+# AZURE_API_VERSION=2024-06-01
 
 
 ### Anthropic Service ####
@@ -112,6 +112,10 @@ OPENAI_API_KEY=sk-xxxxxxxxx
 
 # QWEN_API_KEY=sk-xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx
 
+### SiliconCloud AI  ####
+
+# SILICONCLOUD_API_KEY=sk-xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx
+
 ########################################
 ############ Market Service ############
 ########################################
@@ -129,3 +133,63 @@ OPENAI_API_KEY=sk-xxxxxxxxx
 # set the plugin settings
 # the format is `plugin-identifier:key1=value1;key2=value2`, multiple settings fields are separated by semicolons `;`, multiple plugin settings are separated by commas `,`.
 # PLUGIN_SETTINGS=search-engine:SERPAPI_API_KEY=xxxxx
+
+
+########################################
+##### S3 Object Storage Service ########
+########################################
+
+# S3 keys
+#S3_ACCESS_KEY_ID=9998d6757e276cf9f1edbd325b7083a6
+#S3_SECRET_ACCESS_KEY=55af75d8eb6b99f189f6a35f855336ea62cd9c4751a5cf4337c53c1d3f497ac2
+
+# Bucket name
+#S3_BUCKET=lobechat
+
+# Bucket request endpoint
+#S3_ENDPOINT=https://0b33a03b5c993fd2f453379dc36558e5.r2.cloudflarestorage.com
+
+# Public access domain for the bucket
+#NEXT_PUBLIC_S3_DOMAIN=https://s3-for-lobechat.your-domain.com
+
+# Bucket region, such as us-west-1, generally not needed to add
+# but some service providers may require configuration
+# S3_REGION=us-west-1
+
+
+########################################
+############ Auth Service ##############
+########################################
+
+
+# Clerk related configurations
+
+# Clerk public key and secret key
+#NEXT_PUBLIC_CLERK_PUBLISHABLE_KEY=pk_live_xxxxxxxxxxx
+#CLERK_SECRET_KEY=sk_live_xxxxxxxxxxxxxxxxxxxxxx
+
+# you need to config the clerk webhook secret key if you want to use the clerk with database
+#CLERK_WEBHOOK_SECRET=whsec_xxxxxxxxxxxxxxxxxxxxxx
+
+
+# NextAuth related configurations
+# NEXT_AUTH_SECRET=
+
+# Auth0 configurations
+# AUTH0_CLIENT_ID=
+# AUTH0_CLIENT_SECRET=
+# AUTH0_ISSUER=https://your-domain.auth0.com
+
+########################################
+########## Server Database #############
+########################################
+
+# Specify the service mode as server if you want to use the server database
+#NEXT_PUBLIC_SERVICE_MODE=server
+
+# Postgres database URL
+#DATABASE_URL=postgres://username:password@host:port/database
+
+# use `openssl rand -base64 32` to generate a key for the encryption of the database
+# we use this key to encrypt the user api key
+#KEY_VAULTS_SECRET=xxxxx/xxxxxxxxxxxxxx=

.github/ISSUE_TEMPLATE/1_bug_report.yml

@@ -3,15 +3,18 @@ description: 'Report an bug'
 title: '[Bug] '
 labels: ['🐛 Bug']
 body:
-  - type: checkboxes
+  - type: dropdown
     attributes:
       label: '📦 Environment'
+      multiple: true
       options:
-        - label: 'Official'
-        - label: 'Official Preview'
-        - label: 'Vercel / Zeabur / Sealos'
-        - label: 'Docker'
-        - label: 'Other'
+        - 'Official Preview'
+        - 'Vercel'
+        - 'Zeabur'
+        - 'Sealos'
+        - 'Netlify'
+        - 'Docker'
+        - 'Other'
     validations:
       required: true
   - type: input
@@ -20,28 +23,30 @@ body:
     validations:
       required: true
 
-  - type: checkboxes
+  - type: dropdown
     attributes:
       label: '💻 Operating System'
+      multiple: true
       options:
-        - label: 'Windows'
-        - label: 'macOS'
-        - label: 'Ubuntu'
-        - label: 'Other Linux'
-        - label: 'iOS'
-        - label: 'Android'
-        - label: 'Other'
+        - 'Windows'
+        - 'macOS'
+        - 'Ubuntu'
+        - 'Other Linux'
+        - 'iOS'
+        - 'Android'
+        - 'Other'
     validations:
       required: true
-  - type: checkboxes
+  - type: dropdown
     attributes:
       label: '🌐 Browser'
+      multiple: true
       options:
-        - label: 'Chrome'
-        - label: 'Edge'
-        - label: 'Safari'
-        - label: 'Firefox'
-        - label: 'Other'
+        - 'Chrome'
+        - 'Edge'
+        - 'Safari'
+        - 'Firefox'
+        - 'Other'
     validations:
       required: true
   - type: textarea

.github/ISSUE_TEMPLATE/1_bug_report_cn.yml

@@ -3,15 +3,18 @@ description: '反馈一个问题缺陷'
 title: '[Bug] '
 labels: ['🐛 Bug']
 body:
-  - type: checkboxes
+  - type: dropdown
     attributes:
       label: '📦 部署环境'
+      multiple: true
       options:
-        - label: 'Official'
-        - label: 'Official Preview'
-        - label: 'Vercel / Zeabur / Sealos'
-        - label: 'Docker'
-        - label: 'Other'
+        - 'Official Preview'
+        - 'Vercel'
+        - 'Zeabur'
+        - 'Sealos'
+        - 'Netlify'
+        - 'Docker'
+        - 'Other'
     validations:
       required: true
   - type: input
@@ -20,28 +23,30 @@ body:
     validations:
       required: true
 
-  - type: checkboxes
+  - type: dropdown
     attributes:
       label: '💻 系统环境'
+      multiple: true
       options:
-        - label: 'Windows'
-        - label: 'macOS'
-        - label: 'Ubuntu'
-        - label: 'Other Linux'
-        - label: 'iOS'
-        - label: 'Android'
-        - label: 'Other'
+        - 'Windows'
+        - 'macOS'
+        - 'Ubuntu'
+        - 'Other Linux'
+        - 'iOS'
+        - 'Android'
+        - 'Other'
     validations:
       required: true
-  - type: checkboxes
+  - type: dropdown
     attributes:
       label: '🌐 浏览器'
+      multiple: true
       options:
-        - label: 'Chrome'
-        - label: 'Edge'
-        - label: 'Safari'
-        - label: 'Firefox'
-        - label: 'Other'
+        - 'Chrome'
+        - 'Edge'
+        - 'Safari'
+        - 'Firefox'
+        - 'Other'
     validations:
       required: true
   - type: textarea

.github/PULL_REQUEST_TEMPLATE.md

@@ -6,9 +6,10 @@
 - [ ] 🐛 fix
 - [ ] ♻️ refactor
 - [ ] 💄 style
-- [ ] 🔨 chore
+- [ ] 👷 build
 - [ ] ⚡️ perf
 - [ ] 📝 docs
+- [ ] 🔨 chore
 
 #### 🔀 变更说明 | Description of Change
 

.github/workflows/docker-database.yml

@@ -0,0 +1,46 @@
+name: Publish Database Docker Image
+
+on:
+  workflow_dispatch:
+  release:
+    types: [published]
+
+jobs:
+  push_to_registry:
+    name: Push Docker image to Docker Hub
+    runs-on: ubuntu-latest
+    steps:
+      - name: Check out the repo
+        uses: actions/checkout@v4
+      - name: Log in to Docker Hub
+        uses: docker/login-action@v3
+        with:
+          username: ${{ secrets.DOCKER_REGISTRY_USER }}
+          password: ${{ secrets.DOCKER_REGISTRY_PASSWORD }}
+
+      - name: Extract metadata (tags, labels) for Docker
+        id: meta
+        uses: docker/metadata-action@v5
+        with:
+          images: lobehub/lobe-chat-database
+          tags: |
+            type=raw,value=latest
+            type=ref,event=tag
+
+      - name: Set up QEMU
+        uses: docker/setup-qemu-action@v3
+
+      - name: Set up Docker Buildx
+        uses: docker/setup-buildx-action@v3
+
+      - name: Build and push Docker image
+        uses: docker/build-push-action@v5
+        with:
+          context: .
+          file: ./Dockerfile.database  # 指定使用 Dockerfile.database 文件
+          platforms: linux/amd64,linux/arm64
+          push: true
+          tags: ${{ steps.meta.outputs.tags }}
+          labels: ${{ steps.meta.outputs.labels }}
+          cache-from: type=gha
+          cache-to: type=gha,mode=max

.github/workflows/release.yml

@@ -8,6 +8,17 @@ jobs:
   release:
     name: Release
     runs-on: ubuntu-latest
+
+    services:
+      postgres:
+        image: postgres:16
+        env:
+          POSTGRES_PASSWORD: postgres
+        options: >-
+          --health-cmd pg_isready --health-interval 10s --health-timeout 5s  --health-retries 5
+        ports:
+          - 5432:5432
+          
     steps:
       - uses: actions/checkout@v4
 
@@ -22,8 +33,16 @@ jobs:
       - name: Lint
         run: bun run lint
 
-      - name: Test
-        run: bun run test
+      - name: Test Server Coverage
+        run: bun run test-server:coverage
+        env:
+          DATABASE_TEST_URL: postgresql://postgres:postgres@localhost:5432/postgres
+          DATABASE_DRIVER: node
+          NEXT_PUBLIC_SERVICE_MODE: server
+          KEY_VAULTS_SECRET: LA7n9k3JdEcbSgml2sxfw+4TV1AzaaFU5+R176aQz4s=
+
+      - name: Test App Coverage
+        run: bun run test-app:coverage
 
       - name: Release
         run: bun run release

.github/workflows/sync.yml

@@ -7,7 +7,7 @@ permissions:
 
 on:
   schedule:
-    - cron: '0 * * * *' # every hour
+    - cron: '0 */6 * * *' # every 6 hours
   workflow_dispatch:
 
 jobs:

.github/workflows/test.yml

@@ -1,9 +1,23 @@
 name: Test CI
+
 on: [push, pull_request]
+
 jobs:
   test:
     runs-on: ubuntu-latest
 
+    services:
+      postgres:
+        image: postgres:16
+        env:
+          POSTGRES_PASSWORD: postgres
+        options: >-
+          --health-cmd pg_isready --health-interval 10s --health-timeout 5s  --health-retries 5
+
+
+        ports:
+          - 5432:5432
+
     steps:
       - uses: actions/checkout@v4
 
@@ -18,10 +32,27 @@ jobs:
       - name: Lint
         run: bun run lint
 
-      - name: Test and coverage
-        run: bun run test:coverage
+      - name: Test Server Coverage
+        run: bun run test-server:coverage
+        env:
+          DATABASE_TEST_URL: postgresql://postgres:postgres@localhost:5432/postgres
+          DATABASE_DRIVER: node
+          NEXT_PUBLIC_SERVICE_MODE: server
+          KEY_VAULTS_SECRET: LA7n9k3JdEcbSgml2sxfw+4TV1AzaaFU5+R176aQz4s=
+
+      - name: Upload Server coverage to Codecov
+        uses: codecov/codecov-action@v4
+        with:
+          token: ${{ secrets.CODECOV_TOKEN }}
+          files: ./coverage/server/lcov.info
+          flags: server
+
+      - name: Test App Coverage
+        run: bun run test-app:coverage
 
-      - name: Upload coverage to Codecov
+      - name: Upload App Coverage to Codecov
         uses: codecov/codecov-action@v4
         with:
-          token: ${{ secrets.CODECOV_TOKEN }} # required
+          token: ${{ secrets.CODECOV_TOKEN }}
+          files: ./coverage/app/lcov.info
+          flags: app

.gitignore

@@ -60,3 +60,4 @@ sitemap*.xml
 robots.txt
 
 *.patch
+*.pdf