返回的排片结果使用json格式

ai/utils/basic_func.py

@@ -196,6 +196,14 @@ def data_cleansing(data: str):
     return data.replace('，', ',').replace('影厅 id', '影厅id').replace('本地影片 id', '本地影片id').replace(', ', ',')
 
 
+def json_to_csv(data:list):
+    csv_list = ['影厅别名,影厅id,影片别名,本地影片id,语言,放映日期,开始时间,结束时间,片长,场间', ]
+    for d in data:
+        csv_list.append(
+            f"{d['hall_name']},{d['hall_id']},{d['movie_alias']},{d['movie_id']},{d['language']},{d['show_date']},{d['start']},{d['end']},{d['length']},{d['duration']}")
+    return '\n'.join(csv_list)
+
+
 # 获取排片数据的起始和结束日期
 def get_report_date():
     start_date = datetime.datetime.strftime(

ai/utils/show_process.py

@@ -60,11 +60,15 @@ def show_main_process(zz_code=None, day_delta=None):
             else:
                 result_obj = json.loads(result.strip())
 
+            show_result = result_obj['show']
             # 预测排片数据
-            _show = result_obj['show'].replace('```', '').replace('csv', '').strip()
+            if isinstance(show_result, list):
+                show = json_to_csv(show_result)
+            else:
+                show = data_cleansing(show_result.replace('```', '').replace('csv', '').strip())
 
             # 预测销售数据
-            _sales = str(result_obj['income']).strip()
+            sales = str(result_obj['income']).strip()
 
             # 处理返回结果
             try:
@@ -78,8 +82,8 @@ def show_main_process(zz_code=None, day_delta=None):
                     template=template_show,
                     temp_date=template_date,
                     target=target_show,
-                    show=data_cleansing(_show),
+                    show=show,
-                    sales=_sales,
+                    sales=sales,
                     prompt=prompt,
                     result=result,
                     message=message,
@@ -124,10 +128,15 @@ def show_manual_process(zz_code: str, show_date: str, prompt: str):
         result_obj = json.loads(result.strip())
 
     # 预测排片数据
-    _show = result_obj['show'].replace('```', '').replace('csv', '').strip()
+    show_result = result_obj['show']
+    # 预测排片数据
+    if isinstance(show_result, list):
+        show = json_to_csv(show_result)
+    else:
+        show = data_cleansing(show_result.replace('```', '').replace('csv', '').strip())
 
     # 预测销售数据
-    _sales = str(result_obj['income']).strip()
+    sales = str(result_obj['income']).strip()
 
     # 处理返回结果
     try:
@@ -141,8 +150,8 @@ def show_manual_process(zz_code: str, show_date: str, prompt: str):
             template=template_show,
             temp_date=template_date,
             target=target_show,
-            show=data_cleansing(_show),
+            show=show,
-            sales=_sales,
+            sales=sales,
             prompt=prompt,
             result=result,
             message=message,