open_pub/Uni-Lab-OS
1
0
Fork 0
mirror of https://github.com/dptech-corp/Uni-Lab-OS.git synced 2025-12-17 13:01:12 +00:00
Code Issues Packages Projects Releases Wiki Activity

result_info改为字典类型

Browse Source
This commit is contained in:
Xuwznln
2025-09-11 16:24:53 +08:00
parent 58d1cc4720
commit 513e848d89
7 changed files with 38 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
unilabos/app/communication.py
View File

@@ -52,7 +52,7 @@ class BaseCommunicationClient(ABC):
@abstractmethod
def publish_job_status(
self, feedback_data: dict, job_id: str, status: str, return_info: Optional[str] = None
self, feedback_data: dict, job_id: str, status: str, return_info: Optional[dict] = None
) -> None:
"""
发布作业状态信息

4
unilabos/app/mq.py
View File

@@ -171,11 +171,11 @@ class MQTTClient(BaseCommunicationClient):
self.client.publish(address, json.dumps(status), qos=2)
# logger.info(f"Device {device_id} status published: address: {address}, {status}")
def publish_job_status(self, feedback_data: dict, job_id: str, status: str, return_info: Optional[str] = None):
def publish_job_status(self, feedback_data: dict, job_id: str, status: str, return_info: Optional[dict] = None):
if self.mqtt_disable:
return
if return_info is None:
return_info = "{}"
return_info = {}
jobdata = {"job_id": job_id, "data": feedback_data, "status": status, "return_info": return_info}
self.client.publish(f"labs/{MQConfig.lab_id}/job/list/", json.dumps(jobdata), qos=2)

5
unilabos/app/ws_client.py
View File

@@ -243,6 +243,7 @@ class TaskScheduler:
)
return False
# noinspection PyProtectedMember
action_jobs = len(host_node._device_action_status[item.device_action_key].job_ids)
free = not bool(action_jobs)
@@ -539,7 +540,7 @@ class TaskScheduler:
# 外部接口方法
def publish_job_status(
self, feedback_data: dict, item: "QueueItem", status: str, return_info: Optional[str] = None
self, feedback_data: dict, item: "QueueItem", status: str, return_info: Optional[dict] = None
) -> None:
"""发布作业状态，拦截最终结果（给HostNode调用的接口）"""
if not self.message_sender.is_connected():
@@ -983,7 +984,7 @@ class WebSocketClient(BaseCommunicationClient):
logger.debug(f"[WebSocket] Device status published: {device_id}.{property_name}")
def publish_job_status(
self, feedback_data: dict, item: "QueueItem", status: str, return_info: Optional[str] = None
self, feedback_data: dict, item: "QueueItem", status: str, return_info: Optional[dict] = None
) -> None:
"""发布作业状态（转发给TaskScheduler）"""
if self.task_scheduler: