merge code for main

.gitignore

@@ -120,7 +120,6 @@ celerybeat.pid
 *.sage.py
 
 # Environments
-.env
 .venv
 env/
 venv/

README.md

@@ -5,6 +5,8 @@ This is a comprehensive framework designed to enable Generative BI capabilities
 - Text-to-SQL functionality for querying customized data sources using natural language.
 - User-friendly interface for adding, editing, and managing data sources, tables, and column descriptions.
 - Performance enhancement through the integration of historical question-answer ranking and entity recognition.
+- Customize business information, including entity information, formulas, SQL samples, and analysis ideas for complex business problems.
+- Add agent task splitting function to handle complex attribution analysis problems.
 - Intuitive question-answering UI that provides insights into the underlying Text-to-SQL mechanism.
 - Simple agent design interface for handling complex queries through a conversational approach.
 
@@ -50,10 +52,17 @@ After the role is created, and then add permission by creating inline policy as
             "Sid": "VisualEditor0",
             "Effect": "Allow",
             "Action": [
-                "bedrock:*",
-                "dynamodb:*"
+                "bedrock:InvokeModel",
+                "bedrock:InvokeModelWithResponseStream",
+                "dynamodb:*Table",
+                "dynamodb:*Item",
+                "dynamodb:Scan",
+                "dynamodb:Query"
             ],
-            "Resource": "*"
+            "Resource": [
+                "arn:aws:bedrock:us-west-2::foundation-model/*",
+                "arn:aws:dynamodb:us-west-2:**YOURACCOUNTID**:table/Nlq*"
+            ]
         }
     ]
 }
@@ -171,7 +180,7 @@ the default account is
 
 ```
 username: admin
-password: awsadmin
+password: # Please set the password following instructions below
 ```
 
 if you want change the password or add username, you can change the 
@@ -203,8 +212,8 @@ preauthorized:
 change the password to hashed password
 
 ```python
-import streamlit_authenticator as stauth
-hashed_passwords = stauth.Hasher(['abc', 'def']).generate()
+from streamlit_authenticator.utilities.hasher import Hasher
+hashed_passwords = Hasher(['abc', 'def']).generate()
 ```
 
 

README_CN.md

@@ -7,6 +7,8 @@
 - 通过自然语言查询自定义数据源的Text-to-SQL功能。
 - 用户友好的界面,可添加、编辑和管理数据源、表和列描述。
 - 通过集成历史问题答案排名和实体识别来提高性能。
+- 自定义业务信息，包括实体信息，公式，SQL样本，复杂业务问题分析思路等。
+- 增加agent任务拆分功能，能够处理复杂的归因分析问题。
 - 直观的问答界面,可深入了解底层的Text-to-SQL机制。
 - 简单的代理设计界面,可通过对话方式处理复杂查询。
 
@@ -163,7 +165,7 @@ docker exec nlq-webserver python opensearch_deploy.py custom false
 
 ```
 username: admin
-password: awsadmin
+password: # 请按照以下教程设定密码
 ```
 
 如果你想修改密码或者增加用户，可以修改如下文件
@@ -196,8 +198,8 @@ preauthorized:
 密码需要从明文转换成哈希过之后的密码，可以通过如下方式，获取
 
 ```python
-import streamlit_authenticator as stauth
-hashed_passwords = stauth.Hasher(['abc', 'def']).generate()
+from streamlit_authenticator.utilities.hasher import Hasher
+hashed_passwords = Hasher(['abc', 'def']).generate()
 ```
 
 

application/api/enum.py

@@ -21,4 +21,5 @@ def get_message(self):
 class ContentEnum(Enum):
     EXCEPTION = "exception"
     COMMON = "common"
+    STATE = "state"
     END = "end"

application/api/schemas.py

@@ -11,15 +11,15 @@ class Question(BaseModel):
     agent_cot_flag: bool = True
     profile_name: str = "shopping-demo"
     explain_gen_process_flag: bool = True
-    gen_suggested_question_flag: bool = True
+    gen_suggested_question_flag: bool = False
+    answer_with_insights: bool = False
     top_k: float = 250
     top_p: float = 0.9
     max_tokens: int = 2048
     temperature: float = 0.01
-
-
-class QuestionSocket(Question):
-    session_id: str
+    context_window: int = 3
+    session_id: str = "-1"
+    user_id: str = "admin"
 
 
 class Example(BaseModel):
@@ -28,13 +28,6 @@ class Example(BaseModel):
     answer: str
 
 
-# class Answer(BaseModel):
-#     examples: list[Example]
-#     sql: str
-#     sql_explain: str
-#     sql_query_result: list[Any]
-
-
 class QueryEntity(BaseModel):
     query: str
     sql: str
@@ -45,7 +38,7 @@ class FeedBackInput(BaseModel):
     data_profiles: str
     query: str
     query_intent: str
-    query_answer_list: list[QueryEntity]
+    query_answer: str
 
 
 class Option(BaseModel):
@@ -57,21 +50,23 @@ class CustomQuestion(BaseModel):
     custom_question: list[str]
 
 
+class ChartEntity(BaseModel):
+    chart_type: str
+    chart_data: list[Any]
+
+
 class SQLSearchResult(BaseModel):
     sql: str
     sql_data: list[Any]
     data_show_type: str
     sql_gen_process: str
     data_analyse: str
+    sql_data_chart: list[ChartEntity]
 
 
 class TaskSQLSearchResult(BaseModel):
     sub_task_query: str
-    sql: str
-    sql_data: list[Any]
-    data_show_type: str
-    sql_gen_process: str
-    data_analyse: str
+    sql_search_result: SQLSearchResult
 
 
 class KnowledgeSearchResult(BaseModel):