github/DB-GPT
1
0
Fork 0
mirror of https://github.com/csunny/DB-GPT.git synced 2025-07-30 15:21:02 +00:00
Code Issues Packages Projects Releases Wiki Activity

bugfix(ChatData): ChatData Use AntV Table

Browse Source 
1.Merge ChatData and ChatDB
This commit is contained in:
yhjun1026 2023-11-10 14:20:56 +08:00
parent 74a3f6edb5
commit 440a3e955f
3 changed files with 63 additions and 37 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
pilot/openapi/api_v1/editor/api_editor_v1.py
View File

@ -29,8 +29,6 @@ from pilot.scene.message import OnceConversation
from pilot.scene.chat_dashboard.data_loader import DashboardDataLoader
from pilot.scene.chat_db.data_loader import DbDataLoader
from pilot.memory.chat_history.chat_hisotry_factory import ChatHistory
from pilot.base_modules.agent.commands.command_mange import ApiCall
router = APIRouter()
CFG = Config()
@ -103,16 +101,12 @@ async def get_editor_sql(con_uid: str, round: int):
logger.info(
f'history ai json resp:{element["data"]["content"]}'
)
api_call = ApiCall()
api_call.update_from_context(element["data"]["content"])
result = {}
result['thoughts'] = element["data"]["content"].replace("\n", " ").replace("\\n", " ")
if api_call.check_last_plugin_call_ready(element["data"]["content"]):
if len(api_call.plugin_status_map) > 0:
first_item = next(iter(api_call.plugin_status_map.items()))[1]
result['sql'] = first_item.args["sql"]
return Result.succ(result)
context = (
element["data"]["content"]
.replace("\\n", " ")
.replace("\n", " ")
)
return Result.succ(json.loads(context))
return Result.faild(msg="not have sql!")
@ -140,6 +134,7 @@ async def editor_sql_run(run_param: dict = Body()):
)
return Result.succ(sql_run_data)
except Exception as e:
logging.error("editor_sql_run exception!" + str(e))
return Result.succ(
SqlRunData(result_info=str(e), run_cost=0, colunms=[], values=[])
)
@ -162,18 +157,17 @@ async def sql_editor_submit(sql_edit_context: ChatSqlEditContext = Body()):
)
)[0]
if edit_round:
new_ai_text = ""
for element in edit_round["messages"]:
if element["type"] == "ai":
new_ai_text = element["data"]["content"]
new_ai_text.replace(sql_edit_context.old_sql, sql_edit_context.new_sql)
element["data"]["content"] = new_ai_text
for element in edit_round["messages"]:
db_resp = json.loads(element["data"]["content"])
db_resp["thoughts"] = sql_edit_context.new_speak
db_resp["sql"] = sql_edit_context.new_sql
element["data"]["content"] = json.dumps(db_resp)
if element["type"] == "view":
api_call = ApiCall()
new_view_text = api_call.run_display_sql(new_ai_text, conn.run_to_df)
element["data"]["content"] = new_view_text
data_loader = DbDataLoader()
element["data"]["content"] = data_loader.get_table_view_by_conn(
conn.run_to_df(sql_edit_context.new_sql), sql_edit_context.new_speak
)
history_mem.update(history_messages)
return Result.succ(None)
return Result.faild(msg="Edit Faild!")

8
pilot/scene/chat_db/auto_execute/out_parser.py
View File

@ -24,7 +24,7 @@ class DbChatOutputParser(BaseOutputParser):
def parse_prompt_response(self, model_out_text):
clean_str = super().parse_prompt_response(model_out_text)
print("clean prompt response:", clean_str)
logging.info("clean prompt response:", clean_str)
response = json.loads(clean_str)
for key in sorted(response):
if key.strip() == "sql":
@ -43,16 +43,16 @@ class DbChatOutputParser(BaseOutputParser):
param["type"] = "response_table"
param["sql"] = prompt_response.sql
param["data"] = json.loads(df.to_json(orient='records', date_format='iso', date_unit='s'))
view_json_str = json.dumps(param, default=serialize)
view_json_str = json.dumps(param, default=serialize, ensure_ascii=False)
except Exception as e:
logger.error("parse_view_response error!" + str(e))
err_param = {}
err_param["sql"] = f'{prompt_response.sql}'
err_param["type"] = "response_table"
err_param["err_msg"] = str(e)
# err_param["err_msg"] = str(e)
err_param["data"] = []
err_msg = str(e)
view_json_str = json.dumps(err_param, default=serialize)
view_json_str = json.dumps(err_param, default=serialize, ensure_ascii=False)
api_call_element.text = view_json_str
result = ET.tostring(api_call_element, encoding="utf-8")

56
pilot/scene/chat_db/data_loader.py
View File

@ -1,13 +1,45 @@
class DbDataLoader:
def get_table_view_by_conn(self, data, speak):
import pandas as pd
import xml.etree.ElementTree as ET
import json
import logging
### tool out data to table view
if len(data) < 1:
data.insert(0, ["result"])
df = pd.DataFrame(data[1:], columns=data[0])
html_table = df.to_html(index=False, escape=False, sparsify=False)
table_str = "".join(html_table.split())
html = f"""<div class="w-full overflow-auto">{table_str}</div>"""
view_text = f"##### {str(speak)}" + "\n" + html.replace("\n", " ")
return view_text
from pilot.common.json_utils import serialize
class DbDataLoader:
def get_table_view_by_conn(self, data, speak, sql:str=None):
# import pandas as pd
#
# ### tool out data to table view
# if len(data) < 1:
# data.insert(0, ["result"])
# df = pd.DataFrame(data[1:], columns=data[0])
# html_table = df.to_html(index=False, escape=False, sparsify=False)
# table_str = "".join(html_table.split())
# html = f"""<div class="w-full overflow-auto">{table_str}</div>"""
# view_text = f"##### {str(speak)}" + "\n" + html.replace("\n", " ")
# return view_text
param = {}
api_call_element = ET.Element("chart-view")
err_msg = None
try:
param["type"] = "response_table"
param["sql"] = sql
param["data"] = json.loads(data.to_json(orient='records', date_format='iso', date_unit='s'))
view_json_str = json.dumps(param, default=serialize, ensure_ascii=False)
except Exception as e:
logging.error("parse_view_response error!" + str(e))
err_param = {}
err_param["sql"] = f'{sql}'
err_param["type"] = "response_table"
err_param["err_msg"] = str(e)
err_param["data"] = []
err_msg = str(e)
view_json_str = json.dumps(err_param, default=serialize, ensure_ascii=False)
api_call_element.text = view_json_str
result = ET.tostring(api_call_element, encoding="utf-8")
if err_msg:
return f"""{speak} \\n <span style=\"color:red\">ERROR!</span>{err_msg} \n {result.decode("utf-8")}"""
else:
return speak + "\n" + result.decode("utf-8")