UniqAI/open-webui
1
0
Fork 0
mirror of https://github.com/open-webui/open-webui synced 2025-01-31 15:01:00 +00:00
Code Issues Actions 4 Packages Projects Releases Wiki Activity

Merge pull request #8510 from MadsLang/main

Browse Source 
Add DATABASE_SCHEMA as env var
This commit is contained in:
Timothy Jaeryang Baek 2025-01-13 13:16:06 -08:00 committed by GitHub
commit d83acb2f03
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
backend/open_webui/env.py
View File

@ -274,6 +274,8 @@ DATABASE_URL = os.environ.get("DATABASE_URL", f"sqlite:///{DATA_DIR}/webui.db")
if "postgres://" in DATABASE_URL: if "postgres://" in DATABASE_URL:
DATABASE_URL = DATABASE_URL.replace("postgres://", "postgresql://") DATABASE_URL = DATABASE_URL.replace("postgres://", "postgresql://")
DATABASE_SCHEMA = os.environ.get("DATABASE_SCHEMA", None)
DATABASE_POOL_SIZE = os.environ.get("DATABASE_POOL_SIZE", 0) DATABASE_POOL_SIZE = os.environ.get("DATABASE_POOL_SIZE", 0)
if DATABASE_POOL_SIZE == "": if DATABASE_POOL_SIZE == "":

6
backend/open_webui/internal/db.py
View File

@ -7,6 +7,7 @@ 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,
DATABASE_SCHEMA,
SRC_LOG_LEVELS, SRC_LOG_LEVELS,
DATABASE_POOL_MAX_OVERFLOW, DATABASE_POOL_MAX_OVERFLOW,
DATABASE_POOL_RECYCLE, DATABASE_POOL_RECYCLE,
@ -14,7 +15,7 @@ from open_webui.env import (
DATABASE_POOL_TIMEOUT, DATABASE_POOL_TIMEOUT,
) )
from peewee_migrate import Router from peewee_migrate import Router
from sqlalchemy import Dialect, create_engine, types from sqlalchemy import Dialect, create_engine, MetaData, types
from sqlalchemy.ext.declarative import declarative_base from sqlalchemy.ext.declarative import declarative_base
from sqlalchemy.orm import scoped_session, sessionmaker from sqlalchemy.orm import scoped_session, sessionmaker
from sqlalchemy.pool import QueuePool, NullPool from sqlalchemy.pool import QueuePool, NullPool
@ -99,7 +100,8 @@ else:
SessionLocal = sessionmaker( SessionLocal = sessionmaker(
autocommit=False, autoflush=False, bind=engine, expire_on_commit=False autocommit=False, autoflush=False, bind=engine, expire_on_commit=False
) )
Base = declarative_base() metadata_obj = MetaData(schema=DATABASE_SCHEMA)
Base = declarative_base(metadata=metadata_obj)
Session = scoped_session(SessionLocal) Session = scoped_session(SessionLocal)