diff --git a/backend/apps/chat/curd/chat.py b/backend/apps/chat/curd/chat.py index 70129f07..7425863a 100644 --- a/backend/apps/chat/curd/chat.py +++ b/backend/apps/chat/curd/chat.py @@ -13,7 +13,8 @@ from common.utils.utils import extract_nested_json def list_chats(session: SessionDep, current_user: CurrentUser) -> List[Chat]: - chart_list = session.exec(select(Chat).where(Chat.create_by == current_user.id).order_by(Chat.create_time.desc())).all() + chart_list = session.exec( + select(Chat).where(Chat.create_by == current_user.id).order_by(Chat.create_time.desc())).all() return chart_list @@ -133,7 +134,7 @@ def format_record(record: ChatRecord): def list_base_records(session: SessionDep, chart_id: int, current_user: CurrentUser) -> List[ChatRecord]: record_list = session.query(ChatRecord).filter( and_(Chat.create_by == current_user.id, ChatRecord.chat_id == chart_id, - ChatRecord.analysis_record_id is None, ChatRecord.predict_record_id is None)).order_by( + ChatRecord.analysis_record_id.is_(None), ChatRecord.predict_record_id.is_(None))).order_by( ChatRecord.create_time).all() return record_list @@ -203,7 +204,7 @@ def save_question(session: SessionDep, current_user: CurrentUser, question: Chat if not question.question or question.question.strip() == '': raise Exception("Question cannot be Empty") - #chat = session.query(Chat).filter(Chat.id == question.chat_id).first() + # chat = session.query(Chat).filter(Chat.id == question.chat_id).first() chat: Chat = session.get(Chat, question.chat_id) if not chat: raise Exception(f"Chat with id {question.chat_id} not found") @@ -236,7 +237,7 @@ def save_analysis_predict_record(session: SessionDep, base_record: ChatRecord, a record.engine_type = base_record.engine_type record.ai_modal_id = base_record.ai_modal_id record.create_time = datetime.datetime.now() - record.create_by = base_record.id + record.create_by = base_record.create_by record.chart = base_record.chart record.data = base_record.data diff --git a/backend/apps/chat/task/llm.py b/backend/apps/chat/task/llm.py index efc31b0f..e4357989 100644 --- a/backend/apps/chat/task/llm.py +++ b/backend/apps/chat/task/llm.py @@ -18,8 +18,8 @@ from apps.chat.curd.chat import save_question, save_full_sql_message, save_full_ save_error_message, save_sql_exec_data, save_full_chart_message, save_full_chart_message_and_answer, save_chart, \ finish_record, save_full_analysis_message_and_answer, save_full_predict_message_and_answer, save_predict_data, \ save_full_select_datasource_message_and_answer, save_full_recommend_question_message_and_answer, \ - get_old_questions, save_analysis_predict_record, list_base_records -from apps.chat.models.chat_model import ChatQuestion, ChatRecord, Chat + get_old_questions, save_analysis_predict_record, list_base_records, rename_chat +from apps.chat.models.chat_model import ChatQuestion, ChatRecord, Chat, RenameChat from apps.datasource.crud.datasource import get_table_schema from apps.datasource.models.datasource import CoreDatasource from apps.db.db import exec_sql @@ -45,13 +45,15 @@ class LLMService: session: SessionDep current_user: CurrentUser current_assistant: Optional[CurrentAssistant] = None + change_title: bool = False - def __init__(self, session: SessionDep, current_user: CurrentUser, chat_question: ChatQuestion, current_assistant: Optional[CurrentAssistant] = None): + def __init__(self, session: SessionDep, current_user: CurrentUser, chat_question: ChatQuestion, + current_assistant: Optional[CurrentAssistant] = None): self.session = session self.current_user = current_user self.current_assistant = current_assistant - #chat = self.session.query(Chat).filter(Chat.id == chat_question.chat_id).first() + # chat = self.session.query(Chat).filter(Chat.id == chat_question.chat_id).first() chat_id = chat_question.chat_id chat: Chat = self.session.get(Chat, chat_id) if not chat: @@ -71,6 +73,8 @@ class LLMService: list_base_records(session=self.session, current_user=current_user, chart_id=chat_id)))) + self.change_title = len(history_records) == 0 + # get schema if ds: chat_question.db_schema = get_table_schema(session=self.session, ds=ds) @@ -335,7 +339,7 @@ class LLMService: datasource_msg: List[Union[BaseMessage, dict[str, Any]]] = [] datasource_msg.append(SystemMessage(self.chat_question.datasource_sys_question())) if self.current_assistant: - _ds_list = get_assistant_ds(session = self.session, assistant = self.current_assistant) + _ds_list = get_assistant_ds(session=self.session, assistant=self.current_assistant) else: _ds_list = self.session.exec(select(CoreDatasource).options( load_only(CoreDatasource.id, CoreDatasource.name, CoreDatasource.description))).all() @@ -620,6 +624,14 @@ def run_task(llm_service: LLMService, in_chat: bool = True): if in_chat: yield orjson.dumps({'type': 'id', 'id': llm_service.get_record().id}).decode() + '\n\n' + # return title + if llm_service.change_title: + if llm_service.chat_question.question or llm_service.chat_question.question.strip() != '': + brief = rename_chat(session=llm_service.session, + rename_object=RenameChat(id=llm_service.get_record().chat_id, + brief=llm_service.chat_question.question.strip()[:20])) + yield orjson.dumps({'type': 'brief', 'brief': brief}).decode() + '\n\n' + # select datasource if datasource is none if not llm_service.ds: ds_res = llm_service.select_datasource() diff --git a/frontend/src/assets/svg/icon_sidebar_outlined.svg b/frontend/src/assets/svg/icon_sidebar_outlined.svg new file mode 100644 index 00000000..e01b0148 --- /dev/null +++ b/frontend/src/assets/svg/icon_sidebar_outlined.svg @@ -0,0 +1,6 @@ + + + + + + diff --git a/frontend/src/views/chat/ChatList.vue b/frontend/src/views/chat/ChatList.vue index c312545e..3a9ee8aa 100644 --- a/frontend/src/views/chat/ChatList.vue +++ b/frontend/src/views/chat/ChatList.vue @@ -137,8 +137,8 @@ function handleCommand(command: string | number | object, chat: Chat) { --hover-color: var(--ed-color-primary-light-9); --active-color: var(--hover-color); - padding-left: 14px; - padding-right: 14px; + padding-left: 16px; + padding-right: 16px; width: 100%; display: flex; @@ -152,6 +152,7 @@ function handleCommand(command: string | number | object, chat: Chat) { cursor: pointer; border-radius: 6px; line-height: 1em; + font-size: 14px; display: flex; align-items: center; @@ -177,15 +178,21 @@ function handleCommand(command: string | number | object, chat: Chat) { } &:hover { - background-color: var(--hover-color); + background-color: rgba(31, 35, 41, 0.1); .icon-more { display: inline-flex; + color: rgba(100, 106, 115, 1); + + &:hover { + background-color: rgba(31, 35, 41, 0.1); + } } } &.active { - background-color: var(--active-color); + background-color: rgba(255, 255, 255, 1); + font-weight: 500; } } } diff --git a/frontend/src/views/chat/index.vue b/frontend/src/views/chat/index.vue index 3fa327cd..92706ceb 100644 --- a/frontend/src/views/chat/index.vue +++ b/frontend/src/views/chat/index.vue @@ -1,14 +1,23 @@