From 17a283ec45133e6626f2413f9bcf951d619d95df Mon Sep 17 00:00:00 2001 From: zjf Date: Tue, 27 May 2025 14:10:42 +0800 Subject: [PATCH] rpa --- src/cluster/rpa.py | 6 +++--- src/cluster/rpa_comm.py | 9 +++++---- src/cluster/rpa_web_end_point.py | 4 ++-- 3 files changed, 10 insertions(+), 9 deletions(-) diff --git a/src/cluster/rpa.py b/src/cluster/rpa.py index fb87246..7125e53 100644 --- a/src/cluster/rpa.py +++ b/src/cluster/rpa.py @@ -339,9 +339,9 @@ with rpa_image.imports(): res_value = rpa_dict[ulid] # getting a value logger.info(f"Saved result: {res_value}") - rpa_queue.put(ulid) # adding a value - queue_value = rpa_queue.get() # retrieving a value - logger.info(f"Queued result: {queue_value}") + # rpa_queue.put(ulid) # adding a value + # queue_value = rpa_queue.get() # retrieving a value + # logger.info(f"Queued result: {queue_value}") except IOError as e: logger.error(f"Failed to save JSON file: {str(e)}") diff --git a/src/cluster/rpa_comm.py b/src/cluster/rpa_comm.py index 64fd939..263e48c 100644 --- a/src/cluster/rpa_comm.py +++ b/src/cluster/rpa_comm.py @@ -1,12 +1,13 @@ -from pydantic import BaseModel -from typing import List, Optional,Any +from pydantic import BaseModel, Field +from typing import List, Optional, Any + class LiveStreamProductWatchRequest(BaseModel): """ 直播流商品观测 """ - live_stream_name: Optional[str] = None + live_stream_name: Optional[str] = Field(None, description="直播间推流名称") """直播间推流名称""" live_stream_start_time: Optional[int] = 0 """直播推流开始世界时间(毫秒时间戳)""" @@ -61,4 +62,4 @@ class LiveStreamResult(BaseModel): msg: Optional[str] = None -LIVE_WATCH_TASK_DOING: str = "LIVE_WATCH_TASK_DOING" \ No newline at end of file +LIVE_WATCH_TASK_DOING: str = "LIVE_WATCH_TASK_DOING" diff --git a/src/cluster/rpa_web_end_point.py b/src/cluster/rpa_web_end_point.py index 55df78e..5d16736 100644 --- a/src/cluster/rpa_web_end_point.py +++ b/src/cluster/rpa_web_end_point.py @@ -36,7 +36,7 @@ async def scalar_html(): ) -@web_app.post("/live_watch/submit") +@web_app.post("/live_watch/submit",name="直播观测提交任务",description="监测直播侧发起,观测直播商品&切条") async def submit_job_endpoint(data: LiveStreamProductWatchRequest) -> Optional[Any]: process_job = modal.Function.from_name("rpa", "rpa_run") @@ -44,7 +44,7 @@ async def submit_job_endpoint(data: LiveStreamProductWatchRequest) -> Optional[A return {"call_id": call.object_id} -@web_app.get("/live_watch/result/{call_id}") +@web_app.get("/live_watch/result/{call_id}",name="查询直播观测任务结果",description="异步查询") async def get_job_result_endpoint(call_id: str) -> Any: function_call = modal.FunctionCall.from_id(call_id) try: