highperfocused/danswer
1
0
Fork 0
mirror of https://github.com/danswer-ai/danswer.git synced 2025-08-03 05:34:03 +02:00
Code Issues Packages Projects Releases Wiki Activity

Minor tenant ID improvements (#2850)

Browse Source 
* add migration dockerfile

* address edge case

* k

* k

* k

* nit

* k

* k

* k

* k

* remove

* k

* add comment
This commit is contained in:
pablodanswer
2024-10-20 16:48:00 -07:00
committed by GitHub
parent 7ab0063dc6
commit a24b465663
11 changed files with 98 additions and 53 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
backend/alembic/env.py
View File

@@ -13,7 +13,7 @@ from danswer.configs.app_configs import MULTI_TENANT
from danswer.db.engine import build_connection_string
from danswer.db.models import Base
from celery.backends.database.session import ResultModelBase # type: ignore
from danswer.background.celery.celery_app import get_all_tenant_ids
from danswer.db.engine import get_all_tenant_ids
# Alembic Config object
config = context.config
@@ -61,7 +61,7 @@ def get_schema_options() -> tuple[str, bool, bool]:
create_schema = x_args.get("create_schema", "true").lower() == "true"
upgrade_all_tenants = x_args.get("upgrade_all_tenants", "false").lower() == "true"
if MULTI_TENANT and schema_name == "public":
if MULTI_TENANT and schema_name == "public" and not upgrade_all_tenants:
raise ValueError(
"Cannot run default migrations in public schema when multi-tenancy is enabled. "
"Please specify a tenant-specific schema."