Merge pull request 'fromatting' (#111) from dev into main

Reviewed-on: #111

openwebui/openwebui-secret.json

@@ -5,6 +5,9 @@
         "POSTGRES_PASSWORD": "#POSTGRES_PASSWORD",
         "POSTGRES_ROOT_PASSWORD": "#POSTGRES_ROOT_PASSWORD"
     },
+    "openwebuipipelines": {
+        "PIPELINES_API_KEY": "#PIPELINES_API_KEY"
+    },
     "openwebuisearxng": {
         "SEARXNG_SECRET": "#SEARXNG_SECRET"
     },
@@ -18,7 +21,6 @@
         "WEBUI_ADMIN_PASSWORD": "#WEBUI_ADMIN_PASSWORD",
         "WEBUI_SECRET_KEY": "#WEBUI_SECRET_KEY",
         "OPENAI_API_KEY": "#OPENAI_API_KEY",
-        "HF_TOKEN": "#HF_TOKEN",
         "DATABASE_URL": "postgres://#POSTGRES_USER:#POSTGRES_PASSWORD@openwebuipostgres-db:5432/#POSTGRES_DB",
         "EXTERNAL_WEB_SEARCH_API_KEY": "#SEARXNG_SECRET",
         "EXTERNAL_WEB_LOADER_API_KEY": "#CRAWL4AI_API_TOKEN"

openwebui/service-openwebui.json

@@ -24,7 +24,7 @@
             ],
             "START_ON_BOOT": "false",
             "ENTRYPOINT": "sh -c",
-            "CMD": "mkdir -p /etc/user/data/openwebui/data && mkdir -p /etc/user/data/openwebui/db && mkdir -p /etc/user/data/openwebui/qdrant && mkdir -p /etc/user/data/openwebui/searxng && mkdir -p /etc/user/data/openwebui/crawl4ai && printf %s c2VydmVyOgogIGJpbmRfYWRkcmVzczogMC4wLjAuMAogIHBvcnQ6IDgwODAKICBsaW1pdGVyOiBmYWxzZQogIHB1YmxpY19pbnN0YW5jZTogZmFsc2UKc2VhcmNoOgogIGZvcm1hdHM6CiAgICAtIGh0bWwKICAgIC0ganNvbgp1aToKICBzdGF0aWNfdXNlX2hhc2g6IHRydWUKcmVkaXM6CiAgdXJsOiBmYWxzZQpvdXRnb2luZzoKICB1c2VyYWdlbnQ6IE1vemlsbGEvNS4wIChXaW5kb3dzIE5UIDEwLjA7IFdpbjY0OyB4NjQpIEFwcGxlV2ViS2l0LzUzNy4zNiAoS0hUTUwsIGxpa2UgR2Vja28pIENocm9tZS8xMzEuMC4wLjAgU2FmYXJpLzUzNy4zNgp1c2VfZGVmYXVsdF9zZXR0aW5nczoKICBlbmdpbmVzOgogICAgcmVtb3ZlOgogICAgICAtIGFobWlhCiAgICAgIC0gdG9yY2gKICAgICAgLSB3aWtpZGF0YQpib3RkZXRlY3Rpb246CiAgaXBfbGlzdHM6CiAgICBwYXNzX2lwOgogICAgICAtIDAuMC4wLjAvMAogICAgICAtIDo6LzA= | base64 -d > /etc/user/data/openwebui/searxng/settings.yml && printf %s W2JvdGRldGVjdGlvbi5pcF9saW1pdF0KbGlua190b2tlbiA9IGZhbHNlCg== | base64 -d > /etc/user/data/openwebui/searxng/limiter.toml",
+            "CMD": "mkdir -p /etc/user/data/openwebui/data && mkdir -p /etc/user/data/openwebui/db && mkdir -p /etc/user/data/openwebui/pipelines && mkdir -p /etc/user/data/openwebui/qdrant && mkdir -p /etc/user/data/openwebui/searxng && mkdir -p /etc/user/data/openwebui/crawl4ai && printf %s c2VydmVyOgogIGJpbmRfYWRkcmVzczogMC4wLjAuMAogIHBvcnQ6IDgwODAKICBsaW1pdGVyOiBmYWxzZQogIHB1YmxpY19pbnN0YW5jZTogZmFsc2UKc2VhcmNoOgogIGZvcm1hdHM6CiAgICAtIGh0bWwKdWk6CiAgc3RhdGljX3VzZV9oYXNoOiB0cnVlCnJlZGlzOgogIHVybDogZmFsc2UKb3V0Z29pbmc6CiAgdXNlcmFnZW50OiBNb3ppbGxhLzUuMCAoV2luZG93cyBOVCAxMC4wOyBXaW42NDsgeDY0KSBBcHBsZVdlYktpdC81MzcuMzYgKEtIVE1MLCBsaWtlIEdlY2tvKSBDaHJvbWUvMTMxLjAuMC4wIFNhZmFyaS81MzcuMzYKdXNlX2RlZmF1bHRfc2V0dGluZ3M6CiAgZW5naW5lczoKICAgIHJlbW92ZToKICAgICAgLSBhaG1pYQogICAgICAtIHRvcmNoCiAgICAgIC0gd2lraWRhdGE= | base64 -d > /etc/user/data/openwebui/searxng/settings.yml && printf %s W2JvdGRldGVjdGlvbi5pcF9saW1pdF0KbGlua190b2tlbiA9IHRydWUK | base64 -d > /etc/user/data/openwebui/searxng/limiter.toml",
             "PRE_START": "null",
             "POST_START": "null"
         },
@@ -92,6 +92,54 @@
             "PRE_START": "null",
             "POST_START": "null"
         },
+        {
+            "IMAGE": "ghcr.io/open-webui/pipelines:main",
+            "UPDATE": "true",
+            "NAME": "openwebuipipelines-app",
+            "MEMORY": "1024M",
+            "NETWORK": "openwebui-net",
+            "SELECTOR": "openwebuipipelines-app",
+            "VOLUMES": [
+                {
+                    "SOURCE": "/etc/user/data/openwebui/pipelines",
+                    "DEST": "/app/pipelines",
+                    "TYPE": "rw"
+                }
+            ],
+            "PORTS": [
+                {
+                    "SOURCE": "null",
+                    "DEST": "9099",
+                    "TYPE": "tcp"
+                }
+            ],
+            "ENVS": [
+                {
+                    "OPENAI_API_BASE_URL": "#OPENAI_API_BASE_URL"
+                },
+                {
+                    "VECTOR_DB": "qdrant"
+                },
+                {
+                    "QDRANT_HOST": "openwebuiqdrant-app"
+                },
+                {
+                    "QDRANT_PORT": "6333"
+                },
+                {
+                    "QDRANT_URI": "http://openwebuiqdrant-app:6333"
+                }
+            ],
+            "ENV_FILES": [
+                "/etc/user/secret/openwebui/openwebui.json"
+            ],
+            "EXTRA": "--restart always",
+            "DEPEND": [],
+            "START_ON_BOOT": "false",
+            "CMD": "null",
+            "PRE_START": "null",
+            "POST_START": "null"
+        },
         {
             "IMAGE": "searxng/searxng:latest",
             "UPDATE": "true",
@@ -179,9 +227,6 @@
                 {
                     "ENABLE_PERSISTENT_CONFIG": "false"
                 },
-                {
-                    "HF_HUB_OFFLINE": "#DISABLE_HUGGINGFACE"
-                },
                 {
                     "OPENAI_API_BASE_URL": "#OPENAI_API_BASE_URL"
                 },

openwebui/template.json

@@ -56,19 +56,11 @@
             "type": "password"
         },
         {
-            "description": "Hugging Face token",
+            "description": "Pipelines API key",
-            "key": "HF_TOKEN",
+            "key": "PIPELINES_API_KEY",
             "value": "",
-            "info": "Optional Hugging Face API token for TTS and model access features.",
+            "required": "true",
-            "advanced": "true",
+            "generated": "openssl|hex|32"
-            "type": "password"
-        },
-        {
-            "description": "Disable Hugging Face requests",
-            "key": "DISABLE_HUGGINGFACE",
-            "value": "1",
-            "info": "Set to 1 to disable all outgoing requests to huggingface.co at startup. Set to 0 or leave empty to allow Hugging Face access.",
-            "advanced": "true"
         },
         {
             "description": "SearXNG secret key",
@@ -143,14 +135,14 @@
         {
             "description": "Web",
             "key": "SEARXNG_QUERY_URL",
-            "value": "http://openwebuisearxng-app:8080/search",
+            "value": "http://openwebuisearxng-app:8080/search?q=<query>",
             "info": "Optional web search engine Searxng, keep it empty if you don't want it",
             "advanced": "true"
         },
         {
             "description": "External web search engine",
             "key": "EXTERNAL_WEB_LOADER_URL",
-            "value": "http://openwebuicrawl4ai-app:11235/crawl",
+            "value": "http://openwebuicrawl4ai-app:11235",
             "info": "Optional crawl4ai application url, keep it as is, otherwise keep it empty",
             "advanced": "true"
         }