任务报警

video_agc/agc_video.py

@@ -329,37 +329,39 @@ class AGC():
     @classmethod
     def video(cls, data, platform):
         mark_name = data['mark_name']  # 负责人
+        mark = data["mark"]  # 标示
+        if "-" in mark:
+            name = mark.split("-")[0]
+        else:
+            name = mark
         if platform == "爆款":
             pq_ids = data["pq_id"]
             pq_ids_list = pq_ids.split(',')  # 账号ID
-            mark = data["mark"]  # 标示
             feishu_id = data["feishu_id"]  # 飞书文档ID
             video_call = data["video_call"]  # 脚本sheet
             list_data = Material.get_allbk_data(feishu_id, video_call)
             if len(list_data) == 0:
-                Feishu.bot('recommend', 'AGC完成通知', f'{platform}任务数为0,不做拼接', mark, mark_name)
-                return mark
+                Feishu.bot('recommend', 'AGC完成通知', f'{platform}任务数为0,不做拼接', name, mark_name)
+                return
         elif platform == "常规":
             pq_ids = data["pq_id"]# 账号ID
             pq_ids_list = pq_ids.split(',')
-            mark = data["mark"]
             feishu_id = data["feishu_id"]  # 飞书文档ID
             video_call = data["video_call"]  # 脚本sheet
             video_count = data["video_count"]
             if int(video_count) == 0:
-                Feishu.bot('recommend', 'AGC完成通知', f'{platform}任务数为{video_count},不做拼接', mark, mark_name)
+                Feishu.bot('recommend', 'AGC完成通知', f'{platform}任务数为{video_count},不做拼接', name, mark_name)
                 return mark
             data_list, videos_mark = Material.get_all_data(feishu_id, video_call, mark)
             list_data = cls.get_unique_uid_data(data_list, int(video_count))
         elif platform == "跟随":
             pq_ids = data["pq_id"]
             pq_ids_list = pq_ids.split(',')  # 账号ID
-            mark = data["mark"]  # 标示
             feishu_id = data["feishu_id"]  # 飞书文档ID
             video_call = data["video_call"]
             video_count = data["video_count"]
             if int(video_count) == 0:
-                Feishu.bot('recommend', 'AGC完成通知', f'{platform}任务数为{video_count},不做拼接', mark, mark_name)
+                Feishu.bot('recommend', 'AGC完成通知', f'{platform}任务数为{video_count},不做拼接', name, mark_name)
                 return mark
             data_list, videos = Material.get_all_data(feishu_id, video_call, mark)
             list_data = cls.get_unique_uid_data(data_list, int(video_count))
@@ -372,11 +374,10 @@ class AGC():
             s_path, v_path, video_path_url, v_oss_path = cls.create_folders(mark)
 
             if pj_count == 10:
-                Feishu.bot('recommend', 'AGC拼接画面不足通知', f'视频画面不足，请即使补充！！', mark, mark_name)
+                Feishu.bot('recommend', 'AGC拼接画面不足通知', f'视频画面不足，请即使补充！！', name, mark_name)
                 return
             if count == len(list_data):
                 break
-        # for d_list in list_data:
             try:
                 d_list = list_data[count]
                 uid = d_list['uid']  # 音频id
@@ -391,7 +392,7 @@ class AGC():
                 srt_new = SRT.getSrt(int(uid))
                 Common.logger("video").info(f"S{mark}的{platform}渠道音频ID")
                 if error_count == 5:
-                    Feishu.bot('recommend', 'AGC异常通知', f'音频id为{uid},任务处理异常5次，该任务跳过，请检查格式！', mark, mark_name)
+                    Feishu.bot('recommend', 'AGC异常通知', f'音频id为{uid},任务处理异常5次，该任务跳过，请检查格式！', name, mark_name)
                     count += 1
                     continue
                 if srt_new:
@@ -408,7 +409,7 @@ class AGC():
                     count += 1
                     # 清空所有mp4数据
                     cls.clear_mp4_files(mark)
-                    Feishu.bot('recommend', 'AGC异常通知', f'{platform}任务下，{uid}音频格式填写该任务跳过，请关注', mark, mark_name)
+                    Feishu.bot('recommend', 'AGC异常通知', f'{platform}任务下，{uid}音频格式填写该任务跳过，请关注', name, mark_name)
                     continue
                 if platform != "常规":
                     if platform == "爆款":
@@ -448,8 +449,9 @@ class AGC():
                     else:
                         Common.logger("video").info(f"{mark}的{platform}渠道新视频生成失败")
                         continue
-                # 随机生成视频oss_id
                 pj_count = 0
+                error_count = 0
+                # 随机生成视频oss_id
                 oss_id = cls.random_id()
                 Common.logger("video").info(f"{mark}的{platform}渠道上传到 OSS 生成视频id为：{oss_id}")
                 oss_object_key = Oss.stitching_sync_upload_oss(v_oss_path, oss_id)
@@ -504,17 +506,13 @@ class AGC():
                         Feishu.insert_columns("IbVVsKCpbhxhSJtwYOUc8S1jnWb", "jd9qD9", "ROWS", 1, 2)
                         time.sleep(random_wait_time)
                         Feishu.update_values("IbVVsKCpbhxhSJtwYOUc8S1jnWb", "jd9qD9", "A2:Z2", values)
-                    error_count = 0
+
             except Exception as e:
                 error_count += 1
                 Common.logger("video").warning(f"{mark}的视频拼接失败:{e}\n")
                 # 清空所有mp4数据
                 cls.clear_mp4_files(mark)
                 continue
-        if "-" in mark:
-            name = mark.split("-")[0]
-        else:
-            name = mark
         Feishu.bot('recommend', 'AGC完成通知', f'今日{platform}任务拼接任务完成,共{count}条', name, mark_name)