From d38c9c7cb15902610f6ad686cf8d96d34f1ce44f Mon Sep 17 00:00:00 2001
From: yhjun1026 <460342015@qq.com>
Date: Mon, 20 Nov 2023 10:09:11 +0800
Subject: [PATCH] feat(ChatDB): ChatDB English Prompt fix
1.ChatDB English Promopt fix
---
.../chat_excel/excel_learning/prompt.py | 5 +++--
pilot/scene/chat_db/auto_execute/prompt.py | 19 ++++++++++---------
pilot/server/static/404.html | 2 +-
pilot/server/static/404/index.html | 2 +-
.../_buildManifest.js | 2 +-
.../_ssgManifest.js | 0
.../chunks/355a6ca7.6a7668307202b4ab.js | 1 -
.../chunks/355a6ca7.e6035af22360251e.js | 1 +
...4dfb5aaf8dc.js => 739.985aeeb0618c336c.js} | 10 +++++-----
.../static/chunks/807.785149fbf12a5b3e.js | 1 +
.../static/chunks/807.b9ae9e399a1aadfd.js | 1 -
...551ca268627.js => 955.57e88adf3b1ce473.js} | 2 +-
...3e4f571e60.js => _app-adf4129a63f6503c.js} | 0
...fa4a376095.js => chat-b1a399159cf29d92.js} | 2 +-
...1132926636.js => [id]-760bb41f43cab145.js} | 2 +-
.../pages/knowledge-dc52dba3c1c37db4.js | 1 +
.../pages/knowledge-fbe0df9d6a60a0b5.js | 1 -
...969e70dd.js => models-fa9ad76f43cc7a5f.js} | 2 +-
.../static/chunks/webpack-6db517c886de77b1.js | 1 -
.../static/chunks/webpack-ecc2c716f1bd7a10.js | 1 +
.../_next/static/css/c3ce27df7cf32302.css | 3 ---
.../_next/static/css/e5eb2fcb8d8c6645.css | 3 +++
pilot/server/static/agent/index.html | 2 +-
.../static/chat/[scene]/[id]/index.html | 2 +-
pilot/server/static/chat/index.html | 2 +-
pilot/server/static/database/index.html | 2 +-
pilot/server/static/index.html | 2 +-
.../server/static/knowledge/chunk/index.html | 2 +-
pilot/server/static/knowledge/index.html | 2 +-
pilot/server/static/models/index.html | 2 +-
pilot/server/static/prompt/index.html | 2 +-
pilot/test/test.db | 0
32 files changed, 41 insertions(+), 39 deletions(-)
rename pilot/server/static/_next/static/{8DLUDtzfrUUv_4HYlGW9p => 2q-l6r8HvaIRu4wIDc1Eu}/_buildManifest.js (56%)
rename pilot/server/static/_next/static/{8DLUDtzfrUUv_4HYlGW9p => 2q-l6r8HvaIRu4wIDc1Eu}/_ssgManifest.js (100%)
delete mode 100644 pilot/server/static/_next/static/chunks/355a6ca7.6a7668307202b4ab.js
create mode 100644 pilot/server/static/_next/static/chunks/355a6ca7.e6035af22360251e.js
rename pilot/server/static/_next/static/chunks/{564.159424dfb5aaf8dc.js => 739.985aeeb0618c336c.js} (77%)
create mode 100644 pilot/server/static/_next/static/chunks/807.785149fbf12a5b3e.js
delete mode 100644 pilot/server/static/_next/static/chunks/807.b9ae9e399a1aadfd.js
rename pilot/server/static/_next/static/chunks/{955.05e6f551ca268627.js => 955.57e88adf3b1ce473.js} (99%)
rename pilot/server/static/_next/static/chunks/pages/{_app-5048853e4f571e60.js => _app-adf4129a63f6503c.js} (100%)
rename pilot/server/static/_next/static/chunks/pages/{chat-12498cfa4a376095.js => chat-b1a399159cf29d92.js} (97%)
rename pilot/server/static/_next/static/chunks/pages/chat/[scene]/{[id]-39a3901132926636.js => [id]-760bb41f43cab145.js} (97%)
create mode 100644 pilot/server/static/_next/static/chunks/pages/knowledge-dc52dba3c1c37db4.js
delete mode 100644 pilot/server/static/_next/static/chunks/pages/knowledge-fbe0df9d6a60a0b5.js
rename pilot/server/static/_next/static/chunks/pages/{models-cb9ab490969e70dd.js => models-fa9ad76f43cc7a5f.js} (74%)
delete mode 100644 pilot/server/static/_next/static/chunks/webpack-6db517c886de77b1.js
create mode 100644 pilot/server/static/_next/static/chunks/webpack-ecc2c716f1bd7a10.js
delete mode 100644 pilot/server/static/_next/static/css/c3ce27df7cf32302.css
create mode 100644 pilot/server/static/_next/static/css/e5eb2fcb8d8c6645.css
create mode 100644 pilot/test/test.db
diff --git a/pilot/scene/chat_data/chat_excel/excel_learning/prompt.py b/pilot/scene/chat_data/chat_excel/excel_learning/prompt.py
index 205b9afba..d2d35b4c6 100644
--- a/pilot/scene/chat_data/chat_excel/excel_learning/prompt.py
+++ b/pilot/scene/chat_data/chat_excel/excel_learning/prompt.py
@@ -15,10 +15,11 @@
The following is part of the data of the user file {file_name}. Please learn to understand the structure and content of the data and output the parsing results as required:
{data_example}
Explain the meaning and function of each column, and give a simple and clear explanation of the technical terms， If it is a Date column, please summarize the Date format like: yyyy-MM-dd HH:MM:ss.
+Use the column name as the attribute name and the analysis explanation as the attribute value to form a json array and output it in the ColumnAnalysis attribute that returns the json content.
Please do not modify or translate the column names, make sure they are consistent with the given data column names.
-Provide some analysis options,please think step by step.
+Provide some useful analysis ideas to users from different dimensions for data.
-Please return your answer in JSON format, the return format is as follows:
+Please think step by step and give your answer. Make sure to answer only in JSON format，the format is as follows:
{response}
"""
diff --git a/pilot/scene/chat_db/auto_execute/prompt.py b/pilot/scene/chat_db/auto_execute/prompt.py
index 7aad683f5..3d7242624 100644
--- a/pilot/scene/chat_db/auto_execute/prompt.py
+++ b/pilot/scene/chat_db/auto_execute/prompt.py
@@ -20,10 +20,11 @@
{table_info}
Constraint:
- 1.Unless the user specifies in his question a specific number of examples he wishes to obtain, always limit your query to at most {top_k} results.
- 2.Please do not use columns that do not appear in the tables schema. Also be careful not to misunderstand the relationship between fields and tables in SQL.
- 3.Use as few tables as possible when querying.
- 4.Please check the correctness of the SQL and ensure that the query performance is optimized under correct conditions.
+ 1.Please understand the user's intention based on the user's question, and use the given table structure definition to create a grammatically correct {dialect} sql. If sql is not required, answer the user's question directly..
+ 2.Always limit the query to a maximum of {top_k} results unless the user specifies in the question the specific number of rows of data he wishes to obtain.
+ 3.You can only use the tables provided in the table structure information to generate sql. If you cannot generate sql based on the provided table structure, please say: "The table structure information provided is not enough to generate sql queries." It is prohibited to fabricate information at will.
+ 4.Please be careful not to mistake the relationship between tables and columns when generating SQL.
+ 5.Please check the correctness of the SQL and ensure that the query performance is optimized under correct conditions.
User Question:
{user_input}
@@ -41,11 +42,11 @@
{table_info}
约束:
- 1. 请理解用户意图根据用户输入问题，使用给出表结构定义创建一个语法正确的 {dialect} sql，如果不需要sql，则直接回答用户问题。
- 1. 除非用户在问题中指定了他希望获得的具体数据行数，否则始终将查询限制为最多 {top_k} 个结果。
- 2. 只能使用表结构信息中提供的表来生成 sql，如果无法根据提供的表结构中生成 sql ，请说：“提供的表结构信息不足以生成 sql 查询。” 禁止随意捏造信息。
- 3. 请注意生成SQL时不要弄错表和列的关系
- 4. 请检查SQL的正确性，并保证正确的情况下优化查询性能
+ 1. 请根据用户问题理解用户意图，使用给出表结构定义创建一个语法正确的 {dialect} sql，如果不需要sql，则直接回答用户问题。
+ 2. 除非用户在问题中指定了他希望获得的具体数据行数，否则始终将查询限制为最多 {top_k} 个结果。
+ 3. 只能使用表结构信息中提供的表来生成 sql，如果无法根据提供的表结构中生成 sql ，请说：“提供的表结构信息不足以生成 sql 查询。” 禁止随意捏造信息。
+ 4. 请注意生成SQL时不要弄错表和列的关系
+ 5. 请检查SQL的正确性，并保证正确的情况下优化查询性能
用户问题:
{user_input}
请一步步思考并按照以下JSON格式回复：
diff --git a/pilot/server/static/404.html b/pilot/server/static/404.html
index 27710ebef..eda6327dc 100644
--- a/pilot/server/static/404.html
+++ b/pilot/server/static/404.html
@@ -1 +1 @@
-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 27710ebef..eda6327dc 100644
--- a/pilot/server/static/404/index.html
+++ b/pilot/server/static/404/index.html
@@ -1 +1 @@
-404: This page could not be found
