add log feedback

application/api/main.py

@@ -117,7 +117,9 @@ def user_feedback(input_data: FeedBackInput):
         return upvote_res
     else:
         downvote_res = service.user_feedback_downvote(input_data.data_profiles, user_id, session_id, input_data.query,
-                                                      input_data.query_intent, input_data.query_answer)
+                                                      input_data.query_intent, input_data.query_answer,
+                                                      input_data.error_description, input_data.error_categories,
+                                                      input_data.correct_sql_reference)
         return downvote_res
 
 

application/api/schemas.py

@@ -59,6 +59,9 @@ class FeedBackInput(BaseModel):
     query_answer: str
     session_id: str = "-1"
     user_id: str = "admin"
+    error_description: str = ""
+    error_categories: str = ""
+    correct_sql_reference: str = ""
 
 
 class Option(BaseModel):

application/api/service.py

@@ -4,6 +4,7 @@
 
 from nlq.business.connection import ConnectionManagement
 from nlq.business.datasource.factory import DataSourceFactory
+from nlq.business.log_feedback import FeedBackManagement
 from nlq.business.model import ModelManagement
 from nlq.business.nlq_chain import NLQChain
 from nlq.business.profile import ProfileManagement
@@ -297,26 +298,32 @@ def user_feedback_upvote(data_profiles: str, user_id: str, session_id: str, quer
 
 
 def user_feedback_downvote(data_profiles: str, user_id: str, session_id: str, query: str, query_intent: str,
-                           query_answer):
+                           query_answer, error_description="", error_categories="", correct_sql_reference=""):
     try:
+        error_info_dict = {
+            "error_description": error_description,
+            "error_categories": error_categories,
+            "correct_sql_reference": correct_sql_reference
+        }
+        error_info = json.dumps(error_info_dict, ensure_ascii=False)
         if query_intent == "normal_search":
             log_id = generate_log_id()
             current_time = get_current_time()
-            LogManagement.add_log_to_database(log_id=log_id, user_id=user_id, session_id=session_id,
+            FeedBackManagement.add_log_to_database(log_id=log_id, user_id=user_id, session_id=session_id,
                                               profile_name=data_profiles,
                                               sql=query_answer, query=query,
                                               intent="normal_search_user_downvote",
-                                              log_info="",
+                                              log_info=error_info,
                                               time_str=current_time,
                                               log_type="feedback_downvote")
         elif query_intent == "agent_search":
             log_id = generate_log_id()
             current_time = get_current_time()
-            LogManagement.add_log_to_database(log_id=log_id, user_id=user_id, session_id=session_id,
+            FeedBackManagement.add_log_to_database(log_id=log_id, user_id=user_id, session_id=session_id,
                                               profile_name=data_profiles,
                                               sql=query_answer, query=query,
                                               intent="agent_search_user_downvote",
-                                              log_info="",
+                                              log_info=error_info,
                                               time_str=current_time,
                                               log_type="feedback_downvote")
         return True

application/nlq/business/connection.py

@@ -1,8 +1,9 @@
-import logging
+
 from nlq.data_access.dynamo_connection import ConnectConfigDao, ConnectConfigEntity
 from nlq.data_access.database import RelationDatabase
+from utils.logging import getLogger
 
-logger = logging.getLogger(__name__)
+logger = getLogger()
 
 
 class ConnectionManagement:

application/nlq/business/log_feedback.py

@@ -0,0 +1,18 @@
+import json
+import logging
+
+from nlq.data_access.dynamo_query_log import DynamoQueryLogDao
+from utils.logging import getLogger
+
+logger = getLogger()
+
+
+class FeedBackManagement:
+    dynammo_log_dao = DynamoQueryLogDao()
+
+    @classmethod
+    def add_log_to_database(cls, log_id, user_id, session_id, profile_name, sql, query, intent, log_info, time_str,
+                            log_type='chat_history'):
+        cls.dynammo_log_dao.add_log(log_id=log_id, profile_name=profile_name, user_id=user_id, session_id=session_id,
+                                  sql=sql, query=query, intent=intent, log_info=log_info, time_str=time_str,
+                                  log_type=log_type)

application/nlq/business/log_store.py

@@ -1,9 +1,9 @@
 import json
-import logging
 
 from nlq.data_access.opensearch_query_log import OpenSearchQueryLogDao
+from utils.logging import getLogger
 
-logger = logging.getLogger(__name__)
+logger = getLogger()
 
 
 class LogManagement:

application/nlq/business/model.py

@@ -1,7 +1,8 @@
-import logging
+
 from nlq.data_access.dynamo_model import ModelConfigDao, ModelConfigEntity
+from utils.logging import getLogger
 
-logger = logging.getLogger(__name__)
+logger = getLogger()
 
 
 class ModelManagement:

application/nlq/business/profile.py

@@ -1,7 +1,8 @@
-import logging
+
 from nlq.data_access.dynamo_profile import ProfileConfigDao, ProfileConfigEntity
+from utils.logging import getLogger
 
-logger = logging.getLogger(__name__)
+logger = getLogger()
 
 class ProfileManagement:
     profile_config_dao = ProfileConfigDao()

application/nlq/business/vector_store.py

@@ -1,14 +1,14 @@
-import logging
-import os
+
 import boto3
 import json
 from nlq.data_access.opensearch import OpenSearchDao
 from utils.env_var import BEDROCK_REGION, AOS_HOST, AOS_PORT, AOS_USER, AOS_PASSWORD, opensearch_info, \
     SAGEMAKER_ENDPOINT_EMBEDDING
 from utils.env_var import bedrock_ak_sk_info
 from utils.llm import invoke_model_sagemaker_endpoint
+from utils.logging import getLogger
 
-logger = logging.getLogger(__name__)
+logger = getLogger()
 
 
 class VectorStore: