diff --git a/pilot/openapi/api_v1/api_v1.py b/pilot/openapi/api_v1/api_v1.py
index 3af082026..45d00c13c 100644
--- a/pilot/openapi/api_v1/api_v1.py
+++ b/pilot/openapi/api_v1/api_v1.py
@@ -251,6 +251,7 @@ async def params_load(
### refresh messages
return Result.succ(get_hist_messages(conv_uid))
except Exception as e:
+ logger.error("excel load error!", e)
return Result.faild(code="E000X", msg=f"File Load Error {e}")
diff --git a/pilot/out_parser/base.py b/pilot/out_parser/base.py
index abd4d304b..1d6ab03be 100644
--- a/pilot/out_parser/base.py
+++ b/pilot/out_parser/base.py
@@ -207,7 +207,7 @@ class BaseOutputParser(ABC):
cleaned_output.strip()
.replace("\\n", " ")
.replace("\n", " ")
- .replace("\\", " ")
+ # .replace("\\", " ")
)
cleaned_output = self.__illegal_json_ends(cleaned_output)
return cleaned_output
diff --git a/pilot/scene/chat_dashboard/out_parser.py b/pilot/scene/chat_dashboard/out_parser.py
index 78f0318a3..cc31fe2bd 100644
--- a/pilot/scene/chat_dashboard/out_parser.py
+++ b/pilot/scene/chat_dashboard/out_parser.py
@@ -30,7 +30,7 @@ class ChatDashboardOutputParser(BaseOutputParser):
for item in response:
chart_items.append(
ChartItem(
- item["sql"], item["title"], item["thoughts"], item["showcase"]
+ item["sql"].replace("\\", " "), item["title"], item["thoughts"], item["showcase"]
)
)
return chart_items
diff --git a/pilot/scene/chat_data/chat_excel/excel_analyze/out_parser.py b/pilot/scene/chat_data/chat_excel/excel_analyze/out_parser.py
index 88cce3d68..f627a80c1 100644
--- a/pilot/scene/chat_data/chat_excel/excel_analyze/out_parser.py
+++ b/pilot/scene/chat_data/chat_excel/excel_analyze/out_parser.py
@@ -31,14 +31,14 @@ class ChatExcelOutputParser(BaseOutputParser):
response = json.loads(clean_str)
for key in sorted(response):
if key.strip() == "sql":
- sql = response[key]
+ sql = response[key].replace("\\", " ")
if key.strip() == "thoughts":
thoughts = response[key]
if key.strip() == "display":
display = response[key]
return ExcelAnalyzeResponse(sql, thoughts, display)
except Exception as e:
- raise ValueError(f"LLM Response Can't Parser! \n{ model_out_text}")
+ raise ValueError(f"LLM Response Can't Parser! \n")
def parse_view_response(self, speak, data) -> str:
### tool out data to table view
diff --git a/pilot/scene/chat_data/chat_excel/excel_reader.py b/pilot/scene/chat_data/chat_excel/excel_reader.py
index 7ac8b0d4e..4f373c8f9 100644
--- a/pilot/scene/chat_data/chat_excel/excel_reader.py
+++ b/pilot/scene/chat_data/chat_excel/excel_reader.py
@@ -14,6 +14,14 @@ def excel_colunm_format(old_name: str) -> str:
return new_column
+def add_quotes_ex(sql: str, column_names):
+ sql = sql.replace("`", '"')
+ for column_name in column_names:
+ if sql.find(column_name) != -1 and sql.find(f'"{column_name}"') == -1:
+ sql = sql.replace(column_name, f'"{column_name}"')
+ return sql
+
+
def add_quotes(sql, column_names=[]):
sql = sql.replace("`", "")
parsed = sqlparse.parse(sql)
@@ -28,12 +36,18 @@ def deep_quotes(token, column_names=[]):
for token_child in token.tokens:
deep_quotes(token_child, column_names)
else:
- if token.ttype == sqlparse.tokens.Name:
- if len(column_names) > 0:
- if token.value in column_names:
- token.value = f'"{token.value.replace("`", "")}"'
- else:
- token.value = f'"{token.value.replace("`", "")}"'
+ if token.value in column_names:
+ token.value = f'"{token.value.replace("`", "")}"'
+ elif token.ttype == sqlparse.tokens.Name:
+ token.value = f'"{token.value.replace("`", "")}"'
+
+
+if __name__ == "__main__":
+ sql = "SELECT `地区`, (`2021年人口` - `2001年人口`) / `2001年人口` * 100 AS `Population_Growth_Rate` FROM Generated_by_ChatExcel_table1 (2)"
+ if f'"Generated_by_ChatExcel_table1 (2)"' not in sql:
+ sql = sql.replace('Generated_by_ChatExcel_table1 (2)', f'"Generated_by_ChatExcel_table1 (2)"')
+ sql = add_quotes_ex(sql, ['地区', '地区代码', '2001年人口', '2006年人口', '2011年人口', '2016年人口', '2021年人口'])
+ print(f"excute sql:{sql}")
def is_chinese(string):
@@ -81,14 +95,14 @@ class ExcelReader:
# connect DuckDB
self.db = duckdb.connect(database=":memory:", read_only=False)
- self.table_name = file_name_without_extension
+ self.table_name = "excel_data"
# write data in duckdb
self.db.register(self.table_name, self.df)
def run(self, sql):
if f'"{self.table_name}"' not in sql:
sql = sql.replace(self.table_name, f'"{self.table_name}"')
- sql = add_quotes(sql, self.columns_map.values())
+ sql = add_quotes_ex(sql, self.columns_map.values())
print(f"excute sql:{sql}")
results = self.db.execute(sql)
colunms = []
diff --git a/pilot/scene/chat_db/auto_execute/out_parser.py b/pilot/scene/chat_db/auto_execute/out_parser.py
index 8a79bca33..1f36fe2ce 100644
--- a/pilot/scene/chat_db/auto_execute/out_parser.py
+++ b/pilot/scene/chat_db/auto_execute/out_parser.py
@@ -27,7 +27,7 @@ class DbChatOutputParser(BaseOutputParser):
response = json.loads(clean_str)
for key in sorted(response):
if key.strip() == "sql":
- sql = response[key]
+ sql = response[key].replace("\\", " ")
if key.strip() == "thoughts":
thoughts = response[key]
return SqlAction(sql, thoughts)
diff --git a/pilot/server/static/404.html b/pilot/server/static/404.html
index cda6129d2..eb5ecac4d 100644
--- a/pilot/server/static/404.html
+++ b/pilot/server/static/404.html
@@ -1 +1 @@
-404: This page could not be found
404
This page could not be found.
\ No newline at end of file
+404: This page could not be found
404
This page could not be found.
\ No newline at end of file
diff --git a/pilot/server/static/404/index.html b/pilot/server/static/404/index.html
index cda6129d2..eb5ecac4d 100644
--- a/pilot/server/static/404/index.html
+++ b/pilot/server/static/404/index.html
@@ -1 +1 @@
-404: This page could not be found
404
This page could not be found.
\ No newline at end of file
+404: This page could not be found