Merge pull request 'formatting roundcube template' (#103) from dev into main

Reviewed-on: #103

openwebui/openwebui-secret.json

@@ -5,22 +5,12 @@
         "POSTGRES_PASSWORD": "#POSTGRES_PASSWORD",
         "POSTGRES_ROOT_PASSWORD": "#POSTGRES_ROOT_PASSWORD"
     },
-    "openwebuisearxng": {
-        "SEARXNG_SECRET": "#SEARXNG_SECRET"
-    },
-    "openwebuicrawl4ai": {
-        "CRAWL4AI_API_TOKEN": "#CRAWL4AI_API_TOKEN",
-        "SECRET_KEY": "#CRAWL4AI_SECRET"
-    },
     "openwebuiapp": {
         "WEBUI_ADMIN_NAME": "#WEBUI_ADMIN_NAME",
         "WEBUI_ADMIN_EMAIL": "#WEBUI_ADMIN_EMAIL",
         "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"
-        "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",
             "PRE_START": "null",
             "POST_START": "null"
         },
@@ -62,10 +62,10 @@
         {
             "IMAGE": "qdrant/qdrant:latest",
             "UPDATE": "true",
-            "NAME": "openwebuiqdrant-app",
+            "NAME": "openwebui-qdrant",
             "MEMORY": "1024M",
             "NETWORK": "openwebui-net",
-            "SELECTOR": "openwebuiqdrant-app",
+            "SELECTOR": "openwebui-qdrant",
             "VOLUMES": [
                 {
                     "SOURCE": "/etc/user/data/openwebui/qdrant",
@@ -93,59 +93,42 @@
             "POST_START": "null"
         },
         {
-            "IMAGE": "searxng/searxng:latest",
+            "IMAGE": "ghcr.io/open-webui/pipelines:main",
             "UPDATE": "true",
-            "NAME": "openwebuisearxng-app",
+            "NAME": "openwebui-pipelines",
-            "MEMORY": "512M",
-            "NETWORK": "openwebui-net",
-            "SELECTOR": "openwebuisearxng-app",
-            "VOLUMES": [
-                {
-                    "SOURCE": "/etc/user/data/openwebui/searxng",
-                    "DEST": "/etc/searxng",
-                    "TYPE": "rw"
-                }
-            ],
-            "PORTS": [
-                {
-                    "SOURCE": "null",
-                    "DEST": "8080",
-                    "TYPE": "tcp"
-                }
-            ],
-            "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": "unclecode/crawl4ai:latest",
-            "UPDATE": "true",
-            "NAME": "openwebuicrawl4ai-app",
             "MEMORY": "1024M",
             "NETWORK": "openwebui-net",
-            "SELECTOR": "openwebuicrawl4ai-app",
+            "SELECTOR": "openwebui-pipelines",
             "VOLUMES": [
                 {
-                    "SOURCE": "/etc/user/data/openwebui/crawl4ai",
+                    "SOURCE": "/etc/user/data/openwebui/pipelines",
-                    "DEST": "/app/data",
+                    "DEST": "/app/pipelines",
                     "TYPE": "rw"
                 }
             ],
             "PORTS": [
                 {
                     "SOURCE": "null",
-                    "DEST": "11235",
+                    "DEST": "9099",
                     "TYPE": "tcp"
                 }
             ],
-            "ENV_FILES": [
+            "ENVS": [
-                "/etc/user/secret/openwebui/openwebui.json"
+                {
+                    "OPENAI_API_BASE_URL": "#OPENAI_API_BASE_URL"
+                },
+                {
+                    "VECTOR_DB": "qdrant"
+                },
+                {
+                    "QDRANT_HOST": "openwebui-qdrant"
+                },
+                {
+                    "QDRANT_PORT": "6333"
+                },
+                {
+                    "QDRANT_URI": "http://openwebui-qdrant:6333"
+                }
             ],
             "EXTRA": "--restart always",
             "DEPEND": [],
@@ -176,12 +159,6 @@
                 }
             ],
             "ENVS": [
-                {
-                    "ENABLE_PERSISTENT_CONFIG": "false"
-                },
-                {
-                    "HF_HUB_OFFLINE": "#DISABLE_HUGGINGFACE"
-                },
                 {
                     "OPENAI_API_BASE_URL": "#OPENAI_API_BASE_URL"
                 },
@@ -189,22 +166,19 @@
                     "VECTOR_DB": "qdrant"
                 },
                 {
-                    "QDRANT_URI": "http://openwebuiqdrant-app:6333"
+                    "QDRANT_HOST": "openwebui-qdrant"
                 },
                 {
-                    "ENABLE_WEB_SEARCH": "#ENABLE_WEB_SEARCH"
+                    "QDRANT_PORT": "6333"
                 },
                 {
-                    "WEB_SEARCH_ENGINE": "#WEB_SEARCH_ENGINE"
+                    "QDRANT_URI": "http://openwebui-qdrant:6333"
                 },
                 {
-                    "WEB_LOADER_ENGINE": "#WEB_LOADER_ENGINE"
+                    "ENABLE_RAG_PIPELINE": "True"
                 },
                 {
-                    "SEARXNG_QUERY_URL": "#SEARXNG_QUERY_URL"
+                    "RAG_PIPELINE_URL": "http://openwebui-pipelines:9099/v1"
-                },
-                {
-                    "EXTERNAL_WEB_LOADER_URL": "#EXTERNAL_WEB_LOADER_URL"
                 }
             ],
             "ENV_FILES": [

openwebui/template.json

@@ -55,42 +55,6 @@
             "advanced": "true",
             "type": "password"
         },
-        {
-            "description": "Hugging Face token",
-            "key": "HF_TOKEN",
-            "value": "",
-            "info": "Optional Hugging Face API token for TTS and model access features.",
-            "advanced": "true",
-            "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",
-            "key": "SEARXNG_SECRET",
-            "value": "",
-            "required": "true",
-            "generated": "openssl|hex|32"
-        },
-        {
-            "description": "Crawl4AI API token",
-            "key": "CRAWL4AI_API_TOKEN",
-            "value": "",
-            "required": "true",
-            "generated": "random|md5|24"
-        },
-        {
-            "description": "Crawl4AI secret key",
-            "key": "CRAWL4AI_SECRET",
-            "value": "",
-            "required": "true",
-            "generated": "openssl|hex|32"
-        },
         {
             "description": "Postgres database name",
             "key": "POSTGRES_DB",
@@ -118,41 +82,6 @@
             "value": "",
             "required": "true",
             "generated": "random|sha256|20"
-        },
+        }
-        {
-            "description": "Enable web search",
-            "key": "ENABLE_WEB_SEARCH",
-            "value": "true",
-            "info": "Optional web search enabling, keep it empty if you don't want it",
-            "advanced": "true"
-        },
-        {
-            "description": "Web search engine",
-            "key": "WEB_SEARCH_ENGINE",
-            "value": "searxng",
-            "info": "Optional web search engine Searxng, keep it empty if you don't want it or define any other if you have",
-            "advanced": "true"
-        },
-        {
-            "description": "External web search engine",
-            "key": "WEB_LOADER_ENGINE",
-            "value": "external",
-            "info": "If optional web search engine defined, keep it as is, otherwise keep it empty",
-            "advanced": "true"
-        },
-        {
-            "description": "Web",
-            "key": "SEARXNG_QUERY_URL",
-            "value": "http://openwebuisearxng-app:8080/search",
-            "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",
-            "info": "Optional crawl4ai application url, keep it as is, otherwise keep it empty",
-            "advanced": "true"
-        }    
     ]
 }