resolve conflict

backend/open_webui/config.py

@@ -1880,6 +1880,10 @@ if VECTOR_DB == "oracle23ai" and ORACLE_DB_USE_WALLET and (not ORACLE_WALLET_DIR
         "Oracle23ai requires setting ORACLE_WALLET_DIR and ORACLE_WALLET_PASSWORD when using wallet authentication."
     )
 
+# S3 Vector
+S3_VECTOR_BUCKET_NAME = os.environ.get("S3_VECTOR_BUCKET_NAME", None)
+S3_VECTOR_REGION = os.environ.get("S3_VECTOR_REGION", None)
+
 ####################################
 # Information Retrieval (RAG)
 ####################################

backend/open_webui/retrieval/vector/type.py

@@ -10,3 +10,4 @@ class VectorType(StrEnum):
     OPENSEARCH = "opensearch"
     PGVECTOR = "pgvector"
     ORACLE23AI = "oracle23ai"
+    S3VECTOR = "s3vector"

package-lock.json

@@ -53,6 +53,7 @@
 				"jspdf": "^3.0.0",
 				"katex": "^0.16.22",
 				"kokoro-js": "^1.1.1",
+				"leaflet": "^1.9.4",
 				"lowlight": "^3.3.0",
 				"marked": "^9.1.0",
 				"mermaid": "^11.6.0",

package.json

@@ -97,6 +97,7 @@
 		"jspdf": "^3.0.0",
 		"katex": "^0.16.22",
 		"kokoro-js": "^1.1.1",
+		"leaflet": "^1.9.4",
 		"lowlight": "^3.3.0",
 		"marked": "^9.1.0",
 		"mermaid": "^11.6.0",

pyproject.toml

@@ -13,12 +13,14 @@ dependencies = [
     "python-socketio==5.13.0",
     "python-jose==3.4.0",
     "passlib[bcrypt]==1.7.4",
+    "cryptography",
     "requests==2.32.4",
     "aiohttp==3.11.11",
     "async-timeout",
     "aiocache",
     "aiofiles",
     "starlette-compress==1.6.0",
+    "httpx[socks,http2,zstd,cli,brotli]==0.28.1",
     "sqlalchemy==2.0.38",
     "alembic==1.14.0",
     "peewee==3.18.1",
@@ -32,6 +34,7 @@ dependencies = [
     "boto3==1.35.53",
     "argon2-cffi==23.1.0",
     "APScheduler==3.10.4",
+    "pycrdt==0.12.25",
     "RestrictedPython==8.0",
     "loguru==0.7.3",
     "asgiref==3.8.1",
@@ -40,8 +43,8 @@ dependencies = [
     "google-genai==1.15.0",
     "google-generativeai==0.8.5",
     "tiktoken",
-    "langchain==0.3.24",
-    "langchain-community==0.3.23",
+    "langchain==0.3.26",
+    "langchain-community==0.3.26",
     "fake-useragent==2.1.0",
     "chromadb==0.6.3",
     "pymilvus==2.5.0",
@@ -88,6 +91,7 @@ dependencies = [
     "pytube==15.0.0",
     "pydub",
     "duckduckgo-search==8.0.2",
+    "ddgs==9.0.0",
     "google-api-python-client",
     "google-auth-httplib2",
     "google-auth-oauthlib",
@@ -104,6 +108,7 @@ dependencies = [
     "gcp-storage-emulator>=2024.8.3",
     "moto[s3]>=5.0.26",
     "oracledb>=3.2.0",
+    "posthog==5.4.0",
 ]
 readme = "README.md"
 requires-python = ">= 3.11, < 3.13.0a1"