mirror of
https://gh-proxy.org/https://github.com/klinsmaya/SQLBot.git
synced 2026-11-08 01:06:59 +08:00
Merge branch 'main' of https://github.com/dataease/SQLBot
This commit is contained in:
@@ -145,16 +145,10 @@ class LLMService:
|
||||
count_limit = 0 - base_message_count_limit
|
||||
|
||||
self.sql_message = []
|
||||
if last_sql_messages is None or len(last_sql_messages) == 0:
|
||||
# add sys prompt
|
||||
self.sql_message.append(SystemMessage(content=self.chat_question.sql_sys_question()))
|
||||
else:
|
||||
# add sys prompt
|
||||
self.sql_message.append(SystemMessage(content=self.chat_question.sql_sys_question()))
|
||||
if last_sql_messages is not None and len(last_sql_messages) > 0:
|
||||
# limit count
|
||||
for last_sql_message in last_sql_messages:
|
||||
if last_sql_message['type'] == 'system':
|
||||
_msg = SystemMessage(content=last_sql_message['content'])
|
||||
self.sql_message.append(_msg)
|
||||
break
|
||||
for last_sql_message in last_sql_messages[count_limit:]:
|
||||
_msg: BaseMessage
|
||||
if last_sql_message['type'] == 'human':
|
||||
@@ -167,16 +161,11 @@ class LLMService:
|
||||
last_chart_messages: List[dict[str, Any]] = orjson.loads(last_chart_message_str)
|
||||
|
||||
self.chart_message = []
|
||||
if last_chart_messages is None or len(last_chart_messages) == 0:
|
||||
# add sys prompt
|
||||
self.chart_message.append(SystemMessage(content=self.chat_question.chart_sys_question()))
|
||||
else:
|
||||
# add sys prompt
|
||||
self.chart_message.append(SystemMessage(content=self.chat_question.chart_sys_question()))
|
||||
|
||||
if last_chart_messages is not None and len(last_chart_messages) > 0:
|
||||
# limit count
|
||||
for last_chart_message in last_chart_messages:
|
||||
if last_chart_message['type'] == 'system':
|
||||
_msg = SystemMessage(content=last_chart_message['content'])
|
||||
self.chart_message.append(_msg)
|
||||
break
|
||||
for last_chart_message in last_chart_messages:
|
||||
_msg: BaseMessage
|
||||
if last_chart_message['type'] == 'human':
|
||||
|
||||
@@ -36,7 +36,7 @@ dependencies = [
|
||||
"pyyaml (>=6.0.2,<7.0.0)",
|
||||
"fastapi-mcp (>=0.3.4,<0.4.0)",
|
||||
"tabulate>=0.9.0",
|
||||
"sqlbot-xpack==0.0.3.9",
|
||||
"sqlbot-xpack==0.0.3.10",
|
||||
"fastapi-cache2>=0.2.2",
|
||||
"sqlparse>=0.5.3",
|
||||
"redis>=6.2.0",
|
||||
|
||||
Reference in New Issue
Block a user