调试

analyze_video.py

@@ -11,33 +11,33 @@ class VideoRequest(BaseModel):
     prompt: str
     mark: str
     sample_data: str
-
-@app.post("/process_video_test/")
-async def process_video_test(request: VideoRequest):
-    """处理视频请求"""
-    video_path = request.video_path
-    prompt = request.prompt
-    mark = request.mark
-    sample_data = request.sample_data
-
-    api_key = "AIzaSyB2kjF2-S2B5cJiosx_LpApd227w33CVvs"
-    try:
-        print("来一个请求，使用 API key:", api_key)
-        result, mark = await main(video_path, api_key, prompt, mark, sample_data)
-        return {
-            "code": 0,
-            "message": "视频处理成功",
-            "result": result,
-            "mark": mark
-        }
-    except Exception as e:
-        print(f"视频处理失败: {str(e)}")
-        return {
-            "code": 1,
-            "message": f"视频处理失败: {e}",
-            "result": f"视频处理失败: {e}",
-            "mark": f"视频处理失败: {e}"
-        }
+#
+# @app.post("/process_video_test/")
+# async def process_video_test(request: VideoRequest):
+#     """处理视频请求"""
+#     video_path = request.video_path
+#     prompt = request.prompt
+#     mark = request.mark
+#     sample_data = request.sample_data
+#
+#     api_key = "AIzaSyB2kjF2-S2B5cJiosx_LpApd227w33CVvs"
+#     try:
+#         print("来一个请求，使用 API key:", api_key)
+#         result = await main(video_path, api_key, prompt, mark, sample_data)
+#         return {
+#             "code": 0,
+#             "message": "视频处理成功",
+#             "result": result,
+#             "mark": mark
+#         }
+#     except Exception as e:
+#         print(f"视频处理失败: {str(e)}")
+#         return {
+#             "code": 1,
+#             "message": f"处理失败: {e}",
+#             "result": f"处理失败: {e}",
+#             "mark": f"处理失败: {e}"
+#         }
 
 @app.post("/process_video/")
 async def process_video(request: VideoRequest):
@@ -51,20 +51,20 @@ async def process_video(request: VideoRequest):
     api_key_index = (api_key_index + 1) % len(api_keys)
     try:
         print("来一个请求，使用 API key:", api_key)
-        result, mark = await main(video_path, api_key, prompt, mark, sample_data)
+        result = await main(video_path, api_key, prompt, mark, sample_data)
         return {
             "code": 0,
             "message": "视频处理成功",
             "result": result,
-            "mark": mark
+            "mark": str(mark)
         }
     except Exception as e:
-        print(f"视频处理失败: {str(e)}")
+        print(f"处理失败: {str(e)}")
         return {
             "code": 1,
-            "message": f"视频处理失败: {e}",
-            "result": f"视频处理失败: {e}",
-            "mark": f"视频处理失败: {e}"
+            "message": f"处理失败: {e}",
+            "result": f"处理失败: {e}",
+            "mark": f"处理失败: {e}"
         }
 
 

google_ai/generativeai_video.py

@@ -155,12 +155,12 @@ async def main(video_path, api_key, prompt, mark, sample_data):
             upload_response = await analyzer.upload_video( save_path )
             if upload_response:
                 await analyzer.delete_video()
-                return upload_response, mark
+                return upload_response
             # 创建缓存模型
             model =await analyzer.create_cache()
             if isinstance( model, str ):
                 await analyzer.delete_video()
-                return model, mark
+                return model
             print("创建缓存模型成功")
             # sample_data = {
             #     "一、基础信息": {
@@ -198,14 +198,14 @@ async def main(video_path, api_key, prompt, mark, sample_data):
             response =await analyzer.analyze_video( model, prompt, sample_data )
             if isinstance( response, str ):
                 await analyzer.delete_video()
-                return response, mark
+                return response
             print( response.usage_metadata )
             print(response.text)
             if os.path.exists( save_path ):
                 os.remove( save_path )
                 print( f"文件已删除: {save_path}" )
             await analyzer.delete_video()
-            return response.text, mark
+            return response.text
         except Exception as e:
             attempt += 1  # 增加尝试次数
             if attempt < max_attempts:
@@ -213,7 +213,7 @@ async def main(video_path, api_key, prompt, mark, sample_data):
             else:
                 print( "达到最大重试次数，处理失败" )
                 Common.logger( "ai" ).info( f'视频分析处理失败异常信息{e}' )
-                return f"视频分析处理失败:{e}", None
+                return f"视频分析处理失败:{e}"
 
 
 if __name__ == "__main__":

video_processing/video_processing.py

@@ -76,6 +76,7 @@ class VideoProcessing:
             return
         # 解码为字符串
         data_str = video_data.decode( 'utf-8' )
+
         # 解析为 JSON 对象
         data_json = json.loads( data_str )
         video_id = data_json['video_id']