fix: add retry (#260)

fix #255

Author: timerring

settings.toml

@@ -27,11 +27,11 @@ reserve_for_fixing = false # If encounter MOOV crash error, delete the video or
 upload_line = "auto" # The upload line to be used, default None is auto detect(recommended), if you want to specify, it can be "bldsa", "ws", "tx", "qn", "bda2".
 
 [slice]
-auto_slice = false # General control
+auto_slice = false # General control: true or false
 slice_duration = 60 # better not exceed 300 seconds
-slice_num = 2
-slice_overlap = 30
-slice_step = 1
+slice_num = 2 # the number of slices
+slice_overlap = 30 # the overlap of slices(seconds) see my package https://github.com/timerring/auto-slice-video for more details
+slice_step = 1 # the step of slices(seconds)
 min_video_size = 200 # The minimum video size to be sliced (MB)
 mllm_model = "gemini" # the multi-model LLMs, can be "gemini" or "zhipu" or "qwen"
 zhipu_api_key = "" # Apply for your own GLM-4v-Plus API key at https://www.bigmodel.cn/invite?icode=shBtZUfNE6FfdMH1R6NybGczbXFgPRGIalpycrEwJ28%3D

src/db/conn.py

@@ -1,7 +1,6 @@
 import sqlite3
 import os
 
-# DATA_BASE_FILE ='./data.db'
 DATA_BASE_FILE = os.path.join(os.path.dirname(os.path.abspath(__file__)), 'data.db')
 
 def connect():
@@ -122,4 +121,4 @@ def delete_all_queue():
     # Get the single upload queue after delete, should be None
     # print(get_single_upload_queue())
     # Delete all queue
-    delete_all_queue()
+    # delete_all_queue()

src/log/retry.py

@@ -0,0 +1,40 @@
+from time import sleep
+from src.log.logger import scan_log
+from typing import Any, Tuple
+
+class Retry:
+    def __init__(self, max_retry: int, interval: int = 5, check_func = lambda r: r,  default = None):
+        '''retry the function and check the return value
+        Args:
+            max_retry: the maximum of retries
+            interval: the interval of retries
+            check_func: the function to check the return value
+            default: the default return value
+        
+        Return:
+            status: the status of the excution of the function
+            return_value: the return value of the function
+        '''
+        self.max_retry = max_retry
+        self.check_func = check_func
+        self.interval = interval
+        self.default = default
+
+    def run(self, func, *args, **kwargs) -> Tuple[bool, Any]:
+        status = (False, self.default)
+        for i in range(0, self.max_retry):
+            try:
+                return_value = func(*args, **kwargs)
+                if self.check_func(return_value):
+                    status = (True,return_value)
+                    break
+            except Exception as e:
+                scan_log.error(f"Exceptions in trial {i+1}/{self.max_retry} : {e}")
+                sleep(self.interval)
+
+        return status
+
+    def decorator(self, func):
+        def _(*args, **kwargs):
+            return self.run(func, *args, **kwargs)[1]
+        return _

src/upload/upload.py

@@ -9,18 +9,17 @@
 from src.upload.extract_video_info import generate_title
 from src.log.logger import upload_log
 import time
-import fcntl
 from concurrent.futures import ThreadPoolExecutor, as_completed
 from db.conn import get_single_upload_queue, delete_upload_queue, update_upload_queue_lock, get_single_lock_queue
-import threading
 from .bilitool.bilitool import UploadController, FeedController, LoginController
+from src.log.retry import Retry
 
-# read_lock = threading.Lock()
-
+@Retry(max_retry = 3, interval = 5).decorator
 def upload_video(upload_path):
     try:
         if upload_path.endswith('.flv'):
             copyright, title, tid, tag = generate_slice_data(upload_path)
+            yaml, desc, source, cover, dynamic = ("",) * 5
             if title is None:
                 upload_log.error("Fail to upload slice video, the files will be reserved.")
                 update_upload_queue_lock(upload_path, 0)
@@ -33,6 +32,7 @@ def upload_video(upload_path):
             upload_log.info("Upload successfully, then delete the video")
             os.remove(upload_path)
             delete_upload_queue(upload_path)
+            return True
         else:
             upload_log.error("Fail to upload, the files will be reserved.")
             update_upload_queue_lock(upload_path, 0)
@@ -43,6 +43,7 @@ def upload_video(upload_path):
         update_upload_queue_lock(upload_path, 0)
         return False
 
+@Retry(max_retry = 3, interval = 5).decorator
 def append_upload(upload_path, bv_result):
     try:
         result = UploadController().append_video_entry(upload_path, bv_result, cdn=UPLOAD_LINE)
@@ -51,6 +52,7 @@ def append_upload(upload_path, bv_result):
             upload_log.info("Upload successfully, then delete the video")
             os.remove(upload_path)
             delete_upload_queue(upload_path)
+            return True
         else:
             upload_log.error("Fail to append, the files will be reserved.")
             update_upload_queue_lock(upload_path, 0)
@@ -92,19 +94,22 @@ def read_append_and_delete_lines():
         if upload_queue:  
             video_path = upload_queue['video_path']
             time.sleep(3) # avoid JIT read error
-            query = generate_title(video_path)
-            if query is None: # JIT read error or MOOV crash error or interrupted error
-                if not os.path.exists(video_path):
-                    # Interrupted error, the file has been uploaded. But record is not deleted.
-                    delete_upload_queue(video_path) # Directly delete the record
-                    continue
-                else:
-                    # JIT read error or MOOV crash error
-                    upload_log.error(f"Error occurred in ffprobe: {video_path}")
-                    update_upload_queue_lock(video_path, 1) # Lock first, wait for the lock execute round
-                    continue
-            upload_log.info(f"deal with {video_path}")
-            video_gate(video_path)
+            if video_path.endswith('.flv'):
+                video_gate(video_path)
+            else:
+                query = generate_title(video_path)
+                if query is None: # JIT read error or MOOV crash error or interrupted error
+                    if not os.path.exists(video_path):
+                        # Interrupted error, the file has been uploaded. But record is not deleted.
+                        delete_upload_queue(video_path) # Directly delete the record
+                        continue
+                    else:
+                        # JIT read error or MOOV crash error
+                        upload_log.error(f"Error occurred in ffprobe: {video_path}")
+                        update_upload_queue_lock(video_path, 1) # Lock first, wait for the lock execute round
+                        continue
+                upload_log.info(f"deal with {video_path}")
+                video_gate(video_path)
         elif lock_queue:
             # check the lock video
             video_path = lock_queue['video_path']