Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
43 commits
Select commit Hold shift + click to select a range
9b158f8
修改lh的json启动
Sep 26, 2025
8bed8f8
修改lh的json启动
Sep 26, 2025
e425979
Merge branch '3d_sim' of https://github.com/q434343/Uni-Lab-OS into 3…
Sep 26, 2025
a2ed60e
修改backend,做成sim的通用backend
Sep 26, 2025
24d6786
修改yaml的地址,3D模型适配网页生产环境
Sep 28, 2025
6fb9f1a
Merge remote-tracking branch 'upstream/dev' into 3d_sim
Sep 28, 2025
be6f7a5
添加laiyu硬件连接
Sep 30, 2025
553923d
Merge branch 'dev' into pr/97
TablewareBox Sep 30, 2025
a0641bb
Merge branch '3d_sim' of https://github.com/q434343/Uni-Lab-OS into p…
TablewareBox Sep 30, 2025
1c4878f
修改移液枪的状态判断方法,
Oct 14, 2025
05f11b3
Merge remote-tracking branch 'upstream/dev' into 3d_sim
Oct 15, 2025
0733104
修改laiyu移液站
Oct 15, 2025
41e6d69
Merge remote-tracking branch 'upstream/dev' into 3d_sim
Oct 21, 2025
c25c05d
更新lh以及laiyu workshop
Oct 29, 2025
57b1dd9
修改枪头动作
Oct 29, 2025
d1c523c
修改虚拟仿真方法
Nov 13, 2025
2659fb1
Merge remote-tracking branch 'upstream/dev' into 3d_sim
Nov 13, 2025
e52992b
Merge remote-tracking branch 'upstream/dev' into 3d_sim
Nov 17, 2025
afb28b6
Merge remote-tracking branch 'upstream/dev' into 3d_sim
Nov 21, 2025
3b80e45
Merge remote-tracking branch 'upstream/dev' into 3d_sim
Nov 25, 2025
3cc85d9
添加尺寸判定
Nov 28, 2025
830e914
Merge remote-tracking branch 'upstream/dev' into 3d_sim
Nov 28, 2025
161a6fe
添加json启动文件
Nov 29, 2025
e457c5b
Create prcxi_9320_visual copy.json
Nov 29, 2025
82faa5a
修改grapgio
Nov 29, 2025
03ffb1c
添加纯净启动文件
Nov 29, 2025
9847dd1
canonicalize tests/ folder
TablewareBox Nov 29, 2025
f83aab7
refactor resource_tracker
TablewareBox Nov 29, 2025
346d7dd
添加返回数值
Nov 30, 2025
bdff0c6
Merge branch 'commit' of https://github.com/q434343/Uni-Lab-OS into c…
Nov 30, 2025
68f22b0
修改prcxi的liquid_handling,
Nov 30, 2025
280ad6d
Merge remote-tracking branch 'upstream/dev' into commit
Dec 1, 2025
af19722
删除徕羽部分测试代码
Dec 2, 2025
0ebe509
Merge remote-tracking branch 'upstream/dev' into commit
Dec 2, 2025
51db6d4
Revert "删除徕羽部分测试代码"
Dec 2, 2025
3491479
Reapply "删除徕羽部分测试代码"
Dec 2, 2025
6b96fd1
Revert "Merge remote-tracking branch 'upstream/dev' into commit"
Dec 2, 2025
b9d94de
Reapply "Merge remote-tracking branch 'upstream/dev' into commit"
Dec 2, 2025
b5aa931
Revert "signal when host node is ready"
Dec 2, 2025
fd68194
Revert "Fix startup with remote resource error"
Dec 2, 2025
ad8e9cd
dump example files back to unilabos/test
TablewareBox Dec 23, 2025
68abc02
Merge branch 'dev' into pr/178
TablewareBox Dec 23, 2025
4766cae
clean up files
TablewareBox Dec 23, 2025
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions docs/user_guide/graph_files.md
Original file line number Diff line number Diff line change
Expand Up @@ -463,7 +463,7 @@ Uni-Lab 使用 `ResourceDictInstance.get_resource_instance_from_dict()` 方法
### 使用示例

```python
from unilabos.ros.nodes.resource_tracker import ResourceDictInstance
from unilabos.resources.resource_tracker import ResourceDictInstance

# 旧格式节点
old_format_node = {
Expand All @@ -477,10 +477,10 @@ old_format_node = {
instance = ResourceDictInstance.get_resource_instance_from_dict(old_format_node)

# 访问标准化后的数据
print(instance.res_content.id) # "pump_1"
print(instance.res_content.uuid) # 自动生成的 UUID
print(instance.res_content.id) # "pump_1"
print(instance.res_content.uuid) # 自动生成的 UUID
print(instance.res_content.config) # {}
print(instance.res_content.data) # {}
print(instance.res_content.data) # {}
```

### 格式迁移建议
Expand Down
Empty file removed test/resources/__init__.py
Empty file.
Empty file removed test/ros/__init__.py
Empty file.
Empty file removed test/workflow/__init__.py
Empty file.
35 changes: 0 additions & 35 deletions test/workflow/merge_workflow.py

This file was deleted.

Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,8 @@
import json
import os

from pylabrobot.resources import Resource as ResourcePLR
from unilabos.resources.graphio import resource_bioyond_to_plr
from unilabos.ros.nodes.resource_tracker import ResourceTreeSet
from unilabos.resources.resource_tracker import ResourceTreeSet
from unilabos.registry.registry import lab_registry

from unilabos.resources.bioyond.decks import BIOYOND_PolymerReactionStation_Deck
Expand Down
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
2 changes: 1 addition & 1 deletion unilabos/app/backend.py
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import threading

from unilabos.ros.nodes.resource_tracker import ResourceTreeSet
from unilabos.resources.resource_tracker import ResourceTreeSet
from unilabos.utils import logger


Expand Down
2 changes: 1 addition & 1 deletion unilabos/app/main.py
Original file line number Diff line number Diff line change
Expand Up @@ -315,7 +315,7 @@ def main():
from unilabos.app.web import start_server
from unilabos.app.register import register_devices_and_resources
from unilabos.resources.graphio import modify_to_backend_format
from unilabos.ros.nodes.resource_tracker import ResourceTreeSet, ResourceDict
from unilabos.resources.resource_tracker import ResourceTreeSet, ResourceDict

# 显示启动横幅
print_unilab_banner(args_dict)
Expand Down
4 changes: 1 addition & 3 deletions unilabos/app/web/client.py
Original file line number Diff line number Diff line change
Expand Up @@ -6,12 +6,10 @@

import json
import os
import time
from threading import Thread
from typing import List, Dict, Any, Optional

import requests
from unilabos.ros.nodes.resource_tracker import ResourceTreeSet
from unilabos.resources.resource_tracker import ResourceTreeSet
from unilabos.utils.log import info
from unilabos.config.config import HTTPConfig, BasicConfig
from unilabos.utils import logger
Expand Down
16 changes: 0 additions & 16 deletions unilabos/app/ws_client.py
Original file line number Diff line number Diff line change
Expand Up @@ -1311,19 +1311,3 @@ def cancel_goal(self, job_id: str) -> None:
logger.info(f"[WebSocketClient] Job {job_log} cancelled successfully")
else:
logger.warning(f"[WebSocketClient] Failed to cancel job {job_log}")

def publish_host_ready(self) -> None:
"""发布host_node ready信号"""
if self.is_disabled or not self.is_connected():
logger.debug("[WebSocketClient] Not connected, cannot publish host ready signal")
return

message = {
"action": "host_node_ready",
"data": {
"status": "ready",
"timestamp": time.time(),
},
}
self.message_processor.send_message(message)
logger.info("[WebSocketClient] Host node ready signal published")
Loading
Loading