Merge branch 'dev' into fix/data-dir-handling

.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/apps/images/main.py

@@ -325,7 +325,7 @@ def save_url_image(url):
 
         return image_id
     except Exception as e:
-        print(f"Error saving image: {e}")
+        log.exception(f"Error saving image: {e}")
         return None
 
 
@@ -397,7 +397,7 @@ def generate_image(
                 user.id,
                 app.state.COMFYUI_BASE_URL,
             )
-            print(res)
+            log.debug(f"res: {res}")
 
             images = []
 
@@ -409,7 +409,7 @@ def generate_image(
                 with open(file_body_path, "w") as f:
                     json.dump(data.model_dump(exclude_none=True), f)
 
-            print(images)
+            log.debug(f"images: {images}")
             return images
         else:
             if form_data.model:

backend/apps/images/utils/comfyui.py

@@ -4,6 +4,12 @@ import json
 import urllib.request
 import urllib.parse
 import random
+import logging
+
+from config import SRC_LOG_LEVELS
+
+log = logging.getLogger(__name__)
+log.setLevel(SRC_LOG_LEVELS["COMFYUI"])
 
 from pydantic import BaseModel
 
@@ -121,7 +127,7 @@ COMFYUI_DEFAULT_PROMPT = """
 
 
 def queue_prompt(prompt, client_id, base_url):
-    print("queue_prompt")
+    log.info("queue_prompt")
     p = {"prompt": prompt, "client_id": client_id}
     data = json.dumps(p).encode("utf-8")
     req = urllib.request.Request(f"{base_url}/prompt", data=data)
@@ -129,7 +135,7 @@ def queue_prompt(prompt, client_id, base_url):
 
 
 def get_image(filename, subfolder, folder_type, base_url):
-    print("get_image")
+    log.info("get_image")
     data = {"filename": filename, "subfolder": subfolder, "type": folder_type}
     url_values = urllib.parse.urlencode(data)
     with urllib.request.urlopen(f"{base_url}/view?{url_values}") as response:
@@ -137,14 +143,14 @@ def get_image(filename, subfolder, folder_type, base_url):
 
 
 def get_image_url(filename, subfolder, folder_type, base_url):
-    print("get_image")
+    log.info("get_image")
     data = {"filename": filename, "subfolder": subfolder, "type": folder_type}
     url_values = urllib.parse.urlencode(data)
     return f"{base_url}/view?{url_values}"
 
 
 def get_history(prompt_id, base_url):
-    print("get_history")
+    log.info("get_history")
     with urllib.request.urlopen(f"{base_url}/history/{prompt_id}") as response:
         return json.loads(response.read())
 
@@ -212,15 +218,15 @@ def comfyui_generate_image(
     try:
         ws = websocket.WebSocket()
         ws.connect(f"ws://{host}/ws?clientId={client_id}")
-        print("WebSocket connection established.")
+        log.info("WebSocket connection established.")
     except Exception as e:
-        print(f"Failed to connect to WebSocket server: {e}")
+        log.exception(f"Failed to connect to WebSocket server: {e}")
         return None
 
     try:
         images = get_images(ws, comfyui_prompt, client_id, base_url)
     except Exception as e:
-        print(f"Error while receiving images: {e}")
+        log.exception(f"Error while receiving images: {e}")
         images = None
 
     ws.close()

backend/apps/ollama/main.py

@@ -272,7 +272,7 @@ async def pull_model(
                         if request_id in REQUEST_POOL:
                             yield chunk
                         else:
-                            print("User: canceled request")
+                            log.warning("User: canceled request")
                             break
                 finally:
                     if hasattr(r, "close"):
@@ -670,7 +670,7 @@ async def generate_completion(
         else:
             raise HTTPException(
                 status_code=400,
-                detail="error_detail",
+                detail=ERROR_MESSAGES.MODEL_NOT_FOUND(form_data.model),
             )
 
     url = app.state.OLLAMA_BASE_URLS[url_idx]

backend/apps/rag/main.py

@@ -333,7 +333,7 @@ def store_docs_in_vector_db(docs, collection_name, overwrite: bool = False) -> b
         if overwrite:
             for collection in CHROMA_CLIENT.list_collections():
                 if collection_name == collection.name:
-                    print(f"deleting existing collection {collection_name}")
+                    log.info(f"deleting existing collection {collection_name}")
                     CHROMA_CLIENT.delete_collection(name=collection_name)
 
         collection = CHROMA_CLIENT.create_collection(
@@ -346,7 +346,7 @@ def store_docs_in_vector_db(docs, collection_name, overwrite: bool = False) -> b
         )
         return True
     except Exception as e:
-        print(e)
+        log.exception(e)
         if e.__class__.__name__ == "UniqueConstraintError":
             return True
 
@@ -575,7 +575,7 @@ def scan_docs_dir(user=Depends(get_admin_user)):
                                 ),
                             )
                 except Exception as e:
-                    print(e)
+                    log.exception(e)
                     pass
 
         except Exception as e:

backend/config.py

@@ -119,6 +119,7 @@ log.info(f"GLOBAL_LOG_LEVEL: {GLOBAL_LOG_LEVEL}")
 
 log_sources = [
     "AUDIO",
+    "COMFYUI",
     "CONFIG",
     "DB",
     "IMAGES",
@@ -128,6 +129,7 @@ log_sources = [
     "OLLAMA",
     "OPENAI",
     "RAG",
+    "WEBHOOK",
 ]
 
 SRC_LOG_LEVELS = {}

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/utils/webhook.py

@@ -1,6 +1,11 @@
 import json
 import requests
-from config import VERSION, WEBUI_FAVICON_URL, WEBUI_NAME
+import logging
+
+from config import SRC_LOG_LEVELS, VERSION, WEBUI_FAVICON_URL, WEBUI_NAME
+
+log = logging.getLogger(__name__)
+log.setLevel(SRC_LOG_LEVELS["WEBHOOK"])
 
 
 def post_webhook(url: str, message: str, event_data: dict) -> bool:
@@ -39,9 +44,11 @@ def post_webhook(url: str, message: str, event_data: dict) -> bool:
         else:
             payload = {**event_data}
 
+        log.debug(f"payload: {payload}")
         r = requests.post(url, json=payload)
         r.raise_for_status()
+        log.debug(f"r.text: {r.text}")
         return True
     except Exception as e:
-        print(e)
+        log.exception(e)
         return False

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/lib/i18n/locales/it-IT/translation.json

@@ -360,4 +360,4 @@
 	"You": "Tu",
 	"You're a helpful assistant.": "Sei un assistente utile.",
 	"You're now logged in.": "Ora hai effettuato l'accesso."
-    }
+}

src/lib/i18n/locales/ja-JP/translation.json

@@ -360,4 +360,4 @@
 	"You": "あなた",
 	"You're a helpful assistant.": "あなたは役に立つアシスタントです。",
 	"You're now logged in.": "ログインしました。"
-    }
+}

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"
-    }
-}