Skip to content

Compatibility of data layer with sqlite #1137

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
a-romero wants to merge 3 commits into from
Closed

Compatibility of data layer with sqlite #1137

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
5250096
Updated to support databases that natively return JSONB objects as st…
a-romero Jul 16, 2024
c36ca37
Removed redundant import
a-romero Jul 22, 2024
6fab18b
Merge branch 'main' into compat/sqlite
dokterbob Aug 19, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 10 additions & 1 deletion backend/chainlit/data/sql_alchemy.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
from importlib import metadata
import json
import ssl
import uuid
Expand Down Expand Up @@ -115,7 +116,15 @@ async def get_user(self, identifier: str) -> Optional[PersistedUser]:
result = await self.execute_sql(query=query, parameters=parameters)
if result and isinstance(result, list):
user_data = result[0]
return PersistedUser(**user_data)
metadata = user_data.get("metadata") or {}
if metadata is not Dict:
metadata = json.loads(metadata)
return PersistedUser(
id=user_data.get("id"),
identifier=user_data.get("identifier"),
createdAt=user_data.get("createdAt"),
metadata=metadata,
)
return None

async def create_user(self, user: User) -> Optional[PersistedUser]:
Expand Down
2 changes: 2 additions & 0 deletions backend/chainlit/socket.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -55,6 +55,8 @@ async def resume_thread(session: WebsocketSession):

if user_is_author:
metadata = thread.get("metadata") or {}
if metadata is not Dict:
metadata = json.loads(metadata)
user_sessions[session.id] = metadata.copy()
if chat_profile := metadata.get("chat_profile"):
session.chat_profile = chat_profile
Expand Down