Merge remote-tracking branch 'origin/dev_graph' into dev_graph

service/conversation_service.py

@@ -1,6 +1,6 @@
 import json
 from datetime import datetime
-
+import pandas as pd
 from db_util.db_main import Conversation, SqliteSqlalchemy
 import logging
 
@@ -73,7 +73,10 @@ def update_conversation(id: str, sql=None, question=None, chart_cfg=None, meta=N
             update_data['meta'] = meta
         if answer is not None:
             if isinstance(answer, dict):
-                answer = json.dumps(answer, ensure_ascii=False)
+                logger.info("answer dict")
+                answer_df = pd.DataFrame(answer)
+                answer = answer_df.to_json(orient='records', date_format='iso', force_ascii=False)
+                # answer = json.dumps(answer, ensure_ascii=False)
             update_data['answer'] = answer
         if update_data:
             result = session.query(Conversation).filter(Conversation.id == id).update(update_data)