Timothy Jaeryang Baek 4 months ago
parent
commit
d3d161f723
100 changed files with 1151 additions and 1100 deletions
  1. 5 2
      backend/open_webui/config.py
  2. 1 1
      backend/open_webui/internal/db.py
  3. 0 0
      backend/open_webui/internal/migrations/001_initial_schema.py
  4. 0 0
      backend/open_webui/internal/migrations/002_add_local_sharing.py
  5. 0 0
      backend/open_webui/internal/migrations/003_add_auth_api_key.py
  6. 0 0
      backend/open_webui/internal/migrations/004_add_archived.py
  7. 0 0
      backend/open_webui/internal/migrations/005_add_updated_at.py
  8. 0 0
      backend/open_webui/internal/migrations/006_migrate_timestamps_and_charfields.py
  9. 0 0
      backend/open_webui/internal/migrations/007_add_user_last_active_at.py
  10. 0 0
      backend/open_webui/internal/migrations/008_add_memory.py
  11. 0 0
      backend/open_webui/internal/migrations/009_add_models.py
  12. 0 0
      backend/open_webui/internal/migrations/010_migrate_modelfiles_to_models.py
  13. 0 0
      backend/open_webui/internal/migrations/011_add_user_settings.py
  14. 0 0
      backend/open_webui/internal/migrations/012_add_tools.py
  15. 0 0
      backend/open_webui/internal/migrations/013_add_user_info.py
  16. 0 0
      backend/open_webui/internal/migrations/014_add_files.py
  17. 0 0
      backend/open_webui/internal/migrations/015_add_functions.py
  18. 0 0
      backend/open_webui/internal/migrations/016_add_valves_and_is_active.py
  19. 0 0
      backend/open_webui/internal/migrations/017_add_user_oauth_sub.py
  20. 0 0
      backend/open_webui/internal/migrations/018_add_function_is_global.py
  21. 0 0
      backend/open_webui/internal/wrappers.py
  22. 332 823
      backend/open_webui/main.py
  23. 1 1
      backend/open_webui/migrations/env.py
  24. 1 1
      backend/open_webui/migrations/script.py.mako
  25. 2 2
      backend/open_webui/migrations/versions/7e5b5dc7342b_init.py
  26. 2 2
      backend/open_webui/models/auths.py
  27. 2 2
      backend/open_webui/models/chats.py
  28. 2 2
      backend/open_webui/models/feedbacks.py
  29. 1 1
      backend/open_webui/models/files.py
  30. 2 2
      backend/open_webui/models/folders.py
  31. 2 2
      backend/open_webui/models/functions.py
  32. 2 2
      backend/open_webui/models/groups.py
  33. 3 3
      backend/open_webui/models/knowledge.py
  34. 1 1
      backend/open_webui/models/memories.py
  35. 2 2
      backend/open_webui/models/models.py
  36. 2 2
      backend/open_webui/models/prompts.py
  37. 1 1
      backend/open_webui/models/tags.py
  38. 2 2
      backend/open_webui/models/tools.py
  39. 2 2
      backend/open_webui/models/users.py
  40. 0 0
      backend/open_webui/retrieval/loaders/main.py
  41. 0 0
      backend/open_webui/retrieval/loaders/youtube.py
  42. 0 0
      backend/open_webui/retrieval/models/colbert.py
  43. 0 0
      backend/open_webui/retrieval/utils.py
  44. 0 0
      backend/open_webui/retrieval/vector/connector.py
  45. 0 0
      backend/open_webui/retrieval/vector/dbs/chroma.py
  46. 0 0
      backend/open_webui/retrieval/vector/dbs/milvus.py
  47. 0 0
      backend/open_webui/retrieval/vector/dbs/opensearch.py
  48. 1 1
      backend/open_webui/retrieval/vector/dbs/pgvector.py
  49. 0 0
      backend/open_webui/retrieval/vector/dbs/qdrant.py
  50. 0 0
      backend/open_webui/retrieval/vector/main.py
  51. 0 0
      backend/open_webui/retrieval/web/bing.py
  52. 0 0
      backend/open_webui/retrieval/web/brave.py
  53. 0 0
      backend/open_webui/retrieval/web/duckduckgo.py
  54. 0 0
      backend/open_webui/retrieval/web/google_pse.py
  55. 0 0
      backend/open_webui/retrieval/web/jina_search.py
  56. 0 0
      backend/open_webui/retrieval/web/kagi.py
  57. 0 0
      backend/open_webui/retrieval/web/main.py
  58. 0 0
      backend/open_webui/retrieval/web/mojeek.py
  59. 0 0
      backend/open_webui/retrieval/web/searchapi.py
  60. 0 0
      backend/open_webui/retrieval/web/searxng.py
  61. 0 0
      backend/open_webui/retrieval/web/serper.py
  62. 0 0
      backend/open_webui/retrieval/web/serply.py
  63. 0 0
      backend/open_webui/retrieval/web/serpstack.py
  64. 0 0
      backend/open_webui/retrieval/web/tavily.py
  65. 0 0
      backend/open_webui/retrieval/web/testdata/bing.json
  66. 0 0
      backend/open_webui/retrieval/web/testdata/brave.json
  67. 0 0
      backend/open_webui/retrieval/web/testdata/google_pse.json
  68. 0 0
      backend/open_webui/retrieval/web/testdata/searchapi.json
  69. 0 0
      backend/open_webui/retrieval/web/testdata/searxng.json
  70. 0 0
      backend/open_webui/retrieval/web/testdata/serper.json
  71. 0 0
      backend/open_webui/retrieval/web/testdata/serply.json
  72. 0 0
      backend/open_webui/retrieval/web/testdata/serpstack.json
  73. 0 0
      backend/open_webui/retrieval/web/utils.py
  74. 1 40
      backend/open_webui/routers/audio.py
  75. 2 2
      backend/open_webui/routers/auths.py
  76. 411 0
      backend/open_webui/routers/chat.py
  77. 3 3
      backend/open_webui/routers/chats.py
  78. 0 0
      backend/open_webui/routers/configs.py
  79. 2 2
      backend/open_webui/routers/evaluations.py
  80. 2 2
      backend/open_webui/routers/files.py
  81. 2 2
      backend/open_webui/routers/folders.py
  82. 2 2
      backend/open_webui/routers/functions.py
  83. 1 1
      backend/open_webui/routers/groups.py
  84. 4 51
      backend/open_webui/routers/images.py
  85. 3 3
      backend/open_webui/routers/knowledge.py
  86. 1 1
      backend/open_webui/routers/memories.py
  87. 1 1
      backend/open_webui/routers/models.py
  88. 13 32
      backend/open_webui/routers/ollama.py
  89. 1 25
      backend/open_webui/routers/openai.py
  90. 299 57
      backend/open_webui/routers/pipelines.py
  91. 1 1
      backend/open_webui/routers/prompts.py
  92. 3 3
      backend/open_webui/routers/retrieval.py
  93. 16 1
      backend/open_webui/routers/tasks.py
  94. 2 2
      backend/open_webui/routers/tools.py
  95. 3 3
      backend/open_webui/routers/users.py
  96. 2 2
      backend/open_webui/routers/utils.py
  97. 4 4
      backend/open_webui/routers/webui.py
  98. 1 1
      backend/open_webui/socket/main.py
  99. 0 0
      backend/open_webui/socket/utils.py
  100. 2 2
      backend/open_webui/test/apps/webui/routers/test_auths.py

+ 5 - 2
backend/open_webui/config.py

@@ -10,7 +10,7 @@ from urllib.parse import urlparse
 import chromadb
 import chromadb
 import requests
 import requests
 import yaml
 import yaml
-from open_webui.apps.webui.internal.db import Base, get_db
+from open_webui.internal.db import Base, get_db
 from open_webui.env import (
 from open_webui.env import (
     OPEN_WEBUI_DIR,
     OPEN_WEBUI_DIR,
     DATA_DIR,
     DATA_DIR,
@@ -432,7 +432,10 @@ OAUTH_ADMIN_ROLES = PersistentConfig(
 OAUTH_ALLOWED_DOMAINS = PersistentConfig(
 OAUTH_ALLOWED_DOMAINS = PersistentConfig(
     "OAUTH_ALLOWED_DOMAINS",
     "OAUTH_ALLOWED_DOMAINS",
     "oauth.allowed_domains",
     "oauth.allowed_domains",
-    [domain.strip() for domain in os.environ.get("OAUTH_ALLOWED_DOMAINS", "*").split(",")],
+    [
+        domain.strip()
+        for domain in os.environ.get("OAUTH_ALLOWED_DOMAINS", "*").split(",")
+    ],
 )
 )
 
 
 
 

+ 1 - 1
backend/open_webui/apps/webui/internal/db.py → backend/open_webui/internal/db.py

@@ -3,7 +3,7 @@ import logging
 from contextlib import contextmanager
 from contextlib import contextmanager
 from typing import Any, Optional
 from typing import Any, Optional
 
 
-from open_webui.apps.webui.internal.wrappers import register_connection
+from open_webui.internal.wrappers import register_connection
 from open_webui.env import (
 from open_webui.env import (
     OPEN_WEBUI_DIR,
     OPEN_WEBUI_DIR,
     DATABASE_URL,
     DATABASE_URL,

+ 0 - 0
backend/open_webui/apps/webui/internal/migrations/001_initial_schema.py → backend/open_webui/internal/migrations/001_initial_schema.py


+ 0 - 0
backend/open_webui/apps/webui/internal/migrations/002_add_local_sharing.py → backend/open_webui/internal/migrations/002_add_local_sharing.py


+ 0 - 0
backend/open_webui/apps/webui/internal/migrations/003_add_auth_api_key.py → backend/open_webui/internal/migrations/003_add_auth_api_key.py


+ 0 - 0
backend/open_webui/apps/webui/internal/migrations/004_add_archived.py → backend/open_webui/internal/migrations/004_add_archived.py


+ 0 - 0
backend/open_webui/apps/webui/internal/migrations/005_add_updated_at.py → backend/open_webui/internal/migrations/005_add_updated_at.py


+ 0 - 0
backend/open_webui/apps/webui/internal/migrations/006_migrate_timestamps_and_charfields.py → backend/open_webui/internal/migrations/006_migrate_timestamps_and_charfields.py


+ 0 - 0
backend/open_webui/apps/webui/internal/migrations/007_add_user_last_active_at.py → backend/open_webui/internal/migrations/007_add_user_last_active_at.py


+ 0 - 0
backend/open_webui/apps/webui/internal/migrations/008_add_memory.py → backend/open_webui/internal/migrations/008_add_memory.py


+ 0 - 0
backend/open_webui/apps/webui/internal/migrations/009_add_models.py → backend/open_webui/internal/migrations/009_add_models.py


+ 0 - 0
backend/open_webui/apps/webui/internal/migrations/010_migrate_modelfiles_to_models.py → backend/open_webui/internal/migrations/010_migrate_modelfiles_to_models.py


+ 0 - 0
backend/open_webui/apps/webui/internal/migrations/011_add_user_settings.py → backend/open_webui/internal/migrations/011_add_user_settings.py


+ 0 - 0
backend/open_webui/apps/webui/internal/migrations/012_add_tools.py → backend/open_webui/internal/migrations/012_add_tools.py


+ 0 - 0
backend/open_webui/apps/webui/internal/migrations/013_add_user_info.py → backend/open_webui/internal/migrations/013_add_user_info.py


+ 0 - 0
backend/open_webui/apps/webui/internal/migrations/014_add_files.py → backend/open_webui/internal/migrations/014_add_files.py


+ 0 - 0
backend/open_webui/apps/webui/internal/migrations/015_add_functions.py → backend/open_webui/internal/migrations/015_add_functions.py


+ 0 - 0
backend/open_webui/apps/webui/internal/migrations/016_add_valves_and_is_active.py → backend/open_webui/internal/migrations/016_add_valves_and_is_active.py


+ 0 - 0
backend/open_webui/apps/webui/internal/migrations/017_add_user_oauth_sub.py → backend/open_webui/internal/migrations/017_add_user_oauth_sub.py


+ 0 - 0
backend/open_webui/apps/webui/internal/migrations/018_add_function_is_global.py → backend/open_webui/internal/migrations/018_add_function_is_global.py


+ 0 - 0
backend/open_webui/apps/webui/internal/wrappers.py → backend/open_webui/internal/wrappers.py


File diff suppressed because it is too large
+ 332 - 823
backend/open_webui/main.py


+ 1 - 1
backend/open_webui/migrations/env.py

@@ -1,7 +1,7 @@
 from logging.config import fileConfig
 from logging.config import fileConfig
 
 
 from alembic import context
 from alembic import context
-from open_webui.apps.webui.models.auths import Auth
+from open_webui.models.auths import Auth
 from open_webui.env import DATABASE_URL
 from open_webui.env import DATABASE_URL
 from sqlalchemy import engine_from_config, pool
 from sqlalchemy import engine_from_config, pool
 
 

+ 1 - 1
backend/open_webui/migrations/script.py.mako

@@ -9,7 +9,7 @@ from typing import Sequence, Union
 
 
 from alembic import op
 from alembic import op
 import sqlalchemy as sa
 import sqlalchemy as sa
-import open_webui.apps.webui.internal.db
+import open_webui.internal.db
 ${imports if imports else ""}
 ${imports if imports else ""}
 
 
 # revision identifiers, used by Alembic.
 # revision identifiers, used by Alembic.

+ 2 - 2
backend/open_webui/migrations/versions/7e5b5dc7342b_init.py

@@ -11,8 +11,8 @@ from typing import Sequence, Union
 import sqlalchemy as sa
 import sqlalchemy as sa
 from alembic import op
 from alembic import op
 
 
-import open_webui.apps.webui.internal.db
-from open_webui.apps.webui.internal.db import JSONField
+import open_webui.internal.db
+from open_webui.internal.db import JSONField
 from open_webui.migrations.util import get_existing_tables
 from open_webui.migrations.util import get_existing_tables
 
 
 # revision identifiers, used by Alembic.
 # revision identifiers, used by Alembic.

+ 2 - 2
backend/open_webui/apps/webui/models/auths.py → backend/open_webui/models/auths.py

@@ -2,8 +2,8 @@ import logging
 import uuid
 import uuid
 from typing import Optional
 from typing import Optional
 
 
-from open_webui.apps.webui.internal.db import Base, get_db
-from open_webui.apps.webui.models.users import UserModel, Users
+from open_webui.internal.db import Base, get_db
+from open_webui.models.users import UserModel, Users
 from open_webui.env import SRC_LOG_LEVELS
 from open_webui.env import SRC_LOG_LEVELS
 from pydantic import BaseModel
 from pydantic import BaseModel
 from sqlalchemy import Boolean, Column, String, Text
 from sqlalchemy import Boolean, Column, String, Text

+ 2 - 2
backend/open_webui/apps/webui/models/chats.py → backend/open_webui/models/chats.py

@@ -3,8 +3,8 @@ import time
 import uuid
 import uuid
 from typing import Optional
 from typing import Optional
 
 
-from open_webui.apps.webui.internal.db import Base, get_db
-from open_webui.apps.webui.models.tags import TagModel, Tag, Tags
+from open_webui.internal.db import Base, get_db
+from open_webui.models.tags import TagModel, Tag, Tags
 
 
 
 
 from pydantic import BaseModel, ConfigDict
 from pydantic import BaseModel, ConfigDict

+ 2 - 2
backend/open_webui/apps/webui/models/feedbacks.py → backend/open_webui/models/feedbacks.py

@@ -3,8 +3,8 @@ import time
 import uuid
 import uuid
 from typing import Optional
 from typing import Optional
 
 
-from open_webui.apps.webui.internal.db import Base, get_db
-from open_webui.apps.webui.models.chats import Chats
+from open_webui.internal.db import Base, get_db
+from open_webui.models.chats import Chats
 
 
 from open_webui.env import SRC_LOG_LEVELS
 from open_webui.env import SRC_LOG_LEVELS
 from pydantic import BaseModel, ConfigDict
 from pydantic import BaseModel, ConfigDict

+ 1 - 1
backend/open_webui/apps/webui/models/files.py → backend/open_webui/models/files.py

@@ -2,7 +2,7 @@ import logging
 import time
 import time
 from typing import Optional
 from typing import Optional
 
 
-from open_webui.apps.webui.internal.db import Base, JSONField, get_db
+from open_webui.internal.db import Base, JSONField, get_db
 from open_webui.env import SRC_LOG_LEVELS
 from open_webui.env import SRC_LOG_LEVELS
 from pydantic import BaseModel, ConfigDict
 from pydantic import BaseModel, ConfigDict
 from sqlalchemy import BigInteger, Column, String, Text, JSON
 from sqlalchemy import BigInteger, Column, String, Text, JSON

+ 2 - 2
backend/open_webui/apps/webui/models/folders.py → backend/open_webui/models/folders.py

@@ -3,8 +3,8 @@ import time
 import uuid
 import uuid
 from typing import Optional
 from typing import Optional
 
 
-from open_webui.apps.webui.internal.db import Base, get_db
-from open_webui.apps.webui.models.chats import Chats
+from open_webui.internal.db import Base, get_db
+from open_webui.models.chats import Chats
 
 
 from open_webui.env import SRC_LOG_LEVELS
 from open_webui.env import SRC_LOG_LEVELS
 from pydantic import BaseModel, ConfigDict
 from pydantic import BaseModel, ConfigDict

+ 2 - 2
backend/open_webui/apps/webui/models/functions.py → backend/open_webui/models/functions.py

@@ -2,8 +2,8 @@ import logging
 import time
 import time
 from typing import Optional
 from typing import Optional
 
 
-from open_webui.apps.webui.internal.db import Base, JSONField, get_db
-from open_webui.apps.webui.models.users import Users
+from open_webui.internal.db import Base, JSONField, get_db
+from open_webui.models.users import Users
 from open_webui.env import SRC_LOG_LEVELS
 from open_webui.env import SRC_LOG_LEVELS
 from pydantic import BaseModel, ConfigDict
 from pydantic import BaseModel, ConfigDict
 from sqlalchemy import BigInteger, Boolean, Column, String, Text
 from sqlalchemy import BigInteger, Boolean, Column, String, Text

+ 2 - 2
backend/open_webui/apps/webui/models/groups.py → backend/open_webui/models/groups.py

@@ -4,10 +4,10 @@ import time
 from typing import Optional
 from typing import Optional
 import uuid
 import uuid
 
 
-from open_webui.apps.webui.internal.db import Base, get_db
+from open_webui.internal.db import Base, get_db
 from open_webui.env import SRC_LOG_LEVELS
 from open_webui.env import SRC_LOG_LEVELS
 
 
-from open_webui.apps.webui.models.files import FileMetadataResponse
+from open_webui.models.files import FileMetadataResponse
 
 
 
 
 from pydantic import BaseModel, ConfigDict
 from pydantic import BaseModel, ConfigDict

+ 3 - 3
backend/open_webui/apps/webui/models/knowledge.py → backend/open_webui/models/knowledge.py

@@ -4,11 +4,11 @@ import time
 from typing import Optional
 from typing import Optional
 import uuid
 import uuid
 
 
-from open_webui.apps.webui.internal.db import Base, get_db
+from open_webui.internal.db import Base, get_db
 from open_webui.env import SRC_LOG_LEVELS
 from open_webui.env import SRC_LOG_LEVELS
 
 
-from open_webui.apps.webui.models.files import FileMetadataResponse
-from open_webui.apps.webui.models.users import Users, UserResponse
+from open_webui.models.files import FileMetadataResponse
+from open_webui.models.users import Users, UserResponse
 
 
 
 
 from pydantic import BaseModel, ConfigDict
 from pydantic import BaseModel, ConfigDict

+ 1 - 1
backend/open_webui/apps/webui/models/memories.py → backend/open_webui/models/memories.py

@@ -2,7 +2,7 @@ import time
 import uuid
 import uuid
 from typing import Optional
 from typing import Optional
 
 
-from open_webui.apps.webui.internal.db import Base, get_db
+from open_webui.internal.db import Base, get_db
 from pydantic import BaseModel, ConfigDict
 from pydantic import BaseModel, ConfigDict
 from sqlalchemy import BigInteger, Column, String, Text
 from sqlalchemy import BigInteger, Column, String, Text
 
 

+ 2 - 2
backend/open_webui/apps/webui/models/models.py → backend/open_webui/models/models.py

@@ -2,10 +2,10 @@ import logging
 import time
 import time
 from typing import Optional
 from typing import Optional
 
 
-from open_webui.apps.webui.internal.db import Base, JSONField, get_db
+from open_webui.internal.db import Base, JSONField, get_db
 from open_webui.env import SRC_LOG_LEVELS
 from open_webui.env import SRC_LOG_LEVELS
 
 
-from open_webui.apps.webui.models.users import Users, UserResponse
+from open_webui.models.users import Users, UserResponse
 
 
 
 
 from pydantic import BaseModel, ConfigDict
 from pydantic import BaseModel, ConfigDict

+ 2 - 2
backend/open_webui/apps/webui/models/prompts.py → backend/open_webui/models/prompts.py

@@ -1,8 +1,8 @@
 import time
 import time
 from typing import Optional
 from typing import Optional
 
 
-from open_webui.apps.webui.internal.db import Base, get_db
-from open_webui.apps.webui.models.users import Users, UserResponse
+from open_webui.internal.db import Base, get_db
+from open_webui.models.users import Users, UserResponse
 
 
 from pydantic import BaseModel, ConfigDict
 from pydantic import BaseModel, ConfigDict
 from sqlalchemy import BigInteger, Column, String, Text, JSON
 from sqlalchemy import BigInteger, Column, String, Text, JSON

+ 1 - 1
backend/open_webui/apps/webui/models/tags.py → backend/open_webui/models/tags.py

@@ -3,7 +3,7 @@ import time
 import uuid
 import uuid
 from typing import Optional
 from typing import Optional
 
 
-from open_webui.apps.webui.internal.db import Base, get_db
+from open_webui.internal.db import Base, get_db
 
 
 
 
 from open_webui.env import SRC_LOG_LEVELS
 from open_webui.env import SRC_LOG_LEVELS

+ 2 - 2
backend/open_webui/apps/webui/models/tools.py → backend/open_webui/models/tools.py

@@ -2,8 +2,8 @@ import logging
 import time
 import time
 from typing import Optional
 from typing import Optional
 
 
-from open_webui.apps.webui.internal.db import Base, JSONField, get_db
-from open_webui.apps.webui.models.users import Users, UserResponse
+from open_webui.internal.db import Base, JSONField, get_db
+from open_webui.models.users import Users, UserResponse
 from open_webui.env import SRC_LOG_LEVELS
 from open_webui.env import SRC_LOG_LEVELS
 from pydantic import BaseModel, ConfigDict
 from pydantic import BaseModel, ConfigDict
 from sqlalchemy import BigInteger, Column, String, Text, JSON
 from sqlalchemy import BigInteger, Column, String, Text, JSON

+ 2 - 2
backend/open_webui/apps/webui/models/users.py → backend/open_webui/models/users.py

@@ -1,8 +1,8 @@
 import time
 import time
 from typing import Optional
 from typing import Optional
 
 
-from open_webui.apps.webui.internal.db import Base, JSONField, get_db
-from open_webui.apps.webui.models.chats import Chats
+from open_webui.internal.db import Base, JSONField, get_db
+from open_webui.models.chats import Chats
 from pydantic import BaseModel, ConfigDict
 from pydantic import BaseModel, ConfigDict
 from sqlalchemy import BigInteger, Column, String, Text
 from sqlalchemy import BigInteger, Column, String, Text
 
 

+ 0 - 0
backend/open_webui/apps/retrieval/loaders/main.py → backend/open_webui/retrieval/loaders/main.py


+ 0 - 0
backend/open_webui/apps/retrieval/loaders/youtube.py → backend/open_webui/retrieval/loaders/youtube.py


+ 0 - 0
backend/open_webui/apps/retrieval/models/colbert.py → backend/open_webui/retrieval/models/colbert.py


+ 0 - 0
backend/open_webui/apps/retrieval/utils.py → backend/open_webui/retrieval/utils.py


+ 0 - 0
backend/open_webui/apps/retrieval/vector/connector.py → backend/open_webui/retrieval/vector/connector.py


+ 0 - 0
backend/open_webui/apps/retrieval/vector/dbs/chroma.py → backend/open_webui/retrieval/vector/dbs/chroma.py


+ 0 - 0
backend/open_webui/apps/retrieval/vector/dbs/milvus.py → backend/open_webui/retrieval/vector/dbs/milvus.py


+ 0 - 0
backend/open_webui/apps/retrieval/vector/dbs/opensearch.py → backend/open_webui/retrieval/vector/dbs/opensearch.py


+ 1 - 1
backend/open_webui/apps/retrieval/vector/dbs/pgvector.py → backend/open_webui/retrieval/vector/dbs/pgvector.py

@@ -40,7 +40,7 @@ class PgvectorClient:
 
 
         # if no pgvector uri, use the existing database connection
         # if no pgvector uri, use the existing database connection
         if not PGVECTOR_DB_URL:
         if not PGVECTOR_DB_URL:
-            from open_webui.apps.webui.internal.db import Session
+            from open_webui.internal.db import Session
 
 
             self.session = Session
             self.session = Session
         else:
         else:

+ 0 - 0
backend/open_webui/apps/retrieval/vector/dbs/qdrant.py → backend/open_webui/retrieval/vector/dbs/qdrant.py


+ 0 - 0
backend/open_webui/apps/retrieval/vector/main.py → backend/open_webui/retrieval/vector/main.py


+ 0 - 0
backend/open_webui/apps/retrieval/web/bing.py → backend/open_webui/retrieval/web/bing.py


+ 0 - 0
backend/open_webui/apps/retrieval/web/brave.py → backend/open_webui/retrieval/web/brave.py


+ 0 - 0
backend/open_webui/apps/retrieval/web/duckduckgo.py → backend/open_webui/retrieval/web/duckduckgo.py


+ 0 - 0
backend/open_webui/apps/retrieval/web/google_pse.py → backend/open_webui/retrieval/web/google_pse.py


+ 0 - 0
backend/open_webui/apps/retrieval/web/jina_search.py → backend/open_webui/retrieval/web/jina_search.py


+ 0 - 0
backend/open_webui/apps/retrieval/web/kagi.py → backend/open_webui/retrieval/web/kagi.py


+ 0 - 0
backend/open_webui/apps/retrieval/web/main.py → backend/open_webui/retrieval/web/main.py


+ 0 - 0
backend/open_webui/apps/retrieval/web/mojeek.py → backend/open_webui/retrieval/web/mojeek.py


+ 0 - 0
backend/open_webui/apps/retrieval/web/searchapi.py → backend/open_webui/retrieval/web/searchapi.py


+ 0 - 0
backend/open_webui/apps/retrieval/web/searxng.py → backend/open_webui/retrieval/web/searxng.py


+ 0 - 0
backend/open_webui/apps/retrieval/web/serper.py → backend/open_webui/retrieval/web/serper.py


+ 0 - 0
backend/open_webui/apps/retrieval/web/serply.py → backend/open_webui/retrieval/web/serply.py


+ 0 - 0
backend/open_webui/apps/retrieval/web/serpstack.py → backend/open_webui/retrieval/web/serpstack.py


+ 0 - 0
backend/open_webui/apps/retrieval/web/tavily.py → backend/open_webui/retrieval/web/tavily.py


+ 0 - 0
backend/open_webui/apps/retrieval/web/testdata/bing.json → backend/open_webui/retrieval/web/testdata/bing.json


+ 0 - 0
backend/open_webui/apps/retrieval/web/testdata/brave.json → backend/open_webui/retrieval/web/testdata/brave.json


+ 0 - 0
backend/open_webui/apps/retrieval/web/testdata/google_pse.json → backend/open_webui/retrieval/web/testdata/google_pse.json


+ 0 - 0
backend/open_webui/apps/retrieval/web/testdata/searchapi.json → backend/open_webui/retrieval/web/testdata/searchapi.json


+ 0 - 0
backend/open_webui/apps/retrieval/web/testdata/searxng.json → backend/open_webui/retrieval/web/testdata/searxng.json


+ 0 - 0
backend/open_webui/apps/retrieval/web/testdata/serper.json → backend/open_webui/retrieval/web/testdata/serper.json


+ 0 - 0
backend/open_webui/apps/retrieval/web/testdata/serply.json → backend/open_webui/retrieval/web/testdata/serply.json


+ 0 - 0
backend/open_webui/apps/retrieval/web/testdata/serpstack.json → backend/open_webui/retrieval/web/testdata/serpstack.json


+ 0 - 0
backend/open_webui/apps/retrieval/web/utils.py → backend/open_webui/retrieval/web/utils.py


+ 1 - 40
backend/open_webui/apps/audio/main.py → backend/open_webui/routers/audio.py

@@ -25,11 +25,10 @@ from open_webui.config import (
     AUDIO_TTS_VOICE,
     AUDIO_TTS_VOICE,
     AUDIO_TTS_AZURE_SPEECH_REGION,
     AUDIO_TTS_AZURE_SPEECH_REGION,
     AUDIO_TTS_AZURE_SPEECH_OUTPUT_FORMAT,
     AUDIO_TTS_AZURE_SPEECH_OUTPUT_FORMAT,
-    CACHE_DIR,
-    CORS_ALLOW_ORIGIN,
     WHISPER_MODEL,
     WHISPER_MODEL,
     WHISPER_MODEL_AUTO_UPDATE,
     WHISPER_MODEL_AUTO_UPDATE,
     WHISPER_MODEL_DIR,
     WHISPER_MODEL_DIR,
+    CACHE_DIR,
     AppConfig,
     AppConfig,
 )
 )
 
 
@@ -55,44 +54,6 @@ MAX_FILE_SIZE = MAX_FILE_SIZE_MB * 1024 * 1024  # Convert MB to bytes
 log = logging.getLogger(__name__)
 log = logging.getLogger(__name__)
 log.setLevel(SRC_LOG_LEVELS["AUDIO"])
 log.setLevel(SRC_LOG_LEVELS["AUDIO"])
 
 
-app = FastAPI(
-    docs_url="/docs" if ENV == "dev" else None,
-    openapi_url="/openapi.json" if ENV == "dev" else None,
-    redoc_url=None,
-)
-
-app.add_middleware(
-    CORSMiddleware,
-    allow_origins=CORS_ALLOW_ORIGIN,
-    allow_credentials=True,
-    allow_methods=["*"],
-    allow_headers=["*"],
-)
-
-app.state.config = AppConfig()
-
-app.state.config.STT_OPENAI_API_BASE_URL = AUDIO_STT_OPENAI_API_BASE_URL
-app.state.config.STT_OPENAI_API_KEY = AUDIO_STT_OPENAI_API_KEY
-app.state.config.STT_ENGINE = AUDIO_STT_ENGINE
-app.state.config.STT_MODEL = AUDIO_STT_MODEL
-
-app.state.config.WHISPER_MODEL = WHISPER_MODEL
-app.state.faster_whisper_model = None
-
-app.state.config.TTS_OPENAI_API_BASE_URL = AUDIO_TTS_OPENAI_API_BASE_URL
-app.state.config.TTS_OPENAI_API_KEY = AUDIO_TTS_OPENAI_API_KEY
-app.state.config.TTS_ENGINE = AUDIO_TTS_ENGINE
-app.state.config.TTS_MODEL = AUDIO_TTS_MODEL
-app.state.config.TTS_VOICE = AUDIO_TTS_VOICE
-app.state.config.TTS_API_KEY = AUDIO_TTS_API_KEY
-app.state.config.TTS_SPLIT_ON = AUDIO_TTS_SPLIT_ON
-
-
-app.state.speech_synthesiser = None
-app.state.speech_speaker_embeddings_dataset = None
-
-app.state.config.TTS_AZURE_SPEECH_REGION = AUDIO_TTS_AZURE_SPEECH_REGION
-app.state.config.TTS_AZURE_SPEECH_OUTPUT_FORMAT = AUDIO_TTS_AZURE_SPEECH_OUTPUT_FORMAT
 
 
 # setting device type for whisper model
 # setting device type for whisper model
 whisper_device_type = DEVICE_TYPE if DEVICE_TYPE and DEVICE_TYPE == "cuda" else "cpu"
 whisper_device_type = DEVICE_TYPE if DEVICE_TYPE and DEVICE_TYPE == "cuda" else "cpu"

+ 2 - 2
backend/open_webui/apps/webui/routers/auths.py → backend/open_webui/routers/auths.py

@@ -5,7 +5,7 @@ import datetime
 import logging
 import logging
 from aiohttp import ClientSession
 from aiohttp import ClientSession
 
 
-from open_webui.apps.webui.models.auths import (
+from open_webui.models.auths import (
     AddUserForm,
     AddUserForm,
     ApiKey,
     ApiKey,
     Auths,
     Auths,
@@ -18,7 +18,7 @@ from open_webui.apps.webui.models.auths import (
     UpdateProfileForm,
     UpdateProfileForm,
     UserResponse,
     UserResponse,
 )
 )
-from open_webui.apps.webui.models.users import Users
+from open_webui.models.users import Users
 
 
 from open_webui.constants import ERROR_MESSAGES, WEBHOOK_MESSAGES
 from open_webui.constants import ERROR_MESSAGES, WEBHOOK_MESSAGES
 from open_webui.env import (
 from open_webui.env import (

+ 411 - 0
backend/open_webui/routers/chat.py

@@ -0,0 +1,411 @@
+from fastapi import APIRouter, Depends, HTTPException, Response, status
+from pydantic import BaseModel
+
+router = APIRouter()
+
+
+@app.post("/api/chat/completions")
+async def generate_chat_completions(
+    request: Request,
+    form_data: dict,
+    user=Depends(get_verified_user),
+    bypass_filter: bool = False,
+):
+    if BYPASS_MODEL_ACCESS_CONTROL:
+        bypass_filter = True
+
+    model_list = request.state.models
+    models = {model["id"]: model for model in model_list}
+
+    model_id = form_data["model"]
+    if model_id not in models:
+        raise HTTPException(
+            status_code=status.HTTP_404_NOT_FOUND,
+            detail="Model not found",
+        )
+
+    model = models[model_id]
+
+    # Check if user has access to the model
+    if not bypass_filter and user.role == "user":
+        if model.get("arena"):
+            if not has_access(
+                user.id,
+                type="read",
+                access_control=model.get("info", {})
+                .get("meta", {})
+                .get("access_control", {}),
+            ):
+                raise HTTPException(
+                    status_code=403,
+                    detail="Model not found",
+                )
+        else:
+            model_info = Models.get_model_by_id(model_id)
+            if not model_info:
+                raise HTTPException(
+                    status_code=404,
+                    detail="Model not found",
+                )
+            elif not (
+                user.id == model_info.user_id
+                or has_access(
+                    user.id, type="read", access_control=model_info.access_control
+                )
+            ):
+                raise HTTPException(
+                    status_code=403,
+                    detail="Model not found",
+                )
+
+    if model["owned_by"] == "arena":
+        model_ids = model.get("info", {}).get("meta", {}).get("model_ids")
+        filter_mode = model.get("info", {}).get("meta", {}).get("filter_mode")
+        if model_ids and filter_mode == "exclude":
+            model_ids = [
+                model["id"]
+                for model in await get_all_models()
+                if model.get("owned_by") != "arena" and model["id"] not in model_ids
+            ]
+
+        selected_model_id = None
+        if isinstance(model_ids, list) and model_ids:
+            selected_model_id = random.choice(model_ids)
+        else:
+            model_ids = [
+                model["id"]
+                for model in await get_all_models()
+                if model.get("owned_by") != "arena"
+            ]
+            selected_model_id = random.choice(model_ids)
+
+        form_data["model"] = selected_model_id
+
+        if form_data.get("stream") == True:
+
+            async def stream_wrapper(stream):
+                yield f"data: {json.dumps({'selected_model_id': selected_model_id})}\n\n"
+                async for chunk in stream:
+                    yield chunk
+
+            response = await generate_chat_completions(
+                form_data, user, bypass_filter=True
+            )
+            return StreamingResponse(
+                stream_wrapper(response.body_iterator), media_type="text/event-stream"
+            )
+        else:
+            return {
+                **(
+                    await generate_chat_completions(form_data, user, bypass_filter=True)
+                ),
+                "selected_model_id": selected_model_id,
+            }
+
+    if model.get("pipe"):
+        # Below does not require bypass_filter because this is the only route the uses this function and it is already bypassing the filter
+        return await generate_function_chat_completion(
+            form_data, user=user, models=models
+        )
+    if model["owned_by"] == "ollama":
+        # Using /ollama/api/chat endpoint
+        form_data = convert_payload_openai_to_ollama(form_data)
+        form_data = GenerateChatCompletionForm(**form_data)
+        response = await generate_ollama_chat_completion(
+            form_data=form_data, user=user, bypass_filter=bypass_filter
+        )
+        if form_data.stream:
+            response.headers["content-type"] = "text/event-stream"
+            return StreamingResponse(
+                convert_streaming_response_ollama_to_openai(response),
+                headers=dict(response.headers),
+            )
+        else:
+            return convert_response_ollama_to_openai(response)
+    else:
+        return await generate_openai_chat_completion(
+            form_data, user=user, bypass_filter=bypass_filter
+        )
+
+
+@app.post("/api/chat/completed")
+async def chat_completed(form_data: dict, user=Depends(get_verified_user)):
+    model_list = await get_all_models()
+    models = {model["id"]: model for model in model_list}
+
+    data = form_data
+    model_id = data["model"]
+    if model_id not in models:
+        raise HTTPException(
+            status_code=status.HTTP_404_NOT_FOUND,
+            detail="Model not found",
+        )
+
+    model = models[model_id]
+    sorted_filters = get_sorted_filters(model_id, models)
+    if "pipeline" in model:
+        sorted_filters = [model] + sorted_filters
+
+    for filter in sorted_filters:
+        r = None
+        try:
+            urlIdx = filter["urlIdx"]
+
+            url = openai_app.state.config.OPENAI_API_BASE_URLS[urlIdx]
+            key = openai_app.state.config.OPENAI_API_KEYS[urlIdx]
+
+            if key != "":
+                headers = {"Authorization": f"Bearer {key}"}
+                r = requests.post(
+                    f"{url}/{filter['id']}/filter/outlet",
+                    headers=headers,
+                    json={
+                        "user": {
+                            "id": user.id,
+                            "name": user.name,
+                            "email": user.email,
+                            "role": user.role,
+                        },
+                        "body": data,
+                    },
+                )
+
+                r.raise_for_status()
+                data = r.json()
+        except Exception as e:
+            # Handle connection error here
+            print(f"Connection error: {e}")
+
+            if r is not None:
+                try:
+                    res = r.json()
+                    if "detail" in res:
+                        return JSONResponse(
+                            status_code=r.status_code,
+                            content=res,
+                        )
+                except Exception:
+                    pass
+
+            else:
+                pass
+
+    __event_emitter__ = get_event_emitter(
+        {
+            "chat_id": data["chat_id"],
+            "message_id": data["id"],
+            "session_id": data["session_id"],
+        }
+    )
+
+    __event_call__ = get_event_call(
+        {
+            "chat_id": data["chat_id"],
+            "message_id": data["id"],
+            "session_id": data["session_id"],
+        }
+    )
+
+    def get_priority(function_id):
+        function = Functions.get_function_by_id(function_id)
+        if function is not None and hasattr(function, "valves"):
+            # TODO: Fix FunctionModel to include vavles
+            return (function.valves if function.valves else {}).get("priority", 0)
+        return 0
+
+    filter_ids = [function.id for function in Functions.get_global_filter_functions()]
+    if "info" in model and "meta" in model["info"]:
+        filter_ids.extend(model["info"]["meta"].get("filterIds", []))
+        filter_ids = list(set(filter_ids))
+
+    enabled_filter_ids = [
+        function.id
+        for function in Functions.get_functions_by_type("filter", active_only=True)
+    ]
+    filter_ids = [
+        filter_id for filter_id in filter_ids if filter_id in enabled_filter_ids
+    ]
+
+    # Sort filter_ids by priority, using the get_priority function
+    filter_ids.sort(key=get_priority)
+
+    for filter_id in filter_ids:
+        filter = Functions.get_function_by_id(filter_id)
+        if not filter:
+            continue
+
+        if filter_id in webui_app.state.FUNCTIONS:
+            function_module = webui_app.state.FUNCTIONS[filter_id]
+        else:
+            function_module, _, _ = load_function_module_by_id(filter_id)
+            webui_app.state.FUNCTIONS[filter_id] = function_module
+
+        if hasattr(function_module, "valves") and hasattr(function_module, "Valves"):
+            valves = Functions.get_function_valves_by_id(filter_id)
+            function_module.valves = function_module.Valves(
+                **(valves if valves else {})
+            )
+
+        if not hasattr(function_module, "outlet"):
+            continue
+        try:
+            outlet = function_module.outlet
+
+            # Get the signature of the function
+            sig = inspect.signature(outlet)
+            params = {"body": data}
+
+            # Extra parameters to be passed to the function
+            extra_params = {
+                "__model__": model,
+                "__id__": filter_id,
+                "__event_emitter__": __event_emitter__,
+                "__event_call__": __event_call__,
+            }
+
+            # Add extra params in contained in function signature
+            for key, value in extra_params.items():
+                if key in sig.parameters:
+                    params[key] = value
+
+            if "__user__" in sig.parameters:
+                __user__ = {
+                    "id": user.id,
+                    "email": user.email,
+                    "name": user.name,
+                    "role": user.role,
+                }
+
+                try:
+                    if hasattr(function_module, "UserValves"):
+                        __user__["valves"] = function_module.UserValves(
+                            **Functions.get_user_valves_by_id_and_user_id(
+                                filter_id, user.id
+                            )
+                        )
+                except Exception as e:
+                    print(e)
+
+                params = {**params, "__user__": __user__}
+
+            if inspect.iscoroutinefunction(outlet):
+                data = await outlet(**params)
+            else:
+                data = outlet(**params)
+
+        except Exception as e:
+            print(f"Error: {e}")
+            return JSONResponse(
+                status_code=status.HTTP_400_BAD_REQUEST,
+                content={"detail": str(e)},
+            )
+
+    return data
+
+
+@app.post("/api/chat/actions/{action_id}")
+async def chat_action(action_id: str, form_data: dict, user=Depends(get_verified_user)):
+    if "." in action_id:
+        action_id, sub_action_id = action_id.split(".")
+    else:
+        sub_action_id = None
+
+    action = Functions.get_function_by_id(action_id)
+    if not action:
+        raise HTTPException(
+            status_code=status.HTTP_404_NOT_FOUND,
+            detail="Action not found",
+        )
+
+    model_list = await get_all_models()
+    models = {model["id"]: model for model in model_list}
+
+    data = form_data
+    model_id = data["model"]
+
+    if model_id not in models:
+        raise HTTPException(
+            status_code=status.HTTP_404_NOT_FOUND,
+            detail="Model not found",
+        )
+    model = models[model_id]
+
+    __event_emitter__ = get_event_emitter(
+        {
+            "chat_id": data["chat_id"],
+            "message_id": data["id"],
+            "session_id": data["session_id"],
+        }
+    )
+    __event_call__ = get_event_call(
+        {
+            "chat_id": data["chat_id"],
+            "message_id": data["id"],
+            "session_id": data["session_id"],
+        }
+    )
+
+    if action_id in webui_app.state.FUNCTIONS:
+        function_module = webui_app.state.FUNCTIONS[action_id]
+    else:
+        function_module, _, _ = load_function_module_by_id(action_id)
+        webui_app.state.FUNCTIONS[action_id] = function_module
+
+    if hasattr(function_module, "valves") and hasattr(function_module, "Valves"):
+        valves = Functions.get_function_valves_by_id(action_id)
+        function_module.valves = function_module.Valves(**(valves if valves else {}))
+
+    if hasattr(function_module, "action"):
+        try:
+            action = function_module.action
+
+            # Get the signature of the function
+            sig = inspect.signature(action)
+            params = {"body": data}
+
+            # Extra parameters to be passed to the function
+            extra_params = {
+                "__model__": model,
+                "__id__": sub_action_id if sub_action_id is not None else action_id,
+                "__event_emitter__": __event_emitter__,
+                "__event_call__": __event_call__,
+            }
+
+            # Add extra params in contained in function signature
+            for key, value in extra_params.items():
+                if key in sig.parameters:
+                    params[key] = value
+
+            if "__user__" in sig.parameters:
+                __user__ = {
+                    "id": user.id,
+                    "email": user.email,
+                    "name": user.name,
+                    "role": user.role,
+                }
+
+                try:
+                    if hasattr(function_module, "UserValves"):
+                        __user__["valves"] = function_module.UserValves(
+                            **Functions.get_user_valves_by_id_and_user_id(
+                                action_id, user.id
+                            )
+                        )
+                except Exception as e:
+                    print(e)
+
+                params = {**params, "__user__": __user__}
+
+            if inspect.iscoroutinefunction(action):
+                data = await action(**params)
+            else:
+                data = action(**params)
+
+        except Exception as e:
+            print(f"Error: {e}")
+            return JSONResponse(
+                status_code=status.HTTP_400_BAD_REQUEST,
+                content={"detail": str(e)},
+            )
+
+    return data

+ 3 - 3
backend/open_webui/apps/webui/routers/chats.py → backend/open_webui/routers/chats.py

@@ -2,15 +2,15 @@ import json
 import logging
 import logging
 from typing import Optional
 from typing import Optional
 
 
-from open_webui.apps.webui.models.chats import (
+from open_webui.models.chats import (
     ChatForm,
     ChatForm,
     ChatImportForm,
     ChatImportForm,
     ChatResponse,
     ChatResponse,
     Chats,
     Chats,
     ChatTitleIdResponse,
     ChatTitleIdResponse,
 )
 )
-from open_webui.apps.webui.models.tags import TagModel, Tags
-from open_webui.apps.webui.models.folders import Folders
+from open_webui.models.tags import TagModel, Tags
+from open_webui.models.folders import Folders
 
 
 from open_webui.config import ENABLE_ADMIN_CHAT_ACCESS, ENABLE_ADMIN_EXPORT
 from open_webui.config import ENABLE_ADMIN_CHAT_ACCESS, ENABLE_ADMIN_EXPORT
 from open_webui.constants import ERROR_MESSAGES
 from open_webui.constants import ERROR_MESSAGES

+ 0 - 0
backend/open_webui/apps/webui/routers/configs.py → backend/open_webui/routers/configs.py


+ 2 - 2
backend/open_webui/apps/webui/routers/evaluations.py → backend/open_webui/routers/evaluations.py

@@ -2,8 +2,8 @@ from typing import Optional
 from fastapi import APIRouter, Depends, HTTPException, status, Request
 from fastapi import APIRouter, Depends, HTTPException, status, Request
 from pydantic import BaseModel
 from pydantic import BaseModel
 
 
-from open_webui.apps.webui.models.users import Users, UserModel
-from open_webui.apps.webui.models.feedbacks import (
+from open_webui.models.users import Users, UserModel
+from open_webui.models.feedbacks import (
     FeedbackModel,
     FeedbackModel,
     FeedbackResponse,
     FeedbackResponse,
     FeedbackForm,
     FeedbackForm,

+ 2 - 2
backend/open_webui/apps/webui/routers/files.py → backend/open_webui/routers/files.py

@@ -8,13 +8,13 @@ import mimetypes
 
 
 from open_webui.storage.provider import Storage
 from open_webui.storage.provider import Storage
 
 
-from open_webui.apps.webui.models.files import (
+from open_webui.models.files import (
     FileForm,
     FileForm,
     FileModel,
     FileModel,
     FileModelResponse,
     FileModelResponse,
     Files,
     Files,
 )
 )
-from open_webui.apps.retrieval.main import process_file, ProcessFileForm
+from backend.open_webui.routers.retrieval import process_file, ProcessFileForm
 
 
 from open_webui.config import UPLOAD_DIR
 from open_webui.config import UPLOAD_DIR
 from open_webui.env import SRC_LOG_LEVELS
 from open_webui.env import SRC_LOG_LEVELS

+ 2 - 2
backend/open_webui/apps/webui/routers/folders.py → backend/open_webui/routers/folders.py

@@ -8,12 +8,12 @@ from pydantic import BaseModel
 import mimetypes
 import mimetypes
 
 
 
 
-from open_webui.apps.webui.models.folders import (
+from open_webui.models.folders import (
     FolderForm,
     FolderForm,
     FolderModel,
     FolderModel,
     Folders,
     Folders,
 )
 )
-from open_webui.apps.webui.models.chats import Chats
+from open_webui.models.chats import Chats
 
 
 from open_webui.config import UPLOAD_DIR
 from open_webui.config import UPLOAD_DIR
 from open_webui.env import SRC_LOG_LEVELS
 from open_webui.env import SRC_LOG_LEVELS

+ 2 - 2
backend/open_webui/apps/webui/routers/functions.py → backend/open_webui/routers/functions.py

@@ -2,13 +2,13 @@ import os
 from pathlib import Path
 from pathlib import Path
 from typing import Optional
 from typing import Optional
 
 
-from open_webui.apps.webui.models.functions import (
+from open_webui.models.functions import (
     FunctionForm,
     FunctionForm,
     FunctionModel,
     FunctionModel,
     FunctionResponse,
     FunctionResponse,
     Functions,
     Functions,
 )
 )
-from open_webui.apps.webui.utils import load_function_module_by_id, replace_imports
+from backend.open_webui.utils.plugin import load_function_module_by_id, replace_imports
 from open_webui.config import CACHE_DIR
 from open_webui.config import CACHE_DIR
 from open_webui.constants import ERROR_MESSAGES
 from open_webui.constants import ERROR_MESSAGES
 from fastapi import APIRouter, Depends, HTTPException, Request, status
 from fastapi import APIRouter, Depends, HTTPException, Request, status

+ 1 - 1
backend/open_webui/apps/webui/routers/groups.py → backend/open_webui/routers/groups.py

@@ -2,7 +2,7 @@ import os
 from pathlib import Path
 from pathlib import Path
 from typing import Optional
 from typing import Optional
 
 
-from open_webui.apps.webui.models.groups import (
+from open_webui.models.groups import (
     Groups,
     Groups,
     GroupForm,
     GroupForm,
     GroupUpdateForm,
     GroupUpdateForm,

+ 4 - 51
backend/open_webui/apps/images/main.py → backend/open_webui/routers/images.py

@@ -9,31 +9,14 @@ from pathlib import Path
 from typing import Optional
 from typing import Optional
 
 
 import requests
 import requests
-from open_webui.apps.images.utils.comfyui import (
+from open_webui.utils.images.comfyui import (
     ComfyUIGenerateImageForm,
     ComfyUIGenerateImageForm,
     ComfyUIWorkflow,
     ComfyUIWorkflow,
     comfyui_generate_image,
     comfyui_generate_image,
 )
 )
-from open_webui.config import (
-    AUTOMATIC1111_API_AUTH,
-    AUTOMATIC1111_BASE_URL,
-    AUTOMATIC1111_CFG_SCALE,
-    AUTOMATIC1111_SAMPLER,
-    AUTOMATIC1111_SCHEDULER,
-    CACHE_DIR,
-    COMFYUI_BASE_URL,
-    COMFYUI_WORKFLOW,
-    COMFYUI_WORKFLOW_NODES,
-    CORS_ALLOW_ORIGIN,
-    ENABLE_IMAGE_GENERATION,
-    IMAGE_GENERATION_ENGINE,
-    IMAGE_GENERATION_MODEL,
-    IMAGE_SIZE,
-    IMAGE_STEPS,
-    IMAGES_OPENAI_API_BASE_URL,
-    IMAGES_OPENAI_API_KEY,
-    AppConfig,
-)
+
+
+from open_webui.config import CACHE_DIR
 from open_webui.constants import ERROR_MESSAGES
 from open_webui.constants import ERROR_MESSAGES
 from open_webui.env import ENV, SRC_LOG_LEVELS, ENABLE_FORWARD_USER_INFO_HEADERS
 from open_webui.env import ENV, SRC_LOG_LEVELS, ENABLE_FORWARD_USER_INFO_HEADERS
 
 
@@ -54,36 +37,6 @@ app = FastAPI(
     redoc_url=None,
     redoc_url=None,
 )
 )
 
 
-app.add_middleware(
-    CORSMiddleware,
-    allow_origins=CORS_ALLOW_ORIGIN,
-    allow_credentials=True,
-    allow_methods=["*"],
-    allow_headers=["*"],
-)
-
-app.state.config = AppConfig()
-
-app.state.config.ENGINE = IMAGE_GENERATION_ENGINE
-app.state.config.ENABLED = ENABLE_IMAGE_GENERATION
-
-app.state.config.OPENAI_API_BASE_URL = IMAGES_OPENAI_API_BASE_URL
-app.state.config.OPENAI_API_KEY = IMAGES_OPENAI_API_KEY
-
-app.state.config.MODEL = IMAGE_GENERATION_MODEL
-
-app.state.config.AUTOMATIC1111_BASE_URL = AUTOMATIC1111_BASE_URL
-app.state.config.AUTOMATIC1111_API_AUTH = AUTOMATIC1111_API_AUTH
-app.state.config.AUTOMATIC1111_CFG_SCALE = AUTOMATIC1111_CFG_SCALE
-app.state.config.AUTOMATIC1111_SAMPLER = AUTOMATIC1111_SAMPLER
-app.state.config.AUTOMATIC1111_SCHEDULER = AUTOMATIC1111_SCHEDULER
-app.state.config.COMFYUI_BASE_URL = COMFYUI_BASE_URL
-app.state.config.COMFYUI_WORKFLOW = COMFYUI_WORKFLOW
-app.state.config.COMFYUI_WORKFLOW_NODES = COMFYUI_WORKFLOW_NODES
-
-app.state.config.IMAGE_SIZE = IMAGE_SIZE
-app.state.config.IMAGE_STEPS = IMAGE_STEPS
-
 
 
 @app.get("/config")
 @app.get("/config")
 async def get_config(request: Request, user=Depends(get_admin_user)):
 async def get_config(request: Request, user=Depends(get_admin_user)):

+ 3 - 3
backend/open_webui/apps/webui/routers/knowledge.py → backend/open_webui/routers/knowledge.py

@@ -4,15 +4,15 @@ from pydantic import BaseModel
 from fastapi import APIRouter, Depends, HTTPException, status, Request
 from fastapi import APIRouter, Depends, HTTPException, status, Request
 import logging
 import logging
 
 
-from open_webui.apps.webui.models.knowledge import (
+from open_webui.models.knowledge import (
     Knowledges,
     Knowledges,
     KnowledgeForm,
     KnowledgeForm,
     KnowledgeResponse,
     KnowledgeResponse,
     KnowledgeUserResponse,
     KnowledgeUserResponse,
 )
 )
-from open_webui.apps.webui.models.files import Files, FileModel
+from open_webui.models.files import Files, FileModel
 from open_webui.apps.retrieval.vector.connector import VECTOR_DB_CLIENT
 from open_webui.apps.retrieval.vector.connector import VECTOR_DB_CLIENT
-from open_webui.apps.retrieval.main import process_file, ProcessFileForm
+from backend.open_webui.routers.retrieval import process_file, ProcessFileForm
 
 
 
 
 from open_webui.constants import ERROR_MESSAGES
 from open_webui.constants import ERROR_MESSAGES

+ 1 - 1
backend/open_webui/apps/webui/routers/memories.py → backend/open_webui/routers/memories.py

@@ -3,7 +3,7 @@ from pydantic import BaseModel
 import logging
 import logging
 from typing import Optional
 from typing import Optional
 
 
-from open_webui.apps.webui.models.memories import Memories, MemoryModel
+from open_webui.models.memories import Memories, MemoryModel
 from open_webui.apps.retrieval.vector.connector import VECTOR_DB_CLIENT
 from open_webui.apps.retrieval.vector.connector import VECTOR_DB_CLIENT
 from open_webui.utils.auth import get_verified_user
 from open_webui.utils.auth import get_verified_user
 from open_webui.env import SRC_LOG_LEVELS
 from open_webui.env import SRC_LOG_LEVELS

+ 1 - 1
backend/open_webui/apps/webui/routers/models.py → backend/open_webui/routers/models.py

@@ -1,6 +1,6 @@
 from typing import Optional
 from typing import Optional
 
 
-from open_webui.apps.webui.models.models import (
+from open_webui.models.models import (
     ModelForm,
     ModelForm,
     ModelModel,
     ModelModel,
     ModelResponse,
     ModelResponse,

+ 13 - 32
backend/open_webui/apps/ollama/main.py → backend/open_webui/routers/ollama.py

@@ -12,15 +12,22 @@ import aiohttp
 from aiocache import cached
 from aiocache import cached
 
 
 import requests
 import requests
-from open_webui.apps.webui.models.models import Models
+
+from fastapi import Depends, FastAPI, File, HTTPException, Request, UploadFile
+from fastapi.middleware.cors import CORSMiddleware
+from fastapi.responses import StreamingResponse
+from pydantic import BaseModel, ConfigDict
+from starlette.background import BackgroundTask
+
+
+from open_webui.models.models import Models
+
+
 from open_webui.config import (
 from open_webui.config import (
-    CORS_ALLOW_ORIGIN,
-    ENABLE_OLLAMA_API,
-    OLLAMA_BASE_URLS,
-    OLLAMA_API_CONFIGS,
     UPLOAD_DIR,
     UPLOAD_DIR,
-    AppConfig,
 )
 )
+
+
 from open_webui.env import (
 from open_webui.env import (
     AIOHTTP_CLIENT_TIMEOUT,
     AIOHTTP_CLIENT_TIMEOUT,
     AIOHTTP_CLIENT_TIMEOUT_OPENAI_MODEL_LIST,
     AIOHTTP_CLIENT_TIMEOUT_OPENAI_MODEL_LIST,
@@ -30,11 +37,6 @@ from open_webui.env import (
 
 
 from open_webui.constants import ERROR_MESSAGES
 from open_webui.constants import ERROR_MESSAGES
 from open_webui.env import ENV, SRC_LOG_LEVELS
 from open_webui.env import ENV, SRC_LOG_LEVELS
-from fastapi import Depends, FastAPI, File, HTTPException, Request, UploadFile
-from fastapi.middleware.cors import CORSMiddleware
-from fastapi.responses import StreamingResponse
-from pydantic import BaseModel, ConfigDict
-from starlette.background import BackgroundTask
 
 
 
 
 from open_webui.utils.misc import (
 from open_webui.utils.misc import (
@@ -52,27 +54,6 @@ log = logging.getLogger(__name__)
 log.setLevel(SRC_LOG_LEVELS["OLLAMA"])
 log.setLevel(SRC_LOG_LEVELS["OLLAMA"])
 
 
 
 
-app = FastAPI(
-    docs_url="/docs" if ENV == "dev" else None,
-    openapi_url="/openapi.json" if ENV == "dev" else None,
-    redoc_url=None,
-)
-
-app.add_middleware(
-    CORSMiddleware,
-    allow_origins=CORS_ALLOW_ORIGIN,
-    allow_credentials=True,
-    allow_methods=["*"],
-    allow_headers=["*"],
-)
-
-app.state.config = AppConfig()
-
-app.state.config.ENABLE_OLLAMA_API = ENABLE_OLLAMA_API
-app.state.config.OLLAMA_BASE_URLS = OLLAMA_BASE_URLS
-app.state.config.OLLAMA_API_CONFIGS = OLLAMA_API_CONFIGS
-
-
 # TODO: Implement a more intelligent load balancing mechanism for distributing requests among multiple backend instances.
 # TODO: Implement a more intelligent load balancing mechanism for distributing requests among multiple backend instances.
 # Current implementation uses a simple round-robin approach (random.choice). Consider incorporating algorithms like weighted round-robin,
 # Current implementation uses a simple round-robin approach (random.choice). Consider incorporating algorithms like weighted round-robin,
 # least connections, or least response time for better resource utilization and performance optimization.
 # least connections, or least response time for better resource utilization and performance optimization.

+ 1 - 25
backend/open_webui/apps/openai/main.py → backend/open_webui/routers/openai.py

@@ -10,7 +10,7 @@ from aiocache import cached
 import requests
 import requests
 
 
 
 
-from open_webui.apps.webui.models.models import Models
+from open_webui.models.models import Models
 from open_webui.config import (
 from open_webui.config import (
     CACHE_DIR,
     CACHE_DIR,
     CORS_ALLOW_ORIGIN,
     CORS_ALLOW_ORIGIN,
@@ -48,29 +48,6 @@ log = logging.getLogger(__name__)
 log.setLevel(SRC_LOG_LEVELS["OPENAI"])
 log.setLevel(SRC_LOG_LEVELS["OPENAI"])
 
 
 
 
-app = FastAPI(
-    docs_url="/docs" if ENV == "dev" else None,
-    openapi_url="/openapi.json" if ENV == "dev" else None,
-    redoc_url=None,
-)
-
-
-app.add_middleware(
-    CORSMiddleware,
-    allow_origins=CORS_ALLOW_ORIGIN,
-    allow_credentials=True,
-    allow_methods=["*"],
-    allow_headers=["*"],
-)
-
-app.state.config = AppConfig()
-
-app.state.config.ENABLE_OPENAI_API = ENABLE_OPENAI_API
-app.state.config.OPENAI_API_BASE_URLS = OPENAI_API_BASE_URLS
-app.state.config.OPENAI_API_KEYS = OPENAI_API_KEYS
-app.state.config.OPENAI_API_CONFIGS = OPENAI_API_CONFIGS
-
-
 @app.get("/config")
 @app.get("/config")
 async def get_config(user=Depends(get_admin_user)):
 async def get_config(user=Depends(get_admin_user)):
     return {
     return {
@@ -91,7 +68,6 @@ class OpenAIConfigForm(BaseModel):
 @app.post("/config/update")
 @app.post("/config/update")
 async def update_config(form_data: OpenAIConfigForm, user=Depends(get_admin_user)):
 async def update_config(form_data: OpenAIConfigForm, user=Depends(get_admin_user)):
     app.state.config.ENABLE_OPENAI_API = form_data.ENABLE_OPENAI_API
     app.state.config.ENABLE_OPENAI_API = form_data.ENABLE_OPENAI_API
-
     app.state.config.OPENAI_API_BASE_URLS = form_data.OPENAI_API_BASE_URLS
     app.state.config.OPENAI_API_BASE_URLS = form_data.OPENAI_API_BASE_URLS
     app.state.config.OPENAI_API_KEYS = form_data.OPENAI_API_KEYS
     app.state.config.OPENAI_API_KEYS = form_data.OPENAI_API_KEYS
 
 

+ 299 - 57
backend/open_webui/routers/pipelines.py

@@ -3,7 +3,7 @@ from pydantic import BaseModel
 from starlette.responses import FileResponse
 from starlette.responses import FileResponse
 
 
 
 
-from open_webui.apps.webui.models.chats import ChatTitleMessagesForm
+from open_webui.models.chats import ChatTitleMessagesForm
 from open_webui.config import DATA_DIR, ENABLE_ADMIN_EXPORT
 from open_webui.config import DATA_DIR, ENABLE_ADMIN_EXPORT
 from open_webui.constants import ERROR_MESSAGES
 from open_webui.constants import ERROR_MESSAGES
 
 
@@ -14,86 +14,328 @@ from open_webui.utils.auth import get_admin_user
 router = APIRouter()
 router = APIRouter()
 
 
 
 
-@router.get("/gravatar")
-async def get_gravatar(
-    email: str,
+##################################
+#
+# Pipelines Endpoints
+#
+##################################
+
+
+# TODO: Refactor pipelines API endpoints below into a separate file
+
+
+@app.get("/api/pipelines/list")
+async def get_pipelines_list(user=Depends(get_admin_user)):
+    responses = await get_openai_models_responses()
+
+    log.debug(f"get_pipelines_list: get_openai_models_responses returned {responses}")
+    urlIdxs = [
+        idx
+        for idx, response in enumerate(responses)
+        if response is not None and "pipelines" in response
+    ]
+
+    return {
+        "data": [
+            {
+                "url": openai_app.state.config.OPENAI_API_BASE_URLS[urlIdx],
+                "idx": urlIdx,
+            }
+            for urlIdx in urlIdxs
+        ]
+    }
+
+
+@app.post("/api/pipelines/upload")
+async def upload_pipeline(
+    urlIdx: int = Form(...), file: UploadFile = File(...), user=Depends(get_admin_user)
 ):
 ):
-    return get_gravatar_url(email)
+    print("upload_pipeline", urlIdx, file.filename)
+    # Check if the uploaded file is a python file
+    if not (file.filename and file.filename.endswith(".py")):
+        raise HTTPException(
+            status_code=status.HTTP_400_BAD_REQUEST,
+            detail="Only Python (.py) files are allowed.",
+        )
+
+    upload_folder = f"{CACHE_DIR}/pipelines"
+    os.makedirs(upload_folder, exist_ok=True)
+    file_path = os.path.join(upload_folder, file.filename)
+
+    r = None
+    try:
+        # Save the uploaded file
+        with open(file_path, "wb") as buffer:
+            shutil.copyfileobj(file.file, buffer)
+
+        url = openai_app.state.config.OPENAI_API_BASE_URLS[urlIdx]
+        key = openai_app.state.config.OPENAI_API_KEYS[urlIdx]
+
+        headers = {"Authorization": f"Bearer {key}"}
+
+        with open(file_path, "rb") as f:
+            files = {"file": f}
+            r = requests.post(f"{url}/pipelines/upload", headers=headers, files=files)
+
+        r.raise_for_status()
+        data = r.json()
+
+        return {**data}
+    except Exception as e:
+        # Handle connection error here
+        print(f"Connection error: {e}")
 
 
+        detail = "Pipeline not found"
+        status_code = status.HTTP_404_NOT_FOUND
+        if r is not None:
+            status_code = r.status_code
+            try:
+                res = r.json()
+                if "detail" in res:
+                    detail = res["detail"]
+            except Exception:
+                pass
+
+        raise HTTPException(
+            status_code=status_code,
+            detail=detail,
+        )
+    finally:
+        # Ensure the file is deleted after the upload is completed or on failure
+        if os.path.exists(file_path):
+            os.remove(file_path)
 
 
-class CodeFormatRequest(BaseModel):
-    code: str
 
 
+class AddPipelineForm(BaseModel):
+    url: str
+    urlIdx: int
 
 
-@router.post("/code/format")
-async def format_code(request: CodeFormatRequest):
+
+@app.post("/api/pipelines/add")
+async def add_pipeline(form_data: AddPipelineForm, user=Depends(get_admin_user)):
+    r = None
     try:
     try:
-        formatted_code = black.format_str(request.code, mode=black.Mode())
-        return {"code": formatted_code}
-    except black.NothingChanged:
-        return {"code": request.code}
+        urlIdx = form_data.urlIdx
+
+        url = openai_app.state.config.OPENAI_API_BASE_URLS[urlIdx]
+        key = openai_app.state.config.OPENAI_API_KEYS[urlIdx]
+
+        headers = {"Authorization": f"Bearer {key}"}
+        r = requests.post(
+            f"{url}/pipelines/add", headers=headers, json={"url": form_data.url}
+        )
+
+        r.raise_for_status()
+        data = r.json()
+
+        return {**data}
     except Exception as e:
     except Exception as e:
-        raise HTTPException(status_code=400, detail=str(e))
+        # Handle connection error here
+        print(f"Connection error: {e}")
+
+        detail = "Pipeline not found"
+        if r is not None:
+            try:
+                res = r.json()
+                if "detail" in res:
+                    detail = res["detail"]
+            except Exception:
+                pass
 
 
+        raise HTTPException(
+            status_code=(r.status_code if r is not None else status.HTTP_404_NOT_FOUND),
+            detail=detail,
+        )
 
 
-class MarkdownForm(BaseModel):
-    md: str
 
 
+class DeletePipelineForm(BaseModel):
+    id: str
+    urlIdx: int
 
 
-@router.post("/markdown")
-async def get_html_from_markdown(
-    form_data: MarkdownForm,
-):
-    return {"html": markdown.markdown(form_data.md)}
 
 
+@app.delete("/api/pipelines/delete")
+async def delete_pipeline(form_data: DeletePipelineForm, user=Depends(get_admin_user)):
+    r = None
+    try:
+        urlIdx = form_data.urlIdx
+
+        url = openai_app.state.config.OPENAI_API_BASE_URLS[urlIdx]
+        key = openai_app.state.config.OPENAI_API_KEYS[urlIdx]
+
+        headers = {"Authorization": f"Bearer {key}"}
+        r = requests.delete(
+            f"{url}/pipelines/delete", headers=headers, json={"id": form_data.id}
+        )
+
+        r.raise_for_status()
+        data = r.json()
+
+        return {**data}
+    except Exception as e:
+        # Handle connection error here
+        print(f"Connection error: {e}")
+
+        detail = "Pipeline not found"
+        if r is not None:
+            try:
+                res = r.json()
+                if "detail" in res:
+                    detail = res["detail"]
+            except Exception:
+                pass
+
+        raise HTTPException(
+            status_code=(r.status_code if r is not None else status.HTTP_404_NOT_FOUND),
+            detail=detail,
+        )
+
+
+@app.get("/api/pipelines")
+async def get_pipelines(urlIdx: Optional[int] = None, user=Depends(get_admin_user)):
+    r = None
+    try:
+        url = openai_app.state.config.OPENAI_API_BASE_URLS[urlIdx]
+        key = openai_app.state.config.OPENAI_API_KEYS[urlIdx]
+
+        headers = {"Authorization": f"Bearer {key}"}
+        r = requests.get(f"{url}/pipelines", headers=headers)
+
+        r.raise_for_status()
+        data = r.json()
+
+        return {**data}
+    except Exception as e:
+        # Handle connection error here
+        print(f"Connection error: {e}")
 
 
-class ChatForm(BaseModel):
-    title: str
-    messages: list[dict]
+        detail = "Pipeline not found"
+        if r is not None:
+            try:
+                res = r.json()
+                if "detail" in res:
+                    detail = res["detail"]
+            except Exception:
+                pass
 
 
+        raise HTTPException(
+            status_code=(r.status_code if r is not None else status.HTTP_404_NOT_FOUND),
+            detail=detail,
+        )
 
 
-@router.post("/pdf")
-async def download_chat_as_pdf(
-    form_data: ChatTitleMessagesForm,
+
+@app.get("/api/pipelines/{pipeline_id}/valves")
+async def get_pipeline_valves(
+    urlIdx: Optional[int],
+    pipeline_id: str,
+    user=Depends(get_admin_user),
 ):
 ):
+    r = None
     try:
     try:
-        pdf_bytes = PDFGenerator(form_data).generate_chat_pdf()
+        url = openai_app.state.config.OPENAI_API_BASE_URLS[urlIdx]
+        key = openai_app.state.config.OPENAI_API_KEYS[urlIdx]
+
+        headers = {"Authorization": f"Bearer {key}"}
+        r = requests.get(f"{url}/{pipeline_id}/valves", headers=headers)
+
+        r.raise_for_status()
+        data = r.json()
+
+        return {**data}
+    except Exception as e:
+        # Handle connection error here
+        print(f"Connection error: {e}")
+
+        detail = "Pipeline not found"
+
+        if r is not None:
+            try:
+                res = r.json()
+                if "detail" in res:
+                    detail = res["detail"]
+            except Exception:
+                pass
 
 
-        return Response(
-            content=pdf_bytes,
-            media_type="application/pdf",
-            headers={"Content-Disposition": "attachment;filename=chat.pdf"},
+        raise HTTPException(
+            status_code=(r.status_code if r is not None else status.HTTP_404_NOT_FOUND),
+            detail=detail,
         )
         )
+
+
+@app.get("/api/pipelines/{pipeline_id}/valves/spec")
+async def get_pipeline_valves_spec(
+    urlIdx: Optional[int],
+    pipeline_id: str,
+    user=Depends(get_admin_user),
+):
+    r = None
+    try:
+        url = openai_app.state.config.OPENAI_API_BASE_URLS[urlIdx]
+        key = openai_app.state.config.OPENAI_API_KEYS[urlIdx]
+
+        headers = {"Authorization": f"Bearer {key}"}
+        r = requests.get(f"{url}/{pipeline_id}/valves/spec", headers=headers)
+
+        r.raise_for_status()
+        data = r.json()
+
+        return {**data}
     except Exception as e:
     except Exception as e:
-        print(e)
-        raise HTTPException(status_code=400, detail=str(e))
+        # Handle connection error here
+        print(f"Connection error: {e}")
 
 
+        detail = "Pipeline not found"
+        if r is not None:
+            try:
+                res = r.json()
+                if "detail" in res:
+                    detail = res["detail"]
+            except Exception:
+                pass
 
 
-@router.get("/db/download")
-async def download_db(user=Depends(get_admin_user)):
-    if not ENABLE_ADMIN_EXPORT:
         raise HTTPException(
         raise HTTPException(
-            status_code=status.HTTP_401_UNAUTHORIZED,
-            detail=ERROR_MESSAGES.ACCESS_PROHIBITED,
+            status_code=(r.status_code if r is not None else status.HTTP_404_NOT_FOUND),
+            detail=detail,
+        )
+
+
+@app.post("/api/pipelines/{pipeline_id}/valves/update")
+async def update_pipeline_valves(
+    urlIdx: Optional[int],
+    pipeline_id: str,
+    form_data: dict,
+    user=Depends(get_admin_user),
+):
+    r = None
+    try:
+        url = openai_app.state.config.OPENAI_API_BASE_URLS[urlIdx]
+        key = openai_app.state.config.OPENAI_API_KEYS[urlIdx]
+
+        headers = {"Authorization": f"Bearer {key}"}
+        r = requests.post(
+            f"{url}/{pipeline_id}/valves/update",
+            headers=headers,
+            json={**form_data},
         )
         )
-    from open_webui.apps.webui.internal.db import engine
 
 
-    if engine.name != "sqlite":
+        r.raise_for_status()
+        data = r.json()
+
+        return {**data}
+    except Exception as e:
+        # Handle connection error here
+        print(f"Connection error: {e}")
+
+        detail = "Pipeline not found"
+
+        if r is not None:
+            try:
+                res = r.json()
+                if "detail" in res:
+                    detail = res["detail"]
+            except Exception:
+                pass
+
         raise HTTPException(
         raise HTTPException(
-            status_code=status.HTTP_400_BAD_REQUEST,
-            detail=ERROR_MESSAGES.DB_NOT_SQLITE,
+            status_code=(r.status_code if r is not None else status.HTTP_404_NOT_FOUND),
+            detail=detail,
         )
         )
-    return FileResponse(
-        engine.url.database,
-        media_type="application/octet-stream",
-        filename="webui.db",
-    )
-
-
-@router.get("/litellm/config")
-async def download_litellm_config_yaml(user=Depends(get_admin_user)):
-    return FileResponse(
-        f"{DATA_DIR}/litellm/config.yaml",
-        media_type="application/octet-stream",
-        filename="config.yaml",
-    )

+ 1 - 1
backend/open_webui/apps/webui/routers/prompts.py → backend/open_webui/routers/prompts.py

@@ -1,6 +1,6 @@
 from typing import Optional
 from typing import Optional
 
 
-from open_webui.apps.webui.models.prompts import (
+from open_webui.models.prompts import (
     PromptForm,
     PromptForm,
     PromptUserResponse,
     PromptUserResponse,
     PromptModel,
     PromptModel,

+ 3 - 3
backend/open_webui/apps/retrieval/main.py → backend/open_webui/routers/retrieval.py

@@ -18,7 +18,7 @@ import tiktoken
 
 
 
 
 from open_webui.storage.provider import Storage
 from open_webui.storage.provider import Storage
-from open_webui.apps.webui.models.knowledge import Knowledges
+from open_webui.models.knowledge import Knowledges
 from open_webui.apps.retrieval.vector.connector import VECTOR_DB_CLIENT
 from open_webui.apps.retrieval.vector.connector import VECTOR_DB_CLIENT
 
 
 # Document loaders
 # Document loaders
@@ -43,7 +43,7 @@ from open_webui.apps.retrieval.web.tavily import search_tavily
 from open_webui.apps.retrieval.web.bing import search_bing
 from open_webui.apps.retrieval.web.bing import search_bing
 
 
 
 
-from open_webui.apps.retrieval.utils import (
+from backend.open_webui.retrieval.utils import (
     get_embedding_function,
     get_embedding_function,
     get_model_path,
     get_model_path,
     query_collection,
     query_collection,
@@ -52,7 +52,7 @@ from open_webui.apps.retrieval.utils import (
     query_doc_with_hybrid_search,
     query_doc_with_hybrid_search,
 )
 )
 
 
-from open_webui.apps.webui.models.files import Files
+from open_webui.models.files import Files
 from open_webui.config import (
 from open_webui.config import (
     BRAVE_SEARCH_API_KEY,
     BRAVE_SEARCH_API_KEY,
     KAGI_SEARCH_API_KEY,
     KAGI_SEARCH_API_KEY,

+ 16 - 1
backend/open_webui/routers/tasks.py

@@ -2,6 +2,8 @@ from fastapi import APIRouter, Depends, HTTPException, Response, status, Request
 from pydantic import BaseModel
 from pydantic import BaseModel
 from starlette.responses import FileResponse
 from starlette.responses import FileResponse
 from typing import Optional
 from typing import Optional
+import logging
+
 
 
 from open_webui.utils.task import (
 from open_webui.utils.task import (
     title_generation_template,
     title_generation_template,
@@ -12,6 +14,17 @@ from open_webui.utils.task import (
     moa_response_generation_template,
     moa_response_generation_template,
 )
 )
 from open_webui.utils.auth import get_admin_user, get_verified_user
 from open_webui.utils.auth import get_admin_user, get_verified_user
+from open_webui.constants import TASKS
+
+from open_webui.config import (
+    DEFAULT_QUERY_GENERATION_PROMPT_TEMPLATE,
+    DEFAULT_AUTOCOMPLETE_GENERATION_PROMPT_TEMPLATE,
+)
+from open_webui.env import SRC_LOG_LEVELS
+
+
+log = logging.getLogger(__name__)
+log.setLevel(SRC_LOG_LEVELS["MODELS"])
 
 
 router = APIRouter()
 router = APIRouter()
 
 
@@ -197,7 +210,9 @@ Artificial Intelligence in Healthcare
 
 
 
 
 @router.post("/tags/completions")
 @router.post("/tags/completions")
-async def generate_chat_tags(form_data: dict, user=Depends(get_verified_user)):
+async def generate_chat_tags(
+    request: Request, form_data: dict, user=Depends(get_verified_user)
+):
 
 
     if not request.app.state.config.ENABLE_TAGS_GENERATION:
     if not request.app.state.config.ENABLE_TAGS_GENERATION:
         return JSONResponse(
         return JSONResponse(

+ 2 - 2
backend/open_webui/apps/webui/routers/tools.py → backend/open_webui/routers/tools.py

@@ -1,14 +1,14 @@
 from pathlib import Path
 from pathlib import Path
 from typing import Optional
 from typing import Optional
 
 
-from open_webui.apps.webui.models.tools import (
+from open_webui.models.tools import (
     ToolForm,
     ToolForm,
     ToolModel,
     ToolModel,
     ToolResponse,
     ToolResponse,
     ToolUserResponse,
     ToolUserResponse,
     Tools,
     Tools,
 )
 )
-from open_webui.apps.webui.utils import load_tools_module_by_id, replace_imports
+from backend.open_webui.utils.plugin import load_tools_module_by_id, replace_imports
 from open_webui.config import CACHE_DIR
 from open_webui.config import CACHE_DIR
 from open_webui.constants import ERROR_MESSAGES
 from open_webui.constants import ERROR_MESSAGES
 from fastapi import APIRouter, Depends, HTTPException, Request, status
 from fastapi import APIRouter, Depends, HTTPException, Request, status

+ 3 - 3
backend/open_webui/apps/webui/routers/users.py → backend/open_webui/routers/users.py

@@ -1,9 +1,9 @@
 import logging
 import logging
 from typing import Optional
 from typing import Optional
 
 
-from open_webui.apps.webui.models.auths import Auths
-from open_webui.apps.webui.models.chats import Chats
-from open_webui.apps.webui.models.users import (
+from open_webui.models.auths import Auths
+from open_webui.models.chats import Chats
+from open_webui.models.users import (
     UserModel,
     UserModel,
     UserRoleUpdateForm,
     UserRoleUpdateForm,
     Users,
     Users,

+ 2 - 2
backend/open_webui/apps/webui/routers/utils.py → backend/open_webui/routers/utils.py

@@ -1,7 +1,7 @@
 import black
 import black
 import markdown
 import markdown
 
 
-from open_webui.apps.webui.models.chats import ChatTitleMessagesForm
+from open_webui.models.chats import ChatTitleMessagesForm
 from open_webui.config import DATA_DIR, ENABLE_ADMIN_EXPORT
 from open_webui.config import DATA_DIR, ENABLE_ADMIN_EXPORT
 from open_webui.constants import ERROR_MESSAGES
 from open_webui.constants import ERROR_MESSAGES
 from fastapi import APIRouter, Depends, HTTPException, Response, status
 from fastapi import APIRouter, Depends, HTTPException, Response, status
@@ -76,7 +76,7 @@ async def download_db(user=Depends(get_admin_user)):
             status_code=status.HTTP_401_UNAUTHORIZED,
             status_code=status.HTTP_401_UNAUTHORIZED,
             detail=ERROR_MESSAGES.ACCESS_PROHIBITED,
             detail=ERROR_MESSAGES.ACCESS_PROHIBITED,
         )
         )
-    from open_webui.apps.webui.internal.db import engine
+    from open_webui.internal.db import engine
 
 
     if engine.name != "sqlite":
     if engine.name != "sqlite":
         raise HTTPException(
         raise HTTPException(

+ 4 - 4
backend/open_webui/apps/webui/main.py → backend/open_webui/routers/webui.py

@@ -5,9 +5,9 @@ import time
 from typing import AsyncGenerator, Generator, Iterator
 from typing import AsyncGenerator, Generator, Iterator
 
 
 from open_webui.apps.socket.main import get_event_call, get_event_emitter
 from open_webui.apps.socket.main import get_event_call, get_event_emitter
-from open_webui.apps.webui.models.functions import Functions
-from open_webui.apps.webui.models.models import Models
-from open_webui.apps.webui.routers import (
+from open_webui.models.functions import Functions
+from open_webui.models.models import Models
+from open_webui.routers import (
     auths,
     auths,
     chats,
     chats,
     folders,
     folders,
@@ -24,7 +24,7 @@ from open_webui.apps.webui.routers import (
     users,
     users,
     utils,
     utils,
 )
 )
-from open_webui.apps.webui.utils import load_function_module_by_id
+from backend.open_webui.utils.plugin import load_function_module_by_id
 from open_webui.config import (
 from open_webui.config import (
     ADMIN_EMAIL,
     ADMIN_EMAIL,
     CORS_ALLOW_ORIGIN,
     CORS_ALLOW_ORIGIN,

+ 1 - 1
backend/open_webui/apps/socket/main.py → backend/open_webui/socket/main.py

@@ -6,7 +6,7 @@ import logging
 import sys
 import sys
 import time
 import time
 
 
-from open_webui.apps.webui.models.users import Users
+from open_webui.models.users import Users
 from open_webui.env import (
 from open_webui.env import (
     ENABLE_WEBSOCKET_SUPPORT,
     ENABLE_WEBSOCKET_SUPPORT,
     WEBSOCKET_MANAGER,
     WEBSOCKET_MANAGER,

+ 0 - 0
backend/open_webui/apps/socket/utils.py → backend/open_webui/socket/utils.py


+ 2 - 2
backend/open_webui/test/apps/webui/routers/test_auths.py

@@ -7,8 +7,8 @@ class TestAuths(AbstractPostgresTest):
 
 
     def setup_class(cls):
     def setup_class(cls):
         super().setup_class()
         super().setup_class()
-        from open_webui.apps.webui.models.auths import Auths
-        from open_webui.apps.webui.models.users import Users
+        from open_webui.models.auths import Auths
+        from open_webui.models.users import Users
 
 
         cls.users = Users
         cls.users = Users
         cls.auths = Auths
         cls.auths = Auths

Some files were not shown because too many files changed in this diff