kevin.yang 6 months ago
parent
commit
9a4f86f635
4 changed files with 17 additions and 12 deletions
  1. 3 2
      analyze_video.py
  2. 2 2
      common/redis.py
  3. 7 4
      job_video_processing.py
  4. 5 4
      video_processing/video_processing.py

+ 3 - 2
analyze_video.py

@@ -1,6 +1,7 @@
 import uvicorn
 from fastapi import FastAPI
 from pydantic import BaseModel
+from loguru import logger
 from google_ai.generativeai_video import main
 
 app = FastAPI()
@@ -23,7 +24,7 @@ async def process_video(request: VideoRequest):
     mark = request.mark
     sample_data = request.sample_data
     try:
-        print("来一个请求,使用 API key:", api_key)
+        logger.info("来一个请求,使用 API key:", api_key)
         result = await main(video_path, api_key, prompt, sample_data)
         return {
             "code": 0,
@@ -32,7 +33,7 @@ async def process_video(request: VideoRequest):
             "mark": str(mark)
         }
     except Exception as e:
-        print(f"处理失败: {str(e)}")
+        logger.error(f"处理失败: {str(e)}")
         return {
             "code": 1,
             "message": f"处理失败: {e}",

+ 2 - 2
common/redis.py

@@ -16,8 +16,8 @@ class SyncRedisHelper:
     def _get_pool(self) -> redis.ConnectionPool:
         if self._pool is None:
             self._pool = redis.ConnectionPool(
-                # host="r-bp1mb0v08fqi4hjffupd.redis.rds.aliyuncs.com",  # 外网地址
-                host="r-bp1mb0v08fqi4hjffu.redis.rds.aliyuncs.com",  # 内网地址
+                host="r-bp1mb0v08fqi4hjffupd.redis.rds.aliyuncs.com",  # 外网地址
+                # host="r-bp1mb0v08fqi4hjffu.redis.rds.aliyuncs.com",  # 内网地址
                 port=6379,
                 db=0,
                 password="Wqsd@2019",

+ 7 - 4
job_video_processing.py

@@ -1,5 +1,8 @@
 import time
 from concurrent.futures import ThreadPoolExecutor
+
+from loguru import logger
+
 from video_processing.video_processing import VideoProcessing
 
 max_workers = 1  # 最大线程数
@@ -22,7 +25,7 @@ def video_ai_task_start():
                         task_index = 0
                     time.sleep( 1 )
                 except Exception as e:
-                    print( f"异常信息: {e}" )
+                    logger.error( f"异常信息: {e}" )
                     time.sleep(1)
             else:
                 time.sleep(1)
@@ -30,13 +33,13 @@ def video_ai_task_start():
 
 def process_video_ai(redis_task):
     try:
-        print( f"开始执行任务: {redis_task}" )
+        logger.info( f"开始执行任务: {redis_task}" )
         video_processor = VideoProcessing()
         video_processor.get_video( redis_task )
-        print( f"执行完成: {redis_task}" )
+        logger.success( f"执行完成: {redis_task}" )
         time.sleep( 1 )  # 模拟处理时间
     except Exception as e:
-        print( f"处理任务时出现异常: {e}" )
+        logger.error( f"处理任务时出现异常: {e}" )
         time.sleep( 1 )  # 出现异常时,等待5秒再处理
 
 

+ 5 - 4
video_processing/video_processing.py

@@ -3,6 +3,7 @@ import time
 
 import requests
 import json
+from loguru import logger
 
 from common.aliyun_log import AliyunLogger
 from common.redis import get_video_data
@@ -68,14 +69,14 @@ class VideoProcessing:
             cleaned_string = result.replace( "```json", '' ).replace( "```", '' ).strip()
             return cleaned_string, str(mark)
         except Exception as e:
-            print(f"视频请求异常:{e}")
+            logger.error(f"视频请求异常:{e}")
             return None
 
 
     def get_video(self, redis_task):
         video_data = get_video_data(redis_task)
         if not video_data:
-            print("没有获取到视频内容")
+            logger.info("没有获取到视频内容")
             time.sleep(5)
             return
         # 解码为字符串
@@ -88,10 +89,10 @@ class VideoProcessing:
         video_path = data_json['video_path']
         type = data_json['type']
         partition = data_json['partition']
-        print(video_path)
+        logger.info(video_path)
         data, mark = self.get_ai_data(video_path)
         AliyunLogger.logging(str(video_id), title, video_path, mark, type, partition, data)
-        print("写入日志成功")
+        logger.success("写入日志成功")