From ed8db00ce22a0efc736291d50c293c5c816bc2bf Mon Sep 17 00:00:00 2001 From: ulleo Date: Fri, 25 Jul 2025 11:12:43 +0800 Subject: [PATCH 1/2] feat: chat add ds_type --- backend/apps/chat/curd/chat.py | 1 + backend/apps/chat/models/chat_model.py | 1 + 2 files changed, 2 insertions(+) diff --git a/backend/apps/chat/curd/chat.py b/backend/apps/chat/curd/chat.py index dd22de57..8338cf2b 100644 --- a/backend/apps/chat/curd/chat.py +++ b/backend/apps/chat/curd/chat.py @@ -85,6 +85,7 @@ def get_chat_with_records(session: SessionDep, chart_id: int, current_user: Curr else: chat_info.datasource_exists = True chat_info.datasource_name = ds.name + chat_info.ds_type = ds.type record_list = session.query(ChatRecord).options( load_only(ChatRecord.id, ChatRecord.chat_id, ChatRecord.create_time, ChatRecord.finish_time, diff --git a/backend/apps/chat/models/chat_model.py b/backend/apps/chat/models/chat_model.py index 60fb777d..f095a65d 100644 --- a/backend/apps/chat/models/chat_model.py +++ b/backend/apps/chat/models/chat_model.py @@ -89,6 +89,7 @@ class ChatInfo(BaseModel): chat_type: str = "chat" datasource: Optional[int] = None engine_type: str = '' + ds_type: str = '' datasource_name: str = '' datasource_exists: bool = True records: List[ChatRecord | dict] = [] From 748a4189b3ada5488038c7946fc3a14d87f83b28 Mon Sep 17 00:00:00 2001 From: junjun Date: Fri, 25 Jul 2025 11:16:49 +0800 Subject: [PATCH 2/2] feat: permission normal user --- backend/apps/datasource/crud/datasource.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/backend/apps/datasource/crud/datasource.py b/backend/apps/datasource/crud/datasource.py index fe470005..2e461291 100644 --- a/backend/apps/datasource/crud/datasource.py +++ b/backend/apps/datasource/crud/datasource.py @@ -407,4 +407,4 @@ def filter_list(list_a, list_b): def is_normal_user(current_user: CurrentUser): - return current_user.id != 1 and (current_user.weight is not None and current_user.weight != 1) + return current_user.id != 1