소스 검색

接口未返回视频链接 bug

罗俊辉 11 달 전
부모
커밋
aa68e23e32

+ 1 - 1
applications/functions/async_etl.py

@@ -217,4 +217,4 @@ class AsyncETL(object):
         os.remove(cover_path)
         b = time.time()
         print(b - a)
-        return result["data"]["id"]
+        return result["data"]["id"], result['data']['videoPath']

+ 2 - 2
applications/functions/video_item.py

@@ -236,7 +236,7 @@ async def video_mq_sender(video_obj, user, trace_id, platform):
     else:
         mq_obj = {}
     AE = AsyncETL(video_obj=mq_obj)
-    video_id = await AE.etl_deal()
+    video_id, video_url = await AE.etl_deal()
     # ETL_MQ.send_msg(params=mq_obj)
     logging(
         code="6002",
@@ -244,4 +244,4 @@ async def video_mq_sender(video_obj, user, trace_id, platform):
         data=mq_obj,
         trace_id=trace_id
     )
-    return video_id
+    return video_id, video_url

+ 4 - 2
applications/routes.py

@@ -49,7 +49,7 @@ async def search_videos_from_the_web():
     )
     try:
         kimi_info = await K.search_kimi_schedule(params=params)
-        video_id = await search_videos(
+        video_id, video_url = await search_videos(
             kimi_info=kimi_info,
             trace_id=trace_id,
             gh_id=gh_id
@@ -59,7 +59,9 @@ async def search_videos_from_the_web():
             "trace_id": trace_id,
             "code": 0,
             "kimi_title": kimi_info['k_title'],
-            "search_video_id": video_id
+            "search_video_id": video_id,
+            "video_url": video_url
+
         }
     except Exception as e:
         res = {

+ 8 - 2
applications/schedule/main_schedule.py

@@ -77,16 +77,22 @@ class AskForInfo:
             trace_id = res["trace_id"]
             kimi_title = res['kimi_title']
             video_id = res['search_video_id']
+            video_url = res['video_url']
             res_obj = {
                 "search_videos": "success" if video_id else "fail",
                 "trace_id": trace_id,
-                "video_list": [video_id] if video_id else []
+                "video_list": [video_id] if video_id else [],
+                "video_url": [video_url] if video_url else ""
             }
             time.sleep(2)
             final_obj = await self.ask_for_info(res_obj=res_obj, kt=kimi_title)
             e = time.time()
             print("Rank and Return Time:\t", e - b - 2)
-            return final_obj
+            if final_obj['videoUrl']:
+                return final_obj
+            else:
+                final_obj["videoUrl"] = video_url
+                return final_obj
         elif res['code'] == 1:
             return {
                 "Error": res['message']

+ 2 - 2
applications/schedule/search_schedule.py

@@ -250,13 +250,13 @@ async def search_videos(kimi_info, trace_id, gh_id):
                 trace_id=trace_id,
                 data=recall_video,
             )
-            video_id = await video_mq_sender(
+            video_id, video_url = await video_mq_sender(
                 video_obj=recall_video,
                 user=gh_id_dict.get(gh_id),
                 trace_id=trace_id,
                 platform=platform,
             )
-            return video_id
+            return video_id, video_url
     else:
         logging(code="7003", info="视频搜索失败", trace_id=trace_id)
         return None