调试

agc_main.py

@@ -1,4 +1,4 @@
-from common import Feishu, Material
+from common import Feishu, Material, Common
 from common.sql_help import sqlHelp
 from video_agc.agc_video_method import AgcVidoe
 import concurrent.futures
@@ -8,21 +8,34 @@ import time
 
 
 # 记录今天已经返回的用户名
-returned_usernames_today = set()
+returned_usernames_today = []
 def video_start(user_data):
     global returned_usernames_today
     user_data_mark = user_data["mark"]
     # 开始准备执行生成视频脚本
     if user_data_mark is not None and user_data_mark in returned_usernames_today:
+        Common.logger("video").info(f"视频脚本参数中的用户名 {user_data_mark} 今天已经返回过，不再启动线程。今天已经返回的用户名：{returned_usernames_today}")
         print(f"视频脚本参数中的用户名 {user_data_mark} 今天已经返回过，不再启动线程。")
         return  # 如果返回了某个用户名，并且今天已经返回过，则不启动线程
-    elif user_data_mark is not None:
+    else:
         print(f"视频脚本参数{user_data}")
         mark = AgcVidoe.video_stitching(user_data)
+        print(f"返回用户名{mark}")
         if mark:
-            returned_usernames_today.add(mark)
+            Common.logger("video").info(f"返回用户名{mark}")
+            returned_usernames_today.append(returned_usernames_today)
 
 
+def job_feishu_bot():
+    name_list = Material.feishu_name()
+    count_list = sqlHelp.get_count_list(name_list)
+    Feishu.bot('recommend', 'AGC视频', f'{"".join(count_list)}', 'all')
+    print("机器人通知完成")
+
+def clear_returned_usernames():
+    returned_usernames_today.clear()
+    print("returned_usernames_today 已清空")
+
 # 定义定时任务
 def video_task():
     print("开始执行生成视频脚.")
@@ -36,17 +49,14 @@ def video_task():
             result = future.result()
             print("处理结果:", result)
     print("执行生成视频脚结束")
-schedule.every(10).minutes.do(video_task)
 
-# 每天0点清空集合
-schedule.every().day.at("00:00").do(lambda: returned_usernames_today.clear())
+# 每天0点10清空集合
+schedule.every().day.at("00:10").do(clear_returned_usernames)
+
+#每10分钟执行次脚本
+schedule.every(10).minutes.do(video_task)
 
 
-def job_feishu_bot():
-    name_list = Material.feishu_name()
-    count_list = sqlHelp.get_count_list(name_list)
-    Feishu.bot('recommend', 'AGC视频', f'{"".join(count_list)}', 'all')
-    print("机器人通知完成")
 
 
 # 每天下午1:30执行任务
@@ -59,4 +69,3 @@ while True:
 # list = Material.feishu_list()
 # AgcVidoe.video_stitching(list)
 # print(list)
-

data_main.py

@@ -47,14 +47,15 @@ def kuanshou_task():
 # schedule.every(2).minutes.do(douyin_task)
 #
 # schedule.every(2).minutes.do(kuanshou_task)
+douyin_task()
+kuanshou_task()
+# schedule.every(10).hours.do(douyin_task)
+#
+# schedule.every(11).hours.do(kuanshou_task)
 
-schedule.every(10).hours.do(douyin_task)
-
-schedule.every(11).hours.do(kuanshou_task)
-
-# 持续运行，直到手动终止
-while True:
-    schedule.run_pending()
-    time.sleep(1)
+# # 持续运行，直到手动终止
+# while True:
+#     schedule.run_pending()
+#     time.sleep(1)
 
 

extract_data/kuaishou/kuaishou_author.py

@@ -113,6 +113,7 @@ class kuaishouAuthor():
                         Common.logger("kuaishou").info(
                             f"接口请求失败，请更换cookie，{response.status_code}")
                         Feishu.bot('recommend', '快手', f'{mark}:快手cookie失效，请及时更换～', mark)
+                        time.sleep(600)
                         return
                     elif "feeds" not in response.json()["data"]["visionProfilePhotoList"]:
                         Common.logger("kuaishou").info(
@@ -122,6 +123,7 @@ class kuaishouAuthor():
                         Common.logger("kuaishou").info(
                             f'数据为空{response.json()["data"]["visionProfilePhotoList"]["feeds"]}')
                         Feishu.bot('recommend', '快手', f'{mark}:快手cookie失效，请及时更换～', mark)
+                        time.sleep(600)
                         break
                     pcursor = response.json()['data']['visionProfilePhotoList']['pcursor']
                     feeds = response.json()['data']['visionProfilePhotoList']['feeds']

video_agc/agc_video_method.py

@@ -314,7 +314,7 @@ class AgcVidoe():
                 elif platform == "koubo":
                     link = result[1][0]
                     limit_count = 1
-                    if kb_count >= count or kb_count == 0:
+                    if count >= kb_count or kb_count == 0:
                         Feishu.bot('recommend', 'AGC完成通知', '今日自制视频拼接任务完成啦～', mark)
                         return mark
                 # 获取音频类型+字幕+标题