klinsmaya/SQLBot
1
0
Fork 0
mirror of https://gh-proxy.org/https://github.com/klinsmaya/SQLBot.git synced 2026-11-08 01:06:59 +08:00
Code Issues Packages Projects Releases Wiki Activity

fix: always get terminology in default workspace after select ds

Browse Source
This commit is contained in:
ulleo
2025-09-19 10:20:54 +08:00
committed by ulleo
parent a99573c4c3
commit 3d3685e4be
1 changed files with 15 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files
backend/apps/chat/task/llm.py
+15 -13
View File
@@ -16,7 +16,7 @@ import sqlparse
from langchain.chat_models.base import BaseChatModel
from langchain_community.utilities import SQLDatabase
from langchain_core.messages import BaseMessage, SystemMessage, HumanMessage, AIMessage, BaseMessageChunk
from sqlalchemy import select
from sqlalchemy import and_, select
from sqlalchemy.orm import sessionmaker
from sqlmodel import Session
@@ -404,9 +404,8 @@ class LLMService:
if self.current_assistant and self.current_assistant.type != 4:
_ds_list = get_assistant_ds(session=self.session, llm_service=self)
else:
oid: str = self.current_user.oid
stmt = select(CoreDatasource.id, CoreDatasource.name, CoreDatasource.description).where(
CoreDatasource.oid == oid)
and_(CoreDatasource.oid == self.current_user.oid))
_ds_list = [
{
"id": ds.id,
@@ -424,7 +423,7 @@ class LLMService:
full_thinking_text = ''
full_text = ''
json_str: Optional[str] = None
if not ignore_auto_select:
_ds_list_dict = []
for _ds in _ds_list:
@@ -471,6 +470,8 @@ class LLMService:
token_usage=token_usage)
json_str = extract_nested_json(full_text)
if json_str is None:
raise SingleMessageError(f'Cannot parse datasource from answer: {full_text}')
_error: Exception | None = None
_datasource: int | None = None
@@ -522,11 +523,11 @@ class LLMService:
engine_type=_engine_type)
if self.ds:
oid = self.ds.oid if isinstance(self.ds, CoreDatasource) else 1
dsId = self.ds.id if isinstance(self.ds, CoreDatasource) else None
self.chat_question.terminologies = get_terminology_template(self.session, self.chat_question.question, 1)
self.chat_question.data_training = get_training_template(self.session, self.chat_question.question, dsId, oid)
ds_id = self.ds.id if isinstance(self.ds, CoreDatasource) else None
self.chat_question.terminologies = get_terminology_template(self.session, self.chat_question.question, oid)
self.chat_question.data_training = get_training_template(self.session, self.chat_question.question, ds_id,
oid)
self.init_messages()
@@ -938,10 +939,11 @@ class LLMService:
try:
if self.ds:
oid = self.ds.oid if isinstance(self.ds, CoreDatasource) else 1
dsId = self.ds.id if isinstance(self.ds, CoreDatasource) else None
self.chat_question.terminologies = get_terminology_template(self.session, self.chat_question.question, oid)
self.chat_question.data_training = get_training_template(self.session, self.chat_question.question, dsId, oid)
ds_id = self.ds.id if isinstance(self.ds, CoreDatasource) else None
self.chat_question.terminologies = get_terminology_template(self.session, self.chat_question.question,
oid)
self.chat_question.data_training = get_training_template(self.session, self.chat_question.question,
ds_id, oid)
self.init_messages()