Fix non-default schema in KV store #4655
Merged
+98
−165
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
|
The latest updates on your projects. Learn more about Vercel for Git ↗︎
|
![greptile-apps[bot]](https://avatars.githubusercontent.com/in/867647?s=60&v=4){kind=small}
There was a problem hiding this comment.
PR Summary
This PR simplifies the key-value store implementation by removing custom session management and tenant-specific logic, while ensuring proper schema handling through the standard session context manager.
- Removes unnecessary tenant_id tracking and custom _get_session() context manager in
/backend/onyx/key_value_store/store.py - Simplifies Redis client initialization by using get_redis_client() directly instead of custom tenant-specific logic
- Ensures proper schema handling by using standard get_session_context_manager() instead of explicit schema setting
- Maintains backward compatibility with existing KV store functionality while reducing code complexity
1 file(s) reviewed, 1 comment(s)
Edit PR Review Bot Settings | Greptile
rkuo-danswer
approved these changes
May 2, 2025
Weves
commented
May 2, 2025
| @@ -189,45 +190,6 @@ class SqlEngine: | |||
| _lock: threading.Lock = threading.Lock() | |||
| _app_name: str = POSTGRES_UNKNOWN_APP_NAME | |||
|
|
|||
| # NOTE(rkuo) - this appears to be unused, clean it up? | |||
There was a problem hiding this comment.
not used, was moved into the init_engine function
Weves
commented
May 2, 2025
| @@ -430,33 +380,6 @@ def _set_search_path( | |||
| ) | |||
|
|
|||
|
|
|||
| @asynccontextmanager | |||
| async def get_async_session_with_tenant( | |||
There was a problem hiding this comment.
replaced with get_async_session_context_manager
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Description
Previously, if you set the
POSTGRES_DEFAULT_SCHEMAenv variable, it wouldn't be respected inPgRedisKVStore, which causes issues.Fixes https://linear.app/danswer/issue/DAN-1938/use-correct-schema-in-kv-store
How Has This Been Tested?
Tested different schema locally.
Backporting (check the box to trigger backport action)
Note: You have to check that the action passes, otherwise resolve the conflicts manually and tag the patches.