Merge pull request #1363 from open-webui/dev

fix

.github/workflows/format-backend.yaml

@@ -1,29 +1,39 @@
 name: Python CI
+
 on:
   push:
-    branches: ['main']
+    branches:
+      - main
+      - dev
   pull_request:
+    branches:
+      - main
+      - dev
+
 jobs:
   build:
     name: 'Format Backend'
-    env:
-      PUBLIC_API_BASE_URL: ''
     runs-on: ubuntu-latest
+
     strategy:
       matrix:
-        node-version:
+        python-version: [3.11]
-          - latest
+
     steps:
       - uses: actions/checkout@v4
-      - name: Use Python
+
-        uses: actions/setup-python@v4
+      - name: Set up Python
-      - name: Use Bun
+        uses: actions/setup-python@v2
-        uses: oven-sh/setup-bun@v1
+        with:
+          python-version: ${{ matrix.python-version }}
+
       - name: Install dependencies
         run: |
           python -m pip install --upgrade pip
-          pip install yapf
+          pip install black
+
       - name: Format backend
-        run: bun run format:backend
+        run: black . --exclude "/venv/"
+
       - name: Check for changes after format
         run: git diff --exit-code

.github/workflows/format-build-frontend.yaml

@@ -1,25 +1,36 @@
-name: Bun CI
+name: Frontend Build
+
 on:
   push:
-    branches: ['main']
+    branches:
+      - main
+      - dev
   pull_request:
+    branches:
+      - main
+      - dev
+
 jobs:
   build:
     name: 'Format & Build Frontend'
-    env:
-      PUBLIC_API_BASE_URL: ''
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v4
+      - name: Checkout Repository
-      - name: Use Bun
+        uses: actions/checkout@v4
-        uses: oven-sh/setup-bun@v1
+
-      - run: bun --version
+      - name: Setup Node.js
-      - name: Install frontend dependencies
+        uses: actions/setup-node@v3
-        run: bun install
+        with:
-      - name: Format frontend
+          node-version: '20' # Or specify any other version you want to use
-        run: bun run format
+
-      - name: Check for changes after format
+      - name: Install Dependencies
+        run: npm install
+
+      - name: Format Frontend
+        run: npm run format
+
+      - name: Check for Changes After Format
         run: git diff --exit-code
-      - name: Build frontend
+
-        if: always()
+      - name: Build Frontend
-        run: bun run build
+        run: npm run build

backend/data/config.json

@@ -4,31 +4,19 @@
 		"default_locale": "en-US",
 		"prompt_suggestions": [
 			{
-                "title": [
+				"title": ["Help me study", "vocabulary for a college entrance exam"],
-                    "Help me study",
-                    "vocabulary for a college entrance exam"
-                ],
 				"content": "Help me study vocabulary: write a sentence for me to fill in the blank, and I'll try to pick the correct option."
 			},
 			{
-                "title": [
+				"title": ["Give me ideas", "for what to do with my kids' art"],
-                    "Give me ideas",
-                    "for what to do with my kids' art"
-                ],
 				"content": "What are 5 creative things I could do with my kids' art? I don't want to throw them away, but it's also so much clutter."
 			},
 			{
-                "title": [
+				"title": ["Tell me a fun fact", "about the Roman Empire"],
-                    "Tell me a fun fact",
-                    "about the Roman Empire"
-                ],
 				"content": "Tell me a random fun fact about the Roman Empire"
 			},
 			{
-                "title": [
+				"title": ["Show me a code snippet", "of a website's sticky header"],
-                    "Show me a code snippet",
-                    "of a website's sticky header"
-                ],
 				"content": "Show me a code snippet of a website's sticky header in CSS and JavaScript."
 			}
 		]

backend/main.py

@@ -170,7 +170,7 @@ async def get_app_config():
         "version": VERSION,
         "default_locale": (
             CONFIG_DATA["ui"]["default_locale"]
-            if "default_locale" in CONFIG_DATA["ui"]
+            if "ui" in CONFIG_DATA and "default_locale" in CONFIG_DATA["ui"]
             else "en-US"
         ),
         "images": images_app.state.ENABLED,

package-lock.json

@@ -1,12 +1,12 @@
 {
 	"name": "open-webui",
-	"version": "0.1.114",
+	"version": "0.1.116",
 	"lockfileVersion": 3,
 	"requires": true,
 	"packages": {
 		"": {
 			"name": "open-webui",
-			"version": "0.1.114",
+			"version": "0.1.116",
 			"dependencies": {
 				"@sveltejs/adapter-node": "^1.3.1",
 				"async": "^3.2.5",

package.json

@@ -13,7 +13,6 @@
 		"lint:types": "npm run check",
 		"lint:backend": "pylint backend/",
 		"format": "prettier --plugin-search-dir --write '**/*.{js,ts,svelte,css,md,html,json}'",
-		"format:backend": "yapf --recursive backend -p -i",
 		"i18n:parse": "i18next --config i18next-parser.config.ts && prettier --write 'src/lib/i18n/**/*.{js,json}'"
 	},
 	"devDependencies": {

src/tailwind.css

@@ -3,7 +3,8 @@
 @tailwind utilities;
 
 @layer base {
-	html, pre {
+	html,
+	pre {
 		font-family: -apple-system, 'Arimo', ui-sans-serif, system-ui, 'Segoe UI', Roboto, Ubuntu,
 			Cantarell, 'Noto Sans', sans-serif, 'Helvetica Neue', Arial, 'Apple Color Emoji',
 			'Segoe UI Emoji', 'Segoe UI Symbol', 'Noto Color Emoji';

svelte.config.js

@@ -19,12 +19,10 @@ const config = {
 	},
 	onwarn: (warning, handler) => {
 		const { code, _ } = warning;
-        if (code === "css-unused-selector")
+		if (code === 'css-unused-selector') return;
-            return;
 
 		handler(warning);
-    },
+	}
-
 };
 
 export default config;

test.json

@@ -1,6 +0,0 @@
-{
-    "model_name": "string",
-    "litellm_params": {
-        "model": "ollama/mistral"
-    }
-}