From 75c5de802b8337d26dd74c11b36b158d34bd1feb Mon Sep 17 00:00:00 2001 From: pablodanswer Date: Sat, 19 Oct 2024 18:00:30 -0700 Subject: [PATCH] ensure tenant id passed --- backend/danswer/background/celery/tasks/indexing/tasks.py | 4 ++-- backend/danswer/redis/redis_pool.py | 2 +- backend/danswer/server/documents/credential.py | 3 --- 3 files changed, 3 insertions(+), 6 deletions(-) diff --git a/backend/danswer/background/celery/tasks/indexing/tasks.py b/backend/danswer/background/celery/tasks/indexing/tasks.py index 2d5e0289d..621289944 100644 --- a/backend/danswer/background/celery/tasks/indexing/tasks.py +++ b/backend/danswer/background/celery/tasks/indexing/tasks.py @@ -54,7 +54,7 @@ logger = setup_logger() def check_for_indexing(tenant_id: str | None) -> int | None: tasks_created = 0 - r = get_redis_client() + r = get_redis_client(tenant_id) lock_beat = r.lock( DanswerRedisLocks.CHECK_INDEXING_BEAT_LOCK, @@ -370,7 +370,7 @@ def connector_indexing_task( attempt = None n_final_progress = 0 - r = get_redis_client() + r = get_redis_client(tenant_id) rci = RedisConnectorIndexing(cc_pair_id, search_settings_id) diff --git a/backend/danswer/redis/redis_pool.py b/backend/danswer/redis/redis_pool.py index 2f940b9bf..98621cc64 100644 --- a/backend/danswer/redis/redis_pool.py +++ b/backend/danswer/redis/redis_pool.py @@ -134,7 +134,7 @@ class RedisPool: redis_pool = RedisPool() -def get_redis_client(tenant_id: str | None = None) -> Redis: +def get_redis_client(tenant_id: str | None) -> Redis: return redis_pool.get_client(tenant_id) diff --git a/backend/danswer/server/documents/credential.py b/backend/danswer/server/documents/credential.py index e34a1b059..3d965481b 100644 --- a/backend/danswer/server/documents/credential.py +++ b/backend/danswer/server/documents/credential.py @@ -137,9 +137,6 @@ def create_credential_from_model( target_group_ids=credential_info.groups, object_is_public=credential_info.curator_public, ) - from danswer.db.models import Credential - - db_session.query(Credential).all() credential = create_credential(credential_info, user, db_session) return ObjectCreationIdResponse(