mirror of
https://github.com/deepmodeling/Uni-Lab-OS
synced 2026-05-23 18:22:40 +00:00
Compare commits
547 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
0b3c0e3c29 | ||
|
|
6025957c95 | ||
|
|
fc9c4dd8b4 | ||
|
|
62ba578276 | ||
|
|
832e83633b | ||
|
|
bb0c68fd18 | ||
|
|
3216d8e296 | ||
|
|
81e9068597 | ||
|
|
be5ff9bc5c | ||
|
|
498bcd84f8 | ||
|
|
35199eb863 | ||
|
|
927c7e95f5 | ||
|
|
16910fe25c | ||
|
|
c38987d94d | ||
|
|
e4132111bc | ||
|
|
211ee3027d | ||
|
|
32c195d875 | ||
|
|
f145dc04bb | ||
|
|
195fad9398 | ||
|
|
898ed5d34b | ||
|
|
60cbedc4b2 | ||
|
|
2d6a9f7db9 | ||
|
|
5dca3d8c3d | ||
|
|
37cbed722a | ||
|
|
132cffbe7c | ||
|
|
36e5ff804c | ||
|
|
eaf8ad5609 | ||
|
|
16122ad2fa | ||
|
|
d3fef85dd8 | ||
|
|
f77ac2a5e8 | ||
|
|
93ac55a65b | ||
|
|
af35debe38 | ||
|
|
58997f0654 | ||
|
|
fbfc3e30fb | ||
|
|
1d1c1367df | ||
|
|
c91b600e90 | ||
|
|
49b3c850f9 | ||
|
|
25c94af755 | ||
|
|
861a012747 | ||
|
|
ee63e95f50 | ||
|
|
dbf5df6e4d | ||
|
|
f10c0343ce | ||
|
|
8b6553bdd9 | ||
|
|
e7a4afd6b5 | ||
|
|
f18f6d82fc | ||
|
|
b7c726635c | ||
|
|
c809912fd3 | ||
|
|
d956b27e9f | ||
|
|
ff1e21fcd8 | ||
|
|
b9d9666003 | ||
|
|
d776550a4b | ||
|
|
3d8123849a | ||
|
|
d2f204c5b0 | ||
|
|
d8922884b1 | ||
|
|
427afe83d4 | ||
|
|
23c2e3b2f7 | ||
|
|
59c26265e9 | ||
|
|
4c2adea55a | ||
|
|
0f6264503a | ||
|
|
2c554182d3 | ||
|
|
6d319d91ff | ||
|
|
3155b2f97e | ||
|
|
e5e30a1c7d | ||
|
|
4e82f62327 | ||
|
|
95d3456214 | ||
|
|
38bf95b13c | ||
|
|
f2c0bec02c | ||
|
|
e0394bf414 | ||
|
|
975a56415a | ||
|
|
cadbe87e3f | ||
|
|
b993c1f590 | ||
|
|
e0fae94c10 | ||
|
|
b5cd181ac1 | ||
|
|
5c047beb83 | ||
|
|
b40c087143 | ||
|
|
7f1cc3b2a5 | ||
|
|
3f160c2049 | ||
|
|
a54e7c0f23 | ||
|
|
e5015cd5e0 | ||
|
|
514373c164 | ||
|
|
fcea02585a | ||
|
|
07cf690897 | ||
|
|
cfea27460a | ||
|
|
b7d3e980a9 | ||
|
|
f9ed6cb3fb | ||
|
|
699a0b3ce7 | ||
|
|
cf3a20ae79 | ||
|
|
cdf0652020 | ||
|
|
60073ff139 | ||
|
|
a9053b822f | ||
|
|
d238c2ab8b | ||
|
|
9a7d5c7c82 | ||
|
|
4f7d431c0b | ||
|
|
341a1b537c | ||
|
|
957fb41a6f | ||
|
|
26271bcab8 | ||
|
|
84a8223173 | ||
|
|
e8d1263488 | ||
|
|
380b39100d | ||
|
|
56eb7e2ab4 | ||
|
|
23ce145f74 | ||
|
|
b0da149252 | ||
|
|
07c9e6f0fe | ||
|
|
ccec6b9d77 | ||
|
|
dadfdf3d8d | ||
|
|
400bb073d4 | ||
|
|
3f63c36505 | ||
|
|
0ae94f7f3c | ||
|
|
7eacae6442 | ||
|
|
f7d2cb4b9e | ||
|
|
bf980d7248 | ||
|
|
27c0544bfc | ||
|
|
d48e77c9ae | ||
|
|
e70a5bea66 | ||
|
|
467d75dc03 | ||
|
|
9feeb0c430 | ||
|
|
b2f26ffb28 | ||
|
|
4b0d1553e9 | ||
|
|
67ddee2ab2 | ||
|
|
1bcdad9448 | ||
|
|
039c96fe01 | ||
|
|
e1555d10a0 | ||
|
|
f2a96b2041 | ||
|
|
329349639e | ||
|
|
e4cc111523 | ||
|
|
d245ceef1b | ||
|
|
6db7fbd721 | ||
|
|
ab05b858e1 | ||
|
|
43e4c71a8e | ||
|
|
2cf58ca452 | ||
|
|
fd73bb7dcb | ||
|
|
a02cecfd18 | ||
|
|
d6accc3f1c | ||
|
|
39dc443399 | ||
|
|
37b1fca962 | ||
|
|
216f19fb62 | ||
|
|
ec7ca6a1fe | ||
|
|
4c8022ee95 | ||
|
|
ad21644db0 | ||
|
|
9dfd58e9af | ||
|
|
31c9f9a172 | ||
|
|
02cd8de4c5 | ||
|
|
a66603ec1c | ||
|
|
ec015e16cd | ||
|
|
965bf36e8d | ||
|
|
aacf3497e0 | ||
|
|
657f952e7a | ||
|
|
0165590290 | ||
|
|
daea1ab54d | ||
|
|
93cb307396 | ||
|
|
1c312772ae | ||
|
|
bad1db5094 | ||
|
|
f26eb69eca | ||
|
|
12c0770c92 | ||
|
|
3d2d428a96 | ||
|
|
78bf57f590 | ||
|
|
e227cddab3 | ||
|
|
f2b993643f | ||
|
|
2e14bf197c | ||
|
|
66c18c080a | ||
|
|
a1c34f138e | ||
|
|
75bb5ec553 | ||
|
|
bb95c89829 | ||
|
|
394c140830 | ||
|
|
e6d8d41183 | ||
|
|
847a300af3 | ||
|
|
a201d7c307 | ||
|
|
3433766bc5 | ||
|
|
7e9e93b29c | ||
|
|
9e1e6da505 | ||
|
|
8a0f000bab | ||
|
|
2ffeb49acb | ||
|
|
5fec753fb9 | ||
|
|
acbaff7bb7 | ||
|
|
706323dc3e | ||
|
|
b0804d939c | ||
|
|
97788b4e07 | ||
|
|
39cc280c91 | ||
|
|
d0ac452405 | ||
|
|
152d3a7563 | ||
|
|
ef14737839 | ||
|
|
5d5569121c | ||
|
|
d23e85ade4 | ||
|
|
02afafd423 | ||
|
|
6ac510dcd2 | ||
|
|
ed56c1eba2 | ||
|
|
16ee3de086 | ||
|
|
ced961050d | ||
|
|
11b2c99836 | ||
|
|
04024bc8a3 | ||
|
|
154048107d | ||
|
|
0b896870ba | ||
|
|
ee609e4aa2 | ||
|
|
5551fbf360 | ||
|
|
e13b250632 | ||
|
|
b8278c5026 | ||
|
|
53e767a054 | ||
|
|
cf7032fa81 | ||
|
|
97681ba433 | ||
|
|
3fa81ab4f6 | ||
|
|
9f4a69ddf5 | ||
|
|
05ae4e72df | ||
|
|
2870c04086 | ||
|
|
343e87df0d | ||
|
|
5d0807cba6 | ||
|
|
4875977d5f | ||
|
|
956b1c905b | ||
|
|
944911c52a | ||
|
|
a13b790926 | ||
|
|
9feadd68c6 | ||
|
|
c68d5246d0 | ||
|
|
49073f2c77 | ||
|
|
b2afc29f15 | ||
|
|
4061280f6b | ||
|
|
6a681e1d73 | ||
|
|
653e6e1ac3 | ||
|
|
2c774bcd1d | ||
|
|
2ba395b681 | ||
|
|
b6b3d59083 | ||
|
|
f40e3f521c | ||
|
|
7cc2fe036f | ||
|
|
f81d20bb1d | ||
|
|
db1b5a869f | ||
|
|
0136630700 | ||
|
|
3c31811f9e | ||
|
|
64f02ff129 | ||
|
|
7d097b8222 | ||
|
|
d266d21104 | ||
|
|
b6d0bbcb17 | ||
|
|
31ebff8e37 | ||
|
|
2132895ba2 | ||
|
|
850eeae55a | ||
|
|
d869c14233 | ||
|
|
24101b3cec | ||
|
|
3bf8aad4d5 | ||
|
|
a599eb70e5 | ||
|
|
0bf6994f95 | ||
|
|
c36f53791c | ||
|
|
eb4d2d96c5 | ||
|
|
8233c41b1d | ||
|
|
0dfd4ce8a8 | ||
|
|
7953b3820e | ||
|
|
eed233fa76 | ||
|
|
0c55147ee4 | ||
|
|
ce6267b8e0 | ||
|
|
975e51cd96 | ||
|
|
c5056b381c | ||
|
|
c35da65b15 | ||
|
|
659cf05be6 | ||
|
|
3b8deb4d1d | ||
|
|
c796615f9f | ||
|
|
a5bad6074f | ||
|
|
1d3a07a736 | ||
|
|
cc2cd57cdf | ||
|
|
39bb7dc627 | ||
|
|
0fda155f55 | ||
|
|
6e3eacd2f0 | ||
|
|
062f1a2153 | ||
|
|
61e8d67800 | ||
|
|
d0884cdbd8 | ||
|
|
545ea45024 | ||
|
|
b9ddee8f2c | ||
|
|
a0c5095304 | ||
|
|
e504505137 | ||
|
|
4d9d5701e9 | ||
|
|
6016c4b588 | ||
|
|
be02bef9c4 | ||
|
|
e62f0c2585 | ||
|
|
b6de0623e2 | ||
|
|
9d081e9fcd | ||
|
|
85a58e3464 | ||
|
|
85590672d8 | ||
|
|
1d4018196d | ||
|
|
5d34f742af | ||
|
|
5bef19e6d6 | ||
|
|
f816799753 | ||
|
|
a45d841769 | ||
|
|
7f0b33b3e3 | ||
|
|
2006406a24 | ||
|
|
f94985632b | ||
|
|
12ba110569 | ||
|
|
97212be8b7 | ||
|
|
9bdd42f12f | ||
|
|
627140da03 | ||
|
|
5ceedb0565 | ||
|
|
8c77a20c43 | ||
|
|
3ff894feee | ||
|
|
fa5896ffdb | ||
|
|
eb504803ac | ||
|
|
8b0c845661 | ||
|
|
693873bfa9 | ||
|
|
57da2d8da2 | ||
|
|
8d1fd01259 | ||
|
|
388259e64b | ||
|
|
2c130e7f37 | ||
|
|
9f7c3f02f9 | ||
|
|
19dd80dcdb | ||
|
|
9d5ed627a2 | ||
|
|
2d0ff87bc8 | ||
|
|
d78475de9a | ||
|
|
88ae56806c | ||
|
|
95dd8beb81 | ||
|
|
4ab3fadbec | ||
|
|
229888f834 | ||
|
|
b443b39ebf | ||
|
|
0434bbc15b | ||
|
|
5791b81954 | ||
|
|
bd51c74fab | ||
|
|
ba81cbddf8 | ||
|
|
4e92a26057 | ||
|
|
c2895bb197 | ||
|
|
0423f4f452 | ||
|
|
41390fbef9 | ||
|
|
98bdb4e7e4 | ||
|
|
30037a077a | ||
|
|
6972680099 | ||
|
|
9d2c93807d | ||
|
|
e728007bc5 | ||
|
|
9c5ecda7cc | ||
|
|
2d26c3fac6 | ||
|
|
f5753afb7c | ||
|
|
398b2dde3f | ||
|
|
62c4135938 | ||
|
|
027b4269c4 | ||
|
|
3757bd9c58 | ||
|
|
c75b7d5aae | ||
|
|
dfc635189c | ||
|
|
d8f3ebac15 | ||
|
|
4a1e703a3a | ||
|
|
55d22a7c29 | ||
|
|
03a4e4ecba | ||
|
|
2316c34cb5 | ||
|
|
a8887161d3 | ||
|
|
25834f5ba0 | ||
|
|
a1e9332b51 | ||
|
|
357fc038ef | ||
|
|
fd58ef07f3 | ||
|
|
93dee2c1dc | ||
|
|
70fbf19009 | ||
|
|
9149155232 | ||
|
|
1ca1792e3c | ||
|
|
485e7e8dd2 | ||
|
|
4ddabdcb65 | ||
|
|
a5b0325301 | ||
|
|
50b44938c7 | ||
|
|
df0d2235b0 | ||
|
|
4e434eeb97 | ||
|
|
ca027bf0eb | ||
|
|
635a332b4e | ||
|
|
edf7a117ca | ||
|
|
70b2715996 | ||
|
|
7e8dfc2dc5 | ||
|
|
9b626489a8 | ||
|
|
03fe208743 | ||
|
|
e913e540a3 | ||
|
|
aed39b648d | ||
|
|
8c8359fab3 | ||
|
|
5d20be0762 | ||
|
|
09f745d300 | ||
|
|
bbcbcde9a4 | ||
|
|
42b437cdea | ||
|
|
ffd0f2d26a | ||
|
|
32422c0b3d | ||
|
|
c44e597dc0 | ||
|
|
4eef012a8e | ||
|
|
ac69452f3c | ||
|
|
57b30f627b | ||
|
|
2d2a4ca067 | ||
|
|
a2613aad4c | ||
|
|
54f75183ff | ||
|
|
735be067dc | ||
|
|
0fe62d64f0 | ||
|
|
2d4ecec1e1 | ||
|
|
0f976a1874 | ||
|
|
b263a7e679 | ||
|
|
7c7f1b31c5 | ||
|
|
00e668e140 | ||
|
|
4989f65a0b | ||
|
|
9fa3688196 | ||
|
|
40fb1ea49c | ||
|
|
18b0bb397e | ||
|
|
65abc5dbf7 | ||
|
|
2455ca15ba | ||
|
|
05a3ff607a | ||
|
|
ec882df36d | ||
|
|
43b992e3eb | ||
|
|
6422fa5a9a | ||
|
|
434b9e98e0 | ||
|
|
040073f430 | ||
|
|
3d95c9896a | ||
|
|
9aa97ed01e | ||
|
|
0b8bdf5e0a | ||
|
|
299f010754 | ||
|
|
15ce0d6883 | ||
|
|
dec474e1a7 | ||
|
|
5f187899fc | ||
|
|
c8d16c7024 | ||
|
|
25d46dc9d5 | ||
|
|
88c4d1a9d1 | ||
|
|
81fd8291c5 | ||
|
|
3a11eb90d4 | ||
|
|
387866b9c9 | ||
|
|
7f40f141f6 | ||
|
|
6fc7ed1b88 | ||
|
|
93f0e08d75 | ||
|
|
4b43734b55 | ||
|
|
174b1914d4 | ||
|
|
704e13f030 | ||
|
|
0c42d60cf2 | ||
|
|
df33e1a214 | ||
|
|
1f49924966 | ||
|
|
609b6006e8 | ||
|
|
67c01271b7 | ||
|
|
a1783f489e | ||
|
|
a8f6527de9 | ||
|
|
54cfaf15f3 | ||
|
|
5610c28b67 | ||
|
|
cfc1ee6e79 | ||
|
|
1c9d2ee98a | ||
|
|
3fe8f4ca44 | ||
|
|
2476821dcc | ||
|
|
7b426ed5ae | ||
|
|
9bbae96447 | ||
|
|
10aabb7592 | ||
|
|
709eb0d91c | ||
|
|
14b7d52825 | ||
|
|
a5397ffe12 | ||
|
|
c6c2da69ba | ||
|
|
622e579063 | ||
|
|
196e0f7e2b | ||
|
|
a632fd495e | ||
|
|
a8cc02a126 | ||
|
|
ad2e1432c6 | ||
|
|
c3b9583eac | ||
|
|
5c47cd0c8a | ||
|
|
63ab1af45d | ||
|
|
a8419dc0c3 | ||
|
|
34f05f2e25 | ||
|
|
0dc2488f02 | ||
|
|
f13156e792 | ||
|
|
13fd1ac572 | ||
|
|
f8ef6e0686 | ||
|
|
94a7b8aaca | ||
|
|
301bea639e | ||
|
|
4b5a83efa4 | ||
|
|
2889e9be2c | ||
|
|
304aebbba7 | ||
|
|
091c9fa247 | ||
|
|
67ca45a240 | ||
|
|
7aab2ea493 | ||
|
|
62f3a6d696 | ||
|
|
eb70ad0e18 | ||
|
|
768f43880e | ||
|
|
762c3c737c | ||
|
|
ace98a4472 | ||
|
|
41eaa88c6f | ||
|
|
a1a55a2c0a | ||
|
|
2eaa0ca729 | ||
|
|
6f8f070f40 | ||
|
|
da4bd927e0 | ||
|
|
01f8816597 | ||
|
|
e5006285df | ||
|
|
573c724a5c | ||
|
|
09549d2839 | ||
|
|
50c7777cea | ||
|
|
4888f02c09 | ||
|
|
779c9693d9 | ||
|
|
ffa841a41a | ||
|
|
fc669f09f8 | ||
|
|
2ca0311de6 | ||
|
|
94cdcbf24e | ||
|
|
1cd07915e7 | ||
|
|
b600fc666d | ||
|
|
9e214c56c1 | ||
|
|
bdf27a7e82 | ||
|
|
2493fb9f94 | ||
|
|
c7a0ff67a9 | ||
|
|
711a7c65fa | ||
|
|
cde7956896 | ||
|
|
95b6fd0451 | ||
|
|
513e848d89 | ||
|
|
58d1cc4720 | ||
|
|
5676dd6589 | ||
|
|
1ae274a833 | ||
|
|
22b88c8441 | ||
|
|
81bcc1907d | ||
|
|
8cffd3dc21 | ||
|
|
a722636938 | ||
|
|
f68340d932 | ||
|
|
361eae2f6d | ||
|
|
c25283ae04 | ||
|
|
961752fb0d | ||
|
|
55165024dd | ||
|
|
6ddceb8393 | ||
|
|
4e52c7d2f4 | ||
|
|
0b56efc89d | ||
|
|
a27b93396a | ||
|
|
2a60a6c27e | ||
|
|
5dda94044d | ||
|
|
0cfc6f45e3 | ||
|
|
831f4549f9 | ||
|
|
f4d4eb06d3 | ||
|
|
e3b8164f6b | ||
|
|
78c04acc2e | ||
|
|
cd0428ea78 | ||
|
|
bdddbd57ba | ||
|
|
a312de08a5 | ||
|
|
68513b5745 | ||
|
|
19027350fb | ||
|
|
bbbdb06bbc | ||
|
|
cd84e26126 | ||
|
|
ce5bab3af1 | ||
|
|
82d9ef6bf7 | ||
|
|
332b33c6f4 | ||
|
|
1ec642ee3a | ||
|
|
7d8e6d029b | ||
|
|
5ec8a57a1f | ||
|
|
ae3c1100ae | ||
|
|
14bc2e6cda | ||
|
|
9f823a4198 | ||
|
|
02c79363c1 | ||
|
|
227ff1284a | ||
|
|
4b7bde6be5 | ||
|
|
8a669ac35a | ||
|
|
a1538da39e | ||
|
|
0063df4cf3 | ||
|
|
e570ba4976 | ||
|
|
e8c1f76dbb | ||
|
|
f791c1a342 | ||
|
|
ea60cbe891 | ||
|
|
eac9b8ab3d | ||
|
|
573bcf1a6c | ||
|
|
50e93cb1af | ||
|
|
fe1a029a9b | ||
|
|
662c063f50 | ||
|
|
01cbbba0b3 | ||
|
|
e6c556cf19 | ||
|
|
0605f305ed | ||
|
|
37d8108ec4 | ||
|
|
6081dac561 | ||
|
|
5b2d066127 | ||
|
|
06e66765e7 | ||
|
|
98ce360088 | ||
|
|
5cd0f72fbd | ||
|
|
343f394203 | ||
|
|
46aa7a7bd2 | ||
|
|
a66369e2c3 |
@@ -3,7 +3,7 @@
|
|||||||
|
|
||||||
package:
|
package:
|
||||||
name: unilabos
|
name: unilabos
|
||||||
version: 0.11.0
|
version: 0.11.3
|
||||||
|
|
||||||
source:
|
source:
|
||||||
path: ../../unilabos
|
path: ../../unilabos
|
||||||
@@ -54,7 +54,7 @@ requirements:
|
|||||||
- pymodbus
|
- pymodbus
|
||||||
- matplotlib
|
- matplotlib
|
||||||
- pylibftdi
|
- pylibftdi
|
||||||
- uni-lab::unilabos-env ==0.11.0
|
- uni-lab::unilabos-env ==0.11.3
|
||||||
|
|
||||||
about:
|
about:
|
||||||
repository: https://github.com/deepmodeling/Uni-Lab-OS
|
repository: https://github.com/deepmodeling/Uni-Lab-OS
|
||||||
|
|||||||
@@ -2,7 +2,7 @@
|
|||||||
|
|
||||||
package:
|
package:
|
||||||
name: unilabos-env
|
name: unilabos-env
|
||||||
version: 0.11.0
|
version: 0.11.3
|
||||||
|
|
||||||
build:
|
build:
|
||||||
noarch: generic
|
noarch: generic
|
||||||
|
|||||||
@@ -3,7 +3,7 @@
|
|||||||
|
|
||||||
package:
|
package:
|
||||||
name: unilabos-full
|
name: unilabos-full
|
||||||
version: 0.11.0
|
version: 0.11.3
|
||||||
|
|
||||||
build:
|
build:
|
||||||
noarch: generic
|
noarch: generic
|
||||||
@@ -11,7 +11,7 @@ build:
|
|||||||
requirements:
|
requirements:
|
||||||
run:
|
run:
|
||||||
# Base unilabos package (includes unilabos-env)
|
# Base unilabos package (includes unilabos-env)
|
||||||
- uni-lab::unilabos ==0.11.0
|
- uni-lab::unilabos ==0.11.3
|
||||||
# Documentation tools
|
# Documentation tools
|
||||||
- sphinx
|
- sphinx
|
||||||
- sphinx_rtd_theme
|
- sphinx_rtd_theme
|
||||||
|
|||||||
@@ -5,9 +5,98 @@ description: Guide for adding new devices to Uni-Lab-OS (接入新设备). Uses
|
|||||||
|
|
||||||
# 添加新设备到 Uni-Lab-OS
|
# 添加新设备到 Uni-Lab-OS
|
||||||
|
|
||||||
**第一步:** 使用 Read 工具读取 `docs/ai_guides/add_device.md`,获取完整的设备接入指南。
|
本 Skill 是自包含的设备接入指南,不依赖外部文档。迁移给别人时,只复制 `.cursor/skills/add-device/SKILL.md` 即可获得核心规则、模板、验证方式和常见错误清单。
|
||||||
|
|
||||||
该指南包含设备类别(物模型)列表、通信协议模板、常见错误检查清单等。搜索 `unilabos/devices/` 获取已有设备的实现参考。
|
开始实现前,仍应搜索 `unilabos/devices/` 获取同类别已有设备的接口、参数名、状态字符串和返回值风格作为参考。
|
||||||
|
|
||||||
|
---
|
||||||
|
|
||||||
|
## 接入工作流
|
||||||
|
|
||||||
|
按下面顺序推进,并在工作中维护进度:
|
||||||
|
|
||||||
|
```text
|
||||||
|
设备接入进度:
|
||||||
|
- [ ] 1. 确定设备类别(物模型)和对外单位
|
||||||
|
- [ ] 2. 确定通信协议
|
||||||
|
- [ ] 3. 收集指令协议(SDK、厂商文档、寄存器表、HTTP API、用户口述)
|
||||||
|
- [ ] 4. 对齐同类设备接口(搜索 unilabos/devices/)
|
||||||
|
- [ ] 5. 创建驱动 unilabos/devices/<category>/<file>.py
|
||||||
|
- [ ] 6. 验证可导入、注册表扫描、启动测试
|
||||||
|
- [ ] 7. 如需要,配置实验图文件
|
||||||
|
```
|
||||||
|
|
||||||
|
## 设备类别(物模型)
|
||||||
|
|
||||||
|
优先使用已有类别。只有确实无法归类时才使用 `custom`。
|
||||||
|
|
||||||
|
| 类别 ID | 说明 | 标准属性 | 标准动作 |
|
||||||
|
|---|---|---|---|
|
||||||
|
| `temperature` | 加热、冷却、温控 | `temp`, `temp_target`, `status` | `set_temperature`, `stop` |
|
||||||
|
| `pump_and_valve` | 泵、阀门、注射器 | 见子类型表 | 见子类型表 |
|
||||||
|
| `motor` | 电机、步进马达 | `position`, `status` | `enable`, `move_position`, `move_speed`, `stop` |
|
||||||
|
| `heaterstirrer` | 加热搅拌一体机 | `temp`, `stir_speed`, `status` | `set_temperature`, `stir`, `stop` |
|
||||||
|
| `balance` | 天平、称重 | `weight`, `unit`, `status` | `tare`, `read_weight` |
|
||||||
|
| `sensor` | 传感器(液位、温度等) | `value`, `level`, `status` | `read_value`, `set_threshold` |
|
||||||
|
| `liquid_handling` | 液体处理机器人 | `status`, `deck_state` | `transfer_liquid`, `aspirate`, `dispense` |
|
||||||
|
| `robot_arm` | 机械臂 | `arm_pose`, `arm_status` | `moveit_task`, `pick_and_place` |
|
||||||
|
| `workstation` | 工作站、组合设备 | `workflow_sequence`, `material_info` | `create_order`, `scheduler_start`, `scheduler_stop` |
|
||||||
|
| `virtual` | 虚拟、模拟设备 | 按模拟的真实设备定义 | 按模拟的真实设备定义 |
|
||||||
|
| `custom` | 不属于以上类别 | 用户自定义 | 用户自定义 |
|
||||||
|
|
||||||
|
`pump_and_valve` 子类型:
|
||||||
|
|
||||||
|
| 子类型 | 最小通用属性 | 最小通用动作 | 单位约定 |
|
||||||
|
|---|---|---|---|
|
||||||
|
| 注射泵(syringe pump) | `status`, `valve_position`, `position` | `initialize`, `set_valve_position`, `set_position`, `pull_plunger`, `push_plunger`, `stop_operation` | 体积=mL, 速度=mL/s |
|
||||||
|
| 电磁阀(solenoid valve) | `status`, `valve_position` | `open`, `close`, `set_valve_position` | 无 |
|
||||||
|
| 蠕动泵(peristaltic pump) | `status`, `speed` | `start`, `stop`, `set_speed` | 流速=mL/min |
|
||||||
|
|
||||||
|
对外暴露的属性和动作参数必须使用用户友好的物理单位(mL、ul、degC、RPM 等),硬件原始值转换放在驱动内部。
|
||||||
|
|
||||||
|
## 通信协议和指令来源
|
||||||
|
|
||||||
|
先确认通信方式,再确认具体指令协议。物模型只定义设备“应该做什么”,不会告诉你硬件“具体发什么字节/请求”。
|
||||||
|
|
||||||
|
| 协议 | 常用 config 参数 | 常用依赖 | 现有抽象 |
|
||||||
|
|---|---|---|---|
|
||||||
|
| Serial (RS232/RS485) | `port`, `baudrate`, `timeout` | `pyserial` | 直接使用 `serial.Serial` |
|
||||||
|
| Modbus RTU | `port`, `baudrate`, `slave_id` | `pymodbus` | `device_comms/modbus_plc/` |
|
||||||
|
| Modbus TCP | `host`, `port`, `slave_id` | `pymodbus` | `device_comms/modbus_plc/` |
|
||||||
|
| TCP Socket | `host`, `port`, `timeout` | stdlib | 直接使用 `socket` |
|
||||||
|
| HTTP API | `url`, `token`, `timeout` | `requests` | `device_comms/rpc.py` |
|
||||||
|
| OPC UA | `url` | `opcua` | `device_comms/opcua_client/` |
|
||||||
|
| 无通信(虚拟) | 无 | 无 | 在动作中模拟行为 |
|
||||||
|
|
||||||
|
必须从以下来源之一获得指令细节:
|
||||||
|
|
||||||
|
| 来源 | 处理方式 |
|
||||||
|
|---|---|
|
||||||
|
| 现成 SDK/驱动代码 | 读取代码,提取指令逻辑,包装进 Uni-Lab-OS 类 |
|
||||||
|
| 协议文档/手册 | 解析命令、响应、校验、寄存器、错误码 |
|
||||||
|
| 用户口述 | 按描述实现指令编解码,标出不确定点 |
|
||||||
|
| 标准协议 | 使用标准实现,例如 Modbus 寄存器表、SCPI |
|
||||||
|
| 虚拟设备 | 跳过硬件通信,在动作方法中维护模拟状态 |
|
||||||
|
|
||||||
|
## 对齐已有实现(强制)
|
||||||
|
|
||||||
|
实现前必须搜索 `unilabos/devices/` 中同类别设备:
|
||||||
|
|
||||||
|
- 参数名必须与已有设备保持一致;动作方法参数名是接口契约,不要随意改成 `volume_ml`、`target_temp_c` 这类新名字。
|
||||||
|
- `status` 字符串值要和同类设备一致,优先使用英文稳定值,例如 `Idle`、`Running`、`Error`。
|
||||||
|
- 状态属性用 `@property` + `@topic_config()` 明确声明。
|
||||||
|
- 返回值使用结构化 dict,至少包含 `success`,需要给前端展示的信息放在 `message`、`data`、`error` 等字段。
|
||||||
|
|
||||||
|
## 架构选择
|
||||||
|
|
||||||
|
| 场景 | 推荐方式 |
|
||||||
|
|---|---|
|
||||||
|
| 简单设备 | 纯 Python 类 + `@device` |
|
||||||
|
| 工作站/组合设备 | `WorkstationBase` 或项目内已有工作站模式 |
|
||||||
|
| 液体处理 | `LiquidHandlerAbstract` / PyLabRobot 相关模式 |
|
||||||
|
| Modbus 设备 | 复用 `device_comms/modbus_plc/` 或项目内 Modbus 示例 |
|
||||||
|
| OPC UA 设备 | 复用 `device_comms/opcua_client/` |
|
||||||
|
| 外部独立包 | 使用 `create-device-package` skill |
|
||||||
|
|
||||||
---
|
---
|
||||||
|
|
||||||
@@ -71,6 +160,45 @@ from unilabos.registry.decorators import action
|
|||||||
- `_` 开头的方法 → 不扫描
|
- `_` 开头的方法 → 不扫描
|
||||||
- `@not_action` 标记的方法 → 排除
|
- `@not_action` 标记的方法 → 排除
|
||||||
|
|
||||||
|
### 参数文档 → JSON Schema 元数据
|
||||||
|
|
||||||
|
在 `__init__` 和 action 方法 docstring 的 `Args:` 小节里,使用以下格式生成入参 schema 的显示信息:
|
||||||
|
|
||||||
|
```python
|
||||||
|
"""
|
||||||
|
Args:
|
||||||
|
param[显示名称]: 参数说明,会写入 JSON Schema 的 description。
|
||||||
|
"""
|
||||||
|
```
|
||||||
|
|
||||||
|
- `param[显示名称]` 的显示名称会写入 goal property 的 `title`。
|
||||||
|
- `:` 后面的说明会写入 goal property 的 `description`。
|
||||||
|
- 如果只写 `param: 参数说明`,`title` 会兜底为字段名,`description` 使用参数说明。
|
||||||
|
- 如果没有写参数文档,生成器也会兜底补齐 `title=<字段名>` 和 `description=""`,但新设备应优先写清楚显示名和说明。
|
||||||
|
|
||||||
|
### 特殊参数类型:ResourceSlot / DeviceSlot
|
||||||
|
|
||||||
|
需要前端选择资源或设备时,用特殊类型注解,registry 会自动生成 `placeholder_keys`:
|
||||||
|
|
||||||
|
```python
|
||||||
|
from typing import List
|
||||||
|
from unilabos.registry.placeholder_type import DeviceSlot, ResourceSlot
|
||||||
|
|
||||||
|
@action(description="转移液体")
|
||||||
|
def transfer(self, source: ResourceSlot, target: ResourceSlot, volume_ul: float) -> dict:
|
||||||
|
"""
|
||||||
|
Args:
|
||||||
|
source[源资源]: 源容器或孔位。
|
||||||
|
target[目标资源]: 目标容器或孔位。
|
||||||
|
volume_ul[体积(ul)]: 转移体积。
|
||||||
|
"""
|
||||||
|
return {"success": True}
|
||||||
|
|
||||||
|
@action(description="同步设备")
|
||||||
|
def sync_devices(self, devices: List[DeviceSlot]) -> dict:
|
||||||
|
return {"success": True, "count": len(devices)}
|
||||||
|
```
|
||||||
|
|
||||||
### @topic_config — 状态属性配置
|
### @topic_config — 状态属性配置
|
||||||
|
|
||||||
```python
|
```python
|
||||||
@@ -105,13 +233,27 @@ import logging
|
|||||||
from typing import Any, Dict, Optional
|
from typing import Any, Dict, Optional
|
||||||
|
|
||||||
from unilabos.ros.nodes.base_device_node import BaseROS2DeviceNode
|
from unilabos.ros.nodes.base_device_node import BaseROS2DeviceNode
|
||||||
from unilabos.registry.decorators import device, action, topic_config, not_action
|
from unilabos.registry.decorators import action, device, not_action, topic_config
|
||||||
|
|
||||||
@device(id="my_device", category=["my_category"], description="设备描述")
|
@device(
|
||||||
|
id="my_device",
|
||||||
|
category=["my_category"],
|
||||||
|
description="设备描述",
|
||||||
|
display_name="设备显示名",
|
||||||
|
)
|
||||||
class MyDevice:
|
class MyDevice:
|
||||||
|
"""设备类说明。"""
|
||||||
|
|
||||||
_ros_node: BaseROS2DeviceNode
|
_ros_node: BaseROS2DeviceNode
|
||||||
|
|
||||||
def __init__(self, device_id: Optional[str] = None, config: Optional[Dict[str, Any]] = None, **kwargs):
|
def __init__(self, device_id: Optional[str] = None, config: Optional[Dict[str, Any]] = None, **kwargs):
|
||||||
|
"""
|
||||||
|
初始化设备。
|
||||||
|
|
||||||
|
Args:
|
||||||
|
device_id[设备ID]: 设备实例 ID,默认使用 my_device。
|
||||||
|
config[设备配置]: 设备启动配置。
|
||||||
|
"""
|
||||||
self.device_id = device_id or "my_device"
|
self.device_id = device_id or "my_device"
|
||||||
self.config = config or {}
|
self.config = config or {}
|
||||||
self.logger = logging.getLogger(f"MyDevice.{self.device_id}")
|
self.logger = logging.getLogger(f"MyDevice.{self.device_id}")
|
||||||
@@ -133,7 +275,13 @@ class MyDevice:
|
|||||||
|
|
||||||
@action(description="执行操作")
|
@action(description="执行操作")
|
||||||
def my_action(self, param: float = 0.0, name: str = "") -> Dict[str, Any]:
|
def my_action(self, param: float = 0.0, name: str = "") -> Dict[str, Any]:
|
||||||
"""带 @action 装饰器 → 注册为 'my_action' 动作"""
|
"""
|
||||||
|
带 @action 装饰器 → 注册为 'my_action' 动作。
|
||||||
|
|
||||||
|
Args:
|
||||||
|
param[操作数值]: 操作使用的数值参数。
|
||||||
|
name[操作名称]: 操作名称或备注。
|
||||||
|
"""
|
||||||
return {"success": True}
|
return {"success": True}
|
||||||
|
|
||||||
def get_info(self) -> Dict[str, Any]:
|
def get_info(self) -> Dict[str, Any]:
|
||||||
@@ -158,3 +306,154 @@ class MyDevice:
|
|||||||
- `post_init` 用 `@not_action` 标记,参数类型标注为 `BaseROS2DeviceNode`
|
- `post_init` 用 `@not_action` 标记,参数类型标注为 `BaseROS2DeviceNode`
|
||||||
- 运行时状态存储在 `self.data` 字典中
|
- 运行时状态存储在 `self.data` 字典中
|
||||||
- 设备文件放在 `unilabos/devices/<category>/` 目录下
|
- 设备文件放在 `unilabos/devices/<category>/` 目录下
|
||||||
|
|
||||||
|
---
|
||||||
|
|
||||||
|
## 通信实现片段
|
||||||
|
|
||||||
|
Serial 文本指令:
|
||||||
|
|
||||||
|
```python
|
||||||
|
def _send_command(self, cmd: str) -> str:
|
||||||
|
self.ser.write(f"{cmd}\r\n".encode())
|
||||||
|
return self.ser.readline().decode().strip()
|
||||||
|
```
|
||||||
|
|
||||||
|
RS-485 响应解析要先定位帧头,不要用硬编码索引直接解析原始响应:
|
||||||
|
|
||||||
|
```python
|
||||||
|
def _normalize_response(self, raw: str, start_marker: str = "/") -> str:
|
||||||
|
pos = raw.find(start_marker)
|
||||||
|
return raw[pos:] if pos >= 0 else raw
|
||||||
|
```
|
||||||
|
|
||||||
|
自定义二进制帧:
|
||||||
|
|
||||||
|
```python
|
||||||
|
def _build_frame(self, func_code: int, data: bytes) -> bytes:
|
||||||
|
frame = bytearray([0xFE, func_code]) + bytearray(data)
|
||||||
|
checksum = sum(frame[1:]) % 256
|
||||||
|
frame.append(checksum)
|
||||||
|
return bytes(frame)
|
||||||
|
```
|
||||||
|
|
||||||
|
Modbus 寄存器映射:
|
||||||
|
|
||||||
|
```python
|
||||||
|
REGISTER_MAP = {
|
||||||
|
"temp_target": {"addr": 0x000B, "scale": 10},
|
||||||
|
}
|
||||||
|
|
||||||
|
def set_temperature(self, temp: float, **kwargs) -> bool:
|
||||||
|
reg = REGISTER_MAP["temp_target"]
|
||||||
|
value = int(float(temp) * reg["scale"]) & 0xFFFF
|
||||||
|
self.client.write_register(reg["addr"], value, slave=self.slave_id)
|
||||||
|
self.data["temp_target"] = temp
|
||||||
|
return True
|
||||||
|
```
|
||||||
|
|
||||||
|
HTTP API 映射:
|
||||||
|
|
||||||
|
```python
|
||||||
|
API_MAP = {
|
||||||
|
"set_temperature": {
|
||||||
|
"method": "POST",
|
||||||
|
"endpoint": "/api/temperature",
|
||||||
|
"body_key": "target",
|
||||||
|
},
|
||||||
|
}
|
||||||
|
```
|
||||||
|
|
||||||
|
SDK 封装:
|
||||||
|
|
||||||
|
```python
|
||||||
|
from my_device_sdk import DeviceController
|
||||||
|
|
||||||
|
class MyDevice:
|
||||||
|
def __init__(self, device_id=None, config=None, **kwargs):
|
||||||
|
self.config = config or {}
|
||||||
|
self.controller = DeviceController(port=self.config.get("port", "COM1"))
|
||||||
|
```
|
||||||
|
|
||||||
|
---
|
||||||
|
|
||||||
|
## 验证
|
||||||
|
|
||||||
|
无需手写注册表 YAML。`@device` 装饰器 + AST 扫描会在启动或检查时生成注册表条目。
|
||||||
|
|
||||||
|
```bash
|
||||||
|
# 1. 模块可导入
|
||||||
|
python -c "from unilabos.devices.<category>.<file> import <ClassName>"
|
||||||
|
|
||||||
|
# 2. 启动测试
|
||||||
|
unilab -g <graph>.json
|
||||||
|
|
||||||
|
# 3. 仅检查注册表
|
||||||
|
unilab --check_mode --skip_env_check
|
||||||
|
```
|
||||||
|
|
||||||
|
仅在旧代码无 `@device`、需要覆盖特殊字段、或做 `--complete_registry` 旧设备补全时,才考虑 YAML。新设备默认不要手写 YAML。
|
||||||
|
|
||||||
|
## 图文件节点模板
|
||||||
|
|
||||||
|
实验图 JSON 中的 `class` 对应 `@device(id=...)`,`config` 会传入 `__init__` 的 `config` 字典:
|
||||||
|
|
||||||
|
```json
|
||||||
|
{
|
||||||
|
"id": "my_device_1",
|
||||||
|
"name": "我的设备",
|
||||||
|
"children": [],
|
||||||
|
"parent": null,
|
||||||
|
"type": "device",
|
||||||
|
"class": "my_device",
|
||||||
|
"position": {"x": 0, "y": 0, "z": 0},
|
||||||
|
"config": {
|
||||||
|
"port": "/dev/ttyUSB0",
|
||||||
|
"baudrate": 9600
|
||||||
|
},
|
||||||
|
"data": {}
|
||||||
|
}
|
||||||
|
```
|
||||||
|
|
||||||
|
工作站需要同时配置 `deck` 和 `children`:
|
||||||
|
|
||||||
|
```json
|
||||||
|
{
|
||||||
|
"nodes": [
|
||||||
|
{
|
||||||
|
"id": "my_station",
|
||||||
|
"type": "device",
|
||||||
|
"class": "my_workstation",
|
||||||
|
"children": ["my_deck"],
|
||||||
|
"config": {},
|
||||||
|
"deck": {
|
||||||
|
"data": {
|
||||||
|
"_resource_child_name": "my_deck",
|
||||||
|
"_resource_type": "unilabos.resources.my_module:MyDeck"
|
||||||
|
}
|
||||||
|
}
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"id": "my_deck",
|
||||||
|
"type": "deck",
|
||||||
|
"class": "MyDeckClass",
|
||||||
|
"parent": "my_station",
|
||||||
|
"config": {"type": "MyDeckClass", "setup": true}
|
||||||
|
}
|
||||||
|
]
|
||||||
|
}
|
||||||
|
```
|
||||||
|
|
||||||
|
---
|
||||||
|
|
||||||
|
## 常见错误清单
|
||||||
|
|
||||||
|
- 缺少 `@device`:设备不会被 AST 扫描发现。
|
||||||
|
- 只有 `@property` 没有 `@topic_config()`:属性不会稳定广播到 `status_types`。
|
||||||
|
- `post_init` 没有 `@not_action`:会被误暴露为动作。
|
||||||
|
- `self.data = {}`:空字典会导致属性读取和 schema 初始数据不稳定,必须预填充每个状态键。
|
||||||
|
- 动作参数重命名:不要把同类设备已有的 `volume` 改成 `volume_ml`,参数名是接口契约。
|
||||||
|
- `status` 使用中文或临时文本:前端和工作流依赖稳定英文状态值。
|
||||||
|
- async 方法中使用 `time.sleep()`:应使用 `await self._ros_node.sleep(seconds)`。
|
||||||
|
- 硬编码串口响应索引:RS-485 响应前可能有噪声字节,应先定位帧头。
|
||||||
|
- 把硬件寄存器单位暴露给用户:对外使用物理单位,驱动内部做 scale 转换。
|
||||||
|
|||||||
450
.cursor/skills/filter-workflow-by-tags/SKILL.md
Normal file
450
.cursor/skills/filter-workflow-by-tags/SKILL.md
Normal file
@@ -0,0 +1,450 @@
|
|||||||
|
---
|
||||||
|
name: filter-workflow-by-tags
|
||||||
|
description: Query backend workflow list, aggregate all tags, and filter workflows by domain/scenario requirements using tags. Use when the user wants to search workflows, find workflows by tags, list available workflow tags, filter workflows by category/domain/scenario, or mentions 工作流筛选/标签查询/workflow tags/按领域查找工作流.
|
||||||
|
---
|
||||||
|
# Uni-Lab 工作流标签筛选指南
|
||||||
|
|
||||||
|
通过 Uni-Lab 云端 API 查询工作流列表,汇总所有可用标签(tags),并根据领域和场景要求筛选工作流。
|
||||||
|
|
||||||
|
> **重要**:本指南中的 `Authorization: Lab <token>` 是 **Uni-Lab 平台专用的认证方式**,`Lab` 是 Uni-Lab 的 auth scheme 关键字,**不是** HTTP Basic 认证。请勿将其替换为 `Basic`。
|
||||||
|
|
||||||
|
## 使用模式识别
|
||||||
|
|
||||||
|
**用户可能一开始就给出场景目标**(如"我要做有机合成实验"、"找柱层析相关的 protocol")。此时:
|
||||||
|
|
||||||
|
1. **识别场景关键词** → 映射到可能的 tags(如 synthesis、organic、chromatography、purification)
|
||||||
|
2. **直接执行完整流程**(获取 ak/sk/addr → 拉取所有工作流 → 汇总 tags → 按场景筛选)
|
||||||
|
3. **展示筛选结果** → 引导用户从候选 workflow 中**选择明确的实验 protocol**
|
||||||
|
4. **如果用户确认某个 workflow** → 记录 `workflow_uuid`,准备对接“与其他 Skill 的协作”
|
||||||
|
|
||||||
|
**如果用户未给场景目标**,则按标准 checklist 询问筛选条件。
|
||||||
|
|
||||||
|
---
|
||||||
|
|
||||||
|
## 前置条件
|
||||||
|
|
||||||
|
使用本指南前,**必须**先确认以下信息。如果缺少任何一项,**立即向用户询问并终止**,等补齐后再继续。
|
||||||
|
|
||||||
|
### 1. ak / sk → AUTH
|
||||||
|
|
||||||
|
询问用户的启动参数,从 `--ak` `--sk` 或 config.py 中获取。
|
||||||
|
|
||||||
|
生成 AUTH token:
|
||||||
|
|
||||||
|
```bash
|
||||||
|
python -c "import base64,sys; print('Authorization: Lab ' + base64.b64encode(f'{sys.argv[1]}:{sys.argv[2]}'.encode()).decode())" <ak> <sk>
|
||||||
|
```
|
||||||
|
|
||||||
|
### 2. --addr → BASE URL
|
||||||
|
|
||||||
|
| `--addr` 值 | BASE |
|
||||||
|
| ------------- | ------------------------------------- |
|
||||||
|
| `test` | `https://leap-lab.test.bohrium.com` |
|
||||||
|
| `uat` | `https://leap-lab.uat.bohrium.com` |
|
||||||
|
| `local` | `http://127.0.0.1:48197` |
|
||||||
|
| 不传(默认) | `https://leap-lab.bohrium.com` |
|
||||||
|
|
||||||
|
确认后设置:
|
||||||
|
|
||||||
|
```bash
|
||||||
|
BASE="<根据 addr 确定的 URL>"
|
||||||
|
AUTH="Authorization: Lab <上面命令输出的 token>"
|
||||||
|
```
|
||||||
|
|
||||||
|
### 3. lab_uuid(实验室 UUID)
|
||||||
|
|
||||||
|
如果用户未提供 `lab_uuid`,通过以下 API 自动获取:
|
||||||
|
|
||||||
|
```bash
|
||||||
|
curl -s -X GET "$BASE/api/v1/edge/lab/info" -H "$AUTH"
|
||||||
|
```
|
||||||
|
|
||||||
|
返回 `data.uuid` 即为 `lab_uuid`。
|
||||||
|
|
||||||
|
**三项全部就绪后才可开始。**
|
||||||
|
|
||||||
|
## Session State
|
||||||
|
|
||||||
|
在整个对话过程中,agent 需要记住以下状态:
|
||||||
|
|
||||||
|
- `lab_uuid` — 实验室 UUID
|
||||||
|
- `all_workflows` — 完整工作流列表(分页获取后缓存到内存或临时文件)
|
||||||
|
- `all_tags` — 所有工作流的标签汇总
|
||||||
|
|
||||||
|
---
|
||||||
|
|
||||||
|
## API 端点
|
||||||
|
|
||||||
|
### 查询工作流列表(支持分页)
|
||||||
|
|
||||||
|
```
|
||||||
|
GET $BASE/api/v1/lab/workflow/owner/list?page=<page>&page_size=<page_size>&lab_uuid=$lab_uuid
|
||||||
|
```
|
||||||
|
|
||||||
|
**参数:**
|
||||||
|
|
||||||
|
- `page` — 页码,从 1 开始
|
||||||
|
- `page_size` — 每页数量,建议 1000
|
||||||
|
- `lab_uuid` — 实验室 UUID
|
||||||
|
|
||||||
|
**返回结构:**
|
||||||
|
|
||||||
|
```json
|
||||||
|
{
|
||||||
|
"code": 0,
|
||||||
|
"data": {
|
||||||
|
"has_more": true,
|
||||||
|
"data": [
|
||||||
|
{
|
||||||
|
"uuid": "9661bba2-1b9f-4687-a63d-910245df174b",
|
||||||
|
"name": "Untitled",
|
||||||
|
"description": "",
|
||||||
|
"user_id": "114211",
|
||||||
|
"published": false,
|
||||||
|
"tags": null
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"uuid": "e0436638-190b-46bc-b1a1-2711d9602f6a",
|
||||||
|
"name": "Synthesis v2",
|
||||||
|
"user_id": "114211",
|
||||||
|
"published": true,
|
||||||
|
"tags": ["synthesis", "organic"]
|
||||||
|
}
|
||||||
|
]
|
||||||
|
}
|
||||||
|
}
|
||||||
|
```
|
||||||
|
|
||||||
|
**字段说明:**
|
||||||
|
|
||||||
|
- `has_more` — 若为 `true`,需要继续请求 `page+1`
|
||||||
|
- `tags` — 可能为 `null`、空数组或字符串数组;聚合时必须容忍 `null`
|
||||||
|
|
||||||
|
### 启动工作流(直接运行)
|
||||||
|
|
||||||
|
```
|
||||||
|
POST $BASE/api/v1/lab/workflow/<workflow_uuid>/run
|
||||||
|
```
|
||||||
|
|
||||||
|
**用途:** 直接启动一个 workflow 的默认执行(使用模板中预设的参数),无需创建 notebook。适用于快速测试或无参数变化的重复执行。
|
||||||
|
|
||||||
|
**请求体:** 空 JSON `{}` 或省略
|
||||||
|
|
||||||
|
**返回:**
|
||||||
|
|
||||||
|
```json
|
||||||
|
{
|
||||||
|
"code": 0,
|
||||||
|
"data": "<run_uuid>"
|
||||||
|
}
|
||||||
|
```
|
||||||
|
|
||||||
|
- `run_uuid` — 本次执行的唯一标识(不是 notebook UUID)
|
||||||
|
|
||||||
|
**注意:**
|
||||||
|
|
||||||
|
- 该接口会使用 workflow 模板中保存的默认参数直接执行
|
||||||
|
- 如果 workflow 需要动态参数(如 CSV 路径、样品 UUID),应使用 `POST /lab/notebook` 创建 notebook 并传入 `node_params`
|
||||||
|
- 返回的 `run_uuid` 可直接传入下方「查询任务状态」接口查询实时进度
|
||||||
|
|
||||||
|
### 查询任务状态
|
||||||
|
|
||||||
|
```
|
||||||
|
GET $BASE/api/v1/lab/mcp/task/<task_uuid>
|
||||||
|
```
|
||||||
|
|
||||||
|
**用途:** 查询由 `POST /lab/workflow/<uuid>/run` 返回的 `run_uuid`(即 task_uuid)的实时执行状态,包括整体状态和每个节点(JOS:Job On Station)的执行详情。
|
||||||
|
|
||||||
|
**路径参数:**
|
||||||
|
|
||||||
|
- `task_uuid` — 等同于启动工作流接口返回的 `run_uuid`
|
||||||
|
|
||||||
|
**返回:**
|
||||||
|
|
||||||
|
```json
|
||||||
|
{
|
||||||
|
"code": 0,
|
||||||
|
"data": {
|
||||||
|
"status": "running",
|
||||||
|
"jos_status": [
|
||||||
|
{
|
||||||
|
"uuid": "d0e24bfe-8d99-450e-b19d-f25849dfbaad",
|
||||||
|
"node_name": "PRCXI_BioER_96_wellplate_slot_1",
|
||||||
|
"action_name": "create_resource",
|
||||||
|
"status": "success",
|
||||||
|
"return_info": {
|
||||||
|
"suc": true,
|
||||||
|
"error": "",
|
||||||
|
"return_value": { ... }
|
||||||
|
}
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"uuid": "...",
|
||||||
|
"node_name": "...",
|
||||||
|
"action_name": "transfer_liquid",
|
||||||
|
"status": "pending",
|
||||||
|
"return_info": null
|
||||||
|
}
|
||||||
|
]
|
||||||
|
}
|
||||||
|
}
|
||||||
|
```
|
||||||
|
|
||||||
|
**字段说明:**
|
||||||
|
|
||||||
|
- `data.status` — 整体任务状态
|
||||||
|
- `running` — 正在执行(至少一个节点 pending 或 running)
|
||||||
|
- `success` — 全部节点成功
|
||||||
|
- `failed` — 有节点失败
|
||||||
|
- `data.jos_status[]` — 节点级执行列表(按执行顺序)
|
||||||
|
- `uuid` — 节点执行实例 UUID
|
||||||
|
- `node_name` — 节点名称(资源/设备名或工位名)
|
||||||
|
- `action_name` — 动作类型(`create_resource`、`transfer_liquid`、`centrifuge`、等)
|
||||||
|
- `status` — 节点状态:`success`、`pending`、`running`、`failed`
|
||||||
|
- `return_info` — 执行返回,失败时 `suc=false` 且 `error` 有错误信息
|
||||||
|
|
||||||
|
**注意:**
|
||||||
|
|
||||||
|
- 此接口的 `task_uuid` **是** `POST /lab/workflow/<uuid>/run` 返回的 `run_uuid`,二者为同一个 ID 的不同称呼
|
||||||
|
- **不要**把 notebook UUID(`POST /lab/notebook` 返回)传进来——那条路径用 `GET /lab/notebook/status` 查询
|
||||||
|
- `jos_status` 数组按节点执行顺序给出;从 pending 数量可以估算剩余进度
|
||||||
|
- 返回体可能较大(`return_info.return_value` 中可能包含完整 resource tree),可在脚本中只提取 `status` + `node_name` + `action_name` 做摘要
|
||||||
|
|
||||||
|
**状态轮询示例:**
|
||||||
|
|
||||||
|
```bash
|
||||||
|
# 每 5 秒轮询一次直至完成
|
||||||
|
TASK="b183d97e-d2b5-4b24-b14b-820df04d87c0"
|
||||||
|
while :; do
|
||||||
|
st=$(curl -s -X GET "$BASE/api/v1/lab/mcp/task/$TASK" -H "$AUTH" \
|
||||||
|
| python3 -c "import json,sys; d=json.load(sys.stdin)['data']; \
|
||||||
|
print(d['status'], '|', sum(1 for j in d['jos_status'] if j['status']=='success'), '/', len(d['jos_status']))")
|
||||||
|
echo "$(date +%H:%M:%S) $st"
|
||||||
|
[[ "$st" == success* || "$st" == failed* ]] && break
|
||||||
|
sleep 5
|
||||||
|
done
|
||||||
|
```
|
||||||
|
|
||||||
|
---
|
||||||
|
|
||||||
|
## 完整工作流 Checklist
|
||||||
|
|
||||||
|
```
|
||||||
|
Task Progress:
|
||||||
|
- [ ] Step 0: 识别用户是否已给出场景目标(如"有机合成"、"柱层析")
|
||||||
|
- 若已给出 → 记录场景关键词,自动进入后续步骤
|
||||||
|
- 若未给出 → 在 Step 6 询问用户
|
||||||
|
- [ ] Step 1: 确认 ak/sk → 生成 AUTH token
|
||||||
|
- [ ] Step 2: 确认 --addr → 设置 BASE URL
|
||||||
|
- [ ] Step 3: GET /edge/lab/info → 获取 lab_uuid(如用户未提供)
|
||||||
|
- [ ] Step 4: 分页获取所有工作流(从 page=1 开始直到 has_more=false)
|
||||||
|
- [ ] Step 5: 汇总所有非空 tags → 生成 all_tags(去重、排序、附出现次数)
|
||||||
|
- [ ] Step 6: 根据场景关键词(Step 0 或新询问)在 all_tags 中做语义映射 → 确定候选 tags
|
||||||
|
- 若语义映射不唯一,列出候选 tags 让用户确认
|
||||||
|
- [ ] Step 7: 按候选 tags 筛选工作流(默认 any 模式,召回优先)
|
||||||
|
- [ ] Step 8: 展示筛选结果(uuid、name、description、tags、published)
|
||||||
|
- [ ] Step 9: 引导用户从结果中选择**明确的实验 protocol**
|
||||||
|
- 若结果只有 1 条 → 直接确认该 workflow_uuid
|
||||||
|
- 若结果 2–10 条 → 让用户按编号选择
|
||||||
|
- 若结果过多 → 提示收紧条件(加 tag、切换 all 模式、仅 published)
|
||||||
|
- 若结果为空 → 放宽条件(去掉最稀有 tag)或提示用户换关键词
|
||||||
|
- [ ] Step 10: 记录用户选中的 workflow_uuid,并提示提交实验或查看详情
|
||||||
|
```
|
||||||
|
|
||||||
|
---
|
||||||
|
|
||||||
|
## 推荐路径:使用脚本
|
||||||
|
|
||||||
|
同目录下提供 `scripts/filter_workflows.py`,一次完成分页抓取、标签聚合与筛选:
|
||||||
|
|
||||||
|
```bash
|
||||||
|
# 1. 仅汇总标签(不筛选)
|
||||||
|
python scripts/filter_workflows.py \
|
||||||
|
--auth "<Lab base64token>" \
|
||||||
|
--base "$BASE" \
|
||||||
|
--lab-uuid "$lab_uuid" \
|
||||||
|
--summary-only
|
||||||
|
|
||||||
|
# 2. 按标签筛选(ANY 模式:包含任一)
|
||||||
|
python scripts/filter_workflows.py \
|
||||||
|
--auth "<Lab base64token>" \
|
||||||
|
--base "$BASE" \
|
||||||
|
--lab-uuid "$lab_uuid" \
|
||||||
|
--tags synthesis organic \
|
||||||
|
--mode any
|
||||||
|
|
||||||
|
# 3. 按标签筛选(ALL 模式:必须同时包含)
|
||||||
|
python scripts/filter_workflows.py \
|
||||||
|
--auth "<Lab base64token>" \
|
||||||
|
--base "$BASE" \
|
||||||
|
--lab-uuid "$lab_uuid" \
|
||||||
|
--tags synthesis organic \
|
||||||
|
--mode all \
|
||||||
|
--output filtered.json
|
||||||
|
|
||||||
|
# 4. 仅筛选已发布
|
||||||
|
python scripts/filter_workflows.py \
|
||||||
|
--auth "<Lab base64token>" \
|
||||||
|
--base "$BASE" \
|
||||||
|
--lab-uuid "$lab_uuid" \
|
||||||
|
--tags synthesis \
|
||||||
|
--published-only
|
||||||
|
```
|
||||||
|
|
||||||
|
**`--auth` 参数说明**:传入 `Authorization` 头中 `Lab` 之后的 base64 token(不带 `Lab ` 前缀),脚本内部会自动补上 scheme。
|
||||||
|
|
||||||
|
**输出结构:**
|
||||||
|
|
||||||
|
```json
|
||||||
|
{
|
||||||
|
"total_workflows": 150,
|
||||||
|
"tag_counts": {"synthesis": 12, "organic": 8, "analysis": 5},
|
||||||
|
"all_tags": ["analysis", "organic", "synthesis"],
|
||||||
|
"filter": {"tags": ["synthesis", "organic"], "mode": "any"},
|
||||||
|
"filtered_workflows": [
|
||||||
|
{"uuid": "...", "name": "...", "description": "...", "tags": [...], "published": true}
|
||||||
|
]
|
||||||
|
}
|
||||||
|
```
|
||||||
|
|
||||||
|
---
|
||||||
|
|
||||||
|
## 手动路径:curl + jq
|
||||||
|
|
||||||
|
如果脚本不可用或环境缺少 Python,可用 shell 实现。
|
||||||
|
|
||||||
|
### 1. 分页抓取(写入 `all_workflows.json`)
|
||||||
|
|
||||||
|
```bash
|
||||||
|
page=1
|
||||||
|
echo "[]" > all_workflows.json
|
||||||
|
|
||||||
|
while :; do
|
||||||
|
resp=$(curl -s -X GET \
|
||||||
|
"$BASE/api/v1/lab/workflow/owner/list?page=$page&page_size=1000&lab_uuid=$lab_uuid" \
|
||||||
|
-H "$AUTH")
|
||||||
|
|
||||||
|
page_data=$(echo "$resp" | jq -c '.data.data // []')
|
||||||
|
jq -c --argjson p "$page_data" '. + $p' all_workflows.json > _tmp.json && mv _tmp.json all_workflows.json
|
||||||
|
|
||||||
|
has_more=$(echo "$resp" | jq -r '.data.has_more')
|
||||||
|
[ "$has_more" != "true" ] && break
|
||||||
|
page=$((page + 1))
|
||||||
|
done
|
||||||
|
|
||||||
|
echo "Total: $(jq 'length' all_workflows.json)"
|
||||||
|
```
|
||||||
|
|
||||||
|
### 2. 汇总所有标签(含出现次数)
|
||||||
|
|
||||||
|
```bash
|
||||||
|
jq '[.[].tags // [] | .[]] | group_by(.) | map({tag: .[0], count: length}) | sort_by(-.count)' \
|
||||||
|
all_workflows.json
|
||||||
|
```
|
||||||
|
|
||||||
|
### 3. 按标签筛选
|
||||||
|
|
||||||
|
```bash
|
||||||
|
# ANY:包含任一指定标签
|
||||||
|
jq --argjson want '["synthesis","organic"]' \
|
||||||
|
'[.[] | select((.tags // []) | any(. as $t | $want | index($t)))]' \
|
||||||
|
all_workflows.json
|
||||||
|
|
||||||
|
# ALL:同时包含所有指定标签
|
||||||
|
jq --argjson want '["synthesis","organic"]' \
|
||||||
|
'[.[] | select(($want | all(. as $w | (.tags // []) | index($w))))]' \
|
||||||
|
all_workflows.json
|
||||||
|
```
|
||||||
|
|
||||||
|
---
|
||||||
|
|
||||||
|
## 筛选策略
|
||||||
|
|
||||||
|
agent 拿到用户的「领域 + 场景」自然语言描述时,按如下顺序选择 tag:
|
||||||
|
|
||||||
|
1. **优先用户显式指定的 tags**:若用户明确给出标签词,直接精确匹配。
|
||||||
|
2. **从 all_tags 中做语义映射**:若用户描述是自然语言(如"有机合成、柱层析"),在 all_tags 中找语义相关项(如 `synthesis`、`organic`、`chromatography`)。必要时展示候选 tag 让用户确认。
|
||||||
|
3. **模式选择**:
|
||||||
|
- 默认 `any`(更多召回),给出 tag 集合的并集匹配
|
||||||
|
- 用户强调"必须同时满足"时用 `all`
|
||||||
|
4. **空结果兜底**:如果筛选为空,放宽条件(去掉最稀有 tag、切换 any 模式),并提醒用户。
|
||||||
|
|
||||||
|
---
|
||||||
|
|
||||||
|
## 引导到明确的 Protocol
|
||||||
|
|
||||||
|
筛选完成后,**最终目标是让用户确认一个具体的 workflow_uuid**,而不是停留在"一堆候选"上。按结果数量采取不同策略:
|
||||||
|
|
||||||
|
| 结果数量 | 策略 |
|
||||||
|
| --------- | ---------------------------------------------------------------------------------------------------------------------------------- |
|
||||||
|
| 0 条 | 放宽筛选(去掉最稀有 tag → 切换 any 模式 → 去掉 `--published-only`)。仍为空则提示换关键词,或列出 `all_tags` 让用户重新选。 |
|
||||||
|
| 1 条 | 直接确认:"找到唯一匹配:`<name>` (uuid `<uuid>`),是否用它?"用户确认后记录 `workflow_uuid`。 |
|
||||||
|
| 2–10 条 | 编号列表展示,让用户选编号。每项给出 name、tags、description 摘要、published 状态。 |
|
||||||
|
| 10–30 条 | 先展示 tag 分布帮助用户进一步收紧:列出匹配结果中最常见的子标签,提示"加一个 tag 可将结果缩小到 N 条"。 |
|
||||||
|
| >30 条 | 强制要求用户补充条件:仅 published、指定具体 tag 组合、或按名称关键词过滤。 |
|
||||||
|
|
||||||
|
**确认 workflow 后**:
|
||||||
|
|
||||||
|
1. 将 `workflow_uuid` 写入 session state
|
||||||
|
2. 提示用户下一步可用的 skill:
|
||||||
|
- 提交实验 → 引导到“与其他 Skill 的协作”
|
||||||
|
- 查看 workflow 详细节点 → `GET /api/v1/lab/workflow/template/detail/<workflow_uuid>`
|
||||||
|
3. 若用户想换一个,回到筛选步骤。
|
||||||
|
|
||||||
|
---
|
||||||
|
|
||||||
|
## 展示结果
|
||||||
|
|
||||||
|
推荐格式(表格 + 汇总统计):
|
||||||
|
|
||||||
|
```
|
||||||
|
共 150 个工作流,其中 32 个匹配筛选条件 [tags: synthesis OR organic]
|
||||||
|
|
||||||
|
| UUID (短) | 名称 | Tags | 已发布 |
|
||||||
|
|-----------|--------------------------|------------------------------|--------|
|
||||||
|
| e0436638 | Synthesis v2 | synthesis, organic | ✓ |
|
||||||
|
| 5b60dbb8 | Grignard Protocol | synthesis, organometallic | ✓ |
|
||||||
|
| ... | ... | ... | ... |
|
||||||
|
|
||||||
|
所有可用标签(按频次):
|
||||||
|
synthesis (12), organic (8), analysis (5), purification (4), ...
|
||||||
|
```
|
||||||
|
|
||||||
|
如果用户下一步想执行某工作流 → 引导到“与其他 Skill 的协作”。
|
||||||
|
|
||||||
|
---
|
||||||
|
|
||||||
|
## 常见问题
|
||||||
|
|
||||||
|
### Q: tags 为 null 的工作流要不要展示?
|
||||||
|
|
||||||
|
默认**不展示**在筛选结果中(因为无法按 tag 匹配)。但在 `--summary-only` 或无筛选条件时,这些工作流仍会计入总数,并在输出中单独列出"未打标签"计数。
|
||||||
|
|
||||||
|
### Q: 如何按名称/描述做模糊匹配?
|
||||||
|
|
||||||
|
脚本未内置,但可在 jq 中组合:
|
||||||
|
|
||||||
|
```bash
|
||||||
|
jq '[.[] | select((.name + " " + (.description // "")) | test("organic"; "i"))]' all_workflows.json
|
||||||
|
```
|
||||||
|
|
||||||
|
### Q: `page_size=1000` 是否会被服务端限制?
|
||||||
|
|
||||||
|
接口通常允许最大 1000;如果返回量少于 1000 且 `has_more=false`,说明已到末页。极端情况下若服务端返回错误,可降到 200 或 500 再试。
|
||||||
|
|
||||||
|
### Q: 工作流数量极大(>10k)怎么办?
|
||||||
|
|
||||||
|
1. 先跑 `--summary-only` 了解 tag 分布
|
||||||
|
2. 提示用户先限定 `--published-only` 或指定 tag
|
||||||
|
3. 考虑将 `all_workflows.json` 缓存到本地,下次直接复用
|
||||||
|
|
||||||
|
---
|
||||||
|
|
||||||
|
## 与其他 Skill 的协作
|
||||||
|
|
||||||
|
- 正常情况下,找到 workflow 之后可以直接用它提交实验(启动工作流的 api 端点 POST $BASE/api/v1/lab/workflow/<workflow_uuid>/run,不用别的 skill)
|
||||||
|
- **仅当需要进行多次实验时,使用 batch-submit-experiment** — 筛选到目标工作流后,`workflow_uuid` 直接用于实验提交
|
||||||
|
|
||||||
|
## 脚本依赖
|
||||||
|
|
||||||
|
`scripts/filter_workflows.py` 仅使用 Python 标准库(`urllib`、`json`、`argparse`),无需额外安装。
|
||||||
191
.cursor/skills/filter-workflow-by-tags/scripts/filter_workflows.py
Executable file
191
.cursor/skills/filter-workflow-by-tags/scripts/filter_workflows.py
Executable file
@@ -0,0 +1,191 @@
|
|||||||
|
#!/usr/bin/env python3
|
||||||
|
"""分页拉取 Uni-Lab 工作流列表,汇总 tags 并按 tag 筛选。
|
||||||
|
|
||||||
|
使用示例:
|
||||||
|
python filter_workflows.py \
|
||||||
|
--auth <base64token> \
|
||||||
|
--base https://leap-lab.test.bohrium.com \
|
||||||
|
--lab-uuid a9059772-... \
|
||||||
|
--tags synthesis organic --mode any
|
||||||
|
|
||||||
|
仅依赖 Python 标准库。
|
||||||
|
"""
|
||||||
|
|
||||||
|
from __future__ import annotations
|
||||||
|
|
||||||
|
import argparse
|
||||||
|
import json
|
||||||
|
import sys
|
||||||
|
import urllib.error
|
||||||
|
import urllib.parse
|
||||||
|
import urllib.request
|
||||||
|
from collections import Counter
|
||||||
|
|
||||||
|
|
||||||
|
def fetch_all_workflows(base: str, auth_token: str, lab_uuid: str, page_size: int = 1000) -> list[dict]:
|
||||||
|
"""分页拉取所有 owner 工作流,直到 has_more=false。"""
|
||||||
|
workflows: list[dict] = []
|
||||||
|
page = 1
|
||||||
|
while True:
|
||||||
|
query = urllib.parse.urlencode(
|
||||||
|
{"page": page, "page_size": page_size, "lab_uuid": lab_uuid}
|
||||||
|
)
|
||||||
|
url = f"{base.rstrip('/')}/api/v1/lab/workflow/owner/list?{query}"
|
||||||
|
req = urllib.request.Request(
|
||||||
|
url,
|
||||||
|
headers={
|
||||||
|
"Authorization": f"Lab {auth_token}",
|
||||||
|
"Accept": "application/json",
|
||||||
|
},
|
||||||
|
)
|
||||||
|
try:
|
||||||
|
with urllib.request.urlopen(req, timeout=30) as resp:
|
||||||
|
payload = json.loads(resp.read().decode("utf-8"))
|
||||||
|
except urllib.error.HTTPError as e:
|
||||||
|
sys.exit(f"[ERROR] HTTP {e.code} on page {page}: {e.read().decode('utf-8', 'ignore')}")
|
||||||
|
except urllib.error.URLError as e:
|
||||||
|
sys.exit(f"[ERROR] URL error on page {page}: {e.reason}")
|
||||||
|
|
||||||
|
if payload.get("code") != 0:
|
||||||
|
sys.exit(f"[ERROR] API returned non-zero code: {payload}")
|
||||||
|
|
||||||
|
data = payload.get("data") or {}
|
||||||
|
page_items = data.get("data") or []
|
||||||
|
workflows.extend(page_items)
|
||||||
|
|
||||||
|
if not data.get("has_more"):
|
||||||
|
break
|
||||||
|
page += 1
|
||||||
|
# 防御性兜底,避免接口异常导致无限循环
|
||||||
|
if page > 1000:
|
||||||
|
print(f"[WARN] page count exceeded 1000, stopping early", file=sys.stderr)
|
||||||
|
break
|
||||||
|
|
||||||
|
return workflows
|
||||||
|
|
||||||
|
|
||||||
|
def aggregate_tags(workflows: list[dict]) -> tuple[list[str], dict[str, int], int]:
|
||||||
|
"""返回 (sorted_tags, tag_counts, untagged_count)。"""
|
||||||
|
counter: Counter[str] = Counter()
|
||||||
|
untagged = 0
|
||||||
|
for wf in workflows:
|
||||||
|
tags = wf.get("tags")
|
||||||
|
if not tags:
|
||||||
|
untagged += 1
|
||||||
|
continue
|
||||||
|
for t in tags:
|
||||||
|
if isinstance(t, str) and t.strip():
|
||||||
|
counter[t.strip()] += 1
|
||||||
|
return sorted(counter.keys()), dict(counter), untagged
|
||||||
|
|
||||||
|
|
||||||
|
def filter_workflows(
|
||||||
|
workflows: list[dict],
|
||||||
|
want_tags: list[str],
|
||||||
|
mode: str,
|
||||||
|
published_only: bool,
|
||||||
|
) -> list[dict]:
|
||||||
|
"""按 tag 筛选。mode 取值 any / all。"""
|
||||||
|
want_set = {t.strip() for t in want_tags if t.strip()}
|
||||||
|
out: list[dict] = []
|
||||||
|
for wf in workflows:
|
||||||
|
if published_only and not wf.get("published"):
|
||||||
|
continue
|
||||||
|
if not want_set:
|
||||||
|
out.append(wf)
|
||||||
|
continue
|
||||||
|
tags = wf.get("tags") or []
|
||||||
|
tag_set = {t for t in tags if isinstance(t, str)}
|
||||||
|
if mode == "all":
|
||||||
|
if want_set.issubset(tag_set):
|
||||||
|
out.append(wf)
|
||||||
|
else: # any
|
||||||
|
if want_set & tag_set:
|
||||||
|
out.append(wf)
|
||||||
|
return out
|
||||||
|
|
||||||
|
|
||||||
|
def project_workflow(wf: dict) -> dict:
|
||||||
|
"""精简输出字段。"""
|
||||||
|
return {
|
||||||
|
"uuid": wf.get("uuid"),
|
||||||
|
"name": wf.get("name"),
|
||||||
|
"description": wf.get("description", ""),
|
||||||
|
"tags": wf.get("tags") or [],
|
||||||
|
"published": bool(wf.get("published")),
|
||||||
|
"user_id": wf.get("user_id"),
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
|
def parse_args() -> argparse.Namespace:
|
||||||
|
p = argparse.ArgumentParser(description="Fetch & filter Uni-Lab workflows by tags.")
|
||||||
|
p.add_argument("--auth", required=True, help="Base64 token (the part after `Lab `).")
|
||||||
|
p.add_argument("--base", required=True, help="Base URL, e.g. https://leap-lab.test.bohrium.com")
|
||||||
|
p.add_argument("--lab-uuid", required=True, help="Lab UUID.")
|
||||||
|
p.add_argument("--tags", nargs="*", default=[], help="Tags to filter by (space separated).")
|
||||||
|
p.add_argument(
|
||||||
|
"--mode",
|
||||||
|
choices=["any", "all"],
|
||||||
|
default="any",
|
||||||
|
help="any: workflow contains at least one tag; all: workflow contains every tag.",
|
||||||
|
)
|
||||||
|
p.add_argument("--published-only", action="store_true", help="Only include published workflows.")
|
||||||
|
p.add_argument("--page-size", type=int, default=1000, help="Page size, default 1000.")
|
||||||
|
p.add_argument(
|
||||||
|
"--summary-only",
|
||||||
|
action="store_true",
|
||||||
|
help="Print tag summary without applying filter (still fetches everything).",
|
||||||
|
)
|
||||||
|
p.add_argument("--output", help="Write JSON result to this path. If omitted, print to stdout.")
|
||||||
|
return p.parse_args()
|
||||||
|
|
||||||
|
|
||||||
|
def main() -> None:
|
||||||
|
args = parse_args()
|
||||||
|
workflows = fetch_all_workflows(
|
||||||
|
base=args.base,
|
||||||
|
auth_token=args.auth,
|
||||||
|
lab_uuid=args.lab_uuid,
|
||||||
|
page_size=args.page_size,
|
||||||
|
)
|
||||||
|
sorted_tags, tag_counts, untagged = aggregate_tags(workflows)
|
||||||
|
|
||||||
|
if args.summary_only:
|
||||||
|
result = {
|
||||||
|
"total_workflows": len(workflows),
|
||||||
|
"untagged_count": untagged,
|
||||||
|
"tag_counts": tag_counts,
|
||||||
|
"all_tags": sorted_tags,
|
||||||
|
}
|
||||||
|
else:
|
||||||
|
filtered = filter_workflows(
|
||||||
|
workflows,
|
||||||
|
want_tags=args.tags,
|
||||||
|
mode=args.mode,
|
||||||
|
published_only=args.published_only,
|
||||||
|
)
|
||||||
|
result = {
|
||||||
|
"total_workflows": len(workflows),
|
||||||
|
"untagged_count": untagged,
|
||||||
|
"tag_counts": tag_counts,
|
||||||
|
"all_tags": sorted_tags,
|
||||||
|
"filter": {
|
||||||
|
"tags": args.tags,
|
||||||
|
"mode": args.mode,
|
||||||
|
"published_only": args.published_only,
|
||||||
|
},
|
||||||
|
"matched_count": len(filtered),
|
||||||
|
"filtered_workflows": [project_workflow(wf) for wf in filtered],
|
||||||
|
}
|
||||||
|
|
||||||
|
payload = json.dumps(result, ensure_ascii=False, indent=2)
|
||||||
|
if args.output:
|
||||||
|
with open(args.output, "w", encoding="utf-8") as f:
|
||||||
|
f.write(payload)
|
||||||
|
print(f"Wrote {len(workflows)} workflows summary → {args.output}", file=sys.stderr)
|
||||||
|
else:
|
||||||
|
print(payload)
|
||||||
|
|
||||||
|
|
||||||
|
if __name__ == "__main__":
|
||||||
|
main()
|
||||||
@@ -10,7 +10,8 @@ description: Operate Virtual Workbench via REST API — prepare materials, move
|
|||||||
- **device_id**: `virtual_workbench`
|
- **device_id**: `virtual_workbench`
|
||||||
- **Python 源码**: `unilabos/devices/virtual/workbench.py`
|
- **Python 源码**: `unilabos/devices/virtual/workbench.py`
|
||||||
- **设备类**: `VirtualWorkbench`
|
- **设备类**: `VirtualWorkbench`
|
||||||
- **动作数**: 6(`auto-prepare_materials`, `auto-move_to_heating_station`, `auto-start_heating`, `auto-move_to_output`, `transfer`, `manual_confirm`)
|
- **当前纳入动作**: 5 个(`auto-prepare_materials`, `auto-move_to_heating_station`, `auto-start_heating`, `auto-move_to_output`, `transfer`)
|
||||||
|
- **暂跳过动作**: `manual_confirm`、扣电测试 `test`(需要启用时先从最新注册表重新提取 schema)
|
||||||
- **设备描述**: 模拟工作台,包含 1 个机械臂(每次操作 2s,独占锁)和 3 个加热台(每次加热 60s,可并行)
|
- **设备描述**: 模拟工作台,包含 1 个机械臂(每次操作 2s,独占锁)和 3 个加热台(每次加热 60s,可并行)
|
||||||
|
|
||||||
### 典型工作流程
|
### 典型工作流程
|
||||||
@@ -151,7 +152,8 @@ curl -s -X POST "$BASE/api/v1/lab/mcp/run/action" \
|
|||||||
| `auto-start_heating` | `UniLabJsonCommand` |
|
| `auto-start_heating` | `UniLabJsonCommand` |
|
||||||
| `auto-move_to_output` | `UniLabJsonCommand` |
|
| `auto-move_to_output` | `UniLabJsonCommand` |
|
||||||
| `transfer` | `UniLabJsonCommandAsync` |
|
| `transfer` | `UniLabJsonCommandAsync` |
|
||||||
| `manual_confirm` | `UniLabJsonCommand` |
|
|
||||||
|
> `manual_confirm` 和扣电测试 `test` 当前不纳入本 skill 的推荐操作范围;不要基于历史 JSON 直接调用,需先重新生成并校验 schema。
|
||||||
|
|
||||||
### 10. 查询任务状态
|
### 10. 查询任务状态
|
||||||
|
|
||||||
@@ -225,11 +227,9 @@ curl -s -X PUT "$BASE/api/v1/edge/material/node" \
|
|||||||
| `transfer` | `resource` | ResourceSlot | 待转移物料数组 |
|
| `transfer` | `resource` | ResourceSlot | 待转移物料数组 |
|
||||||
| `transfer` | `target_device` | DeviceSlot | 目标设备路径 |
|
| `transfer` | `target_device` | DeviceSlot | 目标设备路径 |
|
||||||
| `transfer` | `mount_resource` | ResourceSlot | 目标孔位数组 |
|
| `transfer` | `mount_resource` | ResourceSlot | 目标孔位数组 |
|
||||||
| `manual_confirm` | `resource` | ResourceSlot | 确认用物料数组 |
|
|
||||||
| `manual_confirm` | `target_device` | DeviceSlot | 确认用目标设备 |
|
|
||||||
| `manual_confirm` | `mount_resource` | ResourceSlot | 确认用目标孔位数组 |
|
|
||||||
|
|
||||||
> `prepare_materials`、`move_to_heating_station`、`start_heating`、`move_to_output` 这 4 个动作**无 Slot 字段**,参数为纯数值/整数。
|
> `prepare_materials`、`move_to_heating_station`、`start_heating`、`move_to_output` 这 4 个动作**无 Slot 字段**,参数为纯数值/整数。
|
||||||
|
> `manual_confirm` 先跳过,不维护其 Slot 字段表。
|
||||||
|
|
||||||
---
|
---
|
||||||
|
|
||||||
@@ -270,3 +270,13 @@ prepare_materials (count=5)
|
|||||||
```
|
```
|
||||||
|
|
||||||
创建节点时,`prepare_materials` 的 5 个 output handle(`channel_1` ~ `channel_5`)分别连接到 5 个 `move_to_heating_station` 节点的 `material_input` handle。每个 `move_to_heating_station` 的 `heating_station_output` 和 `material_number_output` 连接到对应 `start_heating` 的 `station_id_input` 和 `material_number_input`。
|
创建节点时,`prepare_materials` 的 5 个 output handle(`channel_1` ~ `channel_5`)分别连接到 5 个 `move_to_heating_station` 节点的 `material_input` handle。每个 `move_to_heating_station` 的 `heating_station_output` 和 `material_number_output` 连接到对应 `start_heating` 的 `station_id_input` 和 `material_number_input`。
|
||||||
|
|
||||||
|
`start_heating` 完成后还需要继续连接到 `move_to_output`,否则加热完成的物料不会移出加热台:
|
||||||
|
|
||||||
|
| source action | source handle | target action | target handle | 传递参数 |
|
||||||
|
| ------------- | ------------- | ------------- | ------------- | -------- |
|
||||||
|
| `auto-prepare_materials` | `channel_N` | `auto-move_to_heating_station` | `material_input` | `material_number` |
|
||||||
|
| `auto-move_to_heating_station` | `heating_station_output` | `auto-start_heating` | `station_id_input` | `station_id` |
|
||||||
|
| `auto-move_to_heating_station` | `material_number_output` | `auto-start_heating` | `material_number_input` | `material_number` |
|
||||||
|
| `auto-start_heating` | `heating_done_station` | `auto-move_to_output` | `output_station_input` | `station_id` |
|
||||||
|
| `auto-start_heating` | `heating_done_material` | `auto-move_to_output` | `output_material_input` | `material_number` |
|
||||||
|
|||||||
@@ -1,6 +1,8 @@
|
|||||||
# Action Index — virtual_workbench
|
# Action Index — virtual_workbench
|
||||||
|
|
||||||
6 个动作,按功能分类。每个动作的完整 JSON Schema 在 `actions/<name>.json`。
|
当前纳入 5 个动作,按功能分类。每个动作的完整 JSON Schema 在 `actions/<name>.json`。
|
||||||
|
|
||||||
|
暂跳过:`manual_confirm`、扣电测试 `test`。这两个动作需要启用时,先从最新 `req_device_registry_upload.json` 重新提取 schema 并校验参数。
|
||||||
|
|
||||||
---
|
---
|
||||||
|
|
||||||
@@ -60,17 +62,18 @@
|
|||||||
|
|
||||||
---
|
---
|
||||||
|
|
||||||
## 人工确认
|
## 暂跳过动作
|
||||||
|
|
||||||
### `manual_confirm`
|
### `manual_confirm`
|
||||||
|
|
||||||
创建人工确认节点,等待用户手动确认后继续(含物料转移上下文)
|
创建人工确认节点,等待用户手动确认后继续(含物料转移上下文)。当前先不纳入推荐操作范围。
|
||||||
|
|
||||||
- **action_type**: `UniLabJsonCommand`
|
- **action_type**: `UniLabJsonCommand`
|
||||||
- **Schema**: [`actions/manual_confirm.json`](actions/manual_confirm.json)
|
- **Schema**: [`actions/manual_confirm.json`](actions/manual_confirm.json)
|
||||||
- **核心参数**: `resource`, `target_device`, `mount_resource`, `timeout_seconds`, `assignee_user_ids`
|
- **状态**: 暂跳过。源码参数已包含扣电测试相关字段,历史 JSON 可能过期;需要启用时重新提取 schema。
|
||||||
- **占位符字段**:
|
|
||||||
- `resource` — **ResourceSlot**,物料数组
|
### `test`
|
||||||
- `target_device` — **DeviceSlot**,目标设备路径
|
|
||||||
- `mount_resource` — **ResourceSlot**,目标孔位数组
|
启动扣电测试。当前先不纳入本 skill。
|
||||||
- `assignee_user_ids` — `unilabos_manual_confirm` 类型
|
|
||||||
|
- **状态**: 暂跳过。需要启用时从注册表生成 `actions/test.json` 后再补充索引。
|
||||||
|
|||||||
4
.github/workflows/ci-check.yml
vendored
4
.github/workflows/ci-check.yml
vendored
@@ -25,7 +25,7 @@ jobs:
|
|||||||
fetch-depth: 0
|
fetch-depth: 0
|
||||||
|
|
||||||
- name: Setup Miniforge
|
- name: Setup Miniforge
|
||||||
uses: conda-incubator/setup-miniconda@v3
|
uses: conda-incubator/setup-miniconda@v4
|
||||||
with:
|
with:
|
||||||
miniforge-version: latest
|
miniforge-version: latest
|
||||||
use-mamba: true
|
use-mamba: true
|
||||||
@@ -38,7 +38,7 @@ jobs:
|
|||||||
- name: Install ROS dependencies, uv and unilabos-msgs
|
- name: Install ROS dependencies, uv and unilabos-msgs
|
||||||
run: |
|
run: |
|
||||||
echo Installing ROS dependencies...
|
echo Installing ROS dependencies...
|
||||||
mamba install -n check-env conda-forge::uv conda-forge::opencv robostack-staging::ros-humble-ros-core robostack-staging::ros-humble-action-msgs robostack-staging::ros-humble-std-msgs robostack-staging::ros-humble-geometry-msgs robostack-staging::ros-humble-control-msgs robostack-staging::ros-humble-nav2-msgs uni-lab::ros-humble-unilabos-msgs robostack-staging::ros-humble-cv-bridge robostack-staging::ros-humble-vision-opencv robostack-staging::ros-humble-tf-transformations robostack-staging::ros-humble-moveit-msgs robostack-staging::ros-humble-tf2-ros robostack-staging::ros-humble-tf2-ros-py conda-forge::transforms3d -c robostack-staging -c conda-forge -c uni-lab -y
|
mamba install -n check-env --override-channels -c robostack-staging -c conda-forge -c uni-lab conda-forge::uv conda-forge::opencv robostack-staging::ros-humble-ros-core robostack-staging::ros-humble-action-msgs robostack-staging::ros-humble-std-msgs robostack-staging::ros-humble-geometry-msgs robostack-staging::ros-humble-control-msgs robostack-staging::ros-humble-nav2-msgs uni-lab::ros-humble-unilabos-msgs robostack-staging::ros-humble-cv-bridge robostack-staging::ros-humble-vision-opencv robostack-staging::ros-humble-tf-transformations robostack-staging::ros-humble-moveit-msgs robostack-staging::ros-humble-tf2-ros robostack-staging::ros-humble-tf2-ros-py conda-forge::transforms3d -y
|
||||||
|
|
||||||
- name: Install pip dependencies and unilabos
|
- name: Install pip dependencies and unilabos
|
||||||
run: |
|
run: |
|
||||||
|
|||||||
81
.github/workflows/conda-pack-build.yml
vendored
81
.github/workflows/conda-pack-build.yml
vendored
@@ -1,6 +1,10 @@
|
|||||||
name: Build Conda-Pack Environment
|
name: Build Conda-Pack Environment
|
||||||
|
|
||||||
on:
|
on:
|
||||||
|
# 在 UniLabOS Conda Build 成功上传后自动构建非全量 conda-pack
|
||||||
|
workflow_run:
|
||||||
|
workflows: ["UniLabOS Conda Build"]
|
||||||
|
types: [completed]
|
||||||
workflow_dispatch:
|
workflow_dispatch:
|
||||||
inputs:
|
inputs:
|
||||||
branch:
|
branch:
|
||||||
@@ -21,6 +25,16 @@ on:
|
|||||||
|
|
||||||
jobs:
|
jobs:
|
||||||
build-conda-pack:
|
build-conda-pack:
|
||||||
|
if: |
|
||||||
|
github.event_name == 'workflow_dispatch' ||
|
||||||
|
(
|
||||||
|
github.event_name == 'workflow_run' &&
|
||||||
|
github.event.workflow_run.conclusion == 'success' &&
|
||||||
|
github.event.workflow_run.event == 'workflow_run'
|
||||||
|
)
|
||||||
|
env:
|
||||||
|
BUILD_FULL: ${{ github.event_name == 'workflow_dispatch' && github.event.inputs.build_full == 'true' }}
|
||||||
|
PACKAGE_REF: ${{ github.event.inputs.branch || github.event.workflow_run.head_sha || github.ref_name }}
|
||||||
strategy:
|
strategy:
|
||||||
fail-fast: false
|
fail-fast: false
|
||||||
matrix:
|
matrix:
|
||||||
@@ -29,7 +43,7 @@ jobs:
|
|||||||
platform: linux-64
|
platform: linux-64
|
||||||
env_file: unilabos-linux-64.yaml
|
env_file: unilabos-linux-64.yaml
|
||||||
script_ext: sh
|
script_ext: sh
|
||||||
- os: macos-15 # Intel (via Rosetta)
|
- os: macos-15-intel # Intel x86_64
|
||||||
platform: osx-64
|
platform: osx-64
|
||||||
env_file: unilabos-osx-64.yaml
|
env_file: unilabos-osx-64.yaml
|
||||||
script_ext: sh
|
script_ext: sh
|
||||||
@@ -54,7 +68,9 @@ jobs:
|
|||||||
id: should_build
|
id: should_build
|
||||||
shell: bash
|
shell: bash
|
||||||
run: |
|
run: |
|
||||||
if [[ -z "${{ github.event.inputs.platforms }}" ]]; then
|
if [[ "${{ github.event_name }}" != "workflow_dispatch" ]]; then
|
||||||
|
echo "should_build=true" >> $GITHUB_OUTPUT
|
||||||
|
elif [[ -z "${{ github.event.inputs.platforms }}" ]]; then
|
||||||
echo "should_build=true" >> $GITHUB_OUTPUT
|
echo "should_build=true" >> $GITHUB_OUTPUT
|
||||||
elif [[ "${{ github.event.inputs.platforms }}" == *"${{ matrix.platform }}"* ]]; then
|
elif [[ "${{ github.event.inputs.platforms }}" == *"${{ matrix.platform }}"* ]]; then
|
||||||
echo "should_build=true" >> $GITHUB_OUTPUT
|
echo "should_build=true" >> $GITHUB_OUTPUT
|
||||||
@@ -65,17 +81,17 @@ jobs:
|
|||||||
- uses: actions/checkout@v6
|
- uses: actions/checkout@v6
|
||||||
if: steps.should_build.outputs.should_build == 'true'
|
if: steps.should_build.outputs.should_build == 'true'
|
||||||
with:
|
with:
|
||||||
ref: ${{ github.event.inputs.branch }}
|
ref: ${{ github.event.inputs.branch || github.event.workflow_run.head_sha || github.ref }}
|
||||||
fetch-depth: 0
|
fetch-depth: 0
|
||||||
|
|
||||||
- name: Setup Miniforge (with mamba)
|
- name: Setup Miniforge (with mamba)
|
||||||
if: steps.should_build.outputs.should_build == 'true'
|
if: steps.should_build.outputs.should_build == 'true'
|
||||||
uses: conda-incubator/setup-miniconda@v3
|
uses: conda-incubator/setup-miniconda@v4
|
||||||
with:
|
with:
|
||||||
miniforge-version: latest
|
miniforge-version: latest
|
||||||
use-mamba: true
|
use-mamba: true
|
||||||
python-version: '3.11.14'
|
python-version: '3.11.14'
|
||||||
channels: conda-forge,robostack-staging,uni-lab,defaults
|
channels: conda-forge,robostack-staging,uni-lab
|
||||||
channel-priority: flexible
|
channel-priority: flexible
|
||||||
activate-environment: unilab
|
activate-environment: unilab
|
||||||
auto-update-conda: false
|
auto-update-conda: false
|
||||||
@@ -86,13 +102,13 @@ jobs:
|
|||||||
run: |
|
run: |
|
||||||
echo Installing unilabos and dependencies to unilab environment...
|
echo Installing unilabos and dependencies to unilab environment...
|
||||||
echo Using mamba for faster and more reliable dependency resolution...
|
echo Using mamba for faster and more reliable dependency resolution...
|
||||||
echo Build full: ${{ github.event.inputs.build_full }}
|
echo Build full: ${{ env.BUILD_FULL }}
|
||||||
if "${{ github.event.inputs.build_full }}"=="true" (
|
if "${{ env.BUILD_FULL }}"=="true" (
|
||||||
echo Installing unilabos-full ^(complete package^)...
|
echo Installing unilabos-full ^(complete package^)...
|
||||||
mamba install -n unilab uni-lab::unilabos-full conda-pack -c uni-lab -c robostack-staging -c conda-forge -y
|
mamba install -n unilab --override-channels -c uni-lab -c robostack-staging -c conda-forge uni-lab::unilabos-full conda-pack zstandard -y
|
||||||
) else (
|
) else (
|
||||||
echo Installing unilabos ^(minimal package^)...
|
echo Installing unilabos ^(minimal package^)...
|
||||||
mamba install -n unilab uni-lab::unilabos conda-pack -c uni-lab -c robostack-staging -c conda-forge -y
|
mamba install -n unilab --override-channels -c uni-lab -c robostack-staging -c conda-forge uni-lab::unilabos conda-pack zstandard -y
|
||||||
)
|
)
|
||||||
|
|
||||||
- name: Install conda-pack, unilabos and dependencies (Unix)
|
- name: Install conda-pack, unilabos and dependencies (Unix)
|
||||||
@@ -101,13 +117,13 @@ jobs:
|
|||||||
run: |
|
run: |
|
||||||
echo "Installing unilabos and dependencies to unilab environment..."
|
echo "Installing unilabos and dependencies to unilab environment..."
|
||||||
echo "Using mamba for faster and more reliable dependency resolution..."
|
echo "Using mamba for faster and more reliable dependency resolution..."
|
||||||
echo "Build full: ${{ github.event.inputs.build_full }}"
|
echo "Build full: ${{ env.BUILD_FULL }}"
|
||||||
if [[ "${{ github.event.inputs.build_full }}" == "true" ]]; then
|
if [[ "${{ env.BUILD_FULL }}" == "true" ]]; then
|
||||||
echo "Installing unilabos-full (complete package)..."
|
echo "Installing unilabos-full (complete package)..."
|
||||||
mamba install -n unilab uni-lab::unilabos-full conda-pack -c uni-lab -c robostack-staging -c conda-forge -y
|
mamba install -n unilab --override-channels -c uni-lab -c robostack-staging -c conda-forge uni-lab::unilabos-full conda-pack zstandard -y
|
||||||
else
|
else
|
||||||
echo "Installing unilabos (minimal package)..."
|
echo "Installing unilabos (minimal package)..."
|
||||||
mamba install -n unilab uni-lab::unilabos conda-pack -c uni-lab -c robostack-staging -c conda-forge -y
|
mamba install -n unilab --override-channels -c uni-lab -c robostack-staging -c conda-forge uni-lab::unilabos conda-pack zstandard -y
|
||||||
fi
|
fi
|
||||||
|
|
||||||
- name: Get latest ros-humble-unilabos-msgs version (Windows)
|
- name: Get latest ros-humble-unilabos-msgs version (Windows)
|
||||||
@@ -134,27 +150,27 @@ jobs:
|
|||||||
if: steps.should_build.outputs.should_build == 'true' && matrix.platform == 'win-64'
|
if: steps.should_build.outputs.should_build == 'true' && matrix.platform == 'win-64'
|
||||||
run: |
|
run: |
|
||||||
echo Checking for available ros-humble-unilabos-msgs versions...
|
echo Checking for available ros-humble-unilabos-msgs versions...
|
||||||
mamba search ros-humble-unilabos-msgs -c uni-lab -c robostack-staging -c conda-forge || echo Search completed
|
mamba search --override-channels -c uni-lab -c robostack-staging -c conda-forge ros-humble-unilabos-msgs || echo Search completed
|
||||||
echo.
|
echo.
|
||||||
echo Updating ros-humble-unilabos-msgs to latest version...
|
echo Updating ros-humble-unilabos-msgs to latest version...
|
||||||
mamba update -n unilab ros-humble-unilabos-msgs -c uni-lab -c robostack-staging -c conda-forge -y || echo Already at latest version
|
mamba update -n unilab --override-channels -c uni-lab -c robostack-staging -c conda-forge ros-humble-unilabos-msgs -y || echo Already at latest version
|
||||||
|
|
||||||
- name: Check for newer ros-humble-unilabos-msgs (Unix)
|
- name: Check for newer ros-humble-unilabos-msgs (Unix)
|
||||||
if: steps.should_build.outputs.should_build == 'true' && matrix.platform != 'win-64'
|
if: steps.should_build.outputs.should_build == 'true' && matrix.platform != 'win-64'
|
||||||
shell: bash
|
shell: bash
|
||||||
run: |
|
run: |
|
||||||
echo "Checking for available ros-humble-unilabos-msgs versions..."
|
echo "Checking for available ros-humble-unilabos-msgs versions..."
|
||||||
mamba search ros-humble-unilabos-msgs -c uni-lab -c robostack-staging -c conda-forge || echo "Search completed"
|
mamba search --override-channels -c uni-lab -c robostack-staging -c conda-forge ros-humble-unilabos-msgs || echo "Search completed"
|
||||||
echo ""
|
echo ""
|
||||||
echo "Updating ros-humble-unilabos-msgs to latest version..."
|
echo "Updating ros-humble-unilabos-msgs to latest version..."
|
||||||
mamba update -n unilab ros-humble-unilabos-msgs -c uni-lab -c robostack-staging -c conda-forge -y || echo "Already at latest version"
|
mamba update -n unilab --override-channels -c uni-lab -c robostack-staging -c conda-forge ros-humble-unilabos-msgs -y || echo "Already at latest version"
|
||||||
|
|
||||||
- name: Install latest unilabos from source (Windows)
|
- name: Install latest unilabos from source (Windows)
|
||||||
if: steps.should_build.outputs.should_build == 'true' && matrix.platform == 'win-64'
|
if: steps.should_build.outputs.should_build == 'true' && matrix.platform == 'win-64'
|
||||||
run: |
|
run: |
|
||||||
echo Uninstalling existing unilabos...
|
echo Uninstalling existing unilabos...
|
||||||
mamba run -n unilab pip uninstall unilabos -y || echo unilabos not installed via pip
|
mamba run -n unilab pip uninstall unilabos -y || echo unilabos not installed via pip
|
||||||
echo Installing unilabos from source (branch: ${{ github.event.inputs.branch }})...
|
echo Installing unilabos from source (ref: ${{ env.PACKAGE_REF }})...
|
||||||
mamba run -n unilab pip install .
|
mamba run -n unilab pip install .
|
||||||
echo Verifying installation...
|
echo Verifying installation...
|
||||||
mamba run -n unilab pip show unilabos
|
mamba run -n unilab pip show unilabos
|
||||||
@@ -165,7 +181,7 @@ jobs:
|
|||||||
run: |
|
run: |
|
||||||
echo "Uninstalling existing unilabos..."
|
echo "Uninstalling existing unilabos..."
|
||||||
mamba run -n unilab pip uninstall unilabos -y || echo "unilabos not installed via pip"
|
mamba run -n unilab pip uninstall unilabos -y || echo "unilabos not installed via pip"
|
||||||
echo "Installing unilabos from source (branch: ${{ github.event.inputs.branch }})..."
|
echo "Installing unilabos from source (ref: ${{ env.PACKAGE_REF }})..."
|
||||||
mamba run -n unilab pip install .
|
mamba run -n unilab pip install .
|
||||||
echo "Verifying installation..."
|
echo "Verifying installation..."
|
||||||
mamba run -n unilab pip show unilabos
|
mamba run -n unilab pip show unilabos
|
||||||
@@ -226,7 +242,9 @@ jobs:
|
|||||||
if: steps.should_build.outputs.should_build == 'true' && matrix.platform == 'win-64'
|
if: steps.should_build.outputs.should_build == 'true' && matrix.platform == 'win-64'
|
||||||
run: |
|
run: |
|
||||||
echo Packing unilab environment with conda-pack...
|
echo Packing unilab environment with conda-pack...
|
||||||
mamba activate unilab && conda pack -n unilab -o unilab-env-${{ matrix.platform }}.tar.gz --ignore-missing-files
|
for /f "delims=" %%i in ('mamba run -n unilab python -c "import os; print(os.environ['CONDA_PREFIX'])"') do set "UNILAB_PREFIX=%%i"
|
||||||
|
echo Packing environment at: %UNILAB_PREFIX%
|
||||||
|
mamba run -n unilab conda-pack -p "%UNILAB_PREFIX%" -o unilab-env-${{ matrix.platform }}.tar.gz --ignore-missing-files
|
||||||
echo Pack file created:
|
echo Pack file created:
|
||||||
dir unilab-env-${{ matrix.platform }}.tar.gz
|
dir unilab-env-${{ matrix.platform }}.tar.gz
|
||||||
|
|
||||||
@@ -235,8 +253,9 @@ jobs:
|
|||||||
shell: bash
|
shell: bash
|
||||||
run: |
|
run: |
|
||||||
echo "Packing unilab environment with conda-pack..."
|
echo "Packing unilab environment with conda-pack..."
|
||||||
mamba install conda-pack -c conda-forge -y
|
UNILAB_PREFIX="$(mamba run -n unilab python -c 'import os; print(os.environ["CONDA_PREFIX"])')"
|
||||||
conda pack -n unilab -o unilab-env-${{ matrix.platform }}.tar.gz --ignore-missing-files
|
echo "Packing environment at: $UNILAB_PREFIX"
|
||||||
|
mamba run -n unilab conda-pack -p "$UNILAB_PREFIX" -o unilab-env-${{ matrix.platform }}.tar.gz --ignore-missing-files
|
||||||
echo "Pack file created:"
|
echo "Pack file created:"
|
||||||
ls -lh unilab-env-${{ matrix.platform }}.tar.gz
|
ls -lh unilab-env-${{ matrix.platform }}.tar.gz
|
||||||
|
|
||||||
@@ -267,7 +286,7 @@ jobs:
|
|||||||
|
|
||||||
rem Create README using Python script
|
rem Create README using Python script
|
||||||
echo Creating: README.txt
|
echo Creating: README.txt
|
||||||
python scripts\create_readme.py ${{ matrix.platform }} ${{ github.event.inputs.branch }} dist-package\README.txt
|
python scripts\create_readme.py ${{ matrix.platform }} ${{ env.PACKAGE_REF }} dist-package\README.txt
|
||||||
|
|
||||||
echo.
|
echo.
|
||||||
echo Distribution package contents:
|
echo Distribution package contents:
|
||||||
@@ -303,7 +322,7 @@ jobs:
|
|||||||
|
|
||||||
# Create README using Python script
|
# Create README using Python script
|
||||||
echo "Creating: README.txt"
|
echo "Creating: README.txt"
|
||||||
python scripts/create_readme.py ${{ matrix.platform }} ${{ github.event.inputs.branch }} dist-package/README.txt
|
python scripts/create_readme.py ${{ matrix.platform }} ${{ env.PACKAGE_REF }} dist-package/README.txt
|
||||||
|
|
||||||
echo ""
|
echo ""
|
||||||
echo "Distribution package contents:"
|
echo "Distribution package contents:"
|
||||||
@@ -314,7 +333,7 @@ jobs:
|
|||||||
if: steps.should_build.outputs.should_build == 'true'
|
if: steps.should_build.outputs.should_build == 'true'
|
||||||
uses: actions/upload-artifact@v6
|
uses: actions/upload-artifact@v6
|
||||||
with:
|
with:
|
||||||
name: unilab-pack-${{ matrix.platform }}-${{ github.event.inputs.branch }}
|
name: unilab-pack-${{ matrix.platform }}-${{ env.PACKAGE_REF }}
|
||||||
path: dist-package/
|
path: dist-package/
|
||||||
retention-days: 90
|
retention-days: 90
|
||||||
if-no-files-found: error
|
if-no-files-found: error
|
||||||
@@ -326,9 +345,9 @@ jobs:
|
|||||||
echo Build Summary
|
echo Build Summary
|
||||||
echo ==========================================
|
echo ==========================================
|
||||||
echo Platform: ${{ matrix.platform }}
|
echo Platform: ${{ matrix.platform }}
|
||||||
echo Branch: ${{ github.event.inputs.branch }}
|
echo Branch: ${{ env.PACKAGE_REF }}
|
||||||
echo Python version: 3.11.14
|
echo Python version: 3.11.14
|
||||||
if "${{ github.event.inputs.build_full }}"=="true" (
|
if "${{ env.BUILD_FULL }}"=="true" (
|
||||||
echo Package: unilabos-full ^(complete^)
|
echo Package: unilabos-full ^(complete^)
|
||||||
) else (
|
) else (
|
||||||
echo Package: unilabos ^(minimal^)
|
echo Package: unilabos ^(minimal^)
|
||||||
@@ -337,7 +356,7 @@ jobs:
|
|||||||
echo Distribution package contents:
|
echo Distribution package contents:
|
||||||
dir dist-package
|
dir dist-package
|
||||||
echo.
|
echo.
|
||||||
echo Artifact name: unilab-pack-${{ matrix.platform }}-${{ github.event.inputs.branch }}
|
echo Artifact name: unilab-pack-${{ matrix.platform }}-${{ env.PACKAGE_REF }}
|
||||||
echo.
|
echo.
|
||||||
echo After download, extract the ZIP and run:
|
echo After download, extract the ZIP and run:
|
||||||
echo install_unilab.bat
|
echo install_unilab.bat
|
||||||
@@ -351,9 +370,9 @@ jobs:
|
|||||||
echo "Build Summary"
|
echo "Build Summary"
|
||||||
echo "=========================================="
|
echo "=========================================="
|
||||||
echo "Platform: ${{ matrix.platform }}"
|
echo "Platform: ${{ matrix.platform }}"
|
||||||
echo "Branch: ${{ github.event.inputs.branch }}"
|
echo "Branch: ${{ env.PACKAGE_REF }}"
|
||||||
echo "Python version: 3.11.14"
|
echo "Python version: 3.11.14"
|
||||||
if [[ "${{ github.event.inputs.build_full }}" == "true" ]]; then
|
if [[ "${{ env.BUILD_FULL }}" == "true" ]]; then
|
||||||
echo "Package: unilabos-full (complete)"
|
echo "Package: unilabos-full (complete)"
|
||||||
else
|
else
|
||||||
echo "Package: unilabos (minimal)"
|
echo "Package: unilabos (minimal)"
|
||||||
@@ -362,7 +381,7 @@ jobs:
|
|||||||
echo "Distribution package contents:"
|
echo "Distribution package contents:"
|
||||||
ls -lh dist-package/
|
ls -lh dist-package/
|
||||||
echo ""
|
echo ""
|
||||||
echo "Artifact name: unilab-pack-${{ matrix.platform }}-${{ github.event.inputs.branch }}"
|
echo "Artifact name: unilab-pack-${{ matrix.platform }}-${{ env.PACKAGE_REF }}"
|
||||||
echo ""
|
echo ""
|
||||||
echo "After download:"
|
echo "After download:"
|
||||||
echo " install_unilab.sh"
|
echo " install_unilab.sh"
|
||||||
|
|||||||
12
.github/workflows/deploy-docs.yml
vendored
12
.github/workflows/deploy-docs.yml
vendored
@@ -51,12 +51,12 @@ jobs:
|
|||||||
fetch-depth: 0
|
fetch-depth: 0
|
||||||
|
|
||||||
- name: Setup Miniforge (with mamba)
|
- name: Setup Miniforge (with mamba)
|
||||||
uses: conda-incubator/setup-miniconda@v3
|
uses: conda-incubator/setup-miniconda@v4
|
||||||
with:
|
with:
|
||||||
miniforge-version: latest
|
miniforge-version: latest
|
||||||
use-mamba: true
|
use-mamba: true
|
||||||
python-version: '3.11.14'
|
python-version: '3.11.14'
|
||||||
channels: conda-forge,robostack-staging,uni-lab,defaults
|
channels: conda-forge,robostack-staging,uni-lab
|
||||||
channel-priority: flexible
|
channel-priority: flexible
|
||||||
activate-environment: unilab
|
activate-environment: unilab
|
||||||
auto-update-conda: false
|
auto-update-conda: false
|
||||||
@@ -66,7 +66,7 @@ jobs:
|
|||||||
run: |
|
run: |
|
||||||
echo "Installing unilabos and dependencies to unilab environment..."
|
echo "Installing unilabos and dependencies to unilab environment..."
|
||||||
echo "Using mamba for faster and more reliable dependency resolution..."
|
echo "Using mamba for faster and more reliable dependency resolution..."
|
||||||
mamba install -n unilab uni-lab::unilabos -c uni-lab -c robostack-staging -c conda-forge -y
|
mamba install -n unilab --override-channels -c uni-lab -c robostack-staging -c conda-forge uni-lab::unilabos -y
|
||||||
|
|
||||||
- name: Install latest unilabos from source
|
- name: Install latest unilabos from source
|
||||||
run: |
|
run: |
|
||||||
@@ -84,7 +84,7 @@ jobs:
|
|||||||
|
|
||||||
- name: Setup Pages
|
- name: Setup Pages
|
||||||
id: pages
|
id: pages
|
||||||
uses: actions/configure-pages@v5
|
uses: actions/configure-pages@v6
|
||||||
if: |
|
if: |
|
||||||
github.event.workflow_run.head_branch == 'main' ||
|
github.event.workflow_run.head_branch == 'main' ||
|
||||||
(github.event_name == 'workflow_dispatch' && github.event.inputs.deploy_to_pages == 'true')
|
(github.event_name == 'workflow_dispatch' && github.event.inputs.deploy_to_pages == 'true')
|
||||||
@@ -105,7 +105,7 @@ jobs:
|
|||||||
test -f docs/_build/html/index.html && echo "✓ index.html exists" || echo "✗ index.html missing"
|
test -f docs/_build/html/index.html && echo "✓ index.html exists" || echo "✗ index.html missing"
|
||||||
|
|
||||||
- name: Upload build artifacts
|
- name: Upload build artifacts
|
||||||
uses: actions/upload-pages-artifact@v4
|
uses: actions/upload-pages-artifact@v5
|
||||||
if: |
|
if: |
|
||||||
github.event.workflow_run.head_branch == 'main' ||
|
github.event.workflow_run.head_branch == 'main' ||
|
||||||
(github.event_name == 'workflow_dispatch' && github.event.inputs.deploy_to_pages == 'true')
|
(github.event_name == 'workflow_dispatch' && github.event.inputs.deploy_to_pages == 'true')
|
||||||
@@ -125,4 +125,4 @@ jobs:
|
|||||||
steps:
|
steps:
|
||||||
- name: Deploy to GitHub Pages
|
- name: Deploy to GitHub Pages
|
||||||
id: deployment
|
id: deployment
|
||||||
uses: actions/deploy-pages@v4
|
uses: actions/deploy-pages@v5
|
||||||
|
|||||||
39
.github/workflows/multi-platform-build.yml
vendored
39
.github/workflows/multi-platform-build.yml
vendored
@@ -10,6 +10,9 @@ on:
|
|||||||
# 支持 tag 推送(不依赖 CI Check)
|
# 支持 tag 推送(不依赖 CI Check)
|
||||||
push:
|
push:
|
||||||
tags: ['v*']
|
tags: ['v*']
|
||||||
|
# GitHub Release 发布时自动构建并上传
|
||||||
|
release:
|
||||||
|
types: [published]
|
||||||
# 手动触发
|
# 手动触发
|
||||||
workflow_dispatch:
|
workflow_dispatch:
|
||||||
inputs:
|
inputs:
|
||||||
@@ -60,7 +63,7 @@ jobs:
|
|||||||
- os: ubuntu-latest
|
- os: ubuntu-latest
|
||||||
platform: linux-64
|
platform: linux-64
|
||||||
env_file: unilabos-linux-64.yaml
|
env_file: unilabos-linux-64.yaml
|
||||||
- os: macos-15 # Intel (via Rosetta)
|
- os: macos-15-intel # Intel x86_64
|
||||||
platform: osx-64
|
platform: osx-64
|
||||||
env_file: unilabos-osx-64.yaml
|
env_file: unilabos-osx-64.yaml
|
||||||
- os: macos-latest # ARM64
|
- os: macos-latest # ARM64
|
||||||
@@ -80,7 +83,7 @@ jobs:
|
|||||||
- uses: actions/checkout@v6
|
- uses: actions/checkout@v6
|
||||||
with:
|
with:
|
||||||
# 如果是 workflow_run 触发,使用触发 CI Check 的 commit
|
# 如果是 workflow_run 触发,使用触发 CI Check 的 commit
|
||||||
ref: ${{ github.event.workflow_run.head_sha || github.ref }}
|
ref: ${{ github.event.workflow_run.head_sha || github.event.release.tag_name || github.ref }}
|
||||||
fetch-depth: 0
|
fetch-depth: 0
|
||||||
|
|
||||||
- name: Check if platform should be built
|
- name: Check if platform should be built
|
||||||
@@ -96,12 +99,14 @@ jobs:
|
|||||||
echo "should_build=false" >> $GITHUB_OUTPUT
|
echo "should_build=false" >> $GITHUB_OUTPUT
|
||||||
fi
|
fi
|
||||||
|
|
||||||
- name: Setup Miniconda
|
- name: Setup Miniforge
|
||||||
if: steps.should_build.outputs.should_build == 'true'
|
if: steps.should_build.outputs.should_build == 'true'
|
||||||
uses: conda-incubator/setup-miniconda@v3
|
uses: conda-incubator/setup-miniconda@v4
|
||||||
with:
|
with:
|
||||||
miniconda-version: 'latest'
|
miniforge-version: latest
|
||||||
channels: conda-forge,robostack-staging,defaults
|
use-mamba: true
|
||||||
|
python-version: '3.11.14'
|
||||||
|
channels: conda-forge,robostack-staging
|
||||||
channel-priority: strict
|
channel-priority: strict
|
||||||
activate-environment: build-env
|
activate-environment: build-env
|
||||||
auto-update-conda: false
|
auto-update-conda: false
|
||||||
@@ -110,24 +115,22 @@ jobs:
|
|||||||
- name: Install rattler-build and anaconda-client
|
- name: Install rattler-build and anaconda-client
|
||||||
if: steps.should_build.outputs.should_build == 'true'
|
if: steps.should_build.outputs.should_build == 'true'
|
||||||
run: |
|
run: |
|
||||||
conda install -c conda-forge rattler-build anaconda-client
|
mamba install -n build-env --override-channels -c conda-forge rattler-build anaconda-client -y
|
||||||
|
|
||||||
- name: Show environment info
|
- name: Show environment info
|
||||||
if: steps.should_build.outputs.should_build == 'true'
|
if: steps.should_build.outputs.should_build == 'true'
|
||||||
run: |
|
run: |
|
||||||
conda info
|
conda info
|
||||||
conda list | grep -E "(rattler-build|anaconda-client)"
|
conda list -n build-env | grep -E "(rattler-build|anaconda-client)"
|
||||||
|
conda run -n build-env rattler-build --version
|
||||||
|
conda run -n build-env anaconda --version
|
||||||
echo "Platform: ${{ matrix.platform }}"
|
echo "Platform: ${{ matrix.platform }}"
|
||||||
echo "OS: ${{ matrix.os }}"
|
echo "OS: ${{ matrix.os }}"
|
||||||
|
|
||||||
- name: Build conda package
|
- name: Build conda package
|
||||||
if: steps.should_build.outputs.should_build == 'true'
|
if: steps.should_build.outputs.should_build == 'true'
|
||||||
run: |
|
run: |
|
||||||
if [[ "${{ matrix.platform }}" == "osx-arm64" ]]; then
|
conda run -n build-env rattler-build build -r ./recipes/msgs/recipe.yaml --target-platform ${{ matrix.platform }} -c robostack -c robostack-staging -c conda-forge
|
||||||
rattler-build build -r ./recipes/msgs/recipe.yaml -c robostack -c robostack-staging -c conda-forge
|
|
||||||
else
|
|
||||||
rattler-build build -r ./recipes/msgs/recipe.yaml -c robostack -c robostack-staging -c conda-forge
|
|
||||||
fi
|
|
||||||
|
|
||||||
- name: List built packages
|
- name: List built packages
|
||||||
if: steps.should_build.outputs.should_build == 'true'
|
if: steps.should_build.outputs.should_build == 'true'
|
||||||
@@ -157,9 +160,15 @@ jobs:
|
|||||||
retention-days: 30
|
retention-days: 30
|
||||||
|
|
||||||
- name: Upload to Anaconda.org (unilab organization)
|
- name: Upload to Anaconda.org (unilab organization)
|
||||||
if: steps.should_build.outputs.should_build == 'true' && github.event.inputs.upload_to_anaconda == 'true'
|
if: |
|
||||||
|
steps.should_build.outputs.should_build == 'true' &&
|
||||||
|
(
|
||||||
|
github.event_name == 'release' ||
|
||||||
|
startsWith(github.ref, 'refs/tags/') ||
|
||||||
|
github.event.inputs.upload_to_anaconda == 'true'
|
||||||
|
)
|
||||||
run: |
|
run: |
|
||||||
for package in $(find ./output -name "*.conda"); do
|
for package in $(find ./output -name "*.conda"); do
|
||||||
echo "Uploading $package to unilab organization..."
|
echo "Uploading $package to unilab organization..."
|
||||||
anaconda -t ${{ secrets.ANACONDA_API_TOKEN }} upload --user uni-lab --force "$package"
|
conda run -n build-env anaconda -t ${{ secrets.ANACONDA_API_TOKEN }} upload --user uni-lab --force "$package"
|
||||||
done
|
done
|
||||||
|
|||||||
78
.github/workflows/unilabos-conda-build.yml
vendored
78
.github/workflows/unilabos-conda-build.yml
vendored
@@ -1,14 +1,10 @@
|
|||||||
name: UniLabOS Conda Build
|
name: UniLabOS Conda Build
|
||||||
|
|
||||||
on:
|
on:
|
||||||
# 在 CI Check 成功后自动触发
|
# 在 Multi-Platform Conda Build 成功上传 msgs 后自动触发
|
||||||
workflow_run:
|
workflow_run:
|
||||||
workflows: ["CI Check"]
|
workflows: ["Multi-Platform Conda Build"]
|
||||||
types: [completed]
|
types: [completed]
|
||||||
branches: [main, dev]
|
|
||||||
# 标签推送时直接触发(发布版本)
|
|
||||||
push:
|
|
||||||
tags: ['v*']
|
|
||||||
# 手动触发
|
# 手动触发
|
||||||
workflow_dispatch:
|
workflow_dispatch:
|
||||||
inputs:
|
inputs:
|
||||||
@@ -33,37 +29,37 @@ on:
|
|||||||
type: boolean
|
type: boolean
|
||||||
|
|
||||||
jobs:
|
jobs:
|
||||||
# 等待 CI Check 完成的 job (仅用于 workflow_run 触发)
|
# 等待上游 msgs 构建完成的 job (仅用于 workflow_run 触发)
|
||||||
wait-for-ci:
|
wait-for-upstream:
|
||||||
runs-on: ubuntu-latest
|
runs-on: ubuntu-latest
|
||||||
if: github.event_name == 'workflow_run'
|
if: github.event_name == 'workflow_run'
|
||||||
outputs:
|
outputs:
|
||||||
should_continue: ${{ steps.check.outputs.should_continue }}
|
should_continue: ${{ steps.check.outputs.should_continue }}
|
||||||
steps:
|
steps:
|
||||||
- name: Check CI status
|
- name: Check upstream workflow status
|
||||||
id: check
|
id: check
|
||||||
run: |
|
run: |
|
||||||
if [[ "${{ github.event.workflow_run.conclusion }}" == "success" ]]; then
|
if [[ "${{ github.event.workflow_run.conclusion }}" == "success" && ( "${{ github.event.workflow_run.event }}" == "release" || "${{ github.event.workflow_run.event }}" == "push" ) ]]; then
|
||||||
echo "should_continue=true" >> $GITHUB_OUTPUT
|
echo "should_continue=true" >> $GITHUB_OUTPUT
|
||||||
echo "CI Check passed, proceeding with build"
|
echo "Multi-Platform Conda Build passed for release/tag, proceeding with UniLabOS build"
|
||||||
else
|
else
|
||||||
echo "should_continue=false" >> $GITHUB_OUTPUT
|
echo "should_continue=false" >> $GITHUB_OUTPUT
|
||||||
echo "CI Check did not succeed (status: ${{ github.event.workflow_run.conclusion }}), skipping build"
|
echo "Upstream workflow is not a successful release/tag build (status: ${{ github.event.workflow_run.conclusion }}, event: ${{ github.event.workflow_run.event }}), skipping build"
|
||||||
fi
|
fi
|
||||||
|
|
||||||
build:
|
build:
|
||||||
needs: [wait-for-ci]
|
needs: [wait-for-upstream]
|
||||||
# 运行条件:workflow_run 触发且 CI 成功,或者其他触发方式
|
# 运行条件:workflow_run 触发且上游成功,或者手动触发
|
||||||
if: |
|
if: |
|
||||||
always() &&
|
always() &&
|
||||||
(needs.wait-for-ci.result == 'skipped' || needs.wait-for-ci.outputs.should_continue == 'true')
|
(needs.wait-for-upstream.result == 'skipped' || needs.wait-for-upstream.outputs.should_continue == 'true')
|
||||||
strategy:
|
strategy:
|
||||||
fail-fast: false
|
fail-fast: false
|
||||||
matrix:
|
matrix:
|
||||||
include:
|
include:
|
||||||
- os: ubuntu-latest
|
- os: ubuntu-latest
|
||||||
platform: linux-64
|
platform: linux-64
|
||||||
- os: macos-15 # Intel (via Rosetta)
|
- os: macos-15-intel # Intel x86_64
|
||||||
platform: osx-64
|
platform: osx-64
|
||||||
- os: macos-latest # ARM64
|
- os: macos-latest # ARM64
|
||||||
platform: osx-arm64
|
platform: osx-arm64
|
||||||
@@ -79,7 +75,7 @@ jobs:
|
|||||||
steps:
|
steps:
|
||||||
- uses: actions/checkout@v6
|
- uses: actions/checkout@v6
|
||||||
with:
|
with:
|
||||||
# 如果是 workflow_run 触发,使用触发 CI Check 的 commit
|
# 如果是 workflow_run 触发,使用上游 conda 包构建的 commit
|
||||||
ref: ${{ github.event.workflow_run.head_sha || github.ref }}
|
ref: ${{ github.event.workflow_run.head_sha || github.ref }}
|
||||||
fetch-depth: 0
|
fetch-depth: 0
|
||||||
|
|
||||||
@@ -96,12 +92,14 @@ jobs:
|
|||||||
echo "should_build=false" >> $GITHUB_OUTPUT
|
echo "should_build=false" >> $GITHUB_OUTPUT
|
||||||
fi
|
fi
|
||||||
|
|
||||||
- name: Setup Miniconda
|
- name: Setup Miniforge
|
||||||
if: steps.should_build.outputs.should_build == 'true'
|
if: steps.should_build.outputs.should_build == 'true'
|
||||||
uses: conda-incubator/setup-miniconda@v3
|
uses: conda-incubator/setup-miniconda@v4
|
||||||
with:
|
with:
|
||||||
miniconda-version: 'latest'
|
miniforge-version: latest
|
||||||
channels: conda-forge,robostack-staging,uni-lab,defaults
|
use-mamba: true
|
||||||
|
python-version: '3.11.14'
|
||||||
|
channels: conda-forge,robostack-staging,uni-lab
|
||||||
channel-priority: strict
|
channel-priority: strict
|
||||||
activate-environment: build-env
|
activate-environment: build-env
|
||||||
auto-update-conda: false
|
auto-update-conda: false
|
||||||
@@ -110,20 +108,22 @@ jobs:
|
|||||||
- name: Install rattler-build and anaconda-client
|
- name: Install rattler-build and anaconda-client
|
||||||
if: steps.should_build.outputs.should_build == 'true'
|
if: steps.should_build.outputs.should_build == 'true'
|
||||||
run: |
|
run: |
|
||||||
conda install -c conda-forge rattler-build anaconda-client
|
mamba install -n build-env --override-channels -c conda-forge rattler-build anaconda-client -y
|
||||||
|
|
||||||
- name: Show environment info
|
- name: Show environment info
|
||||||
if: steps.should_build.outputs.should_build == 'true'
|
if: steps.should_build.outputs.should_build == 'true'
|
||||||
run: |
|
run: |
|
||||||
conda info
|
conda info
|
||||||
conda list | grep -E "(rattler-build|anaconda-client)"
|
conda list -n build-env | grep -E "(rattler-build|anaconda-client)"
|
||||||
|
conda run -n build-env rattler-build --version
|
||||||
|
conda run -n build-env anaconda --version
|
||||||
echo "Platform: ${{ matrix.platform }}"
|
echo "Platform: ${{ matrix.platform }}"
|
||||||
echo "OS: ${{ matrix.os }}"
|
echo "OS: ${{ matrix.os }}"
|
||||||
echo "Build full package: ${{ github.event.inputs.build_full || 'false' }}"
|
echo "Build full package: ${{ github.event_name == 'workflow_dispatch' && github.event.inputs.build_full == 'true' }}"
|
||||||
echo "Building packages:"
|
echo "Building packages:"
|
||||||
echo " - unilabos-env (environment dependencies)"
|
echo " - unilabos-env (environment dependencies)"
|
||||||
echo " - unilabos (with pip package)"
|
echo " - unilabos (with pip package)"
|
||||||
if [[ "${{ github.event.inputs.build_full }}" == "true" ]]; then
|
if [[ "${{ github.event_name == 'workflow_dispatch' && github.event.inputs.build_full == 'true' }}" == "true" ]]; then
|
||||||
echo " - unilabos-full (complete package)"
|
echo " - unilabos-full (complete package)"
|
||||||
fi
|
fi
|
||||||
|
|
||||||
@@ -131,14 +131,19 @@ jobs:
|
|||||||
if: steps.should_build.outputs.should_build == 'true'
|
if: steps.should_build.outputs.should_build == 'true'
|
||||||
run: |
|
run: |
|
||||||
echo "Building unilabos-env (conda environment dependencies)..."
|
echo "Building unilabos-env (conda environment dependencies)..."
|
||||||
rattler-build build -r .conda/environment/recipe.yaml -c uni-lab -c robostack-staging -c conda-forge
|
conda run -n build-env rattler-build build -r .conda/environment/recipe.yaml --target-platform ${{ matrix.platform }} -c uni-lab -c robostack-staging -c conda-forge
|
||||||
|
|
||||||
- name: Upload unilabos-env to Anaconda.org (if enabled)
|
- name: Upload unilabos-env to Anaconda.org (if enabled)
|
||||||
if: steps.should_build.outputs.should_build == 'true' && github.event.inputs.upload_to_anaconda == 'true'
|
if: |
|
||||||
|
steps.should_build.outputs.should_build == 'true' &&
|
||||||
|
(
|
||||||
|
github.event_name == 'workflow_run' ||
|
||||||
|
github.event.inputs.upload_to_anaconda == 'true'
|
||||||
|
)
|
||||||
run: |
|
run: |
|
||||||
echo "Uploading unilabos-env to uni-lab organization..."
|
echo "Uploading unilabos-env to uni-lab organization..."
|
||||||
for package in $(find ./output -name "unilabos-env*.conda"); do
|
for package in $(find ./output -name "unilabos-env*.conda"); do
|
||||||
anaconda -t ${{ secrets.ANACONDA_API_TOKEN }} upload --user uni-lab --force "$package"
|
conda run -n build-env anaconda -t ${{ secrets.ANACONDA_API_TOKEN }} upload --user uni-lab --force "$package"
|
||||||
done
|
done
|
||||||
|
|
||||||
- name: Build unilabos (with pip package)
|
- name: Build unilabos (with pip package)
|
||||||
@@ -146,33 +151,40 @@ jobs:
|
|||||||
run: |
|
run: |
|
||||||
echo "Building unilabos package..."
|
echo "Building unilabos package..."
|
||||||
# 如果已上传到 Anaconda,从 uni-lab channel 获取 unilabos-env;否则从本地 output 获取
|
# 如果已上传到 Anaconda,从 uni-lab channel 获取 unilabos-env;否则从本地 output 获取
|
||||||
rattler-build build -r .conda/base/recipe.yaml -c uni-lab -c robostack-staging -c conda-forge --channel ./output
|
conda run -n build-env rattler-build build -r .conda/base/recipe.yaml --target-platform ${{ matrix.platform }} -c uni-lab -c robostack-staging -c conda-forge --channel ./output
|
||||||
|
|
||||||
- name: Upload unilabos to Anaconda.org (if enabled)
|
- name: Upload unilabos to Anaconda.org (if enabled)
|
||||||
if: steps.should_build.outputs.should_build == 'true' && github.event.inputs.upload_to_anaconda == 'true'
|
if: |
|
||||||
|
steps.should_build.outputs.should_build == 'true' &&
|
||||||
|
(
|
||||||
|
github.event_name == 'workflow_run' ||
|
||||||
|
github.event.inputs.upload_to_anaconda == 'true'
|
||||||
|
)
|
||||||
run: |
|
run: |
|
||||||
echo "Uploading unilabos to uni-lab organization..."
|
echo "Uploading unilabos to uni-lab organization..."
|
||||||
for package in $(find ./output -name "unilabos-0*.conda" -o -name "unilabos-[0-9]*.conda"); do
|
for package in $(find ./output -name "unilabos-0*.conda" -o -name "unilabos-[0-9]*.conda"); do
|
||||||
anaconda -t ${{ secrets.ANACONDA_API_TOKEN }} upload --user uni-lab --force "$package"
|
conda run -n build-env anaconda -t ${{ secrets.ANACONDA_API_TOKEN }} upload --user uni-lab --force "$package"
|
||||||
done
|
done
|
||||||
|
|
||||||
- name: Build unilabos-full - Only when explicitly requested
|
- name: Build unilabos-full - Only when explicitly requested
|
||||||
if: |
|
if: |
|
||||||
steps.should_build.outputs.should_build == 'true' &&
|
steps.should_build.outputs.should_build == 'true' &&
|
||||||
|
github.event_name == 'workflow_dispatch' &&
|
||||||
github.event.inputs.build_full == 'true'
|
github.event.inputs.build_full == 'true'
|
||||||
run: |
|
run: |
|
||||||
echo "Building unilabos-full package on ${{ matrix.platform }}..."
|
echo "Building unilabos-full package on ${{ matrix.platform }}..."
|
||||||
rattler-build build -r .conda/full/recipe.yaml -c uni-lab -c robostack-staging -c conda-forge --channel ./output
|
conda run -n build-env rattler-build build -r .conda/full/recipe.yaml --target-platform ${{ matrix.platform }} -c uni-lab -c robostack-staging -c conda-forge --channel ./output
|
||||||
|
|
||||||
- name: Upload unilabos-full to Anaconda.org (if enabled)
|
- name: Upload unilabos-full to Anaconda.org (if enabled)
|
||||||
if: |
|
if: |
|
||||||
steps.should_build.outputs.should_build == 'true' &&
|
steps.should_build.outputs.should_build == 'true' &&
|
||||||
|
github.event_name == 'workflow_dispatch' &&
|
||||||
github.event.inputs.build_full == 'true' &&
|
github.event.inputs.build_full == 'true' &&
|
||||||
github.event.inputs.upload_to_anaconda == 'true'
|
github.event.inputs.upload_to_anaconda == 'true'
|
||||||
run: |
|
run: |
|
||||||
echo "Uploading unilabos-full to uni-lab organization..."
|
echo "Uploading unilabos-full to uni-lab organization..."
|
||||||
for package in $(find ./output -name "unilabos-full*.conda"); do
|
for package in $(find ./output -name "unilabos-full*.conda"); do
|
||||||
anaconda -t ${{ secrets.ANACONDA_API_TOKEN }} upload --user uni-lab --force "$package"
|
conda run -n build-env anaconda -t ${{ secrets.ANACONDA_API_TOKEN }} upload --user uni-lab --force "$package"
|
||||||
done
|
done
|
||||||
|
|
||||||
- name: List built packages
|
- name: List built packages
|
||||||
|
|||||||
611
docs/developer_guide/add_PLC.md
Normal file
611
docs/developer_guide/add_PLC.md
Normal file
@@ -0,0 +1,611 @@
|
|||||||
|
# PLC 通信标准与设备驱动编写指南(基于 AI4M 工站)
|
||||||
|
|
||||||
|
> 本文档以 `unilabos/devices/workstation/AI4M`(水凝胶检测工站)为参考实现,
|
||||||
|
> 介绍如何将 PLC 控制的实验设备接入 Uni-Lab-OS:包含通信协议选型、节点表标准、
|
||||||
|
> 通信基类、设备驱动、Registry 配置以及调试方法。
|
||||||
|
>
|
||||||
|
> 阅读对象:负责现场调试与设备接入的同学。
|
||||||
|
|
||||||
|
---
|
||||||
|
|
||||||
|
## 0. 总览:一台 PLC 设备从硬件到云端的链路
|
||||||
|
|
||||||
|
```
|
||||||
|
PLC(西门子 / 倍福 / 三菱 / 汇川 / 国产 PLC ...)
|
||||||
|
▲
|
||||||
|
│ 各家 PLC 私有协议(S7 / Modbus / EtherCAT ...)
|
||||||
|
│
|
||||||
|
┌──────────┴──────────┐
|
||||||
|
│ OPC UA Server │ ← 统一在 PLC 侧或独立网关上配置
|
||||||
|
│ (内置或 KEPServer)│
|
||||||
|
└──────────┬──────────┘
|
||||||
|
│ OPC UA over TCP(标准协议)
|
||||||
|
│
|
||||||
|
┌──────────┴──────────┐
|
||||||
|
│ Uni-Lab 设备驱动 │ ← 本教程主体
|
||||||
|
│ AI4MDevice │
|
||||||
|
│ ├─ base_opcua_client.py 通信基类
|
||||||
|
│ ├─ opcua_nodes_*.csv 节点表(标准)
|
||||||
|
│ └─ AI4M.py 动作函数
|
||||||
|
└──────────┬──────────┘
|
||||||
|
│ ROS2 Action / 云端 HTTP
|
||||||
|
▼
|
||||||
|
实验记录本 / 云端调度
|
||||||
|
```
|
||||||
|
|
||||||
|
**统一约定**:所有 PLC 设备**只暴露 OPC UA 接口**给 Uni-Lab,PC 端不直接处理 S7 / Modbus 等底层协议。
|
||||||
|
这是 Uni-Lab 在工站类设备上的 PLC 通信标准。
|
||||||
|
|
||||||
|
---
|
||||||
|
|
||||||
|
## 1. 为什么选 OPC UA 作为标准?
|
||||||
|
|
||||||
|
| 维度 | 自研 TCP/串口协议 | Modbus | **OPC UA** |
|
||||||
|
|---|---|---|---|
|
||||||
|
| 厂家无关 | ✗ | 部分 | **✓** |
|
||||||
|
| 自带类型系统 | ✗ | ✗(裸寄存器) | **✓(Boolean/Int16/Float...)** |
|
||||||
|
| 命名空间 / 节点树 | ✗ | ✗(地址=魔数) | **✓(带名字、可分组)** |
|
||||||
|
| 订阅推送 | ✗ | ✗ | **✓(DataChange Notification)** |
|
||||||
|
| 鉴权 / 加密 | 自己造 | ✗ | **✓** |
|
||||||
|
| 与 PLC 工程师沟通成本 | 高 | 中 | **低(按变量名沟通)** |
|
||||||
|
|
||||||
|
实际接入时,PLC 工程师只需要在 PLC 侧把约定的"上位通讯变量"暴露到 OPC UA Server,
|
||||||
|
我们在 PC 侧就能用 `节点名 + 数据类型` 直接读写,不用管底层是 S7 还是 Modbus。
|
||||||
|
|
||||||
|
---
|
||||||
|
|
||||||
|
## 2. 节点表标准:`opcua_nodes_xxx.csv`
|
||||||
|
|
||||||
|
PLC 侧暴露的所有变量统一**用一张 CSV 表**描述,这是 PC 端和 PLC 端**唯一的接口契约**。
|
||||||
|
位置示例:`unilabos/devices/workstation/AI4M/opcua_nodes_AI4M.csv`。
|
||||||
|
|
||||||
|
### 2.1 列定义
|
||||||
|
|
||||||
|
| 列名 | 是否必填 | 说明 |
|
||||||
|
|---|---|---|
|
||||||
|
| `Name` | ✅ | 节点名(PLC 工程师在 PLC 项目中真实使用的变量名,通常是中文/原始名) |
|
||||||
|
| `EnglishName` | 推荐 | 英文别名,**PC 端代码全部用这个名字**调用 |
|
||||||
|
| `NodeType` | ✅ | `VARIABLE`(变量)或 `METHOD`(方法),AI4M 全部用变量 |
|
||||||
|
| `DataType` | ✅ | `BOOLEAN` / `INT16` / `INT32` / `FLOAT` / `DOUBLE` / `STRING` ... |
|
||||||
|
| `NodeLanguage` | 推荐 | `Chinese` / `English`,配合 `EnglishName` 做映射 |
|
||||||
|
| `NodeId` | ✅ | OPC UA 标准 NodeId,格式 `ns=<namespace>;s=<string>` 或 `ns=<n>;i=<int>` |
|
||||||
|
|
||||||
|
### 2.2 真实样例(节选自 `opcua_nodes_AI4M.csv`)
|
||||||
|
|
||||||
|
| Name | EnglishName | NodeType | DataType | NodeLanguage | NodeId |
|
||||||
|
|---|---|---|---|---|---|
|
||||||
|
| 机器人空闲 | `robot_ready` | VARIABLE | BOOLEAN | Chinese | `ns=4;s=上位通讯变量\|机器人空闲` |
|
||||||
|
| 机器人取烧杯编号 | `robot_pick_beaker_id` | VARIABLE | INT16 | Chinese | `ns=4;s=上位通讯变量\|机器人取烧杯编号` |
|
||||||
|
| 检测1请求参数 | `station_1_request_params` | VARIABLE | BOOLEAN | Chinese | `ns=4;s=上位通讯变量\|检测1请求参数` |
|
||||||
|
| 检测1工艺完成 | `station_1_process_complete` | VARIABLE | BOOLEAN | Chinese | `ns=4;s=上位通讯变量\|检测1工艺完成` |
|
||||||
|
| 磁力搅拌参数设置_C[0].搅拌速度 | `mag_stirrer_c0_stir_speed` | VARIABLE | INT16 | Chinese | `ns=4;s=上位通讯变量\|磁力搅拌参数设置_C[0].搅拌速度` |
|
||||||
|
| 报警复位 | `alarm_reset` | VARIABLE | BOOLEAN | Chinese | `ns=4;s=上位通讯变量\|报警复位` |
|
||||||
|
|
||||||
|
### 2.3 设计规范(必读)
|
||||||
|
|
||||||
|
1. **命名按"角色-编号-属性"分层**,便于代码批量寻址:
|
||||||
|
- `mag_stirrer_c{0..4}_stir_speed`(搅拌仪 0~4 的搅拌速度)
|
||||||
|
- `station_{1..3}_process_complete`(检测站 1~3 的完成信号)
|
||||||
|
- `robot_rack_pick_beaker_{1..5}_complete`(取烧杯 1~5 的完成信号)
|
||||||
|
|
||||||
|
这样在驱动里可以直接 `f"mag_stirrer_c{idx}_stir_speed"` 拼出节点名。
|
||||||
|
|
||||||
|
2. **数据类型与 PLC 侧严格一致**:
|
||||||
|
- `BOOL` → `BOOLEAN`,`INT/WORD` → `INT16/UINT16`,`DINT` → `INT32`,`REAL` → `FLOAT`。
|
||||||
|
- 类型不一致会触发 `BadTypeMismatch`,写入失败。
|
||||||
|
|
||||||
|
3. **NodeId 必须从 PLC 工程或 OPC UA Server 中导出**,不要自己拼。
|
||||||
|
常见格式:
|
||||||
|
- 西门子 1500:`ns=4;s=上位通讯变量|<变量名>`
|
||||||
|
- 倍福 TwinCAT:`ns=4;s=PLC1.MAIN.<变量名>`
|
||||||
|
- KEPServerEX:`ns=2;s=Channel1.Device1.<Tag>`
|
||||||
|
|
||||||
|
4. **每个工站一个独立 CSV**,不要共用。
|
||||||
|
AI4M 中真机用 `opcua_nodes_AI4M.csv`,仿真用 `opcua_nodes_AI4M_sim.csv`。
|
||||||
|
|
||||||
|
---
|
||||||
|
|
||||||
|
## 3. 通信基类架构
|
||||||
|
|
||||||
|
文件:`unilabos/devices/workstation/AI4M/base_opcua_client.py`
|
||||||
|
|
||||||
|
整个通信层分两层:
|
||||||
|
|
||||||
|
```
|
||||||
|
BaseOpcUaClient # 最小可用:连接 + 节点注册 + 读写 + 方法调用
|
||||||
|
▲
|
||||||
|
│ 继承
|
||||||
|
│
|
||||||
|
OpcUaClientWithSubscription # 生产可用:+ 订阅推送 + 缓存 + 自动重连
|
||||||
|
▲
|
||||||
|
│ 继承
|
||||||
|
│
|
||||||
|
AI4MDevice # 业务驱动:在它之上写设备动作函数
|
||||||
|
```
|
||||||
|
|
||||||
|
### 3.1 `BaseOpcUaClient` 核心能力
|
||||||
|
|
||||||
|
```python
|
||||||
|
class BaseOpcUaClient(UniversalDriver):
|
||||||
|
client: Optional[Client] = None
|
||||||
|
_node_registry: Dict[str, OpcUaNodeBase] = {} # name -> Variable/Method
|
||||||
|
_name_mapping: Dict[str, str] = {} # 英文名 -> 中文名
|
||||||
|
_reverse_mapping: Dict[str, str] = {} # 中文名 -> 英文名
|
||||||
|
_found_node_objects: Dict[str, Any] = {} # 缓存 ua.Node 用于订阅
|
||||||
|
|
||||||
|
@classmethod
|
||||||
|
def load_csv(cls, file_path) -> Tuple[List[OpcUaNode], dict, dict]: ...
|
||||||
|
def register_node_list(self, node_list) -> "BaseOpcUaClient": ...
|
||||||
|
def use_node(self, name) -> OpcUaNodeBase: ...
|
||||||
|
def read_node(self, node_name: str) -> str: ... # 返回 JSON
|
||||||
|
def write_node(self, json_input: str) -> str: ...
|
||||||
|
def call_method(self, node_name, *args) -> Tuple[Any, bool]: ...
|
||||||
|
```
|
||||||
|
|
||||||
|
它做的事情可以归纳为四步:
|
||||||
|
|
||||||
|
1. **`load_csv`**:读取节点表,建立 `Name ↔ EnglishName` 双向映射。
|
||||||
|
2. **`register_node_list`**:把节点登记进 `_variables_to_find` 待查找列表。
|
||||||
|
3. **`_connect` → `_find_nodes`**:连上 OPC UA 后,按 `NodeId` 把每个节点解析成 `Variable` / `Method` 对象,放进 `_node_registry`。
|
||||||
|
4. **`use_node(name)`**:业务代码取节点的唯一入口,**支持中英文混用**,找不到会自动重试一次。
|
||||||
|
|
||||||
|
### 3.2 `OpcUaClientWithSubscription` 增强能力
|
||||||
|
|
||||||
|
在 `BaseOpcUaClient` 基础上提供三个生产环境必备的能力:
|
||||||
|
|
||||||
|
#### a) 订阅缓存(高频读零开销)
|
||||||
|
|
||||||
|
```python
|
||||||
|
def _setup_subscriptions(self):
|
||||||
|
self._subscription = self.client.create_subscription(
|
||||||
|
self._subscription_interval, # 默认 500ms
|
||||||
|
SubscriptionHandler(self),
|
||||||
|
)
|
||||||
|
for node_name, node in self._node_registry.items():
|
||||||
|
if node.type == NodeType.VARIABLE and node.node_id:
|
||||||
|
handle = self._subscription.subscribe_data_change(ua_node)
|
||||||
|
self._subscription_handles[node_name] = handle
|
||||||
|
```
|
||||||
|
|
||||||
|
当 PLC 侧变量变化时,`datachange_notification` 回调会把新值写进 `self._node_values[name]`,
|
||||||
|
后续 `get_node_value` 优先读缓存——**业务代码可以放心地写 `while not self.get_node_value(...): time.sleep(1)` 而不用担心 OPC UA 频繁请求**。
|
||||||
|
|
||||||
|
#### b) 智能缓存的 `get_node_value`
|
||||||
|
|
||||||
|
```python
|
||||||
|
def get_node_value(self, name, use_cache=True, force_read=False):
|
||||||
|
# 1. 中英文名归一化
|
||||||
|
chinese_name = self._name_mapping.get(name, name)
|
||||||
|
|
||||||
|
# 2. force_read=True 强制透传到 OPC UA Server
|
||||||
|
if force_read: ...
|
||||||
|
|
||||||
|
# 3. 命中订阅推送 → 直接返回缓存
|
||||||
|
# 4. 命中按需读 + 未过期(cache_timeout=5s)→ 返回缓存
|
||||||
|
# 5. 否则发起 read 并更新缓存
|
||||||
|
```
|
||||||
|
|
||||||
|
#### c) 连接监控 + 自动重连
|
||||||
|
|
||||||
|
后台线程每 30s 调一次 `client.get_namespace_array()` 探活,断线则自动 `disconnect → connect → 重新订阅`,最多重试 5 次。
|
||||||
|
|
||||||
|
### 3.3 数据类型 / 节点类型
|
||||||
|
|
||||||
|
`unilabos/device_comms/opcua_client/node/uniopcua.py`:
|
||||||
|
|
||||||
|
```python
|
||||||
|
class DataType(Enum):
|
||||||
|
BOOLEAN = VariantType.Boolean
|
||||||
|
INT16 = VariantType.Int16
|
||||||
|
INT32 = VariantType.Int32
|
||||||
|
FLOAT = VariantType.Float
|
||||||
|
STRING = VariantType.String
|
||||||
|
# ...
|
||||||
|
|
||||||
|
class NodeType(Enum):
|
||||||
|
VARIABLE = NodeClass.Variable
|
||||||
|
METHOD = NodeClass.Method
|
||||||
|
OBJECT = NodeClass.Object
|
||||||
|
```
|
||||||
|
|
||||||
|
`Variable.write()` 内部会按 `DataType` 做强制类型转换,
|
||||||
|
所以 CSV 里的 `DataType` 列就是"PC 端转换写入值的类型说明书"。
|
||||||
|
|
||||||
|
---
|
||||||
|
|
||||||
|
## 4. 编写设备驱动:以 `AI4MDevice` 为例
|
||||||
|
|
||||||
|
文件:`unilabos/devices/workstation/AI4M/AI4M.py`
|
||||||
|
|
||||||
|
### 4.1 继承通信基类,最小骨架
|
||||||
|
|
||||||
|
```python
|
||||||
|
from typing import Optional
|
||||||
|
from unilabos.devices.workstation.AI4M.base_opcua_client import OpcUaClientWithSubscription
|
||||||
|
|
||||||
|
class AI4MDevice(OpcUaClientWithSubscription):
|
||||||
|
def __init__(
|
||||||
|
self,
|
||||||
|
url: str, # opc.tcp://192.168.1.10:4840
|
||||||
|
deck: Optional[AI4M_deck] = None, # 物料台面(资源树)
|
||||||
|
csv_path: str = None, # 节点表 CSV
|
||||||
|
username: str = None,
|
||||||
|
password: str = None,
|
||||||
|
use_subscription: bool = True,
|
||||||
|
cache_timeout: float = 5.0,
|
||||||
|
subscription_interval: int = 500,
|
||||||
|
*args, **kwargs,
|
||||||
|
):
|
||||||
|
super().__init__(
|
||||||
|
url=url, username=username, password=password,
|
||||||
|
use_subscription=use_subscription,
|
||||||
|
cache_timeout=cache_timeout,
|
||||||
|
subscription_interval=subscription_interval,
|
||||||
|
*args, **kwargs,
|
||||||
|
)
|
||||||
|
|
||||||
|
# 物料台面初始化(见教程 4. 物料系统)
|
||||||
|
self.deck = deck or AI4M_deck(setup=True)
|
||||||
|
self._robot_lock = threading.Lock()
|
||||||
|
|
||||||
|
# 关键:加载节点表
|
||||||
|
if csv_path:
|
||||||
|
self.load_nodes_from_csv(csv_path)
|
||||||
|
```
|
||||||
|
|
||||||
|
`load_nodes_from_csv` 会一次性完成:解析 CSV → 注册节点 → 解析 NodeId → 建立订阅,
|
||||||
|
**之后整个驱动都通过 `self.get_node_value(name)` / `self.set_node_value(name, value)` 操作 PLC**。
|
||||||
|
|
||||||
|
### 4.2 PLC 通信的核心模式:握手协议(Handshake)
|
||||||
|
|
||||||
|
PLC 编程的本质是"扫描周期 + 状态机",PC 端**绝对不能用 fire-and-forget 的方式发指令**。
|
||||||
|
和 PLC 配合的标准模式是 **"PC 写指令 → PC 等待 PLC 回执 → PC 复位指令"**。
|
||||||
|
|
||||||
|
AI4M 中所有 `trigger_*` 函数都遵循以下三种握手范式之一:
|
||||||
|
|
||||||
|
#### 范式 A:脉冲触发 + 完成信号(最常用)
|
||||||
|
|
||||||
|
```python
|
||||||
|
def trigger_init(self) -> dict:
|
||||||
|
# ① 复位上一轮残留
|
||||||
|
self.set_node_value("alarm_reset", True); time.sleep(1.0)
|
||||||
|
self.set_node_value("alarm_reset", False)
|
||||||
|
self.set_node_value("manual_auto_switch", False)
|
||||||
|
|
||||||
|
# ② 等待 PLC 退出自动模式
|
||||||
|
while self.get_node_value("auto_mode"):
|
||||||
|
time.sleep(1.0)
|
||||||
|
|
||||||
|
# ③ 发起初始化脉冲(True → False)
|
||||||
|
self.set_node_value("initialize", True); time.sleep(1.0)
|
||||||
|
self.set_node_value("initialize", False)
|
||||||
|
|
||||||
|
# ④ 等待 PLC 给出完成信号
|
||||||
|
while not self.get_node_value("init finished"):
|
||||||
|
time.sleep(1.0)
|
||||||
|
|
||||||
|
return {"message": "设备初始化完成"}
|
||||||
|
```
|
||||||
|
|
||||||
|
要点:
|
||||||
|
- **"PC 写一个 BOOL 拉高再拉低"** 模拟脉冲,PLC 用上升沿触发动作。
|
||||||
|
- **`get_node_value` 要在 while 循环里轮询**,配合订阅缓存基本无压力。
|
||||||
|
- **每个动作必须有"开始"和"完成"两个独立的 BOOL 节点**,不能复用。
|
||||||
|
|
||||||
|
#### 范式 B:参数下发 + 请求/已执行/完成 三步握手(带数据的工艺)
|
||||||
|
|
||||||
|
```python
|
||||||
|
def trigger_station_process(self, station_id: int, mag_stir_speed: int, ...):
|
||||||
|
request_node = f"station_{station_id}_request_params"
|
||||||
|
params_received_node = f"station_{station_id}_params_received"
|
||||||
|
start_node = f"station_{station_id}_start"
|
||||||
|
complete_node = f"station_{station_id}_process_complete"
|
||||||
|
|
||||||
|
# ① PC 复位三个状态位(避免上一轮影响)
|
||||||
|
self._reset_station_process_flags(station_id)
|
||||||
|
|
||||||
|
# ② 等 PLC 主动请求参数(PLC 准备好了才接收)
|
||||||
|
while not self.get_node_value(request_node):
|
||||||
|
time.sleep(1.0)
|
||||||
|
|
||||||
|
# ③ PC 下发参数(注意:PLC 内部数组是 0-based,PC 暴露给用户是 1-based)
|
||||||
|
station_idx = station_id - 1
|
||||||
|
self.set_node_value(f"mag_stirrer_c{station_idx}_stir_speed", mag_stir_speed)
|
||||||
|
self.set_node_value(f"mag_stirrer_c{station_idx}_heat_temp", mag_stir_heat_temp)
|
||||||
|
self.set_node_value(f"mag_stirrer_c{station_idx}_time_set", mag_stir_time_set)
|
||||||
|
self.set_node_value(f"syringe_pump_{station_idx}_abs_position_set", syringe_pump_abs_pos)
|
||||||
|
|
||||||
|
# ④ PC 通知 PLC "参数已就绪",等 PLC 回复"已执行"
|
||||||
|
self.set_node_value(start_node, True)
|
||||||
|
while not self.get_node_value(params_received_node):
|
||||||
|
time.sleep(1.0)
|
||||||
|
|
||||||
|
# ⑤ 等 PLC 完成整个工艺
|
||||||
|
while not self.get_node_value(complete_node):
|
||||||
|
time.sleep(5.0)
|
||||||
|
|
||||||
|
self.set_node_value(start_node, False) # 复位,方便下一轮
|
||||||
|
return {"station_id": station_id, "message": "..."}
|
||||||
|
```
|
||||||
|
|
||||||
|
四个状态位的语义:
|
||||||
|
|
||||||
|
| 信号 | 方向 | 含义 |
|
||||||
|
|---|---|---|
|
||||||
|
| `station_X_request_params` | **PLC → PC** | "我准备好了,把参数给我" |
|
||||||
|
| `station_X_start` | **PC → PLC** | "参数我已经写好了,开干" |
|
||||||
|
| `station_X_params_received` | **PLC → PC** | "参数我已经吃下了" |
|
||||||
|
| `station_X_process_complete` | **PLC → PC** | "工艺已经做完" |
|
||||||
|
|
||||||
|
**这是 PLC 通信教科书级别的标准范式**,所有带数据下发的动作都建议照抄。
|
||||||
|
|
||||||
|
#### 范式 C:编号下发 + 编号对应的完成信号(多目标互锁)
|
||||||
|
|
||||||
|
```python
|
||||||
|
def trigger_robot_pick_beaker(self, pick_beaker_id: int, place_station_id: int = None, ...):
|
||||||
|
# ① 等机器人空闲(互锁)
|
||||||
|
while not self.get_node_value("robot_ready"):
|
||||||
|
time.sleep(1.0)
|
||||||
|
|
||||||
|
# ② 阶段一:下发"取哪一杯"编号 + 等"取这一杯完成"
|
||||||
|
pick_complete_node = f"robot_rack_pick_beaker_{pick_beaker_id}_complete"
|
||||||
|
self.set_node_value("robot_pick_beaker_id", pick_beaker_id)
|
||||||
|
while not self.get_node_value(pick_complete_node):
|
||||||
|
time.sleep(1.0)
|
||||||
|
|
||||||
|
# ③ 阶段二:下发"放到哪个工站"编号 + 等"放完成"
|
||||||
|
place_complete_node = f"robot_place_station_{place_station_id}_complete"
|
||||||
|
self._reset_station_process_flags(place_station_id)
|
||||||
|
self.set_node_value("robot_place_station_id", place_station_id)
|
||||||
|
while not self.get_node_value(place_complete_node):
|
||||||
|
time.sleep(1.0)
|
||||||
|
```
|
||||||
|
|
||||||
|
要点:
|
||||||
|
- **同一个动作的多个目标用"编号变量 + 编号对应的完成信号"实现**,不要每个目标都开一个开始位。
|
||||||
|
- **配合 Python 端 `threading.Lock()` 做软互锁**,避免多个线程争抢机器人。
|
||||||
|
- **每个阶段有独立的完成信号**,串行等待,不能合并。
|
||||||
|
|
||||||
|
### 4.3 一些容易踩坑的细节
|
||||||
|
|
||||||
|
1. **节点名映射**
|
||||||
|
`set_node_value("alarm_reset", True)` 实际写入的是 CSV 中文名 `报警复位`,
|
||||||
|
`get_node_value` 同理。**业务代码全部用 EnglishName**,不要直接用中文。
|
||||||
|
|
||||||
|
2. **PLC 数组索引和 PC 不一致**
|
||||||
|
AI4M 里 PC 暴露 `station_id ∈ {1, 2, 3}`,但 PLC 内部数组是 `C[0..2]`,
|
||||||
|
驱动里要做 `station_idx = station_id - 1`,**这种映射只在驱动层做一次**,
|
||||||
|
不要让上层(registry / 实验记录本)感知。
|
||||||
|
|
||||||
|
3. **订阅模式下 BOOL 节点的边沿同步**
|
||||||
|
订阅有 ~500ms 延迟。如果你刚 `set_node_value(x, True)` 就立刻 `get_node_value(x)`,
|
||||||
|
读到的可能还是 `False`(订阅还没推回来)。
|
||||||
|
解决方案:**写完后用 `force_read=True` 透传一次** 或加一段 `time.sleep`。
|
||||||
|
|
||||||
|
4. **永远不要忘记复位**
|
||||||
|
`start` 拉 True 后必须有地方拉回 False,否则下一轮 PLC 上升沿不触发。
|
||||||
|
AI4M 在 `_reset_station_process_flags` 中统一做:
|
||||||
|
|
||||||
|
```python
|
||||||
|
def _reset_station_process_flags(self, station_id: int) -> None:
|
||||||
|
self.set_node_value(f"station_{station_id}_process_complete", False)
|
||||||
|
self.set_node_value(f"station_{station_id}_start", False)
|
||||||
|
self.set_node_value(f"station_{station_id}_params_received", False)
|
||||||
|
```
|
||||||
|
|
||||||
|
5. **耗时长的等待 sleep 加大**
|
||||||
|
工艺等待用 `time.sleep(5.0)`,机器人等待用 `time.sleep(1.0)`,初始化等待 `time.sleep(1.0)`,
|
||||||
|
不要全部用 0.1s 轮询,会把日志刷爆。
|
||||||
|
|
||||||
|
---
|
||||||
|
|
||||||
|
## 5. 把驱动接到 Uni-Lab:Registry + Graph
|
||||||
|
|
||||||
|
### 5.1 Registry YAML(动作 schema)
|
||||||
|
|
||||||
|
文件:`unilabos/registry/devices/AI4M_station.yaml`
|
||||||
|
|
||||||
|
```yaml
|
||||||
|
AI4M_station:
|
||||||
|
category: [AI4M_station]
|
||||||
|
class:
|
||||||
|
module: unilabos.devices.workstation.AI4M.AI4M:AI4MDevice # ← 入口类
|
||||||
|
type: python
|
||||||
|
action_value_mappings:
|
||||||
|
auto-trigger_init:
|
||||||
|
schema:
|
||||||
|
description: 设备初始化...
|
||||||
|
properties:
|
||||||
|
goal: { properties: {}, required: [], type: object }
|
||||||
|
result:
|
||||||
|
properties: { message: { type: string } }
|
||||||
|
required: [message]
|
||||||
|
type: object
|
||||||
|
type: object
|
||||||
|
type: UniLabJsonCommand
|
||||||
|
|
||||||
|
auto-trigger_station_process:
|
||||||
|
always_free: true
|
||||||
|
schema:
|
||||||
|
description: 执行检测工艺流程
|
||||||
|
properties:
|
||||||
|
goal:
|
||||||
|
properties:
|
||||||
|
station_id: { type: integer, description: 检测编号 1-3 }
|
||||||
|
mag_stir_stir_speed: { type: integer }
|
||||||
|
mag_stir_heat_temp: { type: integer }
|
||||||
|
mag_stir_time_set: { type: integer }
|
||||||
|
syringe_pump_abs_position_set:{ type: integer }
|
||||||
|
required: [station_id, mag_stir_stir_speed, mag_stir_heat_temp,
|
||||||
|
mag_stir_time_set, syringe_pump_abs_position_set]
|
||||||
|
type: object
|
||||||
|
result: { ... }
|
||||||
|
type: UniLabJsonCommand
|
||||||
|
|
||||||
|
init_param_schema:
|
||||||
|
config:
|
||||||
|
type: object
|
||||||
|
required: [url]
|
||||||
|
properties:
|
||||||
|
url: { type: string, description: OPC UA 服务器地址 }
|
||||||
|
csv_path: { type: string, description: 节点配置 CSV 路径 }
|
||||||
|
deck: { type: string, description: 资源树配置 }
|
||||||
|
username: { type: string }
|
||||||
|
password: { type: string }
|
||||||
|
use_subscription: { type: boolean, default: true }
|
||||||
|
cache_timeout: { type: number, default: 5.0 }
|
||||||
|
subscription_interval: { type: integer, default: 500 }
|
||||||
|
```
|
||||||
|
|
||||||
|
规则总结:
|
||||||
|
- `class.module` 指向驱动类(`module:ClassName`)。
|
||||||
|
- `action_value_mappings` 中的 key 形如 `auto-<方法名>`,对应驱动里的同名 Python 方法。
|
||||||
|
- `schema.goal` 自动转成 ROS2 Action 的 goal 消息,`schema.result` 转 result。
|
||||||
|
- `init_param_schema.config` 对应 `__init__` 的入参,**所有需要现场改的参数都要列出来**(最重要的就是 `url` 和 `csv_path`)。
|
||||||
|
- `always_free: true` 表示该动作不占用工站独占锁(多检测站可并发执行)。
|
||||||
|
|
||||||
|
### 5.2 Graph JSON(实例化)
|
||||||
|
|
||||||
|
文件:`unilabos/devices/workstation/AI4M/AI4M.json`
|
||||||
|
|
||||||
|
```json
|
||||||
|
{
|
||||||
|
"nodes": [
|
||||||
|
{
|
||||||
|
"id": "AI4M_station",
|
||||||
|
"name": "AI4M_station",
|
||||||
|
"type": "device",
|
||||||
|
"class": "AI4M_station",
|
||||||
|
"children": ["AI4M_deck"],
|
||||||
|
"parent": null,
|
||||||
|
"config": {
|
||||||
|
"url": "opc.tcp://192.168.1.10:4840",
|
||||||
|
"csv_path": "opcua_nodes_AI4M.csv",
|
||||||
|
"deck": {
|
||||||
|
"data": {
|
||||||
|
"_resource_child_name": "AI4M_deck",
|
||||||
|
"_resource_type": "unilabos.devices.workstation.AI4M.decks:AI4M_deck"
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"id": "AI4M_deck",
|
||||||
|
"type": "deck",
|
||||||
|
"class": "AI4M_deck",
|
||||||
|
"parent": "AI4M_station",
|
||||||
|
"config": { "type": "AI4M_deck" }
|
||||||
|
}
|
||||||
|
]
|
||||||
|
}
|
||||||
|
```
|
||||||
|
|
||||||
|
要点:
|
||||||
|
- `class` 必须和 Registry YAML 的顶层 key 完全一致(`AI4M_station`)。
|
||||||
|
- `config` 字段**逐字传给驱动 `__init__`**,所以 Graph JSON = "现场参数表"。
|
||||||
|
- 多套相同设备时拷贝一份,把 `id` / `url` 改掉即可(参考 `AI4M002_station`)。
|
||||||
|
|
||||||
|
### 5.3 启动命令(来自 `start.md`)
|
||||||
|
|
||||||
|
```cmd
|
||||||
|
# 真机
|
||||||
|
python unilabos/app/main.py -g unilabos/devices/workstation/AI4M/AI4M.json `
|
||||||
|
--ak <ak> --sk <sk> --upload_registry --addr <api_url> --disable_browser
|
||||||
|
|
||||||
|
# 仿真(KEPServerEX 跑在本机 49320 端口)
|
||||||
|
python unilabos/app/main.py -g unilabos/devices/workstation/AI4M/AI4Msim.json `
|
||||||
|
--ak <ak> --sk <sk> --upload_registry --disable_browser
|
||||||
|
```
|
||||||
|
|
||||||
|
`--upload_registry` 会把 `AI4M_station.yaml` 的 schema 上传到云端,
|
||||||
|
之后实验记录本就能看到所有 `auto-*` 动作。
|
||||||
|
|
||||||
|
---
|
||||||
|
|
||||||
|
## 6. 调试方法
|
||||||
|
|
||||||
|
### 6.1 用 KEPServerEX 仿真 PLC
|
||||||
|
|
||||||
|
不带 PLC 的开发机上,可以用 KEPServerEX(或 `python-opcua` 自建 server)模拟。
|
||||||
|
AI4M 提供了一份仿真节点表 `opcua_nodes_AI4M_sim.csv`,**只改 NodeId 不改语义**,
|
||||||
|
所以驱动代码无需任何改动即可在本机调试。
|
||||||
|
|
||||||
|
### 6.2 单独跑驱动(不开 ROS)
|
||||||
|
|
||||||
|
在驱动文件末尾的 `if __name__ == '__main__':` 段:
|
||||||
|
|
||||||
|
```python
|
||||||
|
if __name__ == '__main__':
|
||||||
|
A4 = AI4MDevice(
|
||||||
|
url="opc.tcp://192.168.1.10:4840",
|
||||||
|
csv_path="opcua_nodes_AI4M.csv",
|
||||||
|
)
|
||||||
|
A4.trigger_init()
|
||||||
|
print("初始化完成")
|
||||||
|
A4.trigger_robot_pick_beaker(1, 1)
|
||||||
|
```
|
||||||
|
|
||||||
|
**新动作上线前一定要在这里裸跑一遍**,确认握手时序正确,再往上接 ROS。
|
||||||
|
|
||||||
|
### 6.3 看日志判断卡在哪
|
||||||
|
|
||||||
|
`base_opcua_client.py` 的日志已经覆盖了所有关键节点:
|
||||||
|
|
||||||
|
```
|
||||||
|
✓ 客户端已连接!
|
||||||
|
✓ 找到变量节点: 'robot_ready', NodeId: ns=4;s=...
|
||||||
|
✓ 已订阅节点: robot_ready
|
||||||
|
✓ 节点查找完成:所有 142 个节点均已找到
|
||||||
|
```
|
||||||
|
|
||||||
|
如果看到 `⚠ 以下 N 个节点未找到`,**99% 是 CSV 里的 NodeId 写错了**,回去对一下 PLC 工程导出的 NodeId。
|
||||||
|
|
||||||
|
### 6.4 检查节点是否能直接读写
|
||||||
|
|
||||||
|
```python
|
||||||
|
# 透传读,绕过订阅缓存
|
||||||
|
A4.get_node_value("robot_ready", force_read=True)
|
||||||
|
|
||||||
|
# 直接读 JSON 形式(适合从 HTTP/调试面板调)
|
||||||
|
A4.read_node("robot_ready")
|
||||||
|
|
||||||
|
# 写
|
||||||
|
A4.set_node_value("alarm_reset", True)
|
||||||
|
A4.write_node('{"node_name": "alarm_reset", "value": false}')
|
||||||
|
```
|
||||||
|
|
||||||
|
---
|
||||||
|
|
||||||
|
## 7. 接入新 PLC 设备的 Checklist
|
||||||
|
|
||||||
|
接到一台新工站时,按下面顺序做就能保证不漏:
|
||||||
|
|
||||||
|
- [ ] 1. 让 PLC 工程师把上位通讯变量整理到 OPC UA Server,导出 NodeId 清单。
|
||||||
|
- [ ] 2. 在 `unilabos/devices/workstation/<设备名>/` 下新建目录,复制 `AI4M/base_opcua_client.py` 不动。
|
||||||
|
- [ ] 3. 整理 `opcua_nodes_<设备名>.csv`,6 列填齐,并补上 `EnglishName`。
|
||||||
|
- [ ] 4. 在该目录写设备驱动 `<设备名>.py`,继承 `OpcUaClientWithSubscription`:
|
||||||
|
- [ ] `__init__` 调用 `super().__init__` + `self.load_nodes_from_csv(csv_path)`。
|
||||||
|
- [ ] 每个动作函数用范式 A/B/C 写握手协议。
|
||||||
|
- [ ] 每个动作函数都返回 `dict`,至少含 `message` 字段。
|
||||||
|
- [ ] 5. 在 `unilabos/registry/devices/` 下新建 `<设备名>_station.yaml`,配置 `init_param_schema` 和 `action_value_mappings`。
|
||||||
|
- [ ] 6. 在该目录新建 `<设备名>.json`(Graph),填好 `url` 和 `csv_path`。
|
||||||
|
- [ ] 7. 用 `if __name__ == '__main__':` 单独跑驱动确认握手 OK。
|
||||||
|
- [ ] 8. 用 `python unilabos/app/main.py -g <Graph> --upload_registry ...` 上线,到实验记录本下发动作回归。
|
||||||
|
|
||||||
|
---
|
||||||
|
|
||||||
|
## 8. 参考实现速查
|
||||||
|
|
||||||
|
| 关注点 | 在 AI4M 中看哪里 |
|
||||||
|
|---|---|
|
||||||
|
| OPC UA 通信基类 | `base_opcua_client.py` |
|
||||||
|
| 节点定义类型系统 | `unilabos/device_comms/opcua_client/node/uniopcua.py` |
|
||||||
|
| 节点表 CSV 标准 | `opcua_nodes_AI4M.csv` |
|
||||||
|
| 设备驱动入口类 | `AI4M.py: AI4MDevice` |
|
||||||
|
| 握手范式 A(脉冲+完成) | `AI4M.py: trigger_init` |
|
||||||
|
| 握手范式 B(请求/参数/完成) | `AI4M.py: trigger_station_process` |
|
||||||
|
| 握手范式 C(编号+完成) | `AI4M.py: trigger_robot_pick_beaker` |
|
||||||
|
| 自动模式批量参数下发 | `AI4M.py: download_auto_params` |
|
||||||
|
| Registry schema | `unilabos/registry/devices/AI4M_station.yaml` |
|
||||||
|
| Graph 实例化 | `AI4M.json` / `AI4Msim.json` |
|
||||||
|
| 启动命令 | `start.md` |
|
||||||
@@ -1,5 +1,5 @@
|
|||||||
channel_sources:
|
channel_sources:
|
||||||
- robostack,robostack-staging,conda-forge,defaults
|
- robostack,robostack-staging,conda-forge
|
||||||
|
|
||||||
gazebo:
|
gazebo:
|
||||||
- '11'
|
- '11'
|
||||||
|
|||||||
@@ -1,6 +1,6 @@
|
|||||||
package:
|
package:
|
||||||
name: ros-humble-unilabos-msgs
|
name: ros-humble-unilabos-msgs
|
||||||
version: 0.11.0
|
version: 0.11.3
|
||||||
source:
|
source:
|
||||||
path: ../../unilabos_msgs
|
path: ../../unilabos_msgs
|
||||||
target_directory: src
|
target_directory: src
|
||||||
|
|||||||
@@ -1,6 +1,6 @@
|
|||||||
package:
|
package:
|
||||||
name: unilabos
|
name: unilabos
|
||||||
version: "0.11.0"
|
version: "0.11.3"
|
||||||
|
|
||||||
source:
|
source:
|
||||||
path: ../..
|
path: ../..
|
||||||
|
|||||||
@@ -2,7 +2,6 @@ import json
|
|||||||
import logging
|
import logging
|
||||||
import traceback
|
import traceback
|
||||||
import uuid
|
import uuid
|
||||||
import xml.etree.ElementTree as ET
|
|
||||||
from typing import Any, Dict, List
|
from typing import Any, Dict, List
|
||||||
|
|
||||||
import networkx as nx
|
import networkx as nx
|
||||||
@@ -25,7 +24,15 @@ class SimpleGraph:
|
|||||||
|
|
||||||
def add_edge(self, source, target, **attrs):
|
def add_edge(self, source, target, **attrs):
|
||||||
"""添加边"""
|
"""添加边"""
|
||||||
edge = {"source": source, "target": target, **attrs}
|
# edge = {"source": source, "target": target, **attrs}
|
||||||
|
edge = {
|
||||||
|
"source": source, "target": target,
|
||||||
|
"source_node_uuid": source,
|
||||||
|
"target_node_uuid": target,
|
||||||
|
"source_handle_io": "source",
|
||||||
|
"target_handle_io": "target",
|
||||||
|
**attrs
|
||||||
|
}
|
||||||
self.edges.append(edge)
|
self.edges.append(edge)
|
||||||
|
|
||||||
def to_dict(self):
|
def to_dict(self):
|
||||||
@@ -42,6 +49,7 @@ class SimpleGraph:
|
|||||||
"multigraph": False,
|
"multigraph": False,
|
||||||
"graph": {},
|
"graph": {},
|
||||||
"nodes": nodes_list,
|
"nodes": nodes_list,
|
||||||
|
"edges": self.edges,
|
||||||
"links": self.edges,
|
"links": self.edges,
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -58,495 +66,8 @@ def extract_json_from_markdown(text: str) -> str:
|
|||||||
return text
|
return text
|
||||||
|
|
||||||
|
|
||||||
def convert_to_type(val: str) -> Any:
|
|
||||||
"""将字符串值转换为适当的数据类型"""
|
|
||||||
if val == "True":
|
|
||||||
return True
|
|
||||||
if val == "False":
|
|
||||||
return False
|
|
||||||
if val == "?":
|
|
||||||
return None
|
|
||||||
if val.endswith(" g"):
|
|
||||||
return float(val.split(" ")[0])
|
|
||||||
if val.endswith("mg"):
|
|
||||||
return float(val.split("mg")[0])
|
|
||||||
elif val.endswith("mmol"):
|
|
||||||
return float(val.split("mmol")[0]) / 1000
|
|
||||||
elif val.endswith("mol"):
|
|
||||||
return float(val.split("mol")[0])
|
|
||||||
elif val.endswith("ml"):
|
|
||||||
return float(val.split("ml")[0])
|
|
||||||
elif val.endswith("RPM"):
|
|
||||||
return float(val.split("RPM")[0])
|
|
||||||
elif val.endswith(" °C"):
|
|
||||||
return float(val.split(" ")[0])
|
|
||||||
elif val.endswith(" %"):
|
|
||||||
return float(val.split(" ")[0])
|
|
||||||
return val
|
|
||||||
|
|
||||||
|
|
||||||
def refactor_data(data: List[Dict[str, Any]]) -> List[Dict[str, Any]]:
|
|
||||||
"""统一的数据重构函数,根据操作类型自动选择模板"""
|
|
||||||
refactored_data = []
|
|
||||||
|
|
||||||
# 定义操作映射,包含生物实验和有机化学的所有操作
|
|
||||||
OPERATION_MAPPING = {
|
|
||||||
# 生物实验操作
|
|
||||||
"transfer_liquid": "SynBioFactory-liquid_handler.prcxi-transfer_liquid",
|
|
||||||
"transfer": "SynBioFactory-liquid_handler.biomek-transfer",
|
|
||||||
"incubation": "SynBioFactory-liquid_handler.biomek-incubation",
|
|
||||||
"move_labware": "SynBioFactory-liquid_handler.biomek-move_labware",
|
|
||||||
"oscillation": "SynBioFactory-liquid_handler.biomek-oscillation",
|
|
||||||
# 有机化学操作
|
|
||||||
"HeatChillToTemp": "SynBioFactory-workstation-HeatChillProtocol",
|
|
||||||
"StopHeatChill": "SynBioFactory-workstation-HeatChillStopProtocol",
|
|
||||||
"StartHeatChill": "SynBioFactory-workstation-HeatChillStartProtocol",
|
|
||||||
"HeatChill": "SynBioFactory-workstation-HeatChillProtocol",
|
|
||||||
"Dissolve": "SynBioFactory-workstation-DissolveProtocol",
|
|
||||||
"Transfer": "SynBioFactory-workstation-TransferProtocol",
|
|
||||||
"Evaporate": "SynBioFactory-workstation-EvaporateProtocol",
|
|
||||||
"Recrystallize": "SynBioFactory-workstation-RecrystallizeProtocol",
|
|
||||||
"Filter": "SynBioFactory-workstation-FilterProtocol",
|
|
||||||
"Dry": "SynBioFactory-workstation-DryProtocol",
|
|
||||||
"Add": "SynBioFactory-workstation-AddProtocol",
|
|
||||||
}
|
|
||||||
|
|
||||||
UNSUPPORTED_OPERATIONS = ["Purge", "Wait", "Stir", "ResetHandling"]
|
|
||||||
|
|
||||||
for step in data:
|
|
||||||
operation = step.get("action")
|
|
||||||
if not operation or operation in UNSUPPORTED_OPERATIONS:
|
|
||||||
continue
|
|
||||||
|
|
||||||
# 处理重复操作
|
|
||||||
if operation == "Repeat":
|
|
||||||
times = step.get("times", step.get("parameters", {}).get("times", 1))
|
|
||||||
sub_steps = step.get("steps", step.get("parameters", {}).get("steps", []))
|
|
||||||
for i in range(int(times)):
|
|
||||||
sub_data = refactor_data(sub_steps)
|
|
||||||
refactored_data.extend(sub_data)
|
|
||||||
continue
|
|
||||||
|
|
||||||
# 获取模板名称
|
|
||||||
template = OPERATION_MAPPING.get(operation)
|
|
||||||
if not template:
|
|
||||||
# 自动推断模板类型
|
|
||||||
if operation.lower() in ["transfer", "incubation", "move_labware", "oscillation"]:
|
|
||||||
template = f"SynBioFactory-liquid_handler.biomek-{operation}"
|
|
||||||
else:
|
|
||||||
template = f"SynBioFactory-workstation-{operation}Protocol"
|
|
||||||
|
|
||||||
# 创建步骤数据
|
|
||||||
step_data = {
|
|
||||||
"template": template,
|
|
||||||
"description": step.get("description", step.get("purpose", f"{operation} operation")),
|
|
||||||
"lab_node_type": "Device",
|
|
||||||
"parameters": step.get("parameters", step.get("action_args", {})),
|
|
||||||
}
|
|
||||||
refactored_data.append(step_data)
|
|
||||||
|
|
||||||
return refactored_data
|
|
||||||
|
|
||||||
|
|
||||||
def build_protocol_graph(
|
|
||||||
labware_info: List[Dict[str, Any]], protocol_steps: List[Dict[str, Any]], workstation_name: str
|
|
||||||
) -> SimpleGraph:
|
|
||||||
"""统一的协议图构建函数,根据设备类型自动选择构建逻辑"""
|
|
||||||
G = SimpleGraph()
|
|
||||||
resource_last_writer = {}
|
|
||||||
LAB_NAME = "SynBioFactory"
|
|
||||||
|
|
||||||
protocol_steps = refactor_data(protocol_steps)
|
|
||||||
|
|
||||||
# 检查协议步骤中的模板来判断协议类型
|
|
||||||
has_biomek_template = any(
|
|
||||||
("biomek" in step.get("template", "")) or ("prcxi" in step.get("template", ""))
|
|
||||||
for step in protocol_steps
|
|
||||||
)
|
|
||||||
|
|
||||||
if has_biomek_template:
|
|
||||||
# 生物实验协议图构建
|
|
||||||
for labware_id, labware in labware_info.items():
|
|
||||||
node_id = str(uuid.uuid4())
|
|
||||||
|
|
||||||
labware_attrs = labware.copy()
|
|
||||||
labware_id = labware_attrs.pop("id", labware_attrs.get("name", f"labware_{uuid.uuid4()}"))
|
|
||||||
labware_attrs["description"] = labware_id
|
|
||||||
labware_attrs["lab_node_type"] = (
|
|
||||||
"Reagent" if "Plate" in str(labware_id) else "Labware" if "Rack" in str(labware_id) else "Sample"
|
|
||||||
)
|
|
||||||
labware_attrs["device_id"] = workstation_name
|
|
||||||
|
|
||||||
G.add_node(node_id, template=f"{LAB_NAME}-host_node-create_resource", **labware_attrs)
|
|
||||||
resource_last_writer[labware_id] = f"{node_id}:labware"
|
|
||||||
|
|
||||||
# 处理协议步骤
|
|
||||||
prev_node = None
|
|
||||||
for i, step in enumerate(protocol_steps):
|
|
||||||
node_id = str(uuid.uuid4())
|
|
||||||
G.add_node(node_id, **step)
|
|
||||||
|
|
||||||
# 添加控制流边
|
|
||||||
if prev_node is not None:
|
|
||||||
G.add_edge(prev_node, node_id, source_port="ready", target_port="ready")
|
|
||||||
prev_node = node_id
|
|
||||||
|
|
||||||
# 处理物料流
|
|
||||||
params = step.get("parameters", {})
|
|
||||||
if "sources" in params and params["sources"] in resource_last_writer:
|
|
||||||
source_node, source_port = resource_last_writer[params["sources"]].split(":")
|
|
||||||
G.add_edge(source_node, node_id, source_port=source_port, target_port="labware")
|
|
||||||
|
|
||||||
if "targets" in params:
|
|
||||||
resource_last_writer[params["targets"]] = f"{node_id}:labware"
|
|
||||||
|
|
||||||
# 添加协议结束节点
|
|
||||||
end_id = str(uuid.uuid4())
|
|
||||||
G.add_node(end_id, template=f"{LAB_NAME}-liquid_handler.biomek-run_protocol")
|
|
||||||
if prev_node is not None:
|
|
||||||
G.add_edge(prev_node, end_id, source_port="ready", target_port="ready")
|
|
||||||
|
|
||||||
else:
|
|
||||||
# 有机化学协议图构建
|
|
||||||
WORKSTATION_ID = workstation_name
|
|
||||||
|
|
||||||
# 为所有labware创建资源节点
|
|
||||||
for item_id, item in labware_info.items():
|
|
||||||
# item_id = item.get("id") or item.get("name", f"item_{uuid.uuid4()}")
|
|
||||||
node_id = str(uuid.uuid4())
|
|
||||||
|
|
||||||
# 判断节点类型
|
|
||||||
if item.get("type") == "hardware" or "reactor" in str(item_id).lower():
|
|
||||||
if "reactor" not in str(item_id).lower():
|
|
||||||
continue
|
|
||||||
lab_node_type = "Sample"
|
|
||||||
description = f"Prepare Reactor: {item_id}"
|
|
||||||
liquid_type = []
|
|
||||||
liquid_volume = []
|
|
||||||
else:
|
|
||||||
lab_node_type = "Reagent"
|
|
||||||
description = f"Add Reagent to Flask: {item_id}"
|
|
||||||
liquid_type = [item_id]
|
|
||||||
liquid_volume = [1e5]
|
|
||||||
|
|
||||||
G.add_node(
|
|
||||||
node_id,
|
|
||||||
template=f"{LAB_NAME}-host_node-create_resource",
|
|
||||||
description=description,
|
|
||||||
lab_node_type=lab_node_type,
|
|
||||||
res_id=item_id,
|
|
||||||
device_id=WORKSTATION_ID,
|
|
||||||
class_name="container",
|
|
||||||
parent=WORKSTATION_ID,
|
|
||||||
bind_locations={"x": 0.0, "y": 0.0, "z": 0.0},
|
|
||||||
liquid_input_slot=[-1],
|
|
||||||
liquid_type=liquid_type,
|
|
||||||
liquid_volume=liquid_volume,
|
|
||||||
slot_on_deck="",
|
|
||||||
role=item.get("role", ""),
|
|
||||||
)
|
|
||||||
resource_last_writer[item_id] = f"{node_id}:labware"
|
|
||||||
|
|
||||||
last_control_node_id = None
|
|
||||||
|
|
||||||
# 处理协议步骤
|
|
||||||
for step in protocol_steps:
|
|
||||||
node_id = str(uuid.uuid4())
|
|
||||||
G.add_node(node_id, **step)
|
|
||||||
|
|
||||||
# 控制流
|
|
||||||
if last_control_node_id is not None:
|
|
||||||
G.add_edge(last_control_node_id, node_id, source_port="ready", target_port="ready")
|
|
||||||
last_control_node_id = node_id
|
|
||||||
|
|
||||||
# 物料流
|
|
||||||
params = step.get("parameters", {})
|
|
||||||
input_resources = {
|
|
||||||
"Vessel": params.get("vessel"),
|
|
||||||
"ToVessel": params.get("to_vessel"),
|
|
||||||
"FromVessel": params.get("from_vessel"),
|
|
||||||
"reagent": params.get("reagent"),
|
|
||||||
"solvent": params.get("solvent"),
|
|
||||||
"compound": params.get("compound"),
|
|
||||||
"sources": params.get("sources"),
|
|
||||||
"targets": params.get("targets"),
|
|
||||||
}
|
|
||||||
|
|
||||||
for target_port, resource_name in input_resources.items():
|
|
||||||
if resource_name and resource_name in resource_last_writer:
|
|
||||||
source_node, source_port = resource_last_writer[resource_name].split(":")
|
|
||||||
G.add_edge(source_node, node_id, source_port=source_port, target_port=target_port)
|
|
||||||
|
|
||||||
output_resources = {
|
|
||||||
"VesselOut": params.get("vessel"),
|
|
||||||
"FromVesselOut": params.get("from_vessel"),
|
|
||||||
"ToVesselOut": params.get("to_vessel"),
|
|
||||||
"FiltrateOut": params.get("filtrate_vessel"),
|
|
||||||
"reagent": params.get("reagent"),
|
|
||||||
"solvent": params.get("solvent"),
|
|
||||||
"compound": params.get("compound"),
|
|
||||||
"sources_out": params.get("sources"),
|
|
||||||
"targets_out": params.get("targets"),
|
|
||||||
}
|
|
||||||
|
|
||||||
for source_port, resource_name in output_resources.items():
|
|
||||||
if resource_name:
|
|
||||||
resource_last_writer[resource_name] = f"{node_id}:{source_port}"
|
|
||||||
|
|
||||||
return G
|
|
||||||
|
|
||||||
|
|
||||||
def draw_protocol_graph(protocol_graph: SimpleGraph, output_path: str):
|
|
||||||
"""
|
|
||||||
(辅助功能) 使用 networkx 和 matplotlib 绘制协议工作流图,用于可视化。
|
|
||||||
"""
|
|
||||||
if not protocol_graph:
|
|
||||||
print("Cannot draw graph: Graph object is empty.")
|
|
||||||
return
|
|
||||||
|
|
||||||
G = nx.DiGraph()
|
|
||||||
|
|
||||||
for node_id, attrs in protocol_graph.nodes.items():
|
|
||||||
label = attrs.get("description", attrs.get("template", node_id[:8]))
|
|
||||||
G.add_node(node_id, label=label, **attrs)
|
|
||||||
|
|
||||||
for edge in protocol_graph.edges:
|
|
||||||
G.add_edge(edge["source"], edge["target"])
|
|
||||||
|
|
||||||
plt.figure(figsize=(20, 15))
|
|
||||||
try:
|
|
||||||
pos = nx.nx_agraph.graphviz_layout(G, prog="dot")
|
|
||||||
except Exception:
|
|
||||||
pos = nx.shell_layout(G) # Fallback layout
|
|
||||||
|
|
||||||
node_labels = {node: data["label"] for node, data in G.nodes(data=True)}
|
|
||||||
nx.draw(
|
|
||||||
G,
|
|
||||||
pos,
|
|
||||||
with_labels=False,
|
|
||||||
node_size=2500,
|
|
||||||
node_color="skyblue",
|
|
||||||
node_shape="o",
|
|
||||||
edge_color="gray",
|
|
||||||
width=1.5,
|
|
||||||
arrowsize=15,
|
|
||||||
)
|
|
||||||
nx.draw_networkx_labels(G, pos, labels=node_labels, font_size=8, font_weight="bold")
|
|
||||||
|
|
||||||
plt.title("Chemical Protocol Workflow Graph", size=15)
|
|
||||||
plt.savefig(output_path, dpi=300, bbox_inches="tight")
|
|
||||||
plt.close()
|
|
||||||
print(f" - Visualization saved to '{output_path}'")
|
|
||||||
|
|
||||||
|
|
||||||
from networkx.drawing.nx_agraph import to_agraph
|
|
||||||
import re
|
|
||||||
|
|
||||||
COMPASS = {"n","e","s","w","ne","nw","se","sw","c"}
|
|
||||||
|
|
||||||
def _is_compass(port: str) -> bool:
|
|
||||||
return isinstance(port, str) and port.lower() in COMPASS
|
|
||||||
|
|
||||||
def draw_protocol_graph_with_ports(protocol_graph, output_path: str, rankdir: str = "LR"):
|
|
||||||
"""
|
|
||||||
使用 Graphviz 端口语法绘制协议工作流图。
|
|
||||||
- 若边上的 source_port/target_port 是 compass(n/e/s/w/...),直接用 compass。
|
|
||||||
- 否则自动为节点创建 record 形状并定义命名端口 <portname>。
|
|
||||||
最终由 PyGraphviz 渲染并输出到 output_path(后缀决定格式,如 .png/.svg/.pdf)。
|
|
||||||
"""
|
|
||||||
if not protocol_graph:
|
|
||||||
print("Cannot draw graph: Graph object is empty.")
|
|
||||||
return
|
|
||||||
|
|
||||||
# 1) 先用 networkx 搭建有向图,保留端口属性
|
|
||||||
G = nx.DiGraph()
|
|
||||||
for node_id, attrs in protocol_graph.nodes.items():
|
|
||||||
label = attrs.get("description", attrs.get("template", node_id[:8]))
|
|
||||||
# 保留一个干净的“中心标签”,用于放在 record 的中间槽
|
|
||||||
G.add_node(node_id, _core_label=str(label), **{k:v for k,v in attrs.items() if k not in ("label",)})
|
|
||||||
|
|
||||||
edges_data = []
|
|
||||||
in_ports_by_node = {} # 收集命名输入端口
|
|
||||||
out_ports_by_node = {} # 收集命名输出端口
|
|
||||||
|
|
||||||
for edge in protocol_graph.edges:
|
|
||||||
u = edge["source"]
|
|
||||||
v = edge["target"]
|
|
||||||
sp = edge.get("source_port")
|
|
||||||
tp = edge.get("target_port")
|
|
||||||
|
|
||||||
# 记录到图里(保留原始端口信息)
|
|
||||||
G.add_edge(u, v, source_port=sp, target_port=tp)
|
|
||||||
edges_data.append((u, v, sp, tp))
|
|
||||||
|
|
||||||
# 如果不是 compass,就按“命名端口”先归类,等会儿给节点造 record
|
|
||||||
if sp and not _is_compass(sp):
|
|
||||||
out_ports_by_node.setdefault(u, set()).add(str(sp))
|
|
||||||
if tp and not _is_compass(tp):
|
|
||||||
in_ports_by_node.setdefault(v, set()).add(str(tp))
|
|
||||||
|
|
||||||
# 2) 转为 AGraph,使用 Graphviz 渲染
|
|
||||||
A = to_agraph(G)
|
|
||||||
A.graph_attr.update(rankdir=rankdir, splines="true", concentrate="false", fontsize="10")
|
|
||||||
A.node_attr.update(shape="box", style="rounded,filled", fillcolor="lightyellow", color="#999999", fontname="Helvetica")
|
|
||||||
A.edge_attr.update(arrowsize="0.8", color="#666666")
|
|
||||||
|
|
||||||
# 3) 为需要命名端口的节点设置 record 形状与 label
|
|
||||||
# 左列 = 输入端口;中间 = 核心标签;右列 = 输出端口
|
|
||||||
for n in A.nodes():
|
|
||||||
node = A.get_node(n)
|
|
||||||
core = G.nodes[n].get("_core_label", n)
|
|
||||||
|
|
||||||
in_ports = sorted(in_ports_by_node.get(n, []))
|
|
||||||
out_ports = sorted(out_ports_by_node.get(n, []))
|
|
||||||
|
|
||||||
# 如果该节点涉及命名端口,则用 record;否则保留原 box
|
|
||||||
if in_ports or out_ports:
|
|
||||||
def port_fields(ports):
|
|
||||||
if not ports:
|
|
||||||
return " " # 必须留一个空槽占位
|
|
||||||
# 每个端口一个小格子,<p> name
|
|
||||||
return "|".join(f"<{re.sub(r'[^A-Za-z0-9_:.|-]', '_', p)}> {p}" for p in ports)
|
|
||||||
|
|
||||||
left = port_fields(in_ports)
|
|
||||||
right = port_fields(out_ports)
|
|
||||||
|
|
||||||
# 三栏:左(入) | 中(节点名) | 右(出)
|
|
||||||
record_label = f"{{ {left} | {core} | {right} }}"
|
|
||||||
node.attr.update(shape="record", label=record_label)
|
|
||||||
else:
|
|
||||||
# 没有命名端口:普通盒子,显示核心标签
|
|
||||||
node.attr.update(label=str(core))
|
|
||||||
|
|
||||||
# 4) 给边设置 headport / tailport
|
|
||||||
# - 若端口为 compass:直接用 compass(e.g., headport="e")
|
|
||||||
# - 若端口为命名端口:使用在 record 中定义的 <port> 名(同名即可)
|
|
||||||
for (u, v, sp, tp) in edges_data:
|
|
||||||
e = A.get_edge(u, v)
|
|
||||||
|
|
||||||
# Graphviz 属性:tail 是源,head 是目标
|
|
||||||
if sp:
|
|
||||||
if _is_compass(sp):
|
|
||||||
e.attr["tailport"] = sp.lower()
|
|
||||||
else:
|
|
||||||
# 与 record label 中 <port> 名一致;特殊字符已在 label 中做了清洗
|
|
||||||
e.attr["tailport"] = re.sub(r'[^A-Za-z0-9_:.|-]', '_', str(sp))
|
|
||||||
|
|
||||||
if tp:
|
|
||||||
if _is_compass(tp):
|
|
||||||
e.attr["headport"] = tp.lower()
|
|
||||||
else:
|
|
||||||
e.attr["headport"] = re.sub(r'[^A-Za-z0-9_:.|-]', '_', str(tp))
|
|
||||||
|
|
||||||
# 可选:若想让边更贴边缘,可设置 constraint/spline 等
|
|
||||||
# e.attr["arrowhead"] = "vee"
|
|
||||||
|
|
||||||
# 5) 输出
|
|
||||||
A.draw(output_path, prog="dot")
|
|
||||||
print(f" - Port-aware workflow rendered to '{output_path}'")
|
|
||||||
|
|
||||||
|
|
||||||
def flatten_xdl_procedure(procedure_elem: ET.Element) -> List[ET.Element]:
|
|
||||||
"""展平嵌套的XDL程序结构"""
|
|
||||||
flattened_operations = []
|
|
||||||
TEMP_UNSUPPORTED_PROTOCOL = ["Purge", "Wait", "Stir", "ResetHandling"]
|
|
||||||
|
|
||||||
def extract_operations(element: ET.Element):
|
|
||||||
if element.tag not in ["Prep", "Reaction", "Workup", "Purification", "Procedure"]:
|
|
||||||
if element.tag not in TEMP_UNSUPPORTED_PROTOCOL:
|
|
||||||
flattened_operations.append(element)
|
|
||||||
|
|
||||||
for child in element:
|
|
||||||
extract_operations(child)
|
|
||||||
|
|
||||||
for child in procedure_elem:
|
|
||||||
extract_operations(child)
|
|
||||||
|
|
||||||
return flattened_operations
|
|
||||||
|
|
||||||
|
|
||||||
def parse_xdl_content(xdl_content: str) -> tuple:
|
|
||||||
"""解析XDL内容"""
|
|
||||||
try:
|
|
||||||
xdl_content_cleaned = "".join(c for c in xdl_content if c.isprintable())
|
|
||||||
root = ET.fromstring(xdl_content_cleaned)
|
|
||||||
|
|
||||||
synthesis_elem = root.find("Synthesis")
|
|
||||||
if synthesis_elem is None:
|
|
||||||
return None, None, None
|
|
||||||
|
|
||||||
# 解析硬件组件
|
|
||||||
hardware_elem = synthesis_elem.find("Hardware")
|
|
||||||
hardware = []
|
|
||||||
if hardware_elem is not None:
|
|
||||||
hardware = [{"id": c.get("id"), "type": c.get("type")} for c in hardware_elem.findall("Component")]
|
|
||||||
|
|
||||||
# 解析试剂
|
|
||||||
reagents_elem = synthesis_elem.find("Reagents")
|
|
||||||
reagents = []
|
|
||||||
if reagents_elem is not None:
|
|
||||||
reagents = [{"name": r.get("name"), "role": r.get("role", "")} for r in reagents_elem.findall("Reagent")]
|
|
||||||
|
|
||||||
# 解析程序
|
|
||||||
procedure_elem = synthesis_elem.find("Procedure")
|
|
||||||
if procedure_elem is None:
|
|
||||||
return None, None, None
|
|
||||||
|
|
||||||
flattened_operations = flatten_xdl_procedure(procedure_elem)
|
|
||||||
return hardware, reagents, flattened_operations
|
|
||||||
|
|
||||||
except ET.ParseError as e:
|
|
||||||
raise ValueError(f"Invalid XDL format: {e}")
|
|
||||||
|
|
||||||
|
|
||||||
def convert_xdl_to_dict(xdl_content: str) -> Dict[str, Any]:
|
|
||||||
"""
|
|
||||||
将XDL XML格式转换为标准的字典格式
|
|
||||||
|
|
||||||
Args:
|
|
||||||
xdl_content: XDL XML内容
|
|
||||||
|
|
||||||
Returns:
|
|
||||||
转换结果,包含步骤和器材信息
|
|
||||||
"""
|
|
||||||
try:
|
|
||||||
hardware, reagents, flattened_operations = parse_xdl_content(xdl_content)
|
|
||||||
if hardware is None:
|
|
||||||
return {"error": "Failed to parse XDL content", "success": False}
|
|
||||||
|
|
||||||
# 将XDL元素转换为字典格式
|
|
||||||
steps_data = []
|
|
||||||
for elem in flattened_operations:
|
|
||||||
# 转换参数类型
|
|
||||||
parameters = {}
|
|
||||||
for key, val in elem.attrib.items():
|
|
||||||
converted_val = convert_to_type(val)
|
|
||||||
if converted_val is not None:
|
|
||||||
parameters[key] = converted_val
|
|
||||||
|
|
||||||
step_dict = {
|
|
||||||
"operation": elem.tag,
|
|
||||||
"parameters": parameters,
|
|
||||||
"description": elem.get("purpose", f"Operation: {elem.tag}"),
|
|
||||||
}
|
|
||||||
steps_data.append(step_dict)
|
|
||||||
|
|
||||||
# 合并硬件和试剂为统一的labware_info格式
|
|
||||||
labware_data = []
|
|
||||||
labware_data.extend({"id": hw["id"], "type": "hardware", **hw} for hw in hardware)
|
|
||||||
labware_data.extend({"name": reagent["name"], "type": "reagent", **reagent} for reagent in reagents)
|
|
||||||
|
|
||||||
return {
|
|
||||||
"success": True,
|
|
||||||
"steps": steps_data,
|
|
||||||
"labware": labware_data,
|
|
||||||
"message": f"Successfully converted XDL to dict format. Found {len(steps_data)} steps and {len(labware_data)} labware items.",
|
|
||||||
}
|
|
||||||
|
|
||||||
except Exception as e:
|
|
||||||
error_msg = f"XDL conversion failed: {str(e)}"
|
|
||||||
logger.error(error_msg)
|
|
||||||
return {"error": error_msg, "success": False}
|
|
||||||
|
|
||||||
|
|
||||||
def create_workflow(
|
def create_workflow(
|
||||||
|
|||||||
2
setup.py
2
setup.py
@@ -4,7 +4,7 @@ package_name = 'unilabos'
|
|||||||
|
|
||||||
setup(
|
setup(
|
||||||
name=package_name,
|
name=package_name,
|
||||||
version='0.11.0',
|
version='0.11.3',
|
||||||
packages=find_packages(),
|
packages=find_packages(),
|
||||||
include_package_data=True,
|
include_package_data=True,
|
||||||
install_requires=['setuptools'],
|
install_requires=['setuptools'],
|
||||||
|
|||||||
@@ -1 +1 @@
|
|||||||
__version__ = "0.11.0"
|
__version__ = "0.11.3"
|
||||||
|
|||||||
@@ -12,6 +12,15 @@ from typing import Dict, Any, List
|
|||||||
import networkx as nx
|
import networkx as nx
|
||||||
import yaml
|
import yaml
|
||||||
|
|
||||||
|
# Windows 中文系统 stdout 默认 GBK,无法编码 banner / emoji 日志中的 Unicode 字符
|
||||||
|
# 强制 stdout/stderr 用 UTF-8,避免 print 触发 UnicodeEncodeError 导致进程崩溃
|
||||||
|
if sys.platform == "win32":
|
||||||
|
for _stream in (sys.stdout, sys.stderr):
|
||||||
|
try:
|
||||||
|
_stream.reconfigure(encoding="utf-8", errors="replace") # type: ignore[attr-defined]
|
||||||
|
except (AttributeError, OSError):
|
||||||
|
pass
|
||||||
|
|
||||||
# 首先添加项目根目录到路径
|
# 首先添加项目根目录到路径
|
||||||
current_dir = os.path.dirname(os.path.abspath(__file__))
|
current_dir = os.path.dirname(os.path.abspath(__file__))
|
||||||
unilabos_dir = os.path.dirname(os.path.dirname(current_dir))
|
unilabos_dir = os.path.dirname(os.path.dirname(current_dir))
|
||||||
|
|||||||
@@ -59,6 +59,7 @@ class JobAddReq(BaseModel):
|
|||||||
task_id: str = Field(examples=["task_id"], description="task uuid (auto-generated if empty)", default="")
|
task_id: str = Field(examples=["task_id"], description="task uuid (auto-generated if empty)", default="")
|
||||||
job_id: str = Field(examples=["job_id"], description="goal uuid (auto-generated if empty)", default="")
|
job_id: str = Field(examples=["job_id"], description="goal uuid (auto-generated if empty)", default="")
|
||||||
node_id: str = Field(examples=["node_id"], description="node uuid", default="")
|
node_id: str = Field(examples=["node_id"], description="node uuid", default="")
|
||||||
|
notebook_id: str = Field(examples=["notebook_id"], description="notebook uuid", default="")
|
||||||
server_info: dict = Field(
|
server_info: dict = Field(
|
||||||
examples=[{"send_timestamp": 1717000000.0}],
|
examples=[{"send_timestamp": 1717000000.0}],
|
||||||
description="server info (auto-generated if empty)",
|
description="server info (auto-generated if empty)",
|
||||||
|
|||||||
@@ -10,29 +10,170 @@ import shutil
|
|||||||
import sys
|
import sys
|
||||||
|
|
||||||
|
|
||||||
|
_PATCH_MARKER = "# UniLabOS DLL Patch"
|
||||||
|
_PATCH_END_MARKER = "# End UniLabOS DLL Patch"
|
||||||
|
|
||||||
|
# 75 = EX_TEMPFAIL: 临时失败、重试即可,避免与业务退出码冲突
|
||||||
|
_RESTART_EXIT_CODE = 75
|
||||||
|
|
||||||
|
|
||||||
|
def _build_dll_patch(lib_bin: str, preload_pyd: str = "") -> str:
|
||||||
|
"""生成一段加在目标文件顶部的 DLL 加载补丁源码。
|
||||||
|
|
||||||
|
- 始终把 ``lib_bin`` 加入 DLL 搜索路径,并把 handle 挂在模块属性上,
|
||||||
|
防止 GC 清掉搜索路径(``os.add_dll_directory`` 的句柄被回收时
|
||||||
|
目录会被移除)。
|
||||||
|
- 可选地用 ``ctypes.CDLL`` 预加载一个 .pyd,把它的依赖 DLL 提前装入
|
||||||
|
进程内存,作为 ``rclpy._rclpy_pybind11`` 这类首次加载点的兜底。
|
||||||
|
"""
|
||||||
|
# 用 repr() 序列化路径:Python 解析 repr 的结果会还原成原始字符串,
|
||||||
|
# 不需要也不能再叠加 raw-string 前缀(叠了反而会让 \\ 变成两个反斜杠)。
|
||||||
|
lines = [
|
||||||
|
_PATCH_MARKER,
|
||||||
|
"import os as _ulab_os",
|
||||||
|
f"_ulab_p = {lib_bin!r}",
|
||||||
|
'if hasattr(_ulab_os, "add_dll_directory") and _ulab_os.path.isdir(_ulab_p):',
|
||||||
|
" try: _UNILAB_DLL_HANDLE = _ulab_os.add_dll_directory(_ulab_p)",
|
||||||
|
" except Exception: _UNILAB_DLL_HANDLE = None",
|
||||||
|
]
|
||||||
|
if preload_pyd:
|
||||||
|
lines.extend(
|
||||||
|
[
|
||||||
|
"import ctypes as _ulab_ctypes",
|
||||||
|
f"try: _ulab_ctypes.CDLL({preload_pyd!r})",
|
||||||
|
"except Exception: pass",
|
||||||
|
]
|
||||||
|
)
|
||||||
|
lines.append(_PATCH_END_MARKER)
|
||||||
|
return "\n".join(lines) + "\n"
|
||||||
|
|
||||||
|
|
||||||
|
def _apply_dll_patch(file_path: str, lib_bin: str, preload_pyd: str = "") -> bool:
|
||||||
|
"""把 DLL 补丁前置到 ``file_path``。文件不存在或已打过补丁则返回 False。"""
|
||||||
|
if not os.path.isfile(file_path):
|
||||||
|
return False
|
||||||
|
with open(file_path, "r", encoding="utf-8") as f:
|
||||||
|
content = f.read()
|
||||||
|
if _PATCH_MARKER in content:
|
||||||
|
return False
|
||||||
|
shutil.copy2(file_path, file_path + ".bak")
|
||||||
|
with open(file_path, "w", encoding="utf-8") as f:
|
||||||
|
f.write(_build_dll_patch(lib_bin, preload_pyd) + content)
|
||||||
|
return True
|
||||||
|
|
||||||
|
|
||||||
|
def _print_restart_banner(patched_files):
|
||||||
|
"""打印重启提示并以 EX_TEMPFAIL 退出。
|
||||||
|
|
||||||
|
- 不使用 ANSI 颜色码:Windows 旧版 cmd / PowerShell 5 默认不开 VT 处理,
|
||||||
|
会把 ``\\033[1;33m`` 当做字面字符显示,反而让用户看不到正文。
|
||||||
|
- 同时写入 stderr 与 stdout:某些上层 launcher / supervisor 只重定向
|
||||||
|
其中一路,写两遍能保证用户至少看到一份。
|
||||||
|
- 写入前防御性把流切到 UTF-8 with replace:``main.py`` 里已经做过一次,
|
||||||
|
但本模块也可能被绕过 ``main.py`` 的代码路径直接 import;reconfigure
|
||||||
|
失败也只是退回 errors=replace,不影响整体流程。
|
||||||
|
"""
|
||||||
|
if sys.platform == "win32":
|
||||||
|
for _stream in (sys.stdout, sys.stderr):
|
||||||
|
try:
|
||||||
|
_stream.reconfigure(encoding="utf-8", errors="replace") # type: ignore[attr-defined]
|
||||||
|
except (AttributeError, OSError):
|
||||||
|
pass
|
||||||
|
|
||||||
|
bar = "#" * 78
|
||||||
|
files_lines = [f"[UniLabOS] - {p}" for p in patched_files]
|
||||||
|
body = "\n".join(
|
||||||
|
[
|
||||||
|
"",
|
||||||
|
bar,
|
||||||
|
bar,
|
||||||
|
"##",
|
||||||
|
"## [UniLabOS] Windows + conda 下检测到 DLL 加载失败,已自动打补丁。",
|
||||||
|
"## [UniLabOS] DLL load failure detected on Windows + conda;",
|
||||||
|
"## [UniLabOS] the following files have been auto-patched:",
|
||||||
|
"##",
|
||||||
|
*[f"## {line}" for line in files_lines],
|
||||||
|
"##",
|
||||||
|
"## [UniLabOS] 当前进程的 rclpy 状态已损坏,补丁需要在新进程才生效。",
|
||||||
|
"## [UniLabOS] The current process is unusable; the patch only takes",
|
||||||
|
"## [UniLabOS] effect on a fresh process.",
|
||||||
|
"##",
|
||||||
|
"## >>> 请重新运行刚才的命令 / Please re-run the same command. <<<",
|
||||||
|
"##",
|
||||||
|
bar,
|
||||||
|
bar,
|
||||||
|
"",
|
||||||
|
]
|
||||||
|
)
|
||||||
|
|
||||||
|
for stream in (sys.stderr, sys.stdout):
|
||||||
|
try:
|
||||||
|
stream.write(body)
|
||||||
|
stream.flush()
|
||||||
|
except Exception:
|
||||||
|
try:
|
||||||
|
print(body, file=stream)
|
||||||
|
except Exception:
|
||||||
|
pass
|
||||||
|
|
||||||
|
sys.exit(_RESTART_EXIT_CODE)
|
||||||
|
|
||||||
|
|
||||||
def patch_rclpy_dll_windows():
|
def patch_rclpy_dll_windows():
|
||||||
"""在 Windows + conda 环境下为 rclpy 打 DLL 加载补丁"""
|
"""在 Windows + conda 环境下修复 rclpy / rosidl typesupport 的 DLL 加载。
|
||||||
|
|
||||||
|
背景:conda 安装的 ros 系列包,其原生扩展依赖 ``$CONDA_PREFIX/Library/bin``
|
||||||
|
下的 DLL;只有 conda 环境被正确激活、且 PATH 中含 ``Library/bin`` 时,
|
||||||
|
``os.add_dll_directory`` 才能找到它们。当从快捷方式 / IDE / 子进程 /
|
||||||
|
没激活的 shell 启动 ``unilab`` 时,会出现 ``DLL load failed``。
|
||||||
|
|
||||||
|
本函数会:
|
||||||
|
1) 修补 ``rclpy/impl/implementation_singleton.py`` —— rclpy 自身的 C 扩展入口;
|
||||||
|
2) 修补 ``rpyutils/add_dll_directories.py`` —— 所有 ``*_s__rosidl_typesupport_c.pyd``
|
||||||
|
(``geometry_msgs`` / ``std_msgs`` / ``sensor_msgs`` 等)的统一加载入口。
|
||||||
|
|
||||||
|
打完补丁后**必须重启进程**才能生效(当前进程的 rclpy 已经发生过
|
||||||
|
``ImportError``,子模块仍处于损坏状态)。因此函数会主动退出,并在
|
||||||
|
stdout/stderr 同时打印明显的重启提示,避免用户被后续报错淹没。
|
||||||
|
"""
|
||||||
if sys.platform != "win32" or not os.environ.get("CONDA_PREFIX"):
|
if sys.platform != "win32" or not os.environ.get("CONDA_PREFIX"):
|
||||||
return
|
return
|
||||||
|
|
||||||
try:
|
try:
|
||||||
import rclpy
|
import rclpy # noqa: F401
|
||||||
|
|
||||||
return
|
return
|
||||||
except ImportError as e:
|
except ImportError as e:
|
||||||
if not str(e).startswith("DLL load failed"):
|
if not str(e).startswith("DLL load failed"):
|
||||||
return
|
return
|
||||||
|
|
||||||
cp = os.environ["CONDA_PREFIX"]
|
cp = os.environ["CONDA_PREFIX"]
|
||||||
impl = os.path.join(cp, "Lib", "site-packages", "rclpy", "impl", "implementation_singleton.py")
|
lib_bin = os.path.join(cp, "Library", "bin")
|
||||||
pyd = glob.glob(os.path.join(cp, "Lib", "site-packages", "rclpy", "_rclpy_pybind11*.pyd"))
|
site_packages = os.path.join(cp, "Lib", "site-packages")
|
||||||
if not os.path.exists(impl) or not pyd:
|
if not os.path.isdir(lib_bin):
|
||||||
return
|
return
|
||||||
with open(impl, "r", encoding="utf-8") as f:
|
|
||||||
content = f.read()
|
patched = []
|
||||||
lib_bin = os.path.join(cp, "Library", "bin").replace("\\", "/")
|
|
||||||
patch = f'# UniLabOS DLL Patch\nimport os,ctypes\nos.add_dll_directory("{lib_bin}") if hasattr(os,"add_dll_directory") else None\ntry: ctypes.CDLL("{pyd[0].replace(chr(92),"/")}")\nexcept: pass\n# End Patch\n'
|
# 1) rclpy 自身的入口
|
||||||
shutil.copy2(impl, impl + ".bak")
|
rclpy_impl = os.path.join(site_packages, "rclpy", "impl", "implementation_singleton.py")
|
||||||
with open(impl, "w", encoding="utf-8") as f:
|
rclpy_pyd_matches = glob.glob(os.path.join(site_packages, "rclpy", "_rclpy_pybind11*.pyd"))
|
||||||
f.write(patch + content)
|
rclpy_pyd = rclpy_pyd_matches[0] if rclpy_pyd_matches else ""
|
||||||
|
if rclpy_pyd and _apply_dll_patch(rclpy_impl, lib_bin, preload_pyd=rclpy_pyd):
|
||||||
|
patched.append(rclpy_impl)
|
||||||
|
|
||||||
|
# 2) rpyutils —— 所有 rosidl typesupport pyd 的加载点;放在 rclpy 之后
|
||||||
|
# 例:geometry_msgs/geometry_msgs_s__rosidl_typesupport_c.pyd
|
||||||
|
rpyutils_dll = os.path.join(site_packages, "rpyutils", "add_dll_directories.py")
|
||||||
|
if _apply_dll_patch(rpyutils_dll, lib_bin):
|
||||||
|
patched.append(rpyutils_dll)
|
||||||
|
|
||||||
|
if not patched:
|
||||||
|
# 已经打过补丁但 rclpy 仍然加载失败:原因不是缺 DLL 搜索路径,
|
||||||
|
# 不要再次打补丁污染文件,让上层看到真实的 ImportError。
|
||||||
|
return
|
||||||
|
|
||||||
|
_print_restart_banner(patched)
|
||||||
|
|
||||||
|
|
||||||
patch_rclpy_dll_windows()
|
patch_rclpy_dll_windows()
|
||||||
|
|||||||
@@ -320,6 +320,7 @@ def job_add(req: JobAddReq) -> JobData:
|
|||||||
action_name=action_name,
|
action_name=action_name,
|
||||||
task_id=task_id,
|
task_id=task_id,
|
||||||
job_id=job_id,
|
job_id=job_id,
|
||||||
|
notebook_id=req.notebook_id,
|
||||||
device_action_key=device_action_key,
|
device_action_key=device_action_key,
|
||||||
)
|
)
|
||||||
|
|
||||||
|
|||||||
@@ -59,6 +59,7 @@ class QueueItem:
|
|||||||
action_name: str
|
action_name: str
|
||||||
task_id: str
|
task_id: str
|
||||||
job_id: str
|
job_id: str
|
||||||
|
notebook_id: str
|
||||||
device_action_key: str
|
device_action_key: str
|
||||||
next_run_time: float = 0 # 下次执行时间戳
|
next_run_time: float = 0 # 下次执行时间戳
|
||||||
retry_count: int = 0 # 重试次数
|
retry_count: int = 0 # 重试次数
|
||||||
@@ -71,6 +72,7 @@ class JobInfo:
|
|||||||
job_id: str
|
job_id: str
|
||||||
task_id: str
|
task_id: str
|
||||||
device_id: str
|
device_id: str
|
||||||
|
notebook_id: str
|
||||||
action_name: str
|
action_name: str
|
||||||
device_action_key: str
|
device_action_key: str
|
||||||
status: JobStatus
|
status: JobStatus
|
||||||
@@ -539,7 +541,10 @@ class MessageProcessor:
|
|||||||
self.reconnect_count += 1
|
self.reconnect_count += 1
|
||||||
backoff = WSConfig.reconnect_interval
|
backoff = WSConfig.reconnect_interval
|
||||||
logger.info(
|
logger.info(
|
||||||
f"[MessageProcessor] 即将在 {backoff} 秒后重连 (已尝试 {self.reconnect_count}/{WSConfig.max_reconnect_attempts})"
|
"[MessageProcessor] 即将在 %s 秒后重连 (已尝试 %s/%s)",
|
||||||
|
backoff,
|
||||||
|
self.reconnect_count,
|
||||||
|
WSConfig.max_reconnect_attempts,
|
||||||
)
|
)
|
||||||
await asyncio.sleep(backoff)
|
await asyncio.sleep(backoff)
|
||||||
else:
|
else:
|
||||||
@@ -703,6 +708,7 @@ class MessageProcessor:
|
|||||||
action_name = data.get("action_name", "")
|
action_name = data.get("action_name", "")
|
||||||
task_id = data.get("task_id", "")
|
task_id = data.get("task_id", "")
|
||||||
job_id = data.get("job_id", "")
|
job_id = data.get("job_id", "")
|
||||||
|
notebook_id = data.get("notebook_id", "")
|
||||||
|
|
||||||
if not all([device_id, action_name, task_id, job_id]):
|
if not all([device_id, action_name, task_id, job_id]):
|
||||||
logger.error("[MessageProcessor] Missing required fields in query_action_state")
|
logger.error("[MessageProcessor] Missing required fields in query_action_state")
|
||||||
@@ -718,6 +724,7 @@ class MessageProcessor:
|
|||||||
job_id=job_id,
|
job_id=job_id,
|
||||||
task_id=task_id,
|
task_id=task_id,
|
||||||
device_id=device_id,
|
device_id=device_id,
|
||||||
|
notebook_id=notebook_id,
|
||||||
action_name=action_name,
|
action_name=action_name,
|
||||||
device_action_key=device_action_key,
|
device_action_key=device_action_key,
|
||||||
status=JobStatus.QUEUE,
|
status=JobStatus.QUEUE,
|
||||||
@@ -732,13 +739,27 @@ class MessageProcessor:
|
|||||||
if can_start_immediately:
|
if can_start_immediately:
|
||||||
# 可以立即开始
|
# 可以立即开始
|
||||||
await self._send_action_state_response(
|
await self._send_action_state_response(
|
||||||
device_id, action_name, task_id, job_id, "query_action_status", True, 0
|
device_id,
|
||||||
|
action_name,
|
||||||
|
task_id,
|
||||||
|
job_id,
|
||||||
|
"query_action_status",
|
||||||
|
True,
|
||||||
|
0,
|
||||||
|
notebook_id=notebook_id,
|
||||||
)
|
)
|
||||||
logger.trace(f"[MessageProcessor] Job {job_log} can start immediately")
|
logger.trace(f"[MessageProcessor] Job {job_log} can start immediately")
|
||||||
else:
|
else:
|
||||||
# 需要排队
|
# 需要排队
|
||||||
await self._send_action_state_response(
|
await self._send_action_state_response(
|
||||||
device_id, action_name, task_id, job_id, "query_action_status", False, 10
|
device_id,
|
||||||
|
action_name,
|
||||||
|
task_id,
|
||||||
|
job_id,
|
||||||
|
"query_action_status",
|
||||||
|
False,
|
||||||
|
10,
|
||||||
|
notebook_id=notebook_id,
|
||||||
)
|
)
|
||||||
logger.trace(f"[MessageProcessor] Job {job_log} queued")
|
logger.trace(f"[MessageProcessor] Job {job_log} queued")
|
||||||
|
|
||||||
@@ -768,6 +789,7 @@ class MessageProcessor:
|
|||||||
job_id=req.job_id,
|
job_id=req.job_id,
|
||||||
task_id=req.task_id,
|
task_id=req.task_id,
|
||||||
device_id=req.device_id,
|
device_id=req.device_id,
|
||||||
|
notebook_id=req.notebook_id,
|
||||||
action_name=action_name,
|
action_name=action_name,
|
||||||
device_action_key=device_action_key,
|
device_action_key=device_action_key,
|
||||||
status=JobStatus.QUEUE,
|
status=JobStatus.QUEUE,
|
||||||
@@ -775,11 +797,16 @@ class MessageProcessor:
|
|||||||
always_free=True,
|
always_free=True,
|
||||||
)
|
)
|
||||||
self.device_manager.add_queue_request(job_info)
|
self.device_manager.add_queue_request(job_info)
|
||||||
|
existing_job = job_info
|
||||||
logger.info(f"[MessageProcessor] Job {job_log} always_free, auto-registered from direct job_start")
|
logger.info(f"[MessageProcessor] Job {job_log} always_free, auto-registered from direct job_start")
|
||||||
else:
|
else:
|
||||||
logger.error(f"[MessageProcessor] Job {job_log} not registered (missing query_action_state)")
|
logger.error(f"[MessageProcessor] Job {job_log} not registered (missing query_action_state)")
|
||||||
return
|
return
|
||||||
|
|
||||||
|
if existing_job and req.notebook_id and not existing_job.notebook_id:
|
||||||
|
existing_job.notebook_id = req.notebook_id
|
||||||
|
notebook_id = req.notebook_id or (existing_job.notebook_id if existing_job else "")
|
||||||
|
|
||||||
success = self.device_manager.start_job(req.job_id)
|
success = self.device_manager.start_job(req.job_id)
|
||||||
if not success:
|
if not success:
|
||||||
logger.error(f"[MessageProcessor] Failed to start job {job_log}")
|
logger.error(f"[MessageProcessor] Failed to start job {job_log}")
|
||||||
@@ -795,6 +822,7 @@ class MessageProcessor:
|
|||||||
action_name=req.action,
|
action_name=req.action,
|
||||||
task_id=req.task_id,
|
task_id=req.task_id,
|
||||||
job_id=req.job_id,
|
job_id=req.job_id,
|
||||||
|
notebook_id=notebook_id,
|
||||||
device_action_key=device_action_key,
|
device_action_key=device_action_key,
|
||||||
)
|
)
|
||||||
|
|
||||||
@@ -834,6 +862,7 @@ class MessageProcessor:
|
|||||||
"job_id": req.job_id,
|
"job_id": req.job_id,
|
||||||
"task_id": req.task_id,
|
"task_id": req.task_id,
|
||||||
"device_id": req.device_id,
|
"device_id": req.device_id,
|
||||||
|
"notebook_id": queue_item.notebook_id,
|
||||||
"action_name": req.action,
|
"action_name": req.action,
|
||||||
"status": "failed",
|
"status": "failed",
|
||||||
"feedback_data": {},
|
"feedback_data": {},
|
||||||
@@ -855,6 +884,7 @@ class MessageProcessor:
|
|||||||
"query_action_status",
|
"query_action_status",
|
||||||
True,
|
True,
|
||||||
0,
|
0,
|
||||||
|
notebook_id=next_job.notebook_id,
|
||||||
)
|
)
|
||||||
next_job_log = format_job_log(
|
next_job_log = format_job_log(
|
||||||
next_job.job_id, next_job.task_id, next_job.device_id, next_job.action_name
|
next_job.job_id, next_job.task_id, next_job.device_id, next_job.action_name
|
||||||
@@ -1004,11 +1034,16 @@ class MessageProcessor:
|
|||||||
|
|
||||||
success = host_node.notify_resource_tree_update(dev_id, act, item_list)
|
success = host_node.notify_resource_tree_update(dev_id, act, item_list)
|
||||||
|
|
||||||
if success:
|
if success is True:
|
||||||
logger.info(
|
logger.info(
|
||||||
f"[MessageProcessor] Resource tree {act} completed for device {dev_id}, "
|
f"[MessageProcessor] Resource tree {act} completed for device {dev_id}, "
|
||||||
f"items: {len(item_list)}"
|
f"items: {len(item_list)}"
|
||||||
)
|
)
|
||||||
|
elif success is None:
|
||||||
|
logger.info(
|
||||||
|
f"[MessageProcessor] Resource tree {act} skipped for device {dev_id}: "
|
||||||
|
"在线增加设备暂不支持"
|
||||||
|
)
|
||||||
else:
|
else:
|
||||||
logger.warning(f"[MessageProcessor] Resource tree {act} failed for device {dev_id}")
|
logger.warning(f"[MessageProcessor] Resource tree {act} failed for device {dev_id}")
|
||||||
|
|
||||||
@@ -1032,6 +1067,11 @@ class MessageProcessor:
|
|||||||
|
|
||||||
for item in device_list:
|
for item in device_list:
|
||||||
target_node_id = item.get("target_node_id", "host_node")
|
target_node_id = item.get("target_node_id", "host_node")
|
||||||
|
if action == "add":
|
||||||
|
logger.info(
|
||||||
|
f"[DeviceManage] 在线增加设备暂不支持,跳过 add_device: {item.get('id', '')}"
|
||||||
|
)
|
||||||
|
continue
|
||||||
|
|
||||||
def _notify(target_id: str, act: str, cfg: ResourceDictType):
|
def _notify(target_id: str, act: str, cfg: ResourceDictType):
|
||||||
try:
|
try:
|
||||||
@@ -1101,7 +1141,15 @@ class MessageProcessor:
|
|||||||
logger.info(f"[MessageProcessor] Restart cleanup scheduled")
|
logger.info(f"[MessageProcessor] Restart cleanup scheduled")
|
||||||
|
|
||||||
async def _send_action_state_response(
|
async def _send_action_state_response(
|
||||||
self, device_id: str, action_name: str, task_id: str, job_id: str, typ: str, free: bool, need_more: int
|
self,
|
||||||
|
device_id: str,
|
||||||
|
action_name: str,
|
||||||
|
task_id: str,
|
||||||
|
job_id: str,
|
||||||
|
typ: str,
|
||||||
|
free: bool,
|
||||||
|
need_more: int,
|
||||||
|
notebook_id: str = "",
|
||||||
):
|
):
|
||||||
"""发送动作状态响应"""
|
"""发送动作状态响应"""
|
||||||
message = {
|
message = {
|
||||||
@@ -1112,6 +1160,7 @@ class MessageProcessor:
|
|||||||
"action_name": action_name,
|
"action_name": action_name,
|
||||||
"task_id": task_id,
|
"task_id": task_id,
|
||||||
"job_id": job_id,
|
"job_id": job_id,
|
||||||
|
"notebook_id": notebook_id,
|
||||||
"free": free,
|
"free": free,
|
||||||
"need_more": need_more + 1,
|
"need_more": need_more + 1,
|
||||||
},
|
},
|
||||||
@@ -1194,6 +1243,7 @@ class QueueProcessor:
|
|||||||
action_name=timeout_job.action_name,
|
action_name=timeout_job.action_name,
|
||||||
task_id=timeout_job.task_id,
|
task_id=timeout_job.task_id,
|
||||||
job_id=timeout_job.job_id,
|
job_id=timeout_job.job_id,
|
||||||
|
notebook_id=timeout_job.notebook_id,
|
||||||
device_action_key=timeout_job.device_action_key,
|
device_action_key=timeout_job.device_action_key,
|
||||||
)
|
)
|
||||||
# 发布超时失败状态,这会触发正常的job完成流程
|
# 发布超时失败状态,这会触发正常的job完成流程
|
||||||
@@ -1252,6 +1302,7 @@ class QueueProcessor:
|
|||||||
"action_name": job_info.action_name,
|
"action_name": job_info.action_name,
|
||||||
"task_id": job_info.task_id,
|
"task_id": job_info.task_id,
|
||||||
"job_id": job_info.job_id,
|
"job_id": job_info.job_id,
|
||||||
|
"notebook_id": job_info.notebook_id,
|
||||||
"free": False,
|
"free": False,
|
||||||
"need_more": 10 + 1,
|
"need_more": 10 + 1,
|
||||||
},
|
},
|
||||||
@@ -1291,6 +1342,7 @@ class QueueProcessor:
|
|||||||
"action_name": job_info.action_name,
|
"action_name": job_info.action_name,
|
||||||
"task_id": job_info.task_id,
|
"task_id": job_info.task_id,
|
||||||
"job_id": job_info.job_id,
|
"job_id": job_info.job_id,
|
||||||
|
"notebook_id": job_info.notebook_id,
|
||||||
"free": False,
|
"free": False,
|
||||||
"need_more": 10 + 1,
|
"need_more": 10 + 1,
|
||||||
},
|
},
|
||||||
@@ -1336,12 +1388,15 @@ class QueueProcessor:
|
|||||||
"action_name": next_job.action_name,
|
"action_name": next_job.action_name,
|
||||||
"task_id": next_job.task_id,
|
"task_id": next_job.task_id,
|
||||||
"job_id": next_job.job_id,
|
"job_id": next_job.job_id,
|
||||||
|
"notebook_id": next_job.notebook_id,
|
||||||
"free": True,
|
"free": True,
|
||||||
"need_more": 0,
|
"need_more": 0,
|
||||||
},
|
},
|
||||||
}
|
}
|
||||||
self.message_processor.send_message(message)
|
self.message_processor.send_message(message)
|
||||||
# next_job_log = format_job_log(next_job.job_id, next_job.task_id, next_job.device_id, next_job.action_name)
|
# next_job_log = format_job_log(
|
||||||
|
# next_job.job_id, next_job.task_id, next_job.device_id, next_job.action_name
|
||||||
|
# )
|
||||||
# logger.debug(f"[QueueProcessor] Notified next job {next_job_log} can start")
|
# logger.debug(f"[QueueProcessor] Notified next job {next_job_log} can start")
|
||||||
|
|
||||||
# 立即触发下一轮状态检查
|
# 立即触发下一轮状态检查
|
||||||
@@ -1510,6 +1565,7 @@ class WebSocketClient(BaseCommunicationClient):
|
|||||||
"job_id": item.job_id,
|
"job_id": item.job_id,
|
||||||
"task_id": item.task_id,
|
"task_id": item.task_id,
|
||||||
"device_id": item.device_id,
|
"device_id": item.device_id,
|
||||||
|
"notebook_id": item.notebook_id,
|
||||||
"action_name": item.action_name,
|
"action_name": item.action_name,
|
||||||
"status": status,
|
"status": status,
|
||||||
"feedback_data": feedback_data,
|
"feedback_data": feedback_data,
|
||||||
|
|||||||
@@ -2,6 +2,8 @@ import time
|
|||||||
import logging
|
import logging
|
||||||
from typing import Union, Dict, Optional
|
from typing import Union, Dict, Optional
|
||||||
|
|
||||||
|
from unilabos.registry.decorators import topic_config
|
||||||
|
|
||||||
|
|
||||||
class VirtualMultiwayValve:
|
class VirtualMultiwayValve:
|
||||||
"""
|
"""
|
||||||
@@ -41,13 +43,11 @@ class VirtualMultiwayValve:
|
|||||||
def target_position(self) -> int:
|
def target_position(self) -> int:
|
||||||
return self._target_position
|
return self._target_position
|
||||||
|
|
||||||
def get_current_position(self) -> int:
|
@property
|
||||||
"""获取当前阀门位置 📍"""
|
@topic_config()
|
||||||
return self._current_position
|
def current_port(self) -> str:
|
||||||
|
"""当前连接的端口名称 🔌"""
|
||||||
def get_current_port(self) -> str:
|
return self.port
|
||||||
"""获取当前连接的端口名称 🔌"""
|
|
||||||
return self._current_position
|
|
||||||
|
|
||||||
def set_position(self, command: Union[int, str]):
|
def set_position(self, command: Union[int, str]):
|
||||||
"""
|
"""
|
||||||
@@ -169,12 +169,14 @@ class VirtualMultiwayValve:
|
|||||||
self._status = "Idle"
|
self._status = "Idle"
|
||||||
self._valve_state = "Closed"
|
self._valve_state = "Closed"
|
||||||
|
|
||||||
close_msg = f"🔒 阀门已关闭,保持在位置 {self._current_position} ({self.get_current_port()})"
|
close_msg = f"🔒 阀门已关闭,保持在位置 {self._current_position} ({self.port})"
|
||||||
self.logger.info(close_msg)
|
self.logger.info(close_msg)
|
||||||
return close_msg
|
return close_msg
|
||||||
|
|
||||||
def get_valve_position(self) -> int:
|
@property
|
||||||
"""获取阀门位置 - 兼容性方法 📍"""
|
@topic_config()
|
||||||
|
def valve_position(self) -> int:
|
||||||
|
"""阀门位置 📍"""
|
||||||
return self._current_position
|
return self._current_position
|
||||||
|
|
||||||
def set_valve_position(self, command: Union[int, str]):
|
def set_valve_position(self, command: Union[int, str]):
|
||||||
@@ -229,19 +231,16 @@ class VirtualMultiwayValve:
|
|||||||
self.logger.info(f"🔄 从端口 {self._current_position} 切换到泵位置...")
|
self.logger.info(f"🔄 从端口 {self._current_position} 切换到泵位置...")
|
||||||
return self.set_to_pump_position()
|
return self.set_to_pump_position()
|
||||||
|
|
||||||
def get_flow_path(self) -> str:
|
@property
|
||||||
"""获取当前流路路径描述 🌊"""
|
@topic_config()
|
||||||
current_port = self.get_current_port()
|
def flow_path(self) -> str:
|
||||||
|
"""当前流路路径描述 🌊"""
|
||||||
if self._current_position == 0:
|
if self._current_position == 0:
|
||||||
flow_path = f"🚰 转移泵已连接 (位置 {self._current_position})"
|
return f"🚰 转移泵已连接 (位置 {self._current_position})"
|
||||||
else:
|
return f"🔌 端口 {self._current_position} 已连接 ({self.current_port})"
|
||||||
flow_path = f"🔌 端口 {self._current_position} 已连接 ({current_port})"
|
|
||||||
|
|
||||||
# 删除debug日志:self.logger.debug(f"🌊 当前流路: {flow_path}")
|
|
||||||
return flow_path
|
|
||||||
|
|
||||||
def __str__(self):
|
def __str__(self):
|
||||||
current_port = self.get_current_port()
|
current_port = self.current_port
|
||||||
status_emoji = "✅" if self._status == "Idle" else "🔄" if self._status == "Busy" else "❌"
|
status_emoji = "✅" if self._status == "Idle" else "🔄" if self._status == "Busy" else "❌"
|
||||||
|
|
||||||
return f"🔄 VirtualMultiwayValve({status_emoji} 位置: {self._current_position}/{self.max_positions}, 端口: {current_port}, 状态: {self._status})"
|
return f"🔄 VirtualMultiwayValve({status_emoji} 位置: {self._current_position}/{self.max_positions}, 端口: {current_port}, 状态: {self._status})"
|
||||||
@@ -253,7 +252,7 @@ if __name__ == "__main__":
|
|||||||
|
|
||||||
print("🔄 === 虚拟九通阀门测试 === ✨")
|
print("🔄 === 虚拟九通阀门测试 === ✨")
|
||||||
print(f"🏠 初始状态: {valve}")
|
print(f"🏠 初始状态: {valve}")
|
||||||
print(f"🌊 当前流路: {valve.get_flow_path()}")
|
print(f"🌊 当前流路: {valve.flow_path}")
|
||||||
|
|
||||||
# 切换到试剂瓶1(1号位)
|
# 切换到试剂瓶1(1号位)
|
||||||
print(f"\n🔌 切换到1号位: {valve.set_position(1)}")
|
print(f"\n🔌 切换到1号位: {valve.set_position(1)}")
|
||||||
|
|||||||
@@ -3,6 +3,7 @@ import logging
|
|||||||
import time as time_module
|
import time as time_module
|
||||||
from typing import Dict, Any
|
from typing import Dict, Any
|
||||||
|
|
||||||
|
from unilabos.registry.decorators import topic_config
|
||||||
from unilabos.ros.nodes.base_device_node import BaseROS2DeviceNode
|
from unilabos.ros.nodes.base_device_node import BaseROS2DeviceNode
|
||||||
|
|
||||||
class VirtualStirrer:
|
class VirtualStirrer:
|
||||||
@@ -314,9 +315,11 @@ class VirtualStirrer:
|
|||||||
def min_speed(self) -> float:
|
def min_speed(self) -> float:
|
||||||
return self._min_speed
|
return self._min_speed
|
||||||
|
|
||||||
def get_device_info(self) -> Dict[str, Any]:
|
@property
|
||||||
"""获取设备状态信息 📊"""
|
@topic_config()
|
||||||
info = {
|
def device_info(self) -> Dict[str, Any]:
|
||||||
|
"""设备状态快照信息 📊"""
|
||||||
|
return {
|
||||||
"device_id": self.device_id,
|
"device_id": self.device_id,
|
||||||
"status": self.status,
|
"status": self.status,
|
||||||
"operation_mode": self.operation_mode,
|
"operation_mode": self.operation_mode,
|
||||||
@@ -325,12 +328,9 @@ class VirtualStirrer:
|
|||||||
"is_stirring": self.is_stirring,
|
"is_stirring": self.is_stirring,
|
||||||
"remaining_time": self.remaining_time,
|
"remaining_time": self.remaining_time,
|
||||||
"max_speed": self._max_speed,
|
"max_speed": self._max_speed,
|
||||||
"min_speed": self._min_speed
|
"min_speed": self._min_speed,
|
||||||
}
|
}
|
||||||
|
|
||||||
# self.logger.debug(f"📊 设备信息: 模式={self.operation_mode}, 速度={self.current_speed} RPM, 搅拌={self.is_stirring}")
|
|
||||||
return info
|
|
||||||
|
|
||||||
def __str__(self):
|
def __str__(self):
|
||||||
status_emoji = "✅" if self.operation_mode == "Idle" else "🌪️" if self.operation_mode == "Stirring" else "🛑" if self.operation_mode == "Settling" else "❌"
|
status_emoji = "✅" if self.operation_mode == "Idle" else "🌪️" if self.operation_mode == "Stirring" else "🛑" if self.operation_mode == "Settling" else "❌"
|
||||||
return f"🌪️ VirtualStirrer({status_emoji} {self.device_id}: {self.operation_mode}, {self.current_speed} RPM)"
|
return f"🌪️ VirtualStirrer({status_emoji} {self.device_id}: {self.operation_mode}, {self.current_speed} RPM)"
|
||||||
@@ -4,6 +4,7 @@ from enum import Enum
|
|||||||
from typing import Union, Optional
|
from typing import Union, Optional
|
||||||
import logging
|
import logging
|
||||||
|
|
||||||
|
from unilabos.registry.decorators import topic_config
|
||||||
from unilabos.ros.nodes.base_device_node import BaseROS2DeviceNode
|
from unilabos.ros.nodes.base_device_node import BaseROS2DeviceNode
|
||||||
|
|
||||||
|
|
||||||
@@ -385,8 +386,10 @@ class VirtualTransferPump:
|
|||||||
"""获取当前体积"""
|
"""获取当前体积"""
|
||||||
return self._current_volume
|
return self._current_volume
|
||||||
|
|
||||||
def get_remaining_capacity(self) -> float:
|
@property
|
||||||
"""获取剩余容量"""
|
@topic_config()
|
||||||
|
def remaining_capacity(self) -> float:
|
||||||
|
"""剩余容量 (ml)"""
|
||||||
return self.max_volume - self._current_volume
|
return self.max_volume - self._current_volume
|
||||||
|
|
||||||
def is_empty(self) -> bool:
|
def is_empty(self) -> bool:
|
||||||
|
|||||||
@@ -14,20 +14,30 @@ Virtual Workbench Device - 模拟工作台设备
|
|||||||
|
|
||||||
import logging
|
import logging
|
||||||
import time
|
import time
|
||||||
from typing import Dict, Any, Optional, List
|
|
||||||
from dataclasses import dataclass
|
from dataclasses import dataclass
|
||||||
from enum import Enum
|
from enum import Enum
|
||||||
from threading import Lock, RLock
|
from threading import Lock, RLock
|
||||||
|
from typing import Any, Dict, List, Optional, cast
|
||||||
|
|
||||||
from typing_extensions import TypedDict
|
from typing_extensions import TypedDict
|
||||||
|
|
||||||
from unilabos.registry.decorators import (
|
from unilabos.registry.decorators import (
|
||||||
device, action, ActionInputHandle, ActionOutputHandle, DataSource, topic_config, not_action, NodeType
|
ActionInputHandle,
|
||||||
|
ActionOutputHandle,
|
||||||
|
DataSource,
|
||||||
|
NodeType,
|
||||||
|
action,
|
||||||
|
device,
|
||||||
|
not_action,
|
||||||
|
topic_config,
|
||||||
)
|
)
|
||||||
from unilabos.registry.placeholder_type import ResourceSlot, DeviceSlot
|
from unilabos.registry.placeholder_type import ResourceSlot, DeviceSlot
|
||||||
from unilabos.ros.nodes.base_device_node import BaseROS2DeviceNode, ROS2DeviceNode
|
from unilabos.ros.nodes.base_device_node import BaseROS2DeviceNode, ROS2DeviceNode
|
||||||
from unilabos.resources.resource_tracker import SampleUUIDsType, LabSample, ResourceTreeSet
|
from unilabos.resources.resource_tracker import (
|
||||||
|
SampleUUIDsType,
|
||||||
|
LabSample,
|
||||||
|
ResourceTreeSet,
|
||||||
|
)
|
||||||
|
|
||||||
# ============ TypedDict 返回类型定义 ============
|
# ============ TypedDict 返回类型定义 ============
|
||||||
|
|
||||||
@@ -112,6 +122,7 @@ class HeatingStation:
|
|||||||
|
|
||||||
@device(
|
@device(
|
||||||
id="virtual_workbench",
|
id="virtual_workbench",
|
||||||
|
display_name="虚拟工作台",
|
||||||
category=["virtual_device"],
|
category=["virtual_device"],
|
||||||
description="Virtual Workbench with 1 robotic arm and 3 heating stations for concurrent material processing",
|
description="Virtual Workbench with 1 robotic arm and 3 heating stations for concurrent material processing",
|
||||||
)
|
)
|
||||||
@@ -137,7 +148,19 @@ class VirtualWorkbench:
|
|||||||
HEATING_TIME: float = 60.0 # 加热时间(秒)
|
HEATING_TIME: float = 60.0 # 加热时间(秒)
|
||||||
NUM_HEATING_STATIONS: int = 3 # 加热台数量
|
NUM_HEATING_STATIONS: int = 3 # 加热台数量
|
||||||
|
|
||||||
def __init__(self, device_id: Optional[str] = None, config: Optional[Dict[str, Any]] = None, **kwargs):
|
def __init__(
|
||||||
|
self,
|
||||||
|
device_id: Optional[str] = None,
|
||||||
|
config: Optional[Dict[str, Any]] = None,
|
||||||
|
**kwargs,
|
||||||
|
):
|
||||||
|
"""
|
||||||
|
初始化虚拟工作台。
|
||||||
|
|
||||||
|
Args:
|
||||||
|
device_id[设备ID]: 工作台设备实例 ID,默认使用 virtual_workbench。
|
||||||
|
config[设备配置]: 可包含 arm_operation_time、heating_time、num_heating_stations。
|
||||||
|
"""
|
||||||
# 处理可能的不同调用方式
|
# 处理可能的不同调用方式
|
||||||
if device_id is None and "id" in kwargs:
|
if device_id is None and "id" in kwargs:
|
||||||
device_id = kwargs.pop("id")
|
device_id = kwargs.pop("id")
|
||||||
@@ -151,9 +174,13 @@ class VirtualWorkbench:
|
|||||||
self.data: Dict[str, Any] = {}
|
self.data: Dict[str, Any] = {}
|
||||||
|
|
||||||
# 从config中获取可配置参数
|
# 从config中获取可配置参数
|
||||||
self.ARM_OPERATION_TIME = float(self.config.get("arm_operation_time", self.ARM_OPERATION_TIME))
|
self.ARM_OPERATION_TIME = float(
|
||||||
|
self.config.get("arm_operation_time", self.ARM_OPERATION_TIME)
|
||||||
|
)
|
||||||
self.HEATING_TIME = float(self.config.get("heating_time", self.HEATING_TIME))
|
self.HEATING_TIME = float(self.config.get("heating_time", self.HEATING_TIME))
|
||||||
self.NUM_HEATING_STATIONS = int(self.config.get("num_heating_stations", self.NUM_HEATING_STATIONS))
|
self.NUM_HEATING_STATIONS = int(
|
||||||
|
self.config.get("num_heating_stations", self.NUM_HEATING_STATIONS)
|
||||||
|
)
|
||||||
|
|
||||||
# 机械臂状态和锁
|
# 机械臂状态和锁
|
||||||
self._arm_lock = Lock()
|
self._arm_lock = Lock()
|
||||||
@@ -162,7 +189,8 @@ class VirtualWorkbench:
|
|||||||
|
|
||||||
# 加热台状态
|
# 加热台状态
|
||||||
self._heating_stations: Dict[int, HeatingStation] = {
|
self._heating_stations: Dict[int, HeatingStation] = {
|
||||||
i: HeatingStation(station_id=i) for i in range(1, self.NUM_HEATING_STATIONS + 1)
|
i: HeatingStation(station_id=i)
|
||||||
|
for i in range(1, self.NUM_HEATING_STATIONS + 1)
|
||||||
}
|
}
|
||||||
self._stations_lock = RLock()
|
self._stations_lock = RLock()
|
||||||
|
|
||||||
@@ -292,45 +320,113 @@ class VirtualWorkbench:
|
|||||||
self.logger.info(f"机械臂已释放 (完成: {task})")
|
self.logger.info(f"机械臂已释放 (完成: {task})")
|
||||||
|
|
||||||
@action(
|
@action(
|
||||||
always_free=True, node_type=NodeType.MANUAL_CONFIRM, placeholder_keys={
|
always_free=True,
|
||||||
"assignee_user_ids": "unilabos_manual_confirm"
|
node_type=NodeType.MANUAL_CONFIRM,
|
||||||
}, goal_default={
|
placeholder_keys={"assignee_user_ids": "unilabos_manual_confirm"},
|
||||||
"timeout_seconds": 3600,
|
goal_default={"timeout_seconds": 3600, "assignee_user_ids": []},
|
||||||
"assignee_user_ids": []
|
feedback_interval=300,
|
||||||
}, feedback_interval=300,
|
|
||||||
handles=[
|
handles=[
|
||||||
ActionInputHandle(key="target_device", data_type="device_id",
|
ActionInputHandle(
|
||||||
label="目标设备", data_key="target_device", data_source=DataSource.HANDLE),
|
key="target_device",
|
||||||
ActionInputHandle(key="resource", data_type="resource",
|
data_type="device_id",
|
||||||
label="待转移资源", data_key="resource", data_source=DataSource.HANDLE),
|
label="目标设备",
|
||||||
ActionInputHandle(key="mount_resource", data_type="resource",
|
data_key="target_device",
|
||||||
label="目标孔位", data_key="mount_resource", data_source=DataSource.HANDLE),
|
data_source=DataSource.HANDLE,
|
||||||
|
),
|
||||||
ActionInputHandle(key="collector_mass", data_type="collector_mass",
|
ActionInputHandle(
|
||||||
label="极流体质量", data_key="collector_mass", data_source=DataSource.HANDLE),
|
key="resource",
|
||||||
ActionInputHandle(key="active_material", data_type="active_material",
|
data_type="resource",
|
||||||
label="活性物质含量", data_key="active_material", data_source=DataSource.HANDLE),
|
label="待转移资源",
|
||||||
ActionInputHandle(key="capacity", data_type="capacity",
|
data_key="resource",
|
||||||
label="克容量", data_key="capacity", data_source=DataSource.HANDLE),
|
data_source=DataSource.HANDLE,
|
||||||
ActionInputHandle(key="battery_system", data_type="battery_system",
|
),
|
||||||
label="电池体系", data_key="battery_system", data_source=DataSource.HANDLE),
|
ActionInputHandle(
|
||||||
|
key="mount_resource",
|
||||||
|
data_type="resource",
|
||||||
|
label="目标孔位",
|
||||||
|
data_key="mount_resource",
|
||||||
|
data_source=DataSource.HANDLE,
|
||||||
|
),
|
||||||
|
ActionInputHandle(
|
||||||
|
key="collector_mass",
|
||||||
|
data_type="collector_mass",
|
||||||
|
label="极流体质量",
|
||||||
|
data_key="collector_mass",
|
||||||
|
data_source=DataSource.HANDLE,
|
||||||
|
),
|
||||||
|
ActionInputHandle(
|
||||||
|
key="active_material",
|
||||||
|
data_type="active_material",
|
||||||
|
label="活性物质含量",
|
||||||
|
data_key="active_material",
|
||||||
|
data_source=DataSource.HANDLE,
|
||||||
|
),
|
||||||
|
ActionInputHandle(
|
||||||
|
key="capacity",
|
||||||
|
data_type="capacity",
|
||||||
|
label="克容量",
|
||||||
|
data_key="capacity",
|
||||||
|
data_source=DataSource.HANDLE,
|
||||||
|
),
|
||||||
|
ActionInputHandle(
|
||||||
|
key="battery_system",
|
||||||
|
data_type="battery_system",
|
||||||
|
label="电池体系",
|
||||||
|
data_key="battery_system",
|
||||||
|
data_source=DataSource.HANDLE,
|
||||||
|
),
|
||||||
# transfer使用
|
# transfer使用
|
||||||
ActionOutputHandle(key="target_device", data_type="device_id",
|
ActionOutputHandle(
|
||||||
label="目标设备", data_key="target_device", data_source=DataSource.EXECUTOR),
|
key="target_device",
|
||||||
ActionOutputHandle(key="resource", data_type="resource",
|
data_type="device_id",
|
||||||
label="待转移资源", data_key="resource.@flatten", data_source=DataSource.EXECUTOR),
|
label="目标设备",
|
||||||
ActionOutputHandle(key="mount_resource", data_type="resource",
|
data_key="target_device",
|
||||||
label="目标孔位", data_key="mount_resource.@flatten", data_source=DataSource.EXECUTOR),
|
data_source=DataSource.EXECUTOR,
|
||||||
|
),
|
||||||
|
ActionOutputHandle(
|
||||||
|
key="resource",
|
||||||
|
data_type="resource",
|
||||||
|
label="待转移资源",
|
||||||
|
data_key="resource.@flatten",
|
||||||
|
data_source=DataSource.EXECUTOR,
|
||||||
|
),
|
||||||
|
ActionOutputHandle(
|
||||||
|
key="mount_resource",
|
||||||
|
data_type="resource",
|
||||||
|
label="目标孔位",
|
||||||
|
data_key="mount_resource.@flatten",
|
||||||
|
data_source=DataSource.EXECUTOR,
|
||||||
|
),
|
||||||
# test使用
|
# test使用
|
||||||
ActionOutputHandle(key="collector_mass", data_type="collector_mass",
|
ActionOutputHandle(
|
||||||
label="极流体质量", data_key="collector_mass", data_source=DataSource.EXECUTOR),
|
key="collector_mass",
|
||||||
ActionOutputHandle(key="active_material", data_type="active_material",
|
data_type="collector_mass",
|
||||||
label="活性物质含量", data_key="active_material", data_source=DataSource.EXECUTOR),
|
label="极流体质量",
|
||||||
ActionOutputHandle(key="capacity", data_type="capacity",
|
data_key="collector_mass",
|
||||||
label="克容量", data_key="capacity", data_source=DataSource.EXECUTOR),
|
data_source=DataSource.EXECUTOR,
|
||||||
ActionOutputHandle(key="battery_system", data_type="battery_system",
|
),
|
||||||
label="电池体系", data_key="battery_system", data_source=DataSource.EXECUTOR),
|
ActionOutputHandle(
|
||||||
]
|
key="active_material",
|
||||||
|
data_type="active_material",
|
||||||
|
label="活性物质含量",
|
||||||
|
data_key="active_material",
|
||||||
|
data_source=DataSource.EXECUTOR,
|
||||||
|
),
|
||||||
|
ActionOutputHandle(
|
||||||
|
key="capacity",
|
||||||
|
data_type="capacity",
|
||||||
|
label="克容量",
|
||||||
|
data_key="capacity",
|
||||||
|
data_source=DataSource.EXECUTOR,
|
||||||
|
),
|
||||||
|
ActionOutputHandle(
|
||||||
|
key="battery_system",
|
||||||
|
data_type="battery_system",
|
||||||
|
label="电池体系",
|
||||||
|
data_key="battery_system",
|
||||||
|
data_source=DataSource.EXECUTOR,
|
||||||
|
),
|
||||||
|
],
|
||||||
)
|
)
|
||||||
def manual_confirm(
|
def manual_confirm(
|
||||||
self,
|
self,
|
||||||
@@ -343,67 +439,156 @@ class VirtualWorkbench:
|
|||||||
battery_system: List[str],
|
battery_system: List[str],
|
||||||
timeout_seconds: int,
|
timeout_seconds: int,
|
||||||
assignee_user_ids: list[str],
|
assignee_user_ids: list[str],
|
||||||
**kwargs
|
**kwargs,
|
||||||
) -> dict:
|
) -> dict:
|
||||||
"""
|
"""
|
||||||
timeout_seconds: 超时时间(秒),默认3600秒
|
人工确认资源转移和扣电测试参数。
|
||||||
collector_mass: 极流体质量
|
|
||||||
active_material: 活性物质含量
|
Args:
|
||||||
capacity: 克容量(mAh/g)
|
resource[待转移资源]: 需要人工确认的资源列表。
|
||||||
battery_system: 电池体系
|
target_device[目标设备]: 资源要转移到的目标设备 ID。
|
||||||
修改的结果无效,是只读的
|
mount_resource[目标孔位]: 资源要挂载到的目标孔位列表。
|
||||||
|
collector_mass[极流体质量]: 每个样品对应的极流体质量。
|
||||||
|
active_material[活性物质含量]: 每个样品对应的活性物质含量。
|
||||||
|
capacity[克容量]: 每个样品对应的克容量,单位 mAh/g。
|
||||||
|
battery_system[电池体系]: 每个样品对应的电池体系名称。
|
||||||
|
timeout_seconds[超时时间]: 人工确认超时时间,单位秒。
|
||||||
|
assignee_user_ids[确认人]: 指定处理人工确认任务的用户 ID 列表。
|
||||||
|
|
||||||
|
Note:
|
||||||
|
修改的结果无效,是只读的。
|
||||||
"""
|
"""
|
||||||
resource = ResourceTreeSet.from_plr_resources(resource).dump()
|
resource_tree = ResourceTreeSet.from_plr_resources(cast(Any, resource)).dump()
|
||||||
mount_resource = ResourceTreeSet.from_plr_resources(mount_resource).dump()
|
mount_resource_tree = ResourceTreeSet.from_plr_resources(cast(Any, mount_resource)).dump()
|
||||||
kwargs.update(locals())
|
kwargs.update(locals())
|
||||||
kwargs.pop("kwargs")
|
kwargs.pop("kwargs")
|
||||||
kwargs.pop("self")
|
kwargs.pop("self")
|
||||||
|
kwargs["resource"] = resource_tree
|
||||||
|
kwargs["mount_resource"] = mount_resource_tree
|
||||||
|
kwargs.pop("resource_tree")
|
||||||
|
kwargs.pop("mount_resource_tree")
|
||||||
return kwargs
|
return kwargs
|
||||||
|
|
||||||
@action(
|
@action(
|
||||||
description="转移物料",
|
description="转移物料",
|
||||||
handles=[
|
handles=[
|
||||||
ActionInputHandle(key="target_device", data_type="device_id",
|
ActionInputHandle(
|
||||||
label="目标设备", data_key="target_device", data_source=DataSource.HANDLE),
|
key="target_device",
|
||||||
ActionInputHandle(key="resource", data_type="resource",
|
data_type="device_id",
|
||||||
label="待转移资源", data_key="resource", data_source=DataSource.HANDLE),
|
label="目标设备",
|
||||||
ActionInputHandle(key="mount_resource", data_type="resource",
|
data_key="target_device",
|
||||||
label="目标孔位", data_key="mount_resource", data_source=DataSource.HANDLE),
|
data_source=DataSource.HANDLE,
|
||||||
]
|
),
|
||||||
|
ActionInputHandle(
|
||||||
|
key="resource",
|
||||||
|
data_type="resource",
|
||||||
|
label="待转移资源",
|
||||||
|
data_key="resource",
|
||||||
|
data_source=DataSource.HANDLE,
|
||||||
|
),
|
||||||
|
ActionInputHandle(
|
||||||
|
key="mount_resource",
|
||||||
|
data_type="resource",
|
||||||
|
label="目标孔位",
|
||||||
|
data_key="mount_resource",
|
||||||
|
data_source=DataSource.HANDLE,
|
||||||
|
),
|
||||||
|
],
|
||||||
)
|
)
|
||||||
async def transfer(self, resource: List[ResourceSlot], target_device: DeviceSlot, mount_resource: List[ResourceSlot]):
|
async def transfer(
|
||||||
future = ROS2DeviceNode.run_async_func(self._ros_node.transfer_resource_to_another, True,
|
self,
|
||||||
|
resource: List[ResourceSlot],
|
||||||
|
target_device: DeviceSlot,
|
||||||
|
mount_resource: List[ResourceSlot],
|
||||||
|
):
|
||||||
|
"""
|
||||||
|
转移资源到目标设备。
|
||||||
|
|
||||||
|
Args:
|
||||||
|
resource[待转移资源]: 待转移的资源列表。
|
||||||
|
target_device[目标设备]: 接收资源的目标设备 ID。
|
||||||
|
mount_resource[目标孔位]: 目标设备上的挂载孔位列表。
|
||||||
|
"""
|
||||||
|
future = ROS2DeviceNode.run_async_func(
|
||||||
|
self._ros_node.transfer_resource_to_another,
|
||||||
|
True,
|
||||||
**{
|
**{
|
||||||
"plr_resources": resource,
|
"plr_resources": resource,
|
||||||
"target_device_id": target_device,
|
"target_device_id": target_device,
|
||||||
"target_resources": mount_resource,
|
"target_resources": mount_resource,
|
||||||
"sites": [None] * len(mount_resource),
|
"sites": [None] * len(mount_resource),
|
||||||
})
|
},
|
||||||
|
)
|
||||||
result = await future
|
result = await future
|
||||||
return result
|
return result
|
||||||
|
|
||||||
|
|
||||||
@action(
|
@action(
|
||||||
description="扣电测试启动",
|
description="扣电测试启动",
|
||||||
handles=[
|
handles=[
|
||||||
ActionInputHandle(key="resource", data_type="resource",
|
ActionInputHandle(
|
||||||
label="待转移资源", data_key="resource", data_source=DataSource.HANDLE),
|
key="resource",
|
||||||
ActionInputHandle(key="mount_resource", data_type="resource",
|
data_type="resource",
|
||||||
label="目标孔位", data_key="mount_resource", data_source=DataSource.HANDLE),
|
label="待转移资源",
|
||||||
|
data_key="resource",
|
||||||
ActionInputHandle(key="collector_mass", data_type="collector_mass",
|
data_source=DataSource.HANDLE,
|
||||||
label="极流体质量", data_key="collector_mass", data_source=DataSource.HANDLE),
|
),
|
||||||
ActionInputHandle(key="active_material", data_type="active_material",
|
ActionInputHandle(
|
||||||
label="活性物质含量", data_key="active_material", data_source=DataSource.HANDLE),
|
key="mount_resource",
|
||||||
ActionInputHandle(key="capacity", data_type="capacity",
|
data_type="resource",
|
||||||
label="克容量", data_key="capacity", data_source=DataSource.HANDLE),
|
label="目标孔位",
|
||||||
ActionInputHandle(key="battery_system", data_type="battery_system",
|
data_key="mount_resource",
|
||||||
label="电池体系", data_key="battery_system", data_source=DataSource.HANDLE),
|
data_source=DataSource.HANDLE,
|
||||||
]
|
),
|
||||||
|
ActionInputHandle(
|
||||||
|
key="collector_mass",
|
||||||
|
data_type="collector_mass",
|
||||||
|
label="极流体质量",
|
||||||
|
data_key="collector_mass",
|
||||||
|
data_source=DataSource.HANDLE,
|
||||||
|
),
|
||||||
|
ActionInputHandle(
|
||||||
|
key="active_material",
|
||||||
|
data_type="active_material",
|
||||||
|
label="活性物质含量",
|
||||||
|
data_key="active_material",
|
||||||
|
data_source=DataSource.HANDLE,
|
||||||
|
),
|
||||||
|
ActionInputHandle(
|
||||||
|
key="capacity",
|
||||||
|
data_type="capacity",
|
||||||
|
label="克容量",
|
||||||
|
data_key="capacity",
|
||||||
|
data_source=DataSource.HANDLE,
|
||||||
|
),
|
||||||
|
ActionInputHandle(
|
||||||
|
key="battery_system",
|
||||||
|
data_type="battery_system",
|
||||||
|
label="电池体系",
|
||||||
|
data_key="battery_system",
|
||||||
|
data_source=DataSource.HANDLE,
|
||||||
|
),
|
||||||
|
],
|
||||||
)
|
)
|
||||||
async def test(
|
async def test(
|
||||||
self, resource: List[ResourceSlot], mount_resource: List[ResourceSlot], collector_mass: List[float], active_material: List[float], capacity: List[float], battery_system: list[str]
|
self,
|
||||||
|
resource: List[ResourceSlot],
|
||||||
|
mount_resource: List[ResourceSlot],
|
||||||
|
collector_mass: List[float],
|
||||||
|
active_material: List[float],
|
||||||
|
capacity: List[float],
|
||||||
|
battery_system: list[str],
|
||||||
):
|
):
|
||||||
|
"""
|
||||||
|
启动扣电测试。
|
||||||
|
|
||||||
|
Args:
|
||||||
|
resource[待测试资源]: 需要进行扣电测试的资源列表。
|
||||||
|
mount_resource[测试孔位]: 扣电测试使用的目标孔位列表。
|
||||||
|
collector_mass[极流体质量]: 每个样品对应的极流体质量。
|
||||||
|
active_material[活性物质含量]: 每个样品对应的活性物质含量。
|
||||||
|
capacity[克容量]: 每个样品对应的克容量,单位 mAh/g。
|
||||||
|
battery_system[电池体系]: 每个样品对应的电池体系名称。
|
||||||
|
"""
|
||||||
print(resource)
|
print(resource)
|
||||||
print(mount_resource)
|
print(mount_resource)
|
||||||
print(collector_mass)
|
print(collector_mass)
|
||||||
@@ -415,16 +600,11 @@ class VirtualWorkbench:
|
|||||||
auto_prefix=True,
|
auto_prefix=True,
|
||||||
description="批量准备物料 - 虚拟起始节点, 生成A1-A5物料, 输出5个handle供后续节点使用",
|
description="批量准备物料 - 虚拟起始节点, 生成A1-A5物料, 输出5个handle供后续节点使用",
|
||||||
handles=[
|
handles=[
|
||||||
ActionOutputHandle(key="channel_1", data_type="workbench_material",
|
ActionOutputHandle(key="channel_1", data_type="workbench_material", label="实验1", data_key="material_1", data_source=DataSource.EXECUTOR), # noqa: E501
|
||||||
label="实验1", data_key="material_1", data_source=DataSource.EXECUTOR),
|
ActionOutputHandle(key="channel_2", data_type="workbench_material", label="实验2", data_key="material_2", data_source=DataSource.EXECUTOR), # noqa: E501
|
||||||
ActionOutputHandle(key="channel_2", data_type="workbench_material",
|
ActionOutputHandle(key="channel_3", data_type="workbench_material", label="实验3", data_key="material_3", data_source=DataSource.EXECUTOR), # noqa: E501
|
||||||
label="实验2", data_key="material_2", data_source=DataSource.EXECUTOR),
|
ActionOutputHandle(key="channel_4", data_type="workbench_material", label="实验4", data_key="material_4", data_source=DataSource.EXECUTOR), # noqa: E501
|
||||||
ActionOutputHandle(key="channel_3", data_type="workbench_material",
|
ActionOutputHandle(key="channel_5", data_type="workbench_material", label="实验5", data_key="material_5", data_source=DataSource.EXECUTOR), # noqa: E501
|
||||||
label="实验3", data_key="material_3", data_source=DataSource.EXECUTOR),
|
|
||||||
ActionOutputHandle(key="channel_4", data_type="workbench_material",
|
|
||||||
label="实验4", data_key="material_4", data_source=DataSource.EXECUTOR),
|
|
||||||
ActionOutputHandle(key="channel_5", data_type="workbench_material",
|
|
||||||
label="实验5", data_key="material_5", data_source=DataSource.EXECUTOR),
|
|
||||||
],
|
],
|
||||||
)
|
)
|
||||||
def prepare_materials(
|
def prepare_materials(
|
||||||
@@ -437,6 +617,9 @@ class VirtualWorkbench:
|
|||||||
|
|
||||||
作为工作流的起始节点, 生成指定数量的物料编号供后续节点使用。
|
作为工作流的起始节点, 生成指定数量的物料编号供后续节点使用。
|
||||||
输出5个handle (material_1 ~ material_5), 分别对应实验1~5。
|
输出5个handle (material_1 ~ material_5), 分别对应实验1~5。
|
||||||
|
|
||||||
|
Args:
|
||||||
|
count[物料数量]: 要生成的物料数量,默认生成 5 个。
|
||||||
"""
|
"""
|
||||||
materials = [i for i in range(1, count + 1)]
|
materials = [i for i in range(1, count + 1)]
|
||||||
|
|
||||||
@@ -457,7 +640,11 @@ class VirtualWorkbench:
|
|||||||
LabSample(
|
LabSample(
|
||||||
sample_uuid=sample_uuid,
|
sample_uuid=sample_uuid,
|
||||||
oss_path="",
|
oss_path="",
|
||||||
extra={"material_uuid": content} if isinstance(content, str) else (content.serialize() if content else {}),
|
extra=(
|
||||||
|
{"material_uuid": content}
|
||||||
|
if isinstance(content, str)
|
||||||
|
else (content.serialize() if content else {})
|
||||||
|
),
|
||||||
)
|
)
|
||||||
for sample_uuid, content in sample_uuids.items()
|
for sample_uuid, content in sample_uuids.items()
|
||||||
],
|
],
|
||||||
@@ -467,12 +654,27 @@ class VirtualWorkbench:
|
|||||||
auto_prefix=True,
|
auto_prefix=True,
|
||||||
description="将物料从An位置移动到空闲加热台, 返回分配的加热台ID",
|
description="将物料从An位置移动到空闲加热台, 返回分配的加热台ID",
|
||||||
handles=[
|
handles=[
|
||||||
ActionInputHandle(key="material_input", data_type="workbench_material",
|
ActionInputHandle(
|
||||||
label="物料编号", data_key="material_number", data_source=DataSource.HANDLE),
|
key="material_input",
|
||||||
ActionOutputHandle(key="heating_station_output", data_type="workbench_station",
|
data_type="workbench_material",
|
||||||
label="加热台ID", data_key="station_id", data_source=DataSource.EXECUTOR),
|
label="物料编号",
|
||||||
ActionOutputHandle(key="material_number_output", data_type="workbench_material",
|
data_key="material_number",
|
||||||
label="物料编号", data_key="material_number", data_source=DataSource.EXECUTOR),
|
data_source=DataSource.HANDLE,
|
||||||
|
),
|
||||||
|
ActionOutputHandle(
|
||||||
|
key="heating_station_output",
|
||||||
|
data_type="workbench_station",
|
||||||
|
label="加热台ID",
|
||||||
|
data_key="station_id",
|
||||||
|
data_source=DataSource.EXECUTOR,
|
||||||
|
),
|
||||||
|
ActionOutputHandle(
|
||||||
|
key="material_number_output",
|
||||||
|
data_type="workbench_material",
|
||||||
|
label="物料编号",
|
||||||
|
data_key="material_number",
|
||||||
|
data_source=DataSource.EXECUTOR,
|
||||||
|
),
|
||||||
],
|
],
|
||||||
)
|
)
|
||||||
def move_to_heating_station(
|
def move_to_heating_station(
|
||||||
@@ -484,6 +686,9 @@ class VirtualWorkbench:
|
|||||||
将物料从An位置移动到加热台
|
将物料从An位置移动到加热台
|
||||||
|
|
||||||
多线程并发调用时, 会竞争机械臂使用权, 并自动查找空闲加热台
|
多线程并发调用时, 会竞争机械臂使用权, 并自动查找空闲加热台
|
||||||
|
|
||||||
|
Args:
|
||||||
|
material_number[物料编号]: 要移动的物料编号,对应 A1、A2 等起始位置。
|
||||||
"""
|
"""
|
||||||
material_id = f"A{material_number}"
|
material_id = f"A{material_number}"
|
||||||
task_desc = f"移动{material_id}到加热台"
|
task_desc = f"移动{material_id}到加热台"
|
||||||
@@ -546,7 +751,8 @@ class VirtualWorkbench:
|
|||||||
oss_path="",
|
oss_path="",
|
||||||
extra=(
|
extra=(
|
||||||
{"material_uuid": content}
|
{"material_uuid": content}
|
||||||
if isinstance(content, str) else (content.serialize() if content else {})
|
if isinstance(content, str)
|
||||||
|
else (content.serialize() if content else {})
|
||||||
),
|
),
|
||||||
)
|
)
|
||||||
for sample_uuid, content in sample_uuids.items()
|
for sample_uuid, content in sample_uuids.items()
|
||||||
@@ -569,7 +775,8 @@ class VirtualWorkbench:
|
|||||||
oss_path="",
|
oss_path="",
|
||||||
extra=(
|
extra=(
|
||||||
{"material_uuid": content}
|
{"material_uuid": content}
|
||||||
if isinstance(content, str) else (content.serialize() if content else {})
|
if isinstance(content, str)
|
||||||
|
else (content.serialize() if content else {})
|
||||||
),
|
),
|
||||||
)
|
)
|
||||||
for sample_uuid, content in sample_uuids.items()
|
for sample_uuid, content in sample_uuids.items()
|
||||||
@@ -581,14 +788,34 @@ class VirtualWorkbench:
|
|||||||
always_free=True,
|
always_free=True,
|
||||||
description="启动指定加热台的加热程序",
|
description="启动指定加热台的加热程序",
|
||||||
handles=[
|
handles=[
|
||||||
ActionInputHandle(key="station_id_input", data_type="workbench_station",
|
ActionInputHandle(
|
||||||
label="加热台ID", data_key="station_id", data_source=DataSource.HANDLE),
|
key="station_id_input",
|
||||||
ActionInputHandle(key="material_number_input", data_type="workbench_material",
|
data_type="workbench_station",
|
||||||
label="物料编号", data_key="material_number", data_source=DataSource.HANDLE),
|
label="加热台ID",
|
||||||
ActionOutputHandle(key="heating_done_station", data_type="workbench_station",
|
data_key="station_id",
|
||||||
label="加热完成-加热台ID", data_key="station_id", data_source=DataSource.EXECUTOR),
|
data_source=DataSource.HANDLE,
|
||||||
ActionOutputHandle(key="heating_done_material", data_type="workbench_material",
|
),
|
||||||
label="加热完成-物料编号", data_key="material_number", data_source=DataSource.EXECUTOR),
|
ActionInputHandle(
|
||||||
|
key="material_number_input",
|
||||||
|
data_type="workbench_material",
|
||||||
|
label="物料编号",
|
||||||
|
data_key="material_number",
|
||||||
|
data_source=DataSource.HANDLE,
|
||||||
|
),
|
||||||
|
ActionOutputHandle(
|
||||||
|
key="heating_done_station",
|
||||||
|
data_type="workbench_station",
|
||||||
|
label="加热完成-加热台ID",
|
||||||
|
data_key="station_id",
|
||||||
|
data_source=DataSource.EXECUTOR,
|
||||||
|
),
|
||||||
|
ActionOutputHandle(
|
||||||
|
key="heating_done_material",
|
||||||
|
data_type="workbench_material",
|
||||||
|
label="加热完成-物料编号",
|
||||||
|
data_key="material_number",
|
||||||
|
data_source=DataSource.EXECUTOR,
|
||||||
|
),
|
||||||
],
|
],
|
||||||
)
|
)
|
||||||
def start_heating(
|
def start_heating(
|
||||||
@@ -599,6 +826,10 @@ class VirtualWorkbench:
|
|||||||
) -> StartHeatingResult:
|
) -> StartHeatingResult:
|
||||||
"""
|
"""
|
||||||
启动指定加热台的加热程序
|
启动指定加热台的加热程序
|
||||||
|
|
||||||
|
Args:
|
||||||
|
station_id[加热台ID]: 要启动加热的加热台编号。
|
||||||
|
material_number[物料编号]: 当前加热台上的物料编号。
|
||||||
"""
|
"""
|
||||||
self.logger.info(f"[加热台{station_id}] 开始加热")
|
self.logger.info(f"[加热台{station_id}] 开始加热")
|
||||||
|
|
||||||
@@ -615,7 +846,8 @@ class VirtualWorkbench:
|
|||||||
oss_path="",
|
oss_path="",
|
||||||
extra=(
|
extra=(
|
||||||
{"material_uuid": content}
|
{"material_uuid": content}
|
||||||
if isinstance(content, str) else (content.serialize() if content else {})
|
if isinstance(content, str)
|
||||||
|
else (content.serialize() if content else {})
|
||||||
),
|
),
|
||||||
)
|
)
|
||||||
for sample_uuid, content in sample_uuids.items()
|
for sample_uuid, content in sample_uuids.items()
|
||||||
@@ -638,7 +870,8 @@ class VirtualWorkbench:
|
|||||||
oss_path="",
|
oss_path="",
|
||||||
extra=(
|
extra=(
|
||||||
{"material_uuid": content}
|
{"material_uuid": content}
|
||||||
if isinstance(content, str) else (content.serialize() if content else {})
|
if isinstance(content, str)
|
||||||
|
else (content.serialize() if content else {})
|
||||||
),
|
),
|
||||||
)
|
)
|
||||||
for sample_uuid, content in sample_uuids.items()
|
for sample_uuid, content in sample_uuids.items()
|
||||||
@@ -658,7 +891,8 @@ class VirtualWorkbench:
|
|||||||
oss_path="",
|
oss_path="",
|
||||||
extra=(
|
extra=(
|
||||||
{"material_uuid": content}
|
{"material_uuid": content}
|
||||||
if isinstance(content, str) else (content.serialize() if content else {})
|
if isinstance(content, str)
|
||||||
|
else (content.serialize() if content else {})
|
||||||
),
|
),
|
||||||
)
|
)
|
||||||
for sample_uuid, content in sample_uuids.items()
|
for sample_uuid, content in sample_uuids.items()
|
||||||
@@ -698,7 +932,9 @@ class VirtualWorkbench:
|
|||||||
self._update_data_status(f"加热台{station_id}加热中: {progress:.1f}%")
|
self._update_data_status(f"加热台{station_id}加热中: {progress:.1f}%")
|
||||||
|
|
||||||
if time.time() - last_countdown_log >= 5.0:
|
if time.time() - last_countdown_log >= 5.0:
|
||||||
self.logger.info(f"[加热台{station_id}] {material_id} 剩余 {remaining:.1f}s")
|
self.logger.info(
|
||||||
|
f"[加热台{station_id}] {material_id} 剩余 {remaining:.1f}s"
|
||||||
|
)
|
||||||
last_countdown_log = time.time()
|
last_countdown_log = time.time()
|
||||||
|
|
||||||
if elapsed >= self.HEATING_TIME:
|
if elapsed >= self.HEATING_TIME:
|
||||||
@@ -715,7 +951,9 @@ class VirtualWorkbench:
|
|||||||
self._active_tasks[material_id]["status"] = "heating_completed"
|
self._active_tasks[material_id]["status"] = "heating_completed"
|
||||||
|
|
||||||
self._update_data_status(f"加热台{station_id}加热完成")
|
self._update_data_status(f"加热台{station_id}加热完成")
|
||||||
self.logger.info(f"[加热台{station_id}] {material_id}加热完成 (用时{self.HEATING_TIME}s)")
|
self.logger.info(
|
||||||
|
f"[加热台{station_id}] {material_id}加热完成 (用时{self.HEATING_TIME}s)"
|
||||||
|
)
|
||||||
|
|
||||||
return {
|
return {
|
||||||
"success": True,
|
"success": True,
|
||||||
@@ -729,7 +967,8 @@ class VirtualWorkbench:
|
|||||||
oss_path="",
|
oss_path="",
|
||||||
extra=(
|
extra=(
|
||||||
{"material_uuid": content}
|
{"material_uuid": content}
|
||||||
if isinstance(content, str) else (content.serialize() if content else {})
|
if isinstance(content, str)
|
||||||
|
else (content.serialize() if content else {})
|
||||||
),
|
),
|
||||||
)
|
)
|
||||||
for sample_uuid, content in sample_uuids.items()
|
for sample_uuid, content in sample_uuids.items()
|
||||||
@@ -740,10 +979,20 @@ class VirtualWorkbench:
|
|||||||
auto_prefix=True,
|
auto_prefix=True,
|
||||||
description="将物料从加热台移动到输出位置Cn",
|
description="将物料从加热台移动到输出位置Cn",
|
||||||
handles=[
|
handles=[
|
||||||
ActionInputHandle(key="output_station_input", data_type="workbench_station",
|
ActionInputHandle(
|
||||||
label="加热台ID", data_key="station_id", data_source=DataSource.HANDLE),
|
key="output_station_input",
|
||||||
ActionInputHandle(key="output_material_input", data_type="workbench_material",
|
data_type="workbench_station",
|
||||||
label="物料编号", data_key="material_number", data_source=DataSource.HANDLE),
|
label="加热台ID",
|
||||||
|
data_key="station_id",
|
||||||
|
data_source=DataSource.HANDLE,
|
||||||
|
),
|
||||||
|
ActionInputHandle(
|
||||||
|
key="output_material_input",
|
||||||
|
data_type="workbench_material",
|
||||||
|
label="物料编号",
|
||||||
|
data_key="material_number",
|
||||||
|
data_source=DataSource.HANDLE,
|
||||||
|
),
|
||||||
],
|
],
|
||||||
)
|
)
|
||||||
def move_to_output(
|
def move_to_output(
|
||||||
@@ -754,6 +1003,10 @@ class VirtualWorkbench:
|
|||||||
) -> MoveToOutputResult:
|
) -> MoveToOutputResult:
|
||||||
"""
|
"""
|
||||||
将物料从加热台移动到输出位置Cn
|
将物料从加热台移动到输出位置Cn
|
||||||
|
|
||||||
|
Args:
|
||||||
|
station_id[加热台ID]: 已完成加热的加热台编号。
|
||||||
|
material_number[物料编号]: 要移动到输出位置的物料编号,对应 Cn。
|
||||||
"""
|
"""
|
||||||
output_number = material_number
|
output_number = material_number
|
||||||
|
|
||||||
@@ -770,7 +1023,8 @@ class VirtualWorkbench:
|
|||||||
oss_path="",
|
oss_path="",
|
||||||
extra=(
|
extra=(
|
||||||
{"material_uuid": content}
|
{"material_uuid": content}
|
||||||
if isinstance(content, str) else (content.serialize() if content else {})
|
if isinstance(content, str)
|
||||||
|
else (content.serialize() if content else {})
|
||||||
),
|
),
|
||||||
)
|
)
|
||||||
for sample_uuid, content in sample_uuids.items()
|
for sample_uuid, content in sample_uuids.items()
|
||||||
@@ -794,7 +1048,8 @@ class VirtualWorkbench:
|
|||||||
oss_path="",
|
oss_path="",
|
||||||
extra=(
|
extra=(
|
||||||
{"material_uuid": content}
|
{"material_uuid": content}
|
||||||
if isinstance(content, str) else (content.serialize() if content else {})
|
if isinstance(content, str)
|
||||||
|
else (content.serialize() if content else {})
|
||||||
),
|
),
|
||||||
)
|
)
|
||||||
for sample_uuid, content in sample_uuids.items()
|
for sample_uuid, content in sample_uuids.items()
|
||||||
@@ -814,7 +1069,8 @@ class VirtualWorkbench:
|
|||||||
oss_path="",
|
oss_path="",
|
||||||
extra=(
|
extra=(
|
||||||
{"material_uuid": content}
|
{"material_uuid": content}
|
||||||
if isinstance(content, str) else (content.serialize() if content else {})
|
if isinstance(content, str)
|
||||||
|
else (content.serialize() if content else {})
|
||||||
),
|
),
|
||||||
)
|
)
|
||||||
for sample_uuid, content in sample_uuids.items()
|
for sample_uuid, content in sample_uuids.items()
|
||||||
@@ -896,7 +1152,8 @@ class VirtualWorkbench:
|
|||||||
oss_path="",
|
oss_path="",
|
||||||
extra=(
|
extra=(
|
||||||
{"material_uuid": content}
|
{"material_uuid": content}
|
||||||
if isinstance(content, str) else (content.serialize() if content else {})
|
if isinstance(content, str)
|
||||||
|
else (content.serialize() if content else {})
|
||||||
),
|
),
|
||||||
)
|
)
|
||||||
for sample_uuid, content in sample_uuids.items()
|
for sample_uuid, content in sample_uuids.items()
|
||||||
|
|||||||
@@ -32,7 +32,7 @@ from typing import Any, Dict, List, Optional, Tuple, Union
|
|||||||
|
|
||||||
MAX_SCAN_DEPTH = 10 # 最大目录递归深度
|
MAX_SCAN_DEPTH = 10 # 最大目录递归深度
|
||||||
MAX_SCAN_FILES = 1000 # 最大扫描文件数量
|
MAX_SCAN_FILES = 1000 # 最大扫描文件数量
|
||||||
_CACHE_VERSION = 1 # 缓存格式版本号,格式变更时递增
|
_CACHE_VERSION = 2 # 缓存格式版本号,格式变更时递增
|
||||||
|
|
||||||
# 合法的装饰器来源模块
|
# 合法的装饰器来源模块
|
||||||
_REGISTRY_DECORATOR_MODULE = "unilabos.registry.decorators"
|
_REGISTRY_DECORATOR_MODULE = "unilabos.registry.decorators"
|
||||||
@@ -258,8 +258,6 @@ def scan_directory(
|
|||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
# ---------------------------------------------------------------------------
|
# ---------------------------------------------------------------------------
|
||||||
# File-level parsing
|
# File-level parsing
|
||||||
# ---------------------------------------------------------------------------
|
# ---------------------------------------------------------------------------
|
||||||
@@ -361,6 +359,7 @@ def _parse_file(
|
|||||||
"actions": class_body.get("actions", {}),
|
"actions": class_body.get("actions", {}),
|
||||||
"status_properties": class_body.get("status_properties", {}),
|
"status_properties": class_body.get("status_properties", {}),
|
||||||
"init_params": class_body.get("init_params", []),
|
"init_params": class_body.get("init_params", []),
|
||||||
|
"init_docstring": class_body.get("init_docstring"),
|
||||||
"auto_methods": class_body.get("auto_methods", {}),
|
"auto_methods": class_body.get("auto_methods", {}),
|
||||||
"import_map": import_map,
|
"import_map": import_map,
|
||||||
}
|
}
|
||||||
@@ -497,7 +496,6 @@ def _collect_imports(tree: ast.Module, module_path: str = "") -> Dict[str, str]:
|
|||||||
return import_map
|
return import_map
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
# ---------------------------------------------------------------------------
|
# ---------------------------------------------------------------------------
|
||||||
# Decorator finding & argument extraction
|
# Decorator finding & argument extraction
|
||||||
# ---------------------------------------------------------------------------
|
# ---------------------------------------------------------------------------
|
||||||
@@ -768,6 +766,7 @@ def _extract_class_body(
|
|||||||
"actions": {}, # method_name -> action_info
|
"actions": {}, # method_name -> action_info
|
||||||
"status_properties": {}, # prop_name -> status_info
|
"status_properties": {}, # prop_name -> status_info
|
||||||
"init_params": [], # [{"name": ..., "type": ..., "default": ...}, ...]
|
"init_params": [], # [{"name": ..., "type": ..., "default": ...}, ...]
|
||||||
|
"init_docstring": None,
|
||||||
"auto_methods": {}, # method_name -> method_info (no @action decorator)
|
"auto_methods": {}, # method_name -> method_info (no @action decorator)
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -780,6 +779,7 @@ def _extract_class_body(
|
|||||||
# --- __init__ ---
|
# --- __init__ ---
|
||||||
if method_name == "__init__":
|
if method_name == "__init__":
|
||||||
result["init_params"] = _extract_method_params(item, import_map)
|
result["init_params"] = _extract_method_params(item, import_map)
|
||||||
|
result["init_docstring"] = ast.get_docstring(item)
|
||||||
continue
|
continue
|
||||||
|
|
||||||
# --- Skip private/dunder ---
|
# --- Skip private/dunder ---
|
||||||
|
|||||||
@@ -51,14 +51,18 @@ Qone_nmr:
|
|||||||
properties:
|
properties:
|
||||||
check_interval:
|
check_interval:
|
||||||
default: 60
|
default: 60
|
||||||
|
description: 检查间隔时间(秒),默认60秒
|
||||||
type: string
|
type: string
|
||||||
expected_count:
|
expected_count:
|
||||||
default: 1
|
default: 1
|
||||||
|
description: 期望生成的.nmr文件数量,默认1个
|
||||||
type: string
|
type: string
|
||||||
monitor_dir:
|
monitor_dir:
|
||||||
|
description: 要监督的目录路径,如果未指定则使用self.monitor_directory
|
||||||
type: string
|
type: string
|
||||||
stability_checks:
|
stability_checks:
|
||||||
default: 3
|
default: 3
|
||||||
|
description: 文件大小稳定性检查次数,默认3次
|
||||||
type: string
|
type: string
|
||||||
required: []
|
required: []
|
||||||
type: object
|
type: object
|
||||||
@@ -85,11 +89,14 @@ Qone_nmr:
|
|||||||
goal:
|
goal:
|
||||||
properties:
|
properties:
|
||||||
output_dir:
|
output_dir:
|
||||||
|
description: 输出目录(如果未指定,使用self.output_directory)
|
||||||
type: string
|
type: string
|
||||||
string_list:
|
string_list:
|
||||||
|
description: 字符串列表
|
||||||
type: string
|
type: string
|
||||||
txt_encoding:
|
txt_encoding:
|
||||||
default: utf-8
|
default: utf-8
|
||||||
|
description: 文件编码
|
||||||
type: string
|
type: string
|
||||||
required:
|
required:
|
||||||
- string_list
|
- string_list
|
||||||
@@ -151,6 +158,13 @@ Qone_nmr:
|
|||||||
additionalProperties: false
|
additionalProperties: false
|
||||||
properties:
|
properties:
|
||||||
string:
|
string:
|
||||||
|
description: '包含多个字符串的输入数据,支持两种格式:
|
||||||
|
|
||||||
|
1. 逗号分隔:如 "A 1 B 2 C 3, X 10 Y 20 Z 30"
|
||||||
|
|
||||||
|
2. 换行分隔:如 "A 1 B 2 C 3
|
||||||
|
|
||||||
|
X 10 Y 20 Z 30"'
|
||||||
type: string
|
type: string
|
||||||
title: StrSingleInput_Goal
|
title: StrSingleInput_Goal
|
||||||
type: object
|
type: object
|
||||||
|
|||||||
@@ -491,14 +491,17 @@ bioyond_cell:
|
|||||||
goal:
|
goal:
|
||||||
properties:
|
properties:
|
||||||
material_names:
|
material_names:
|
||||||
|
description: 物料名称列表;默认使用 [LiPF6, LiDFOB, DTD, LiFSI, LiPO2F2]
|
||||||
items:
|
items:
|
||||||
type: string
|
type: string
|
||||||
type: array
|
type: array
|
||||||
type_id:
|
type_id:
|
||||||
default: 3a190ca0-b2f6-9aeb-8067-547e72c11469
|
default: 3a190ca0-b2f6-9aeb-8067-547e72c11469
|
||||||
|
description: 物料类型ID
|
||||||
type: string
|
type: string
|
||||||
warehouse_name:
|
warehouse_name:
|
||||||
default: 粉末加样头堆栈
|
default: 粉末加样头堆栈
|
||||||
|
description: 目标仓库名(用于取位置信息)
|
||||||
type: string
|
type: string
|
||||||
required: []
|
required: []
|
||||||
type: object
|
type: object
|
||||||
@@ -527,12 +530,16 @@ bioyond_cell:
|
|||||||
goal:
|
goal:
|
||||||
properties:
|
properties:
|
||||||
location_name_or_id:
|
location_name_or_id:
|
||||||
|
description: 具体库位名称(如 A01)或库位 UUID,由用户指定。
|
||||||
type: string
|
type: string
|
||||||
material_name:
|
material_name:
|
||||||
|
description: 物料名称(会优先匹配配置模板)。
|
||||||
type: string
|
type: string
|
||||||
type_id:
|
type_id:
|
||||||
|
description: 物料类型 ID(若为空则尝试从配置推断)。
|
||||||
type: string
|
type: string
|
||||||
warehouse_name:
|
warehouse_name:
|
||||||
|
description: 需要入库的仓库名称;若为空则仅创建不入库。
|
||||||
type: string
|
type: string
|
||||||
required:
|
required:
|
||||||
- material_name
|
- material_name
|
||||||
@@ -661,15 +668,20 @@ bioyond_cell:
|
|||||||
goal:
|
goal:
|
||||||
properties:
|
properties:
|
||||||
board_type:
|
board_type:
|
||||||
|
description: 板类型,如 "5ml分液瓶板"、"配液瓶(小)板"
|
||||||
type: string
|
type: string
|
||||||
bottle_type:
|
bottle_type:
|
||||||
|
description: 瓶类型,如 "5ml分液瓶"、"配液瓶(小)"
|
||||||
type: string
|
type: string
|
||||||
location_code:
|
location_code:
|
||||||
|
description: 库位编号,例如 "A01"
|
||||||
type: string
|
type: string
|
||||||
name:
|
name:
|
||||||
|
description: 物料名称
|
||||||
type: string
|
type: string
|
||||||
warehouse_name:
|
warehouse_name:
|
||||||
default: 手动堆栈
|
default: 手动堆栈
|
||||||
|
description: 仓库名称,默认为 "手动堆栈",支持 "自动堆栈-左"、"自动堆栈-右" 等
|
||||||
type: string
|
type: string
|
||||||
required:
|
required:
|
||||||
- name
|
- name
|
||||||
@@ -1956,7 +1968,7 @@ bioyond_cell:
|
|||||||
properties:
|
properties:
|
||||||
source_wh_id:
|
source_wh_id:
|
||||||
default: 3a19debc-84b4-0359-e2d4-b3beea49348b
|
default: 3a19debc-84b4-0359-e2d4-b3beea49348b
|
||||||
description: 来源仓库ID
|
description: 来源仓库 Id (默认为3号仓库)
|
||||||
type: string
|
type: string
|
||||||
source_x:
|
source_x:
|
||||||
default: 1
|
default: 1
|
||||||
@@ -2061,9 +2073,11 @@ bioyond_cell:
|
|||||||
goal:
|
goal:
|
||||||
properties:
|
properties:
|
||||||
order_code:
|
order_code:
|
||||||
|
description: 任务编号
|
||||||
type: string
|
type: string
|
||||||
timeout:
|
timeout:
|
||||||
default: 36000
|
default: 36000
|
||||||
|
description: 超时时间(秒)
|
||||||
type: integer
|
type: integer
|
||||||
required:
|
required:
|
||||||
- order_code
|
- order_code
|
||||||
@@ -2092,12 +2106,15 @@ bioyond_cell:
|
|||||||
goal:
|
goal:
|
||||||
properties:
|
properties:
|
||||||
order_code:
|
order_code:
|
||||||
|
description: 任务编号
|
||||||
type: string
|
type: string
|
||||||
poll_interval:
|
poll_interval:
|
||||||
default: 0.5
|
default: 0.5
|
||||||
|
description: 轮询间隔(秒),默认 0.5 秒
|
||||||
type: number
|
type: number
|
||||||
timeout:
|
timeout:
|
||||||
default: 36000
|
default: 36000
|
||||||
|
description: 超时时间(秒)
|
||||||
type: integer
|
type: integer
|
||||||
required:
|
required:
|
||||||
- order_code
|
- order_code
|
||||||
@@ -2154,10 +2171,15 @@ bioyond_cell:
|
|||||||
config:
|
config:
|
||||||
properties:
|
properties:
|
||||||
bioyond_config:
|
bioyond_config:
|
||||||
|
description: '从 JSON 文件加载的 bioyond 配置字典
|
||||||
|
|
||||||
|
包含 api_host, api_key, HTTP_host, HTTP_port 等配置'
|
||||||
type: object
|
type: object
|
||||||
deck:
|
deck:
|
||||||
|
description: Deck 配置(可选,会从 JSON 中自动处理)
|
||||||
type: string
|
type: string
|
||||||
protocol_type:
|
protocol_type:
|
||||||
|
description: 协议类型(可选)
|
||||||
type: string
|
type: string
|
||||||
required: []
|
required: []
|
||||||
type: object
|
type: object
|
||||||
|
|||||||
@@ -47,8 +47,10 @@ bioyond_dispensing_station:
|
|||||||
goal:
|
goal:
|
||||||
properties:
|
properties:
|
||||||
report_request:
|
report_request:
|
||||||
|
description: WorkstationReportRequest 对象,包含任务完成信息
|
||||||
type: string
|
type: string
|
||||||
used_materials:
|
used_materials:
|
||||||
|
description: 物料使用记录列表
|
||||||
type: string
|
type: string
|
||||||
required:
|
required:
|
||||||
- report_request
|
- report_request
|
||||||
@@ -102,6 +104,7 @@ bioyond_dispensing_station:
|
|||||||
goal:
|
goal:
|
||||||
properties:
|
properties:
|
||||||
material_name:
|
material_name:
|
||||||
|
description: 物料名称
|
||||||
type: string
|
type: string
|
||||||
required:
|
required:
|
||||||
- material_name
|
- material_name
|
||||||
@@ -611,10 +614,10 @@ bioyond_dispensing_station:
|
|||||||
goal:
|
goal:
|
||||||
properties:
|
properties:
|
||||||
target_device_id:
|
target_device_id:
|
||||||
description: 目标反应站设备ID(从设备列表中选择,所有转移组都使用同一个目标设备)
|
description: 目标反应站设备ID(所有转移组使用同一个设备)
|
||||||
type: string
|
type: string
|
||||||
transfer_groups:
|
transfer_groups:
|
||||||
description: 转移任务组列表,每组包含物料名称、目标堆栈和目标库位,可以添加多组
|
description: '转移任务组列表,每组包含:'
|
||||||
type: array
|
type: array
|
||||||
required:
|
required:
|
||||||
- target_device_id
|
- target_device_id
|
||||||
@@ -694,10 +697,13 @@ bioyond_dispensing_station:
|
|||||||
config:
|
config:
|
||||||
properties:
|
properties:
|
||||||
config:
|
config:
|
||||||
|
description: 配置字典,应包含material_type_mappings等配置
|
||||||
type: object
|
type: object
|
||||||
deck:
|
deck:
|
||||||
|
description: Deck对象
|
||||||
type: string
|
type: string
|
||||||
protocol_type:
|
protocol_type:
|
||||||
|
description: 协议类型(由ROS系统传递,此处忽略)
|
||||||
type: string
|
type: string
|
||||||
required: []
|
required: []
|
||||||
type: object
|
type: object
|
||||||
|
|||||||
@@ -158,7 +158,7 @@ coincellassemblyworkstation_device:
|
|||||||
type: integer
|
type: integer
|
||||||
battery_clean_ignore:
|
battery_clean_ignore:
|
||||||
default: false
|
default: false
|
||||||
description: 是否忽略电池清洁步骤
|
description: 是否忽略电池清洁
|
||||||
type: boolean
|
type: boolean
|
||||||
battery_pressure_mode:
|
battery_pressure_mode:
|
||||||
default: true
|
default: true
|
||||||
@@ -170,21 +170,21 @@ coincellassemblyworkstation_device:
|
|||||||
type: integer
|
type: integer
|
||||||
dual_drop_mode:
|
dual_drop_mode:
|
||||||
default: false
|
default: false
|
||||||
description: 电解液添加模式(false=单次滴液, true=二次滴液)
|
description: 电解液添加模式 (False=单次滴液, True=二次滴液)
|
||||||
type: boolean
|
type: boolean
|
||||||
dual_drop_start_timing:
|
dual_drop_start_timing:
|
||||||
default: false
|
default: false
|
||||||
description: 二次滴液开始滴液时机(false=正极片前, true=正极片后)
|
description: 二次滴液开始滴液时机 (False=正极片前, True=正极片后)
|
||||||
type: boolean
|
type: boolean
|
||||||
dual_drop_suction_timing:
|
dual_drop_suction_timing:
|
||||||
default: false
|
default: false
|
||||||
description: 二次滴液吸液时机(false=正常吸液, true=先吸液)
|
description: 二次滴液吸液时机 (False=正常吸液, True=先吸液)
|
||||||
type: boolean
|
type: boolean
|
||||||
elec_num:
|
elec_num:
|
||||||
description: 电解液瓶数
|
description: 电解液瓶数
|
||||||
type: string
|
type: string
|
||||||
elec_use_num:
|
elec_use_num:
|
||||||
description: 每瓶电解液组装电池数
|
description: 每瓶电解液组装的电池数
|
||||||
type: string
|
type: string
|
||||||
elec_vol:
|
elec_vol:
|
||||||
default: 50
|
default: 50
|
||||||
@@ -196,7 +196,7 @@ coincellassemblyworkstation_device:
|
|||||||
type: string
|
type: string
|
||||||
fujipian_juzhendianwei:
|
fujipian_juzhendianwei:
|
||||||
default: 0
|
default: 0
|
||||||
description: 负极片矩阵点位。盘位置从1开始计数,有效范围:1-8, 13-20 (写入值比实际位置少1,例如:写0取盘位1,写1取盘位2)
|
description: 负极片矩阵点位
|
||||||
type: integer
|
type: integer
|
||||||
fujipian_panshu:
|
fujipian_panshu:
|
||||||
default: 0
|
default: 0
|
||||||
@@ -204,7 +204,7 @@ coincellassemblyworkstation_device:
|
|||||||
type: integer
|
type: integer
|
||||||
gemo_juzhendianwei:
|
gemo_juzhendianwei:
|
||||||
default: 0
|
default: 0
|
||||||
description: 隔膜矩阵点位。盘位置从1开始计数,有效范围:1-8, 13-20 (写入值比实际位置少1,例如:写0取盘位1,写1取盘位2)
|
description: 隔膜矩阵点位
|
||||||
type: integer
|
type: integer
|
||||||
gemopanshu:
|
gemopanshu:
|
||||||
default: 0
|
default: 0
|
||||||
@@ -216,7 +216,7 @@ coincellassemblyworkstation_device:
|
|||||||
type: boolean
|
type: boolean
|
||||||
qiangtou_juzhendianwei:
|
qiangtou_juzhendianwei:
|
||||||
default: 0
|
default: 0
|
||||||
description: 枪头盒矩阵点位。盘位置从1开始计数,有效范围:1-32, 64-96 (写入值比实际位置少1,例如:写0取盘位1,写1取盘位2)
|
description: 枪头盒矩阵点位
|
||||||
type: integer
|
type: integer
|
||||||
required:
|
required:
|
||||||
- elec_num
|
- elec_num
|
||||||
@@ -308,7 +308,13 @@ coincellassemblyworkstation_device:
|
|||||||
properties:
|
properties:
|
||||||
material_search_enable:
|
material_search_enable:
|
||||||
default: false
|
default: false
|
||||||
description: 是否启用物料搜寻功能。设备初始化后会弹出物料搜寻确认弹窗,此参数控制自动点击"是"(启用)或"否"(不启用)。默认为false(不启用物料搜寻)
|
description: '是否启用物料搜寻功能。
|
||||||
|
|
||||||
|
设备初始化后会弹出物料搜寻确认弹窗,
|
||||||
|
|
||||||
|
此参数控制自动点击''是''(启用)或''否''(不启用)。
|
||||||
|
|
||||||
|
默认为False(不启用物料搜寻)。'
|
||||||
type: boolean
|
type: boolean
|
||||||
required: []
|
required: []
|
||||||
type: object
|
type: object
|
||||||
@@ -555,7 +561,7 @@ coincellassemblyworkstation_device:
|
|||||||
type: integer
|
type: integer
|
||||||
battery_clean_ignore:
|
battery_clean_ignore:
|
||||||
default: false
|
default: false
|
||||||
description: 是否忽略电池清洁步骤
|
description: 是否忽略电池清洁
|
||||||
type: boolean
|
type: boolean
|
||||||
battery_pressure_mode:
|
battery_pressure_mode:
|
||||||
default: true
|
default: true
|
||||||
@@ -567,21 +573,21 @@ coincellassemblyworkstation_device:
|
|||||||
type: integer
|
type: integer
|
||||||
dual_drop_mode:
|
dual_drop_mode:
|
||||||
default: false
|
default: false
|
||||||
description: 电解液添加模式(false=单次滴液, true=二次滴液)
|
description: 电解液添加模式 (False=单次滴液, True=二次滴液)
|
||||||
type: boolean
|
type: boolean
|
||||||
dual_drop_start_timing:
|
dual_drop_start_timing:
|
||||||
default: false
|
default: false
|
||||||
description: 二次滴液开始滴液时机(false=正极片前, true=正极片后)
|
description: 二次滴液开始滴液时机 (False=正极片前, True=正极片后)
|
||||||
type: boolean
|
type: boolean
|
||||||
dual_drop_suction_timing:
|
dual_drop_suction_timing:
|
||||||
default: false
|
default: false
|
||||||
description: 二次滴液吸液时机(false=正常吸液, true=先吸液)
|
description: 二次滴液吸液时机 (False=正常吸液, True=先吸液)
|
||||||
type: boolean
|
type: boolean
|
||||||
elec_num:
|
elec_num:
|
||||||
description: 电解液瓶数,如果在workflow中已通过handles连接上游(create_orders的bottle_count输出),则此参数会自动从上游获取,无需手动填写;如果单独使用此函数(没有上游连接),则必须手动填写电解液瓶数
|
description: 电解液瓶数
|
||||||
type: string
|
type: string
|
||||||
elec_use_num:
|
elec_use_num:
|
||||||
description: 每瓶电解液组装电池数
|
description: 每瓶电解液组装的电池数
|
||||||
type: string
|
type: string
|
||||||
elec_vol:
|
elec_vol:
|
||||||
default: 50
|
default: 50
|
||||||
@@ -593,7 +599,7 @@ coincellassemblyworkstation_device:
|
|||||||
type: string
|
type: string
|
||||||
fujipian_juzhendianwei:
|
fujipian_juzhendianwei:
|
||||||
default: 0
|
default: 0
|
||||||
description: 负极片矩阵点位。盘位置从1开始计数,有效范围:1-8, 13-20 (写入值比实际位置少1,例如:写0取盘位1,写1取盘位2)
|
description: 负极片矩阵点位
|
||||||
type: integer
|
type: integer
|
||||||
fujipian_panshu:
|
fujipian_panshu:
|
||||||
default: 0
|
default: 0
|
||||||
@@ -601,7 +607,7 @@ coincellassemblyworkstation_device:
|
|||||||
type: integer
|
type: integer
|
||||||
gemo_juzhendianwei:
|
gemo_juzhendianwei:
|
||||||
default: 0
|
default: 0
|
||||||
description: 隔膜矩阵点位。盘位置从1开始计数,有效范围:1-8, 13-20 (写入值比实际位置少1,例如:写0取盘位1,写1取盘位2)
|
description: 隔膜矩阵点位
|
||||||
type: integer
|
type: integer
|
||||||
gemopanshu:
|
gemopanshu:
|
||||||
default: 0
|
default: 0
|
||||||
@@ -613,7 +619,7 @@ coincellassemblyworkstation_device:
|
|||||||
type: boolean
|
type: boolean
|
||||||
qiangtou_juzhendianwei:
|
qiangtou_juzhendianwei:
|
||||||
default: 0
|
default: 0
|
||||||
description: 枪头盒矩阵点位。盘位置从1开始计数,有效范围:1-32, 64-96 (写入值比实际位置少1,例如:写0取盘位1,写1取盘位2)
|
description: 枪头盒矩阵点位
|
||||||
type: integer
|
type: integer
|
||||||
required:
|
required:
|
||||||
- elec_num
|
- elec_num
|
||||||
|
|||||||
@@ -18,6 +18,7 @@ xyz_stepper_controller:
|
|||||||
goal:
|
goal:
|
||||||
properties:
|
properties:
|
||||||
degrees:
|
degrees:
|
||||||
|
description: 角度值
|
||||||
type: number
|
type: number
|
||||||
required:
|
required:
|
||||||
- degrees
|
- degrees
|
||||||
@@ -44,6 +45,7 @@ xyz_stepper_controller:
|
|||||||
goal:
|
goal:
|
||||||
properties:
|
properties:
|
||||||
axis:
|
axis:
|
||||||
|
description: 电机轴
|
||||||
type: object
|
type: object
|
||||||
required:
|
required:
|
||||||
- axis
|
- axis
|
||||||
@@ -71,6 +73,7 @@ xyz_stepper_controller:
|
|||||||
properties:
|
properties:
|
||||||
enable:
|
enable:
|
||||||
default: true
|
default: true
|
||||||
|
description: True为使能,False为失能
|
||||||
type: boolean
|
type: boolean
|
||||||
required: []
|
required: []
|
||||||
type: object
|
type: object
|
||||||
@@ -99,9 +102,11 @@ xyz_stepper_controller:
|
|||||||
goal:
|
goal:
|
||||||
properties:
|
properties:
|
||||||
axis:
|
axis:
|
||||||
|
description: 电机轴
|
||||||
type: object
|
type: object
|
||||||
enable:
|
enable:
|
||||||
default: true
|
default: true
|
||||||
|
description: True为使能,False为失能
|
||||||
type: boolean
|
type: boolean
|
||||||
required:
|
required:
|
||||||
- axis
|
- axis
|
||||||
@@ -152,6 +157,7 @@ xyz_stepper_controller:
|
|||||||
goal:
|
goal:
|
||||||
properties:
|
properties:
|
||||||
axis:
|
axis:
|
||||||
|
description: 电机轴
|
||||||
type: object
|
type: object
|
||||||
required:
|
required:
|
||||||
- axis
|
- axis
|
||||||
@@ -183,16 +189,21 @@ xyz_stepper_controller:
|
|||||||
properties:
|
properties:
|
||||||
acceleration:
|
acceleration:
|
||||||
default: 1000
|
default: 1000
|
||||||
|
description: 加速度(rpm/s)
|
||||||
type: integer
|
type: integer
|
||||||
axis:
|
axis:
|
||||||
|
description: 电机轴
|
||||||
type: object
|
type: object
|
||||||
position:
|
position:
|
||||||
|
description: 目标位置(步数)
|
||||||
type: integer
|
type: integer
|
||||||
precision:
|
precision:
|
||||||
default: 100
|
default: 100
|
||||||
|
description: 到位精度
|
||||||
type: integer
|
type: integer
|
||||||
speed:
|
speed:
|
||||||
default: 5000
|
default: 5000
|
||||||
|
description: 运行速度(rpm)
|
||||||
type: integer
|
type: integer
|
||||||
required:
|
required:
|
||||||
- axis
|
- axis
|
||||||
@@ -225,16 +236,21 @@ xyz_stepper_controller:
|
|||||||
properties:
|
properties:
|
||||||
acceleration:
|
acceleration:
|
||||||
default: 1000
|
default: 1000
|
||||||
|
description: 加速度
|
||||||
type: integer
|
type: integer
|
||||||
axis:
|
axis:
|
||||||
|
description: 电机轴
|
||||||
type: object
|
type: object
|
||||||
degrees:
|
degrees:
|
||||||
|
description: 目标角度(度)
|
||||||
type: number
|
type: number
|
||||||
precision:
|
precision:
|
||||||
default: 100
|
default: 100
|
||||||
|
description: 精度
|
||||||
type: integer
|
type: integer
|
||||||
speed:
|
speed:
|
||||||
default: 5000
|
default: 5000
|
||||||
|
description: 移动速度
|
||||||
type: integer
|
type: integer
|
||||||
required:
|
required:
|
||||||
- axis
|
- axis
|
||||||
@@ -267,16 +283,21 @@ xyz_stepper_controller:
|
|||||||
properties:
|
properties:
|
||||||
acceleration:
|
acceleration:
|
||||||
default: 1000
|
default: 1000
|
||||||
|
description: 加速度
|
||||||
type: integer
|
type: integer
|
||||||
axis:
|
axis:
|
||||||
|
description: 电机轴
|
||||||
type: object
|
type: object
|
||||||
precision:
|
precision:
|
||||||
default: 100
|
default: 100
|
||||||
|
description: 精度
|
||||||
type: integer
|
type: integer
|
||||||
revolutions:
|
revolutions:
|
||||||
|
description: 目标圈数
|
||||||
type: number
|
type: number
|
||||||
speed:
|
speed:
|
||||||
default: 5000
|
default: 5000
|
||||||
|
description: 移动速度
|
||||||
type: integer
|
type: integer
|
||||||
required:
|
required:
|
||||||
- axis
|
- axis
|
||||||
@@ -309,15 +330,20 @@ xyz_stepper_controller:
|
|||||||
properties:
|
properties:
|
||||||
acceleration:
|
acceleration:
|
||||||
default: 1000
|
default: 1000
|
||||||
|
description: 加速度
|
||||||
type: integer
|
type: integer
|
||||||
speed:
|
speed:
|
||||||
default: 5000
|
default: 5000
|
||||||
|
description: 运行速度
|
||||||
type: integer
|
type: integer
|
||||||
x:
|
x:
|
||||||
|
description: X轴目标位置
|
||||||
type: integer
|
type: integer
|
||||||
y:
|
y:
|
||||||
|
description: Y轴目标位置
|
||||||
type: integer
|
type: integer
|
||||||
z:
|
z:
|
||||||
|
description: Z轴目标位置
|
||||||
type: integer
|
type: integer
|
||||||
required: []
|
required: []
|
||||||
type: object
|
type: object
|
||||||
@@ -350,15 +376,20 @@ xyz_stepper_controller:
|
|||||||
properties:
|
properties:
|
||||||
acceleration:
|
acceleration:
|
||||||
default: 1000
|
default: 1000
|
||||||
|
description: 加速度
|
||||||
type: integer
|
type: integer
|
||||||
speed:
|
speed:
|
||||||
default: 5000
|
default: 5000
|
||||||
|
description: 移动速度
|
||||||
type: integer
|
type: integer
|
||||||
x_deg:
|
x_deg:
|
||||||
|
description: X轴目标角度(度)
|
||||||
type: number
|
type: number
|
||||||
y_deg:
|
y_deg:
|
||||||
|
description: Y轴目标角度(度)
|
||||||
type: number
|
type: number
|
||||||
z_deg:
|
z_deg:
|
||||||
|
description: Z轴目标角度(度)
|
||||||
type: number
|
type: number
|
||||||
required: []
|
required: []
|
||||||
type: object
|
type: object
|
||||||
@@ -391,15 +422,20 @@ xyz_stepper_controller:
|
|||||||
properties:
|
properties:
|
||||||
acceleration:
|
acceleration:
|
||||||
default: 1000
|
default: 1000
|
||||||
|
description: 加速度
|
||||||
type: integer
|
type: integer
|
||||||
speed:
|
speed:
|
||||||
default: 5000
|
default: 5000
|
||||||
|
description: 移动速度
|
||||||
type: integer
|
type: integer
|
||||||
x_rev:
|
x_rev:
|
||||||
|
description: X轴目标圈数
|
||||||
type: number
|
type: number
|
||||||
y_rev:
|
y_rev:
|
||||||
|
description: Y轴目标圈数
|
||||||
type: number
|
type: number
|
||||||
z_rev:
|
z_rev:
|
||||||
|
description: Z轴目标圈数
|
||||||
type: number
|
type: number
|
||||||
required: []
|
required: []
|
||||||
type: object
|
type: object
|
||||||
@@ -427,6 +463,7 @@ xyz_stepper_controller:
|
|||||||
goal:
|
goal:
|
||||||
properties:
|
properties:
|
||||||
revolutions:
|
revolutions:
|
||||||
|
description: 圈数
|
||||||
type: number
|
type: number
|
||||||
required:
|
required:
|
||||||
- revolutions
|
- revolutions
|
||||||
@@ -456,10 +493,13 @@ xyz_stepper_controller:
|
|||||||
properties:
|
properties:
|
||||||
acceleration:
|
acceleration:
|
||||||
default: 1000
|
default: 1000
|
||||||
|
description: 加速度(rpm/s)
|
||||||
type: integer
|
type: integer
|
||||||
axis:
|
axis:
|
||||||
|
description: 电机轴
|
||||||
type: object
|
type: object
|
||||||
speed:
|
speed:
|
||||||
|
description: 运行速度(rpm),正值正转,负值反转
|
||||||
type: integer
|
type: integer
|
||||||
required:
|
required:
|
||||||
- axis
|
- axis
|
||||||
@@ -487,6 +527,7 @@ xyz_stepper_controller:
|
|||||||
goal:
|
goal:
|
||||||
properties:
|
properties:
|
||||||
steps:
|
steps:
|
||||||
|
description: 步数
|
||||||
type: integer
|
type: integer
|
||||||
required:
|
required:
|
||||||
- steps
|
- steps
|
||||||
@@ -513,6 +554,7 @@ xyz_stepper_controller:
|
|||||||
goal:
|
goal:
|
||||||
properties:
|
properties:
|
||||||
steps:
|
steps:
|
||||||
|
description: 步数
|
||||||
type: integer
|
type: integer
|
||||||
required:
|
required:
|
||||||
- steps
|
- steps
|
||||||
@@ -564,9 +606,11 @@ xyz_stepper_controller:
|
|||||||
goal:
|
goal:
|
||||||
properties:
|
properties:
|
||||||
axis:
|
axis:
|
||||||
|
description: 电机轴
|
||||||
type: object
|
type: object
|
||||||
timeout:
|
timeout:
|
||||||
default: 30.0
|
default: 30.0
|
||||||
|
description: 超时时间(秒)
|
||||||
type: number
|
type: number
|
||||||
required:
|
required:
|
||||||
- axis
|
- axis
|
||||||
@@ -591,11 +635,14 @@ xyz_stepper_controller:
|
|||||||
properties:
|
properties:
|
||||||
baudrate:
|
baudrate:
|
||||||
default: 115200
|
default: 115200
|
||||||
|
description: 波特率
|
||||||
type: integer
|
type: integer
|
||||||
port:
|
port:
|
||||||
|
description: 串口端口名
|
||||||
type: string
|
type: string
|
||||||
timeout:
|
timeout:
|
||||||
default: 1.0
|
default: 1.0
|
||||||
|
description: 通信超时时间
|
||||||
type: number
|
type: number
|
||||||
required:
|
required:
|
||||||
- port
|
- port
|
||||||
|
|||||||
@@ -510,9 +510,11 @@ liquid_handler:
|
|||||||
goal:
|
goal:
|
||||||
properties:
|
properties:
|
||||||
msg:
|
msg:
|
||||||
|
description: information to be printed
|
||||||
type: string
|
type: string
|
||||||
seconds:
|
seconds:
|
||||||
default: 0
|
default: 0
|
||||||
|
description: seconds to wait
|
||||||
type: string
|
type: string
|
||||||
required: []
|
required: []
|
||||||
type: object
|
type: object
|
||||||
@@ -2963,15 +2965,22 @@ liquid_handler:
|
|||||||
additionalProperties: false
|
additionalProperties: false
|
||||||
properties:
|
properties:
|
||||||
channel:
|
channel:
|
||||||
|
description: int
|
||||||
maximum: 2147483647
|
maximum: 2147483647
|
||||||
minimum: -2147483648
|
minimum: -2147483648
|
||||||
type: integer
|
type: integer
|
||||||
dis_to_top:
|
dis_to_top:
|
||||||
|
description: 'float
|
||||||
|
|
||||||
|
Height in mm to move to relative to the well top.'
|
||||||
maximum: 1.7976931348623157e+308
|
maximum: 1.7976931348623157e+308
|
||||||
minimum: -1.7976931348623157e+308
|
minimum: -1.7976931348623157e+308
|
||||||
type: number
|
type: number
|
||||||
well:
|
well:
|
||||||
additionalProperties: false
|
additionalProperties: false
|
||||||
|
description: 'Well
|
||||||
|
|
||||||
|
The target well.'
|
||||||
properties:
|
properties:
|
||||||
category:
|
category:
|
||||||
type: string
|
type: string
|
||||||
@@ -4829,11 +4838,13 @@ liquid_handler:
|
|||||||
config:
|
config:
|
||||||
properties:
|
properties:
|
||||||
backend:
|
backend:
|
||||||
|
description: Backend to use.
|
||||||
type: object
|
type: object
|
||||||
channel_num:
|
channel_num:
|
||||||
default: 8
|
default: 8
|
||||||
type: integer
|
type: integer
|
||||||
deck:
|
deck:
|
||||||
|
description: Deck to use.
|
||||||
type: object
|
type: object
|
||||||
simulator:
|
simulator:
|
||||||
default: false
|
default: false
|
||||||
@@ -4883,14 +4894,17 @@ liquid_handler.biomek:
|
|||||||
bind_parent_id:
|
bind_parent_id:
|
||||||
type: string
|
type: string
|
||||||
liquid_input_slot:
|
liquid_input_slot:
|
||||||
|
description: 液体输入槽列表
|
||||||
items:
|
items:
|
||||||
type: integer
|
type: integer
|
||||||
type: array
|
type: array
|
||||||
liquid_type:
|
liquid_type:
|
||||||
|
description: 液体类型列表
|
||||||
items:
|
items:
|
||||||
type: string
|
type: string
|
||||||
type: array
|
type: array
|
||||||
liquid_volume:
|
liquid_volume:
|
||||||
|
description: 液体体积列表
|
||||||
items:
|
items:
|
||||||
type: integer
|
type: integer
|
||||||
type: array
|
type: array
|
||||||
@@ -4901,6 +4915,7 @@ liquid_handler.biomek:
|
|||||||
type: object
|
type: object
|
||||||
type: array
|
type: array
|
||||||
slot_on_deck:
|
slot_on_deck:
|
||||||
|
description: 甲板上的槽位
|
||||||
type: integer
|
type: integer
|
||||||
required:
|
required:
|
||||||
- resource_tracker
|
- resource_tracker
|
||||||
@@ -5036,20 +5051,27 @@ liquid_handler.biomek:
|
|||||||
additionalProperties: false
|
additionalProperties: false
|
||||||
properties:
|
properties:
|
||||||
none_keys:
|
none_keys:
|
||||||
|
description: 需要设置为None的键列表
|
||||||
items:
|
items:
|
||||||
type: string
|
type: string
|
||||||
type: array
|
type: array
|
||||||
protocol_author:
|
protocol_author:
|
||||||
|
description: 协议作者
|
||||||
type: string
|
type: string
|
||||||
protocol_date:
|
protocol_date:
|
||||||
|
description: 协议日期
|
||||||
type: string
|
type: string
|
||||||
protocol_description:
|
protocol_description:
|
||||||
|
description: 协议描述
|
||||||
type: string
|
type: string
|
||||||
protocol_name:
|
protocol_name:
|
||||||
|
description: 协议名称
|
||||||
type: string
|
type: string
|
||||||
protocol_type:
|
protocol_type:
|
||||||
|
description: 协议类型
|
||||||
type: string
|
type: string
|
||||||
protocol_version:
|
protocol_version:
|
||||||
|
description: 协议版本
|
||||||
type: string
|
type: string
|
||||||
title: LiquidHandlerProtocolCreation_Goal
|
title: LiquidHandlerProtocolCreation_Goal
|
||||||
type: object
|
type: object
|
||||||
|
|||||||
@@ -87,7 +87,7 @@ neware_battery_test_system:
|
|||||||
properties:
|
properties:
|
||||||
filepath:
|
filepath:
|
||||||
default: bts_status.json
|
default: bts_status.json
|
||||||
description: 输出JSON文件路径
|
description: 输出文件路径
|
||||||
type: string
|
type: string
|
||||||
required: []
|
required: []
|
||||||
type: object
|
type: object
|
||||||
@@ -146,7 +146,7 @@ neware_battery_test_system:
|
|||||||
goal:
|
goal:
|
||||||
properties:
|
properties:
|
||||||
plate_num:
|
plate_num:
|
||||||
description: 盘号 (1 或 2),如果为null则返回所有盘的状态
|
description: 盘号 (1 或 2),如果为None则返回所有盘的状态
|
||||||
type: integer
|
type: integer
|
||||||
required: []
|
required: []
|
||||||
type: object
|
type: object
|
||||||
@@ -237,11 +237,11 @@ neware_battery_test_system:
|
|||||||
goal:
|
goal:
|
||||||
properties:
|
properties:
|
||||||
csv_path:
|
csv_path:
|
||||||
description: 输入CSV文件的绝对路径
|
description: 输入CSV文件路径
|
||||||
type: string
|
type: string
|
||||||
output_dir:
|
output_dir:
|
||||||
default: .
|
default: .
|
||||||
description: 输出目录(用于存储XML和备份文件),默认当前目录
|
description: 输出目录,用于存储XML文件和备份,默认当前目录
|
||||||
type: string
|
type: string
|
||||||
required:
|
required:
|
||||||
- csv_path
|
- csv_path
|
||||||
@@ -302,14 +302,14 @@ neware_battery_test_system:
|
|||||||
goal:
|
goal:
|
||||||
properties:
|
properties:
|
||||||
backup_dir:
|
backup_dir:
|
||||||
description: 备份目录路径(默认使用最近一次submit_from_csv的backup_dir)
|
description: 备份目录路径,默认使用最近一次 submit_from_csv 的 backup_dir
|
||||||
type: string
|
type: string
|
||||||
file_pattern:
|
file_pattern:
|
||||||
default: '*'
|
default: '*'
|
||||||
description: 文件通配符模式,例如 *.csv 或 Battery_*.nda
|
description: 文件通配符模式,默认 "*" 上传所有文件(例如 "*.csv" 仅上传 CSV 文件)
|
||||||
type: string
|
type: string
|
||||||
oss_prefix:
|
oss_prefix:
|
||||||
description: OSS对象路径前缀(默认使用self.oss_prefix)
|
description: OSS 对象前缀,默认使用类初始化时的配置
|
||||||
type: string
|
type: string
|
||||||
required: []
|
required: []
|
||||||
type: object
|
type: object
|
||||||
@@ -336,19 +336,25 @@ neware_battery_test_system:
|
|||||||
config:
|
config:
|
||||||
properties:
|
properties:
|
||||||
devtype:
|
devtype:
|
||||||
|
description: 设备类型标识
|
||||||
type: string
|
type: string
|
||||||
ip:
|
ip:
|
||||||
|
description: TCP服务器IP地址
|
||||||
type: string
|
type: string
|
||||||
machine_id:
|
machine_id:
|
||||||
default: 1
|
default: 1
|
||||||
|
description: 机器ID
|
||||||
type: integer
|
type: integer
|
||||||
oss_prefix:
|
oss_prefix:
|
||||||
default: neware_backup
|
default: neware_backup
|
||||||
|
description: OSS对象路径前缀,默认"neware_backup"
|
||||||
type: string
|
type: string
|
||||||
oss_upload_enabled:
|
oss_upload_enabled:
|
||||||
default: false
|
default: false
|
||||||
|
description: 是否启用OSS上传功能,默认False
|
||||||
type: boolean
|
type: boolean
|
||||||
port:
|
port:
|
||||||
|
description: TCP端口
|
||||||
type: integer
|
type: integer
|
||||||
size_x:
|
size_x:
|
||||||
default: 50
|
default: 50
|
||||||
@@ -360,6 +366,7 @@ neware_battery_test_system:
|
|||||||
default: 20
|
default: 20
|
||||||
type: number
|
type: number
|
||||||
timeout:
|
timeout:
|
||||||
|
description: 通信超时时间(秒)
|
||||||
type: integer
|
type: integer
|
||||||
required: []
|
required: []
|
||||||
type: object
|
type: object
|
||||||
|
|||||||
@@ -207,8 +207,12 @@ separator.homemade:
|
|||||||
goal:
|
goal:
|
||||||
properties:
|
properties:
|
||||||
condition:
|
condition:
|
||||||
|
description: The condition to be monitored, either 'delta' or 'time'.
|
||||||
type: string
|
type: string
|
||||||
value:
|
value:
|
||||||
|
description: 'The threshold value for the condition.
|
||||||
|
|
||||||
|
`delta > 0.05`, `time > 60`'
|
||||||
type: string
|
type: string
|
||||||
required:
|
required:
|
||||||
- condition
|
- condition
|
||||||
@@ -305,12 +309,17 @@ separator.homemade:
|
|||||||
event:
|
event:
|
||||||
type: string
|
type: string
|
||||||
settling_time:
|
settling_time:
|
||||||
|
description: The duration for which to settle after stirring, in
|
||||||
|
seconds. Defaults to 10.
|
||||||
type: string
|
type: string
|
||||||
stir_speed:
|
stir_speed:
|
||||||
|
description: The speed of stirring, in RPM. Defaults to 300.
|
||||||
maximum: 1.7976931348623157e+308
|
maximum: 1.7976931348623157e+308
|
||||||
minimum: -1.7976931348623157e+308
|
minimum: -1.7976931348623157e+308
|
||||||
type: number
|
type: number
|
||||||
stir_time:
|
stir_time:
|
||||||
|
description: The duration for which to stir, in seconds. Defaults
|
||||||
|
to 10.
|
||||||
maximum: 1.7976931348623157e+308
|
maximum: 1.7976931348623157e+308
|
||||||
minimum: -1.7976931348623157e+308
|
minimum: -1.7976931348623157e+308
|
||||||
type: number
|
type: number
|
||||||
|
|||||||
@@ -456,6 +456,7 @@ syringe_pump_with_valve.runze.SY03B-T06:
|
|||||||
goal:
|
goal:
|
||||||
properties:
|
properties:
|
||||||
volume:
|
volume:
|
||||||
|
description: 'absolute position of the plunger, unit: mL'
|
||||||
type: number
|
type: number
|
||||||
required:
|
required:
|
||||||
- volume
|
- volume
|
||||||
@@ -481,6 +482,7 @@ syringe_pump_with_valve.runze.SY03B-T06:
|
|||||||
goal:
|
goal:
|
||||||
properties:
|
properties:
|
||||||
volume:
|
volume:
|
||||||
|
description: 'absolute position of the plunger, unit: mL'
|
||||||
type: number
|
type: number
|
||||||
required:
|
required:
|
||||||
- volume
|
- volume
|
||||||
@@ -687,8 +689,10 @@ syringe_pump_with_valve.runze.SY03B-T06:
|
|||||||
goal:
|
goal:
|
||||||
properties:
|
properties:
|
||||||
max_velocity:
|
max_velocity:
|
||||||
|
description: 'maximum velocity of the plunger, unit: ml/s'
|
||||||
type: number
|
type: number
|
||||||
position:
|
position:
|
||||||
|
description: 'absolute position of the plunger, unit: ml'
|
||||||
type: number
|
type: number
|
||||||
required:
|
required:
|
||||||
- position
|
- position
|
||||||
@@ -1003,6 +1007,7 @@ syringe_pump_with_valve.runze.SY03B-T08:
|
|||||||
goal:
|
goal:
|
||||||
properties:
|
properties:
|
||||||
volume:
|
volume:
|
||||||
|
description: 'absolute position of the plunger, unit: mL'
|
||||||
type: number
|
type: number
|
||||||
required:
|
required:
|
||||||
- volume
|
- volume
|
||||||
@@ -1028,6 +1033,7 @@ syringe_pump_with_valve.runze.SY03B-T08:
|
|||||||
goal:
|
goal:
|
||||||
properties:
|
properties:
|
||||||
volume:
|
volume:
|
||||||
|
description: 'absolute position of the plunger, unit: mL'
|
||||||
type: number
|
type: number
|
||||||
required:
|
required:
|
||||||
- volume
|
- volume
|
||||||
@@ -1234,8 +1240,10 @@ syringe_pump_with_valve.runze.SY03B-T08:
|
|||||||
goal:
|
goal:
|
||||||
properties:
|
properties:
|
||||||
max_velocity:
|
max_velocity:
|
||||||
|
description: 'maximum velocity of the plunger, unit: ml/s'
|
||||||
type: number
|
type: number
|
||||||
position:
|
position:
|
||||||
|
description: 'absolute position of the plunger, unit: ml'
|
||||||
type: number
|
type: number
|
||||||
required:
|
required:
|
||||||
- position
|
- position
|
||||||
|
|||||||
@@ -32,7 +32,7 @@ reaction_station.bioyond:
|
|||||||
type: integer
|
type: integer
|
||||||
end_point:
|
end_point:
|
||||||
default: 0
|
default: 0
|
||||||
description: 终点计时点 (Start=开始前, End=结束后)
|
description: 终点计时点 (Start=0, End=1)
|
||||||
type: integer
|
type: integer
|
||||||
end_step_key:
|
end_step_key:
|
||||||
default: ''
|
default: ''
|
||||||
@@ -40,11 +40,11 @@ reaction_station.bioyond:
|
|||||||
type: string
|
type: string
|
||||||
start_point:
|
start_point:
|
||||||
default: 0
|
default: 0
|
||||||
description: 起点计时点 (Start=开始前, End=结束后)
|
description: 起点计时点 (Start=0, End=1)
|
||||||
type: integer
|
type: integer
|
||||||
start_step_key:
|
start_step_key:
|
||||||
default: ''
|
default: ''
|
||||||
description: 起点步骤Key (例如 "feeding", "liquid", 可选, 默认为空则自动选择)
|
description: 起点步骤Key (可选, 默认为空则自动选择)
|
||||||
type: string
|
type: string
|
||||||
required:
|
required:
|
||||||
- duration
|
- duration
|
||||||
@@ -91,6 +91,7 @@ reaction_station.bioyond:
|
|||||||
goal:
|
goal:
|
||||||
properties:
|
properties:
|
||||||
json_str:
|
json_str:
|
||||||
|
description: 订单参数的JSON字符串
|
||||||
type: string
|
type: string
|
||||||
required:
|
required:
|
||||||
- json_str
|
- json_str
|
||||||
@@ -117,6 +118,7 @@ reaction_station.bioyond:
|
|||||||
goal:
|
goal:
|
||||||
properties:
|
properties:
|
||||||
workflow_ids:
|
workflow_ids:
|
||||||
|
description: 要删除的工作流ID数组
|
||||||
items:
|
items:
|
||||||
type: string
|
type: string
|
||||||
type: array
|
type: array
|
||||||
@@ -145,6 +147,7 @@ reaction_station.bioyond:
|
|||||||
goal:
|
goal:
|
||||||
properties:
|
properties:
|
||||||
json_str:
|
json_str:
|
||||||
|
description: 'JSON格式的字符串,包含:'
|
||||||
type: string
|
type: string
|
||||||
required:
|
required:
|
||||||
- json_str
|
- json_str
|
||||||
@@ -197,6 +200,7 @@ reaction_station.bioyond:
|
|||||||
goal:
|
goal:
|
||||||
properties:
|
properties:
|
||||||
web_workflow_json:
|
web_workflow_json:
|
||||||
|
description: JSON 格式的网页工作流列表
|
||||||
type: string
|
type: string
|
||||||
required:
|
required:
|
||||||
- web_workflow_json
|
- web_workflow_json
|
||||||
@@ -228,8 +232,10 @@ reaction_station.bioyond:
|
|||||||
goal:
|
goal:
|
||||||
properties:
|
properties:
|
||||||
reactor_id:
|
reactor_id:
|
||||||
|
description: 反应器编号 (1-5)
|
||||||
type: integer
|
type: integer
|
||||||
temperature:
|
temperature:
|
||||||
|
description: 目标温度 (°C)
|
||||||
type: number
|
type: number
|
||||||
required:
|
required:
|
||||||
- reactor_id
|
- reactor_id
|
||||||
@@ -257,6 +263,7 @@ reaction_station.bioyond:
|
|||||||
goal:
|
goal:
|
||||||
properties:
|
properties:
|
||||||
preintake_id:
|
preintake_id:
|
||||||
|
description: 通量ID
|
||||||
type: string
|
type: string
|
||||||
required:
|
required:
|
||||||
- preintake_id
|
- preintake_id
|
||||||
@@ -338,6 +345,7 @@ reaction_station.bioyond:
|
|||||||
goal:
|
goal:
|
||||||
properties:
|
properties:
|
||||||
value:
|
value:
|
||||||
|
description: 工作流 ID 列表
|
||||||
items:
|
items:
|
||||||
type: string
|
type: string
|
||||||
type: array
|
type: array
|
||||||
@@ -365,6 +373,7 @@ reaction_station.bioyond:
|
|||||||
goal:
|
goal:
|
||||||
properties:
|
properties:
|
||||||
workflow_id:
|
workflow_id:
|
||||||
|
description: 工作流ID
|
||||||
type: string
|
type: string
|
||||||
required:
|
required:
|
||||||
- workflow_id
|
- workflow_id
|
||||||
@@ -424,11 +433,11 @@ reaction_station.bioyond:
|
|||||||
goal:
|
goal:
|
||||||
properties:
|
properties:
|
||||||
assign_material_name:
|
assign_material_name:
|
||||||
description: 物料名称(不能为空)
|
description: 物料名称(液体种类)
|
||||||
type: string
|
type: string
|
||||||
temperature:
|
temperature:
|
||||||
default: 25.0
|
default: 25.0
|
||||||
description: 温度设定(°C)
|
description: 温度(C)
|
||||||
type: number
|
type: number
|
||||||
time:
|
time:
|
||||||
default: '90'
|
default: '90'
|
||||||
@@ -436,14 +445,14 @@ reaction_station.bioyond:
|
|||||||
type: string
|
type: string
|
||||||
titration_type:
|
titration_type:
|
||||||
default: '1'
|
default: '1'
|
||||||
description: 是否滴定(NO=否, YES=是)
|
description: 是否滴定(NO=1, YES=2)
|
||||||
type: string
|
type: string
|
||||||
torque_variation:
|
torque_variation:
|
||||||
default: 2
|
default: 2
|
||||||
description: 是否观察 (NO=否, YES=是)
|
description: 是否观察(NO=1, YES=2)
|
||||||
type: integer
|
type: integer
|
||||||
volume:
|
volume:
|
||||||
description: 分液公式(mL)
|
description: 分液量(μL)
|
||||||
type: string
|
type: string
|
||||||
required:
|
required:
|
||||||
- assign_material_name
|
- assign_material_name
|
||||||
@@ -525,11 +534,11 @@ reaction_station.bioyond:
|
|||||||
properties:
|
properties:
|
||||||
assign_material_name:
|
assign_material_name:
|
||||||
default: BAPP
|
default: BAPP
|
||||||
description: 物料名称
|
description: 物料名称(试剂瓶位)
|
||||||
type: string
|
type: string
|
||||||
temperature:
|
temperature:
|
||||||
default: 25.0
|
default: 25.0
|
||||||
description: 温度设定(°C)
|
description: 温度设定(C)
|
||||||
type: number
|
type: number
|
||||||
time:
|
time:
|
||||||
default: '0'
|
default: '0'
|
||||||
@@ -537,15 +546,15 @@ reaction_station.bioyond:
|
|||||||
type: string
|
type: string
|
||||||
titration_type:
|
titration_type:
|
||||||
default: '1'
|
default: '1'
|
||||||
description: 是否滴定(NO=否, YES=是)
|
description: 是否滴定(NO=1, YES=2)
|
||||||
type: string
|
type: string
|
||||||
torque_variation:
|
torque_variation:
|
||||||
default: 1
|
default: 1
|
||||||
description: 是否观察 (NO=否, YES=是)
|
description: 是否观察(int类型, 1=否, 2=是)
|
||||||
type: integer
|
type: integer
|
||||||
volume:
|
volume:
|
||||||
default: '350'
|
default: '350'
|
||||||
description: 分液公式(mL)
|
description: 分液质量(g)
|
||||||
type: string
|
type: string
|
||||||
required: []
|
required: []
|
||||||
type: object
|
type: object
|
||||||
@@ -593,26 +602,28 @@ reaction_station.bioyond:
|
|||||||
description: 物料名称
|
description: 物料名称
|
||||||
type: string
|
type: string
|
||||||
solvents:
|
solvents:
|
||||||
description: '溶剂信息对象(可选),包含: additional_solvent(溶剂体积mL), total_liquid_volume(总液体体积mL)。如果提供,将自动计算volume'
|
description: '溶剂信息的字典或JSON字符串(可选),格式如下:
|
||||||
|
|
||||||
|
{'
|
||||||
type: string
|
type: string
|
||||||
temperature:
|
temperature:
|
||||||
default: 25.0
|
default: 25.0
|
||||||
description: 温度设定(°C),默认25.00
|
description: 温度设定(C)
|
||||||
type: number
|
type: number
|
||||||
time:
|
time:
|
||||||
default: '360'
|
default: '360'
|
||||||
description: 观察时间(分钟),默认360
|
description: 观察时间(分钟)
|
||||||
type: string
|
type: string
|
||||||
titration_type:
|
titration_type:
|
||||||
default: '1'
|
default: '1'
|
||||||
description: 是否滴定(NO=否, YES=是),默认NO
|
description: 是否滴定(NO=1, YES=2)
|
||||||
type: string
|
type: string
|
||||||
torque_variation:
|
torque_variation:
|
||||||
default: 2
|
default: 2
|
||||||
description: 是否观察 (NO=否, YES=是),默认YES
|
description: 是否观察(NO=1, YES=2)
|
||||||
type: integer
|
type: integer
|
||||||
volume:
|
volume:
|
||||||
description: 分液量(mL)。可直接提供,或通过solvents参数自动计算
|
description: 分液量(μL),直接指定体积(可选,如果提供solvents则自动计算)
|
||||||
type: string
|
type: string
|
||||||
required:
|
required:
|
||||||
- assign_material_name
|
- assign_material_name
|
||||||
@@ -671,33 +682,32 @@ reaction_station.bioyond:
|
|||||||
description: 物料名称
|
description: 物料名称
|
||||||
type: string
|
type: string
|
||||||
extracted_actuals:
|
extracted_actuals:
|
||||||
description: 从报告提取的实际加料量JSON字符串,包含actualTargetWeigh(m二酐滴定)和actualVolume(V二酐滴定)
|
description: 从报告提取的实际加料量JSON字符串,包含actualTargetWeigh和actualVolume
|
||||||
type: string
|
type: string
|
||||||
feeding_order_data:
|
feeding_order_data:
|
||||||
description: 'feeding_order JSON对象,用于获取m二酐值(type为main_anhydride的amount)。示例:
|
description: feeding_order JSON字符串或对象,用于获取m二酐值
|
||||||
{"feeding_order": [{"type": "main_anhydride", "amount": 1.915}]}'
|
|
||||||
type: string
|
type: string
|
||||||
temperature:
|
temperature:
|
||||||
default: 25.0
|
default: 25.0
|
||||||
description: 温度设定(°C),默认25.00
|
description: 温度(C)
|
||||||
type: number
|
type: number
|
||||||
time:
|
time:
|
||||||
default: '90'
|
default: '90'
|
||||||
description: 观察时间(分钟),默认90
|
description: 观察时间(分钟)
|
||||||
type: string
|
type: string
|
||||||
titration_type:
|
titration_type:
|
||||||
default: '2'
|
default: '2'
|
||||||
description: 是否滴定(NO=否, YES=是),默认YES
|
description: 是否滴定(NO=1, YES=2),默认2
|
||||||
type: string
|
type: string
|
||||||
torque_variation:
|
torque_variation:
|
||||||
default: 2
|
default: 2
|
||||||
description: 是否观察 (NO=否, YES=是),默认YES
|
description: 是否观察(NO=1, YES=2)
|
||||||
type: integer
|
type: integer
|
||||||
volume_formula:
|
volume_formula:
|
||||||
description: 分液公式(mL)。可直接提供固定公式,或留空由系统根据x_value、feeding_order_data、extracted_actuals自动生成
|
description: 分液公式(μL),如果提供则直接使用,否则自动计算
|
||||||
type: string
|
type: string
|
||||||
x_value:
|
x_value:
|
||||||
description: 公式中的x值,手工输入,格式为"{{1-2-3}}"(包含双花括号)。用于自动公式计算
|
description: 手工输入的x值,格式如 "1-2-3"
|
||||||
type: string
|
type: string
|
||||||
required:
|
required:
|
||||||
- assign_material_name
|
- assign_material_name
|
||||||
@@ -738,7 +748,7 @@ reaction_station.bioyond:
|
|||||||
type: string
|
type: string
|
||||||
temperature:
|
temperature:
|
||||||
default: 25.0
|
default: 25.0
|
||||||
description: 温度设定(°C)
|
description: 温度(C)
|
||||||
type: number
|
type: number
|
||||||
time:
|
time:
|
||||||
default: '0'
|
default: '0'
|
||||||
@@ -746,14 +756,14 @@ reaction_station.bioyond:
|
|||||||
type: string
|
type: string
|
||||||
titration_type:
|
titration_type:
|
||||||
default: '1'
|
default: '1'
|
||||||
description: 是否滴定(NO=否, YES=是)
|
description: 是否滴定(NO=1, YES=2)
|
||||||
type: string
|
type: string
|
||||||
torque_variation:
|
torque_variation:
|
||||||
default: 1
|
default: 1
|
||||||
description: 是否观察 (NO=否, YES=是)
|
description: 是否观察(NO=1, YES=2)
|
||||||
type: integer
|
type: integer
|
||||||
volume_formula:
|
volume_formula:
|
||||||
description: 分液公式(mL)
|
description: 分液公式(μL)
|
||||||
type: string
|
type: string
|
||||||
required:
|
required:
|
||||||
- volume_formula
|
- volume_formula
|
||||||
@@ -786,7 +796,7 @@ reaction_station.bioyond:
|
|||||||
description: 任务名称
|
description: 任务名称
|
||||||
type: string
|
type: string
|
||||||
workflow_name:
|
workflow_name:
|
||||||
description: 工作流名称
|
description: 合并后的工作流名称
|
||||||
type: string
|
type: string
|
||||||
required:
|
required:
|
||||||
- workflow_name
|
- workflow_name
|
||||||
@@ -819,15 +829,15 @@ reaction_station.bioyond:
|
|||||||
goal:
|
goal:
|
||||||
properties:
|
properties:
|
||||||
assign_material_name:
|
assign_material_name:
|
||||||
description: 物料名称
|
description: 物料名称(不能为空)
|
||||||
type: string
|
type: string
|
||||||
cutoff:
|
cutoff:
|
||||||
default: '900000'
|
default: '900000'
|
||||||
description: 粘度上限
|
description: 粘度上限(需为有效数字字符串,默认 "900000")
|
||||||
type: string
|
type: string
|
||||||
temperature:
|
temperature:
|
||||||
default: -10.0
|
default: -10.0
|
||||||
description: 温度设定(°C)
|
description: 温度设定(C,范围:-50.00 至 100.00)
|
||||||
type: number
|
type: number
|
||||||
required:
|
required:
|
||||||
- assign_material_name
|
- assign_material_name
|
||||||
@@ -909,11 +919,11 @@ reaction_station.bioyond:
|
|||||||
description: 物料名称(用于获取试剂瓶位ID)
|
description: 物料名称(用于获取试剂瓶位ID)
|
||||||
type: string
|
type: string
|
||||||
material_id:
|
material_id:
|
||||||
description: 粉末类型ID,Salt=盐(21分钟),Flour=面粉(27分钟),BTDA=BTDA(38分钟)
|
description: 粉末类型ID, Salt=1, Flour=2, BTDA=3
|
||||||
type: string
|
type: string
|
||||||
temperature:
|
temperature:
|
||||||
default: 25.0
|
default: 25.0
|
||||||
description: 温度设定(°C)
|
description: 温度设定(C)
|
||||||
type: number
|
type: number
|
||||||
time:
|
time:
|
||||||
default: '0'
|
default: '0'
|
||||||
@@ -921,7 +931,7 @@ reaction_station.bioyond:
|
|||||||
type: string
|
type: string
|
||||||
torque_variation:
|
torque_variation:
|
||||||
default: 1
|
default: 1
|
||||||
description: 是否观察 (NO=否, YES=是)
|
description: 是否观察(NO=1, YES=2)
|
||||||
type: integer
|
type: integer
|
||||||
required:
|
required:
|
||||||
- material_id
|
- material_id
|
||||||
@@ -945,10 +955,13 @@ reaction_station.bioyond:
|
|||||||
config:
|
config:
|
||||||
properties:
|
properties:
|
||||||
config:
|
config:
|
||||||
|
description: 配置字典,应包含workflow_mappings等配置
|
||||||
type: object
|
type: object
|
||||||
deck:
|
deck:
|
||||||
|
description: Deck对象
|
||||||
type: string
|
type: string
|
||||||
protocol_type:
|
protocol_type:
|
||||||
|
description: 协议类型(由ROS系统传递,此处忽略)
|
||||||
type: string
|
type: string
|
||||||
required: []
|
required: []
|
||||||
type: object
|
type: object
|
||||||
|
|||||||
@@ -198,6 +198,8 @@ robotic_arm.SCARA_with_slider.moveit.virtual:
|
|||||||
additionalProperties: false
|
additionalProperties: false
|
||||||
properties:
|
properties:
|
||||||
command:
|
command:
|
||||||
|
description: A JSON-formatted string that includes option, target,
|
||||||
|
speed, lift_height, mt_height
|
||||||
type: string
|
type: string
|
||||||
title: SendCmd_Goal
|
title: SendCmd_Goal
|
||||||
type: object
|
type: object
|
||||||
@@ -241,6 +243,8 @@ robotic_arm.SCARA_with_slider.moveit.virtual:
|
|||||||
additionalProperties: false
|
additionalProperties: false
|
||||||
properties:
|
properties:
|
||||||
command:
|
command:
|
||||||
|
description: A JSON-formatted string that includes quaternion, speed,
|
||||||
|
position
|
||||||
type: string
|
type: string
|
||||||
title: SendCmd_Goal
|
title: SendCmd_Goal
|
||||||
type: object
|
type: object
|
||||||
@@ -284,6 +288,7 @@ robotic_arm.SCARA_with_slider.moveit.virtual:
|
|||||||
additionalProperties: false
|
additionalProperties: false
|
||||||
properties:
|
properties:
|
||||||
command:
|
command:
|
||||||
|
description: A JSON-formatted string that includes speed
|
||||||
type: string
|
type: string
|
||||||
title: SendCmd_Goal
|
title: SendCmd_Goal
|
||||||
type: object
|
type: object
|
||||||
|
|||||||
@@ -709,6 +709,8 @@ linear_motion.toyo_xyz.sim:
|
|||||||
additionalProperties: false
|
additionalProperties: false
|
||||||
properties:
|
properties:
|
||||||
command:
|
command:
|
||||||
|
description: A JSON-formatted string that includes option, target,
|
||||||
|
speed, lift_height, mt_height
|
||||||
type: string
|
type: string
|
||||||
title: SendCmd_Goal
|
title: SendCmd_Goal
|
||||||
type: object
|
type: object
|
||||||
@@ -752,6 +754,8 @@ linear_motion.toyo_xyz.sim:
|
|||||||
additionalProperties: false
|
additionalProperties: false
|
||||||
properties:
|
properties:
|
||||||
command:
|
command:
|
||||||
|
description: A JSON-formatted string that includes quaternion, speed,
|
||||||
|
position
|
||||||
type: string
|
type: string
|
||||||
title: SendCmd_Goal
|
title: SendCmd_Goal
|
||||||
type: object
|
type: object
|
||||||
@@ -795,6 +799,7 @@ linear_motion.toyo_xyz.sim:
|
|||||||
additionalProperties: false
|
additionalProperties: false
|
||||||
properties:
|
properties:
|
||||||
command:
|
command:
|
||||||
|
description: A JSON-formatted string that includes speed
|
||||||
type: string
|
type: string
|
||||||
title: SendCmd_Goal
|
title: SendCmd_Goal
|
||||||
type: object
|
type: object
|
||||||
|
|||||||
@@ -2179,6 +2179,7 @@ virtual_multiway_valve:
|
|||||||
goal:
|
goal:
|
||||||
properties:
|
properties:
|
||||||
port_number:
|
port_number:
|
||||||
|
description: 端口号 (1-8)
|
||||||
type: integer
|
type: integer
|
||||||
required:
|
required:
|
||||||
- port_number
|
- port_number
|
||||||
@@ -2225,6 +2226,7 @@ virtual_multiway_valve:
|
|||||||
goal:
|
goal:
|
||||||
properties:
|
properties:
|
||||||
port_number:
|
port_number:
|
||||||
|
description: 目标端口号 (1-8)
|
||||||
type: integer
|
type: integer
|
||||||
required:
|
required:
|
||||||
- port_number
|
- port_number
|
||||||
@@ -2261,6 +2263,7 @@ virtual_multiway_valve:
|
|||||||
additionalProperties: false
|
additionalProperties: false
|
||||||
properties:
|
properties:
|
||||||
command:
|
command:
|
||||||
|
description: 目标位置 (0-8) 或位置字符串
|
||||||
type: string
|
type: string
|
||||||
title: SendCmd_Goal
|
title: SendCmd_Goal
|
||||||
type: object
|
type: object
|
||||||
@@ -2304,6 +2307,7 @@ virtual_multiway_valve:
|
|||||||
additionalProperties: false
|
additionalProperties: false
|
||||||
properties:
|
properties:
|
||||||
command:
|
command:
|
||||||
|
description: 目标位置 (0-8) 或位置字符串
|
||||||
type: string
|
type: string
|
||||||
title: SendCmd_Goal
|
title: SendCmd_Goal
|
||||||
type: object
|
type: object
|
||||||
@@ -3960,6 +3964,14 @@ virtual_separator:
|
|||||||
io_type: source
|
io_type: source
|
||||||
label: bottom_phase_out
|
label: bottom_phase_out
|
||||||
side: SOUTH
|
side: SOUTH
|
||||||
|
- data_key: top_outlet
|
||||||
|
data_source: executor
|
||||||
|
data_type: fluid
|
||||||
|
description: 上相(轻相)液体输出口
|
||||||
|
handler_key: topphaseout
|
||||||
|
io_type: source
|
||||||
|
label: top_phase_out
|
||||||
|
side: NORTH
|
||||||
- data_key: mechanical_port
|
- data_key: mechanical_port
|
||||||
data_source: handle
|
data_source: handle
|
||||||
data_type: mechanical
|
data_type: mechanical
|
||||||
@@ -4207,6 +4219,7 @@ virtual_solenoid_valve:
|
|||||||
additionalProperties: false
|
additionalProperties: false
|
||||||
properties:
|
properties:
|
||||||
string:
|
string:
|
||||||
|
description: '"ON"/"OFF" 或 "OPEN"/"CLOSED"'
|
||||||
type: string
|
type: string
|
||||||
title: StrSingleInput_Goal
|
title: StrSingleInput_Goal
|
||||||
type: object
|
type: object
|
||||||
@@ -4250,6 +4263,7 @@ virtual_solenoid_valve:
|
|||||||
additionalProperties: false
|
additionalProperties: false
|
||||||
properties:
|
properties:
|
||||||
command:
|
command:
|
||||||
|
description: '"OPEN"/"CLOSED" 或其他控制命令'
|
||||||
type: string
|
type: string
|
||||||
title: SendCmd_Goal
|
title: SendCmd_Goal
|
||||||
type: object
|
type: object
|
||||||
@@ -4410,16 +4424,20 @@ virtual_solid_dispenser:
|
|||||||
event:
|
event:
|
||||||
type: string
|
type: string
|
||||||
mass:
|
mass:
|
||||||
|
description: 质量字符串 (如 "2.9 g")
|
||||||
type: string
|
type: string
|
||||||
mol:
|
mol:
|
||||||
|
description: 摩尔数字符串 (如 "0.12 mol")
|
||||||
type: string
|
type: string
|
||||||
purpose:
|
purpose:
|
||||||
|
description: 添加目的
|
||||||
type: string
|
type: string
|
||||||
rate_spec:
|
rate_spec:
|
||||||
type: string
|
type: string
|
||||||
ratio:
|
ratio:
|
||||||
type: string
|
type: string
|
||||||
reagent:
|
reagent:
|
||||||
|
description: 试剂名称
|
||||||
type: string
|
type: string
|
||||||
stir:
|
stir:
|
||||||
type: boolean
|
type: boolean
|
||||||
@@ -4431,6 +4449,7 @@ virtual_solid_dispenser:
|
|||||||
type: string
|
type: string
|
||||||
vessel:
|
vessel:
|
||||||
additionalProperties: false
|
additionalProperties: false
|
||||||
|
description: 目标容器
|
||||||
properties:
|
properties:
|
||||||
category:
|
category:
|
||||||
type: string
|
type: string
|
||||||
@@ -5560,8 +5579,10 @@ virtual_transfer_pump:
|
|||||||
goal:
|
goal:
|
||||||
properties:
|
properties:
|
||||||
velocity:
|
velocity:
|
||||||
|
description: 拉取速度 (ml/s)
|
||||||
type: number
|
type: number
|
||||||
volume:
|
volume:
|
||||||
|
description: 要拉取的体积 (ml)
|
||||||
type: number
|
type: number
|
||||||
required:
|
required:
|
||||||
- volume
|
- volume
|
||||||
@@ -5588,8 +5609,10 @@ virtual_transfer_pump:
|
|||||||
goal:
|
goal:
|
||||||
properties:
|
properties:
|
||||||
velocity:
|
velocity:
|
||||||
|
description: 推出速度 (ml/s)
|
||||||
type: number
|
type: number
|
||||||
volume:
|
volume:
|
||||||
|
description: 要推出的体积 (ml)
|
||||||
type: number
|
type: number
|
||||||
required:
|
required:
|
||||||
- volume
|
- volume
|
||||||
@@ -5685,10 +5708,12 @@ virtual_transfer_pump:
|
|||||||
additionalProperties: false
|
additionalProperties: false
|
||||||
properties:
|
properties:
|
||||||
max_velocity:
|
max_velocity:
|
||||||
|
description: 移动速度 (ml/s)
|
||||||
maximum: 1.7976931348623157e+308
|
maximum: 1.7976931348623157e+308
|
||||||
minimum: -1.7976931348623157e+308
|
minimum: -1.7976931348623157e+308
|
||||||
type: number
|
type: number
|
||||||
position:
|
position:
|
||||||
|
description: 目标位置 (ml)
|
||||||
maximum: 1.7976931348623157e+308
|
maximum: 1.7976931348623157e+308
|
||||||
minimum: -1.7976931348623157e+308
|
minimum: -1.7976931348623157e+308
|
||||||
type: number
|
type: number
|
||||||
@@ -5837,8 +5862,10 @@ virtual_transfer_pump:
|
|||||||
config:
|
config:
|
||||||
properties:
|
properties:
|
||||||
config:
|
config:
|
||||||
|
description: 配置字典,包含max_volume, port等参数
|
||||||
type: object
|
type: object
|
||||||
device_id:
|
device_id:
|
||||||
|
description: 设备ID
|
||||||
type: string
|
type: string
|
||||||
required: []
|
required: []
|
||||||
type: object
|
type: object
|
||||||
|
|||||||
@@ -421,7 +421,7 @@ xrd_d7mate:
|
|||||||
type: number
|
type: number
|
||||||
sample_id:
|
sample_id:
|
||||||
default: ''
|
default: ''
|
||||||
description: 样品标识符
|
description: 样品名称
|
||||||
type: string
|
type: string
|
||||||
start_theta:
|
start_theta:
|
||||||
default: 10.0
|
default: 10.0
|
||||||
@@ -433,7 +433,7 @@ xrd_d7mate:
|
|||||||
type: string
|
type: string
|
||||||
wait_minutes:
|
wait_minutes:
|
||||||
default: 3.0
|
default: 3.0
|
||||||
description: 允许上样后等待分钟数
|
description: 在允许上样后、发送样品准备完成前的等待分钟数(默认 3 分钟)
|
||||||
type: number
|
type: number
|
||||||
required: []
|
required: []
|
||||||
title: StartWorkflow_Goal
|
title: StartWorkflow_Goal
|
||||||
@@ -492,12 +492,15 @@ xrd_d7mate:
|
|||||||
properties:
|
properties:
|
||||||
host:
|
host:
|
||||||
default: 127.0.0.1
|
default: 127.0.0.1
|
||||||
|
description: 设备IP地址
|
||||||
type: string
|
type: string
|
||||||
port:
|
port:
|
||||||
default: 6001
|
default: 6001
|
||||||
|
description: 通信端口,默认6001
|
||||||
type: string
|
type: string
|
||||||
timeout:
|
timeout:
|
||||||
default: 10.0
|
default: 10.0
|
||||||
|
description: 超时时间,单位秒
|
||||||
type: string
|
type: string
|
||||||
required: []
|
required: []
|
||||||
type: object
|
type: object
|
||||||
|
|||||||
@@ -217,6 +217,7 @@ zhida_gcms:
|
|||||||
additionalProperties: false
|
additionalProperties: false
|
||||||
properties:
|
properties:
|
||||||
string:
|
string:
|
||||||
|
description: Base64编码的CSV数据(ROS2参数名)
|
||||||
type: string
|
type: string
|
||||||
title: StrSingleInput_Goal
|
title: StrSingleInput_Goal
|
||||||
type: object
|
type: object
|
||||||
@@ -257,6 +258,7 @@ zhida_gcms:
|
|||||||
additionalProperties: false
|
additionalProperties: false
|
||||||
properties:
|
properties:
|
||||||
string:
|
string:
|
||||||
|
description: CSV文件路径(ROS2参数名)
|
||||||
type: string
|
type: string
|
||||||
title: StrSingleInput_Goal
|
title: StrSingleInput_Goal
|
||||||
type: object
|
type: object
|
||||||
@@ -289,12 +291,15 @@ zhida_gcms:
|
|||||||
properties:
|
properties:
|
||||||
host:
|
host:
|
||||||
default: 192.168.3.184
|
default: 192.168.3.184
|
||||||
|
description: 设备IP地址,本地部署时可使用'127.0.0.1'
|
||||||
type: string
|
type: string
|
||||||
port:
|
port:
|
||||||
default: 5792
|
default: 5792
|
||||||
|
description: 通信端口,默认5792
|
||||||
type: string
|
type: string
|
||||||
timeout:
|
timeout:
|
||||||
default: 10.0
|
default: 10.0
|
||||||
|
description: 超时时间,单位秒
|
||||||
type: string
|
type: string
|
||||||
required: []
|
required: []
|
||||||
type: object
|
type: object
|
||||||
|
|||||||
@@ -271,6 +271,7 @@ class Registry:
|
|||||||
registry_cache.pkl 一个文件中,删除即可完全重置。
|
registry_cache.pkl 一个文件中,删除即可完全重置。
|
||||||
"""
|
"""
|
||||||
import time as _time
|
import time as _time
|
||||||
|
from unilabos.registry.ast_registry_scanner import _CACHE_VERSION as AST_SCAN_CACHE_VERSION
|
||||||
from unilabos.registry.ast_registry_scanner import scan_directory
|
from unilabos.registry.ast_registry_scanner import scan_directory
|
||||||
|
|
||||||
scan_t0 = _time.perf_counter()
|
scan_t0 = _time.perf_counter()
|
||||||
@@ -286,6 +287,10 @@ class Registry:
|
|||||||
# ---- 统一缓存:一个 pkl 包含所有数据 ----
|
# ---- 统一缓存:一个 pkl 包含所有数据 ----
|
||||||
unified_cache = self._load_config_cache()
|
unified_cache = self._load_config_cache()
|
||||||
ast_cache = unified_cache.setdefault("_ast_scan", {"files": {}})
|
ast_cache = unified_cache.setdefault("_ast_scan", {"files": {}})
|
||||||
|
if ast_cache.get("version") != AST_SCAN_CACHE_VERSION:
|
||||||
|
ast_cache = {"version": AST_SCAN_CACHE_VERSION, "files": {}}
|
||||||
|
unified_cache["_ast_scan"] = ast_cache
|
||||||
|
unified_cache.pop("_build_results", None)
|
||||||
|
|
||||||
# 默认:扫描 unilabos 包所在的父目录
|
# 默认:扫描 unilabos 包所在的父目录
|
||||||
pkg_root = Path(__file__).resolve().parent.parent # .../unilabos
|
pkg_root = Path(__file__).resolve().parent.parent # .../unilabos
|
||||||
@@ -561,13 +566,47 @@ class Registry:
|
|||||||
|
|
||||||
return prop_schema
|
return prop_schema
|
||||||
|
|
||||||
|
@staticmethod
|
||||||
|
def _apply_docstring_param_metadata(
|
||||||
|
schema: Dict[str, Any],
|
||||||
|
doc_info: Dict[str, Any],
|
||||||
|
field_to_param: Optional[Dict[str, str]] = None,
|
||||||
|
apply_defaults: bool = False,
|
||||||
|
) -> None:
|
||||||
|
"""Apply parsed docstring display names and descriptions to schema properties."""
|
||||||
|
if not schema or not doc_info:
|
||||||
|
return
|
||||||
|
|
||||||
|
props = schema.get("properties", {})
|
||||||
|
if not isinstance(props, dict):
|
||||||
|
return
|
||||||
|
|
||||||
|
param_descs = doc_info.get("params", {}) or {}
|
||||||
|
param_display_names = doc_info.get("param_display_names", {}) or {}
|
||||||
|
for field_name, prop_schema in props.items():
|
||||||
|
if not isinstance(prop_schema, dict):
|
||||||
|
continue
|
||||||
|
param_name = field_to_param.get(field_name, field_name) if field_to_param else field_name
|
||||||
|
if not isinstance(param_name, str):
|
||||||
|
continue
|
||||||
|
param_name = param_name.removesuffix("[]")
|
||||||
|
if param_name in param_display_names:
|
||||||
|
prop_schema["title"] = param_display_names[param_name]
|
||||||
|
elif apply_defaults and not prop_schema.get("title"):
|
||||||
|
prop_schema["title"] = field_name
|
||||||
|
|
||||||
|
if param_name in param_descs:
|
||||||
|
prop_schema["description"] = param_descs[param_name]
|
||||||
|
elif apply_defaults and "description" not in prop_schema:
|
||||||
|
prop_schema["description"] = ""
|
||||||
|
|
||||||
def _generate_unilab_json_command_schema(
|
def _generate_unilab_json_command_schema(
|
||||||
self, method_args: list, docstring: Optional[str] = None,
|
self, method_args: list, docstring: Optional[str] = None,
|
||||||
import_map: Optional[Dict[str, str]] = None,
|
import_map: Optional[Dict[str, str]] = None,
|
||||||
|
apply_doc_defaults: bool = False,
|
||||||
) -> Dict[str, Any]:
|
) -> Dict[str, Any]:
|
||||||
"""根据方法参数和 docstring 生成 UniLabJsonCommand schema"""
|
"""根据方法参数和 docstring 生成 UniLabJsonCommand schema"""
|
||||||
doc_info = parse_docstring(docstring)
|
doc_info = parse_docstring(docstring)
|
||||||
param_descs = doc_info.get("params", {})
|
|
||||||
|
|
||||||
schema = {
|
schema = {
|
||||||
"type": "object",
|
"type": "object",
|
||||||
@@ -598,12 +637,10 @@ class Registry:
|
|||||||
param_name, param_type, param_default, import_map=import_map
|
param_name, param_type, param_default, import_map=import_map
|
||||||
)
|
)
|
||||||
|
|
||||||
if param_name in param_descs:
|
|
||||||
schema["properties"][param_name]["description"] = param_descs[param_name]
|
|
||||||
|
|
||||||
if param_required:
|
if param_required:
|
||||||
schema["required"].append(param_name)
|
schema["required"].append(param_name)
|
||||||
|
|
||||||
|
self._apply_docstring_param_metadata(schema, doc_info, apply_defaults=apply_doc_defaults)
|
||||||
return schema
|
return schema
|
||||||
|
|
||||||
def _generate_status_types_schema(self, status_methods: Dict[str, Any]) -> Dict[str, Any]:
|
def _generate_status_types_schema(self, status_methods: Dict[str, Any]) -> Dict[str, Any]:
|
||||||
@@ -799,6 +836,7 @@ class Registry:
|
|||||||
type_str = "UniLabJsonCommandAsync" if is_async else "UniLabJsonCommand"
|
type_str = "UniLabJsonCommandAsync" if is_async else "UniLabJsonCommand"
|
||||||
params = method_info.get("params", [])
|
params = method_info.get("params", [])
|
||||||
method_doc = method_info.get("docstring")
|
method_doc = method_info.get("docstring")
|
||||||
|
method_doc_info = parse_docstring(method_doc)
|
||||||
goal_schema = self._generate_schema_from_ast_params(params, method_name, method_doc, imap)
|
goal_schema = self._generate_schema_from_ast_params(params, method_name, method_doc, imap)
|
||||||
|
|
||||||
if action_args is not None:
|
if action_args is not None:
|
||||||
@@ -828,7 +866,11 @@ class Registry:
|
|||||||
|
|
||||||
# action handles: 从 @action(handles=[...]) 提取并转换为标准格式
|
# action handles: 从 @action(handles=[...]) 提取并转换为标准格式
|
||||||
raw_handles = (action_args or {}).get("handles")
|
raw_handles = (action_args or {}).get("handles")
|
||||||
handles = normalize_ast_action_handles(raw_handles) if isinstance(raw_handles, list) else (raw_handles or {})
|
handles = (
|
||||||
|
normalize_ast_action_handles(raw_handles)
|
||||||
|
if isinstance(raw_handles, list)
|
||||||
|
else (raw_handles or {})
|
||||||
|
)
|
||||||
|
|
||||||
# placeholder_keys: 先从参数类型自动检测,再用装饰器显式配置覆盖/补充
|
# placeholder_keys: 先从参数类型自动检测,再用装饰器显式配置覆盖/补充
|
||||||
pk = detect_placeholder_keys(params)
|
pk = detect_placeholder_keys(params)
|
||||||
@@ -847,7 +889,12 @@ class Registry:
|
|||||||
"goal": goal,
|
"goal": goal,
|
||||||
"feedback": (action_args or {}).get("feedback") or {},
|
"feedback": (action_args or {}).get("feedback") or {},
|
||||||
"result": (action_args or {}).get("result") or {},
|
"result": (action_args or {}).get("result") or {},
|
||||||
"schema": wrap_action_schema(goal_schema, action_name, result_schema=result_schema),
|
"schema": wrap_action_schema(
|
||||||
|
goal_schema,
|
||||||
|
action_name,
|
||||||
|
description=(action_args or {}).get("description") or method_doc_info.get("description", ""),
|
||||||
|
result_schema=result_schema,
|
||||||
|
),
|
||||||
"goal_default": goal_default,
|
"goal_default": goal_default,
|
||||||
"handles": handles,
|
"handles": handles,
|
||||||
"placeholder_keys": pk,
|
"placeholder_keys": pk,
|
||||||
@@ -886,7 +933,11 @@ class Registry:
|
|||||||
action_name = f"auto-{action_name}"
|
action_name = f"auto-{action_name}"
|
||||||
|
|
||||||
raw_handles = action_args.get("handles")
|
raw_handles = action_args.get("handles")
|
||||||
handles = normalize_ast_action_handles(raw_handles) if isinstance(raw_handles, list) else (raw_handles or {})
|
handles = (
|
||||||
|
normalize_ast_action_handles(raw_handles)
|
||||||
|
if isinstance(raw_handles, list)
|
||||||
|
else (raw_handles or {})
|
||||||
|
)
|
||||||
|
|
||||||
method_params = method_info.get("params", [])
|
method_params = method_info.get("params", [])
|
||||||
|
|
||||||
@@ -979,7 +1030,10 @@ class Registry:
|
|||||||
"schema": schema,
|
"schema": schema,
|
||||||
"goal_default": goal_default,
|
"goal_default": goal_default,
|
||||||
"handles": handles,
|
"handles": handles,
|
||||||
"placeholder_keys": {**detect_placeholder_keys(method_params), **(action_args.get("placeholder_keys") or {})},
|
"placeholder_keys": {
|
||||||
|
**detect_placeholder_keys(method_params),
|
||||||
|
**(action_args.get("placeholder_keys") or {}),
|
||||||
|
},
|
||||||
}
|
}
|
||||||
if action_args.get("always_free") or method_info.get("always_free"):
|
if action_args.get("always_free") or method_info.get("always_free"):
|
||||||
action_entry["always_free"] = True
|
action_entry["always_free"] = True
|
||||||
@@ -988,13 +1042,22 @@ class Registry:
|
|||||||
nt = normalize_enum_value(action_args.get("node_type"), NodeType)
|
nt = normalize_enum_value(action_args.get("node_type"), NodeType)
|
||||||
if nt:
|
if nt:
|
||||||
action_entry["node_type"] = nt
|
action_entry["node_type"] = nt
|
||||||
|
goal_schema_for_docs = action_entry.get("schema", {}).get("properties", {}).get("goal", {})
|
||||||
|
self._apply_docstring_param_metadata(
|
||||||
|
goal_schema_for_docs,
|
||||||
|
parse_docstring(method_info.get("docstring")),
|
||||||
|
goal,
|
||||||
|
apply_defaults=True,
|
||||||
|
)
|
||||||
action_value_mappings[action_name] = action_entry
|
action_value_mappings[action_name] = action_entry
|
||||||
|
|
||||||
action_value_mappings = dict(sorted(action_value_mappings.items()))
|
action_value_mappings = dict(sorted(action_value_mappings.items()))
|
||||||
|
|
||||||
# --- init_param_schema = { config: <init_params>, data: <status_types> } ---
|
# --- init_param_schema = { config: <init_params>, data: <status_types> } ---
|
||||||
init_params = ast_meta.get("init_params", [])
|
init_params = ast_meta.get("init_params", [])
|
||||||
config_schema = self._generate_schema_from_ast_params(init_params, "__init__", import_map=imap)
|
config_schema = self._generate_schema_from_ast_params(
|
||||||
|
init_params, "__init__", ast_meta.get("init_docstring"), import_map=imap
|
||||||
|
)
|
||||||
data_schema = self._generate_status_schema_from_ast(
|
data_schema = self._generate_status_schema_from_ast(
|
||||||
ast_meta.get("status_properties", {}), imap
|
ast_meta.get("status_properties", {}), imap
|
||||||
)
|
)
|
||||||
@@ -1042,7 +1105,6 @@ class Registry:
|
|||||||
) -> Dict[str, Any]:
|
) -> Dict[str, Any]:
|
||||||
"""Generate JSON Schema from AST-extracted parameter list."""
|
"""Generate JSON Schema from AST-extracted parameter list."""
|
||||||
doc_info = parse_docstring(docstring)
|
doc_info = parse_docstring(docstring)
|
||||||
param_descs = doc_info.get("params", {})
|
|
||||||
|
|
||||||
schema: Dict[str, Any] = {
|
schema: Dict[str, Any] = {
|
||||||
"type": "object",
|
"type": "object",
|
||||||
@@ -1072,12 +1134,10 @@ class Registry:
|
|||||||
pname, ptype, pdefault, import_map
|
pname, ptype, pdefault, import_map
|
||||||
)
|
)
|
||||||
|
|
||||||
if pname in param_descs:
|
|
||||||
schema["properties"][pname]["description"] = param_descs[pname]
|
|
||||||
|
|
||||||
if prequired:
|
if prequired:
|
||||||
schema["required"].append(pname)
|
schema["required"].append(pname)
|
||||||
|
|
||||||
|
self._apply_docstring_param_metadata(schema, doc_info, apply_defaults=True)
|
||||||
return schema
|
return schema
|
||||||
|
|
||||||
def _generate_status_schema_from_ast(
|
def _generate_status_schema_from_ast(
|
||||||
@@ -1807,7 +1867,7 @@ class Registry:
|
|||||||
else:
|
else:
|
||||||
action_key = f"auto-{k}"
|
action_key = f"auto-{k}"
|
||||||
goal_schema = self._generate_unilab_json_command_schema(
|
goal_schema = self._generate_unilab_json_command_schema(
|
||||||
v["args"], import_map=enhanced_import_map
|
v["args"], docstring=v.get("docstring"), import_map=enhanced_import_map
|
||||||
)
|
)
|
||||||
ret_type = v.get("return_type", "")
|
ret_type = v.get("return_type", "")
|
||||||
result_schema = None
|
result_schema = None
|
||||||
@@ -1816,7 +1876,13 @@ class Registry:
|
|||||||
"result", ret_type, None, import_map=enhanced_import_map
|
"result", ret_type, None, import_map=enhanced_import_map
|
||||||
)
|
)
|
||||||
old_cfg = old_action_configs.get(action_key) or old_action_configs.get(f"auto-{k}", {})
|
old_cfg = old_action_configs.get(action_key) or old_action_configs.get(f"auto-{k}", {})
|
||||||
new_schema = wrap_action_schema(goal_schema, action_key, result_schema=result_schema)
|
doc_info = parse_docstring(v.get("docstring"))
|
||||||
|
new_schema = wrap_action_schema(
|
||||||
|
goal_schema,
|
||||||
|
action_key,
|
||||||
|
description=doc_info.get("description", ""),
|
||||||
|
result_schema=result_schema,
|
||||||
|
)
|
||||||
old_schema = old_cfg.get("schema", {})
|
old_schema = old_cfg.get("schema", {})
|
||||||
if old_schema:
|
if old_schema:
|
||||||
preserve_field_descriptions(new_schema, old_schema)
|
preserve_field_descriptions(new_schema, old_schema)
|
||||||
@@ -1882,6 +1948,12 @@ class Registry:
|
|||||||
|
|
||||||
merged_pk = dict(old_cfg.get("placeholder_keys", {}))
|
merged_pk = dict(old_cfg.get("placeholder_keys", {}))
|
||||||
merged_pk.update(detect_placeholder_keys(v["args"]))
|
merged_pk.update(detect_placeholder_keys(v["args"]))
|
||||||
|
goal_schema_for_docs = (
|
||||||
|
entry_schema.get("properties", {}).get("goal", {})
|
||||||
|
if isinstance(entry_schema, dict)
|
||||||
|
else {}
|
||||||
|
)
|
||||||
|
self._apply_docstring_param_metadata(goal_schema_for_docs, doc_info, entry_goal)
|
||||||
|
|
||||||
entry = {
|
entry = {
|
||||||
"type": entry_type,
|
"type": entry_type,
|
||||||
@@ -1902,7 +1974,8 @@ class Registry:
|
|||||||
|
|
||||||
device_config["init_param_schema"] = {}
|
device_config["init_param_schema"] = {}
|
||||||
init_schema = self._generate_unilab_json_command_schema(
|
init_schema = self._generate_unilab_json_command_schema(
|
||||||
enhanced_info["init_params"], "__init__",
|
enhanced_info["init_params"],
|
||||||
|
docstring=enhanced_info.get("init_docstring"),
|
||||||
import_map=enhanced_import_map,
|
import_map=enhanced_import_map,
|
||||||
)
|
)
|
||||||
device_config["init_param_schema"]["config"] = init_schema
|
device_config["init_param_schema"]["config"] = init_schema
|
||||||
@@ -1949,7 +2022,9 @@ class Registry:
|
|||||||
action_str_type_mapping[action_type_str] = target_type
|
action_str_type_mapping[action_type_str] = target_type
|
||||||
if target_type is not None:
|
if target_type is not None:
|
||||||
try:
|
try:
|
||||||
action_config["goal_default"] = ROS2MessageInstance(target_type.Goal()).get_python_dict()
|
action_config["goal_default"] = ROS2MessageInstance(
|
||||||
|
target_type.Goal()
|
||||||
|
).get_python_dict()
|
||||||
except Exception:
|
except Exception:
|
||||||
action_config["goal_default"] = {}
|
action_config["goal_default"] = {}
|
||||||
prev_schema = action_config.get("schema", {})
|
prev_schema = action_config.get("schema", {})
|
||||||
@@ -2141,6 +2216,7 @@ class Registry:
|
|||||||
"unilabos_device_id": {
|
"unilabos_device_id": {
|
||||||
"type": "string",
|
"type": "string",
|
||||||
"default": "",
|
"default": "",
|
||||||
|
"title": "设备ID",
|
||||||
"description": "UniLabOS设备ID,用于指定执行动作的具体设备实例",
|
"description": "UniLabOS设备ID,用于指定执行动作的具体设备实例",
|
||||||
},
|
},
|
||||||
**schema["properties"]["goal"]["properties"],
|
**schema["properties"]["goal"]["properties"],
|
||||||
@@ -2212,7 +2288,14 @@ class Registry:
|
|||||||
lab_registry = Registry()
|
lab_registry = Registry()
|
||||||
|
|
||||||
|
|
||||||
def build_registry(registry_paths=None, devices_dirs=None, upload_registry=False, check_mode=False, complete_registry=False, external_only=False):
|
def build_registry(
|
||||||
|
registry_paths=None,
|
||||||
|
devices_dirs=None,
|
||||||
|
upload_registry=False,
|
||||||
|
check_mode=False,
|
||||||
|
complete_registry=False,
|
||||||
|
external_only=False,
|
||||||
|
):
|
||||||
"""
|
"""
|
||||||
构建或获取Registry单例实例
|
构建或获取Registry单例实例
|
||||||
"""
|
"""
|
||||||
@@ -2226,7 +2309,12 @@ def build_registry(registry_paths=None, devices_dirs=None, upload_registry=False
|
|||||||
if path not in current_paths:
|
if path not in current_paths:
|
||||||
lab_registry.registry_paths.append(path)
|
lab_registry.registry_paths.append(path)
|
||||||
|
|
||||||
lab_registry.setup(devices_dirs=devices_dirs, upload_registry=upload_registry, complete_registry=complete_registry, external_only=external_only)
|
lab_registry.setup(
|
||||||
|
devices_dirs=devices_dirs,
|
||||||
|
upload_registry=upload_registry,
|
||||||
|
complete_registry=complete_registry,
|
||||||
|
external_only=external_only,
|
||||||
|
)
|
||||||
|
|
||||||
# 将 AST 扫描的字符串类型替换为实际 ROS2 消息类(仅查找 ROS2 类型,不 import 设备模块)
|
# 将 AST 扫描的字符串类型替换为实际 ROS2 消息类(仅查找 ROS2 类型,不 import 设备模块)
|
||||||
lab_registry.resolve_all_types()
|
lab_registry.resolve_all_types()
|
||||||
|
|||||||
@@ -36,16 +36,40 @@ class ROSMsgNotFound(Exception):
|
|||||||
# ---------------------------------------------------------------------------
|
# ---------------------------------------------------------------------------
|
||||||
|
|
||||||
_SECTION_RE = re.compile(r"^(\w[\w\s]*):\s*$")
|
_SECTION_RE = re.compile(r"^(\w[\w\s]*):\s*$")
|
||||||
|
_PARAM_HEADER_RE = re.compile(
|
||||||
|
r"^\s*(?P<name>\w[\w]*)\s*(?:\[(?P<display_name>[^\]]+)\])?(?:\s*\([^)]*\))?\s*$"
|
||||||
|
)
|
||||||
|
|
||||||
|
|
||||||
|
def _parse_docstring_param_header(param_part: str) -> Tuple[str, Optional[str]]:
|
||||||
|
"""Parse ``name[display_name]`` or Google-style ``name (type)``."""
|
||||||
|
match = _PARAM_HEADER_RE.match(param_part.strip())
|
||||||
|
if not match:
|
||||||
|
return param_part.strip().split("(")[0].strip(), None
|
||||||
|
|
||||||
|
display_name = match.group("display_name")
|
||||||
|
if display_name is not None:
|
||||||
|
display_name = display_name.strip() or None
|
||||||
|
return match.group("name").strip(), display_name
|
||||||
|
|
||||||
|
|
||||||
def parse_docstring(docstring: Optional[str]) -> Dict[str, Any]:
|
def parse_docstring(docstring: Optional[str]) -> Dict[str, Any]:
|
||||||
"""
|
"""
|
||||||
解析 Google-style docstring,提取描述和参数说明。
|
解析 docstring,提取描述和参数说明。
|
||||||
|
|
||||||
|
支持:
|
||||||
|
- Google-style ``Args:`` / ``Parameters:`` 小节
|
||||||
|
- 直接参数行 ``field: desc``
|
||||||
|
- 带显示名参数行 ``field[Display Name]: desc``
|
||||||
|
|
||||||
Returns:
|
Returns:
|
||||||
{"description": "短描述", "params": {"param1": "参数1描述", ...}}
|
{
|
||||||
|
"description": "短描述",
|
||||||
|
"params": {"param1": "参数1描述", ...},
|
||||||
|
"param_display_names": {"param1": "显示名", ...},
|
||||||
|
}
|
||||||
"""
|
"""
|
||||||
result: Dict[str, Any] = {"description": "", "params": {}}
|
result: Dict[str, Any] = {"description": "", "params": {}, "param_display_names": {}}
|
||||||
if not docstring:
|
if not docstring:
|
||||||
return result
|
return result
|
||||||
|
|
||||||
@@ -53,33 +77,53 @@ def parse_docstring(docstring: Optional[str]) -> Dict[str, Any]:
|
|||||||
if not lines:
|
if not lines:
|
||||||
return result
|
return result
|
||||||
|
|
||||||
result["description"] = lines[0].strip()
|
|
||||||
|
|
||||||
in_args = False
|
in_args = False
|
||||||
|
current_section: Optional[str] = None
|
||||||
current_param: Optional[str] = None
|
current_param: Optional[str] = None
|
||||||
|
current_display_name: Optional[str] = None
|
||||||
current_desc_parts: list = []
|
current_desc_parts: list = []
|
||||||
|
|
||||||
for line in lines[1:]:
|
def flush_current_param() -> None:
|
||||||
|
nonlocal current_param, current_display_name, current_desc_parts
|
||||||
|
if current_param is None:
|
||||||
|
return
|
||||||
|
result["params"][current_param] = "\n".join(current_desc_parts).strip()
|
||||||
|
if current_display_name:
|
||||||
|
result["param_display_names"][current_param] = current_display_name
|
||||||
|
current_param = None
|
||||||
|
current_display_name = None
|
||||||
|
current_desc_parts = []
|
||||||
|
|
||||||
|
first_line = lines[0].strip()
|
||||||
|
start_index = 0
|
||||||
|
if not _SECTION_RE.match(first_line) and ":" not in first_line:
|
||||||
|
result["description"] = first_line
|
||||||
|
start_index = 1
|
||||||
|
|
||||||
|
for line in lines[start_index:]:
|
||||||
stripped = line.strip()
|
stripped = line.strip()
|
||||||
|
if not stripped:
|
||||||
|
if current_param is not None:
|
||||||
|
current_desc_parts.append("")
|
||||||
|
continue
|
||||||
|
|
||||||
section_match = _SECTION_RE.match(stripped)
|
section_match = _SECTION_RE.match(stripped)
|
||||||
if section_match:
|
if section_match:
|
||||||
if current_param is not None:
|
flush_current_param()
|
||||||
result["params"][current_param] = "\n".join(current_desc_parts).strip()
|
current_section = section_match.group(1).lower()
|
||||||
current_param = None
|
in_args = current_section in ("args", "arguments", "parameters", "params")
|
||||||
current_desc_parts = []
|
|
||||||
section_name = section_match.group(1).lower()
|
|
||||||
in_args = section_name in ("args", "arguments", "parameters", "params")
|
|
||||||
continue
|
continue
|
||||||
|
|
||||||
if not in_args:
|
parse_as_param = in_args or current_section is None
|
||||||
|
if not parse_as_param:
|
||||||
continue
|
continue
|
||||||
|
|
||||||
if ":" in stripped and not stripped.startswith(" "):
|
if ":" in stripped:
|
||||||
if current_param is not None:
|
flush_current_param()
|
||||||
result["params"][current_param] = "\n".join(current_desc_parts).strip()
|
|
||||||
param_part, _, desc_part = stripped.partition(":")
|
param_part, _, desc_part = stripped.partition(":")
|
||||||
param_name = param_part.strip().split("(")[0].strip()
|
param_name, display_name = _parse_docstring_param_header(param_part)
|
||||||
current_param = param_name
|
current_param = param_name
|
||||||
|
current_display_name = display_name
|
||||||
current_desc_parts = [desc_part.strip()]
|
current_desc_parts = [desc_part.strip()]
|
||||||
elif current_param is not None:
|
elif current_param is not None:
|
||||||
aline = line
|
aline = line
|
||||||
@@ -89,8 +133,7 @@ def parse_docstring(docstring: Optional[str]) -> Dict[str, Any]:
|
|||||||
aline = aline[1:]
|
aline = aline[1:]
|
||||||
current_desc_parts.append(aline.strip())
|
current_desc_parts.append(aline.strip())
|
||||||
|
|
||||||
if current_param is not None:
|
flush_current_param()
|
||||||
result["params"][current_param] = "\n".join(current_desc_parts).strip()
|
|
||||||
|
|
||||||
return result
|
return result
|
||||||
|
|
||||||
|
|||||||
@@ -42,7 +42,7 @@ def canonicalize_nodes_data(
|
|||||||
Returns:
|
Returns:
|
||||||
ResourceTreeSet: 标准化后的资源树集合
|
ResourceTreeSet: 标准化后的资源树集合
|
||||||
"""
|
"""
|
||||||
print_status(f"{len(nodes)} Resources loaded:", "info")
|
print_status(f"{len(nodes)} Resources loaded", "info")
|
||||||
|
|
||||||
# 第一步:基本预处理(处理graphml的label字段)
|
# 第一步:基本预处理(处理graphml的label字段)
|
||||||
outer_host_node_id = None
|
outer_host_node_id = None
|
||||||
|
|||||||
@@ -45,6 +45,7 @@ from unilabos.resources.graphio import (
|
|||||||
)
|
)
|
||||||
from unilabos.resources.plr_additional_res_reg import register
|
from unilabos.resources.plr_additional_res_reg import register
|
||||||
from unilabos.ros.msgs.message_converter import (
|
from unilabos.ros.msgs.message_converter import (
|
||||||
|
String,
|
||||||
convert_to_ros_msg,
|
convert_to_ros_msg,
|
||||||
convert_from_ros_msg_with_mapping,
|
convert_from_ros_msg_with_mapping,
|
||||||
convert_to_ros_msg_with_mapping,
|
convert_to_ros_msg_with_mapping,
|
||||||
@@ -250,7 +251,8 @@ class PropertyPublisher:
|
|||||||
):
|
):
|
||||||
self.node = node
|
self.node = node
|
||||||
self.name = name
|
self.name = name
|
||||||
self.msg_type = msg_type
|
self.msg_type = self._normalize_msg_type(msg_type)
|
||||||
|
self.original_msg_type = msg_type
|
||||||
self.get_method = get_method
|
self.get_method = get_method
|
||||||
self.timer_period = initial_period
|
self.timer_period = initial_period
|
||||||
self.print_publish = print_publish
|
self.print_publish = print_publish
|
||||||
@@ -258,16 +260,36 @@ class PropertyPublisher:
|
|||||||
|
|
||||||
self._value = None
|
self._value = None
|
||||||
try:
|
try:
|
||||||
self.publisher_ = node.create_publisher(msg_type, f"{name}", qos)
|
self.publisher_ = node.create_publisher(self.msg_type, f"{name}", qos)
|
||||||
except Exception as e:
|
except Exception as e:
|
||||||
self.node.lab_logger().error(
|
self.node.lab_logger().error(
|
||||||
f"StatusError, DeviceId: {self.node.device_id} 创建发布者 {name} 失败,可能由于注册表有误,类型: {msg_type},错误: {e}"
|
f"StatusError, DeviceId: {self.node.device_id} 创建发布者 {name} 失败,"
|
||||||
|
f"可能由于注册表有误,类型: {msg_type},错误: {e}"
|
||||||
)
|
)
|
||||||
|
self.msg_type = String
|
||||||
|
try:
|
||||||
|
self.publisher_ = node.create_publisher(self.msg_type, f"{name}", qos)
|
||||||
|
self.node.lab_logger().warning(
|
||||||
|
f"属性 {name} 的发布类型已降级为 String,原始类型: {msg_type}"
|
||||||
|
)
|
||||||
|
except Exception:
|
||||||
|
self.publisher_ = None
|
||||||
self.timer = node.create_timer(self.timer_period, self.publish_property)
|
self.timer = node.create_timer(self.timer_period, self.publish_property)
|
||||||
self.__loop = ROS2DeviceNode.get_asyncio_loop()
|
self.__loop = ROS2DeviceNode.get_asyncio_loop()
|
||||||
str_msg_type = str(msg_type)[8:-2]
|
str_msg_type = str(self.msg_type)[8:-2]
|
||||||
self.node.lab_logger().trace(f"发布属性: {name}, 类型: {str_msg_type}, 周期: {initial_period}秒, QoS: {qos}")
|
self.node.lab_logger().trace(f"发布属性: {name}, 类型: {str_msg_type}, 周期: {initial_period}秒, QoS: {qos}")
|
||||||
|
|
||||||
|
@staticmethod
|
||||||
|
def _normalize_msg_type(msg_type):
|
||||||
|
if msg_type in (dict, list, tuple, set) or msg_type in ("dict", "list", "tuple", "set"):
|
||||||
|
return String
|
||||||
|
return msg_type
|
||||||
|
|
||||||
|
def _normalize_value(self, value):
|
||||||
|
if self.msg_type is String and isinstance(value, (dict, list, tuple, set)):
|
||||||
|
return json.dumps(value, ensure_ascii=False, cls=TypeEncoder)
|
||||||
|
return value
|
||||||
|
|
||||||
def get_property(self):
|
def get_property(self):
|
||||||
if asyncio.iscoroutinefunction(self.get_method):
|
if asyncio.iscoroutinefunction(self.get_method):
|
||||||
# 如果是异步函数,运行事件循环并等待结果
|
# 如果是异步函数,运行事件循环并等待结果
|
||||||
@@ -302,12 +324,16 @@ class PropertyPublisher:
|
|||||||
pass
|
pass
|
||||||
# self.node.lab_logger().trace(f"【.publish_property】发布 {self.msg_type}: {value}")
|
# self.node.lab_logger().trace(f"【.publish_property】发布 {self.msg_type}: {value}")
|
||||||
if value is not None:
|
if value is not None:
|
||||||
|
if self.publisher_ is None:
|
||||||
|
return
|
||||||
|
value = self._normalize_value(value)
|
||||||
msg = convert_to_ros_msg(self.msg_type, value)
|
msg = convert_to_ros_msg(self.msg_type, value)
|
||||||
self.publisher_.publish(msg)
|
self.publisher_.publish(msg)
|
||||||
# self.node.lab_logger().trace(f"【.publish_property】属性 {self.name} 发布成功")
|
# self.node.lab_logger().trace(f"【.publish_property】属性 {self.name} 发布成功")
|
||||||
except Exception as e:
|
except Exception as e:
|
||||||
|
topic = getattr(self.publisher_, "topic", self.name)
|
||||||
self.node.lab_logger().error(
|
self.node.lab_logger().error(
|
||||||
f"【.publish_property】发布属性 {self.publisher_.topic} 出错: {str(e)}\n{traceback.format_exc()}"
|
f"【.publish_property】发布属性 {topic} 出错: {str(e)}\n{traceback.format_exc()}"
|
||||||
)
|
)
|
||||||
|
|
||||||
def change_frequency(self, period):
|
def change_frequency(self, period):
|
||||||
@@ -1971,10 +1997,15 @@ class BaseROS2DeviceNode(Node, Generic[T]):
|
|||||||
|
|
||||||
mapped_plr_resources = []
|
mapped_plr_resources = []
|
||||||
for uuid in uuids_list:
|
for uuid in uuids_list:
|
||||||
|
found = None
|
||||||
for plr_resource in figured_resources:
|
for plr_resource in figured_resources:
|
||||||
r = self.resource_tracker.loop_find_with_uuid(plr_resource, uuid)
|
r = self.resource_tracker.loop_find_with_uuid(plr_resource, uuid)
|
||||||
mapped_plr_resources.append(r)
|
if r is not None:
|
||||||
|
found = r
|
||||||
break
|
break
|
||||||
|
if found is None:
|
||||||
|
raise Exception(f"未能在已解析的资源树中找到 uuid={uuid} 对应的资源")
|
||||||
|
mapped_plr_resources.append(found)
|
||||||
|
|
||||||
return mapped_plr_resources
|
return mapped_plr_resources
|
||||||
|
|
||||||
|
|||||||
@@ -1691,7 +1691,9 @@ class HostNode(BaseROS2DeviceNode):
|
|||||||
else:
|
else:
|
||||||
self.lab_logger().warning("⚠️ 收到无效的Pong响应(缺少ping_id)")
|
self.lab_logger().warning("⚠️ 收到无效的Pong响应(缺少ping_id)")
|
||||||
|
|
||||||
def notify_resource_tree_update(self, device_id: str, action: str, resource_uuid_list: List[str]) -> bool:
|
def notify_resource_tree_update(
|
||||||
|
self, device_id: str, action: str, resource_uuid_list: List[str]
|
||||||
|
) -> Optional[bool]:
|
||||||
"""
|
"""
|
||||||
通知设备节点更新资源树
|
通知设备节点更新资源树
|
||||||
|
|
||||||
@@ -1701,13 +1703,14 @@ class HostNode(BaseROS2DeviceNode):
|
|||||||
resource_uuid_list: 资源UUIDs
|
resource_uuid_list: 资源UUIDs
|
||||||
|
|
||||||
Returns:
|
Returns:
|
||||||
bool: 操作是否成功
|
True if the update completed, False if it failed, None if it was intentionally skipped.
|
||||||
"""
|
"""
|
||||||
try:
|
try:
|
||||||
# 检查设备是否存在
|
|
||||||
if device_id not in self.devices_names:
|
if device_id not in self.devices_names:
|
||||||
self.lab_logger().error(f"[Host Node-Resource] Device {device_id} not found in devices_names")
|
self.lab_logger().info(
|
||||||
return False
|
f"[Host Node-Resource] 在线增加设备暂不支持,跳过设备 {device_id} 的资源树 {action} 更新"
|
||||||
|
)
|
||||||
|
return None
|
||||||
|
|
||||||
namespace = self.devices_names[device_id]
|
namespace = self.devices_names[device_id]
|
||||||
device_key = f"{namespace}/{device_id}"
|
device_key = f"{namespace}/{device_id}"
|
||||||
|
|||||||
@@ -33,10 +33,83 @@ _USE_UV: Optional[bool] = None
|
|||||||
def _has_uv() -> bool:
|
def _has_uv() -> bool:
|
||||||
global _USE_UV
|
global _USE_UV
|
||||||
if _USE_UV is None:
|
if _USE_UV is None:
|
||||||
_USE_UV = shutil.which("uv") is not None
|
uv_path = shutil.which("uv")
|
||||||
|
if not uv_path:
|
||||||
|
_USE_UV = False
|
||||||
|
else:
|
||||||
|
try:
|
||||||
|
result = subprocess.run([uv_path, "--version"], capture_output=True, text=True, timeout=10)
|
||||||
|
_USE_UV = result.returncode == 0
|
||||||
|
except Exception:
|
||||||
|
_USE_UV = False
|
||||||
return _USE_UV
|
return _USE_UV
|
||||||
|
|
||||||
|
|
||||||
|
def _install_command(installer: str, package: str, upgrade: bool, is_chinese: bool) -> List[str]:
|
||||||
|
if installer == "uv":
|
||||||
|
# uv >= 0.5 默认要求虚拟环境,对 conda env 会报 "No virtual environment found"。
|
||||||
|
# 显式 --python sys.executable 让 uv 把当前解释器(conda/venv/system 都行)
|
||||||
|
# 视为目标环境,绕开 venv 检测。
|
||||||
|
cmd = ["uv", "pip", "install", "--python", sys.executable]
|
||||||
|
if upgrade:
|
||||||
|
cmd.append("--upgrade")
|
||||||
|
cmd.append(package)
|
||||||
|
if is_chinese:
|
||||||
|
cmd.extend(["--index-url", "https://mirrors.tuna.tsinghua.edu.cn/pypi/web/simple"])
|
||||||
|
return cmd
|
||||||
|
|
||||||
|
cmd = [sys.executable, "-m", "pip", "install", "--disable-pip-version-check"]
|
||||||
|
if upgrade:
|
||||||
|
cmd.append("--upgrade")
|
||||||
|
cmd.append(package)
|
||||||
|
if is_chinese:
|
||||||
|
cmd.extend(["-i", "https://mirrors.tuna.tsinghua.edu.cn/pypi/web/simple"])
|
||||||
|
return cmd
|
||||||
|
|
||||||
|
|
||||||
|
def _installer_candidates() -> List[str]:
|
||||||
|
installers: List[str] = []
|
||||||
|
if _has_uv():
|
||||||
|
installers.append("uv")
|
||||||
|
installers.append("pip")
|
||||||
|
return installers
|
||||||
|
|
||||||
|
|
||||||
|
def _git_url_from_requirement(requirement: str) -> Optional[str]:
|
||||||
|
if not requirement.startswith("git+"):
|
||||||
|
return None
|
||||||
|
return requirement[4:].split("#", 1)[0]
|
||||||
|
|
||||||
|
|
||||||
|
def _repo_dir_name(git_url: str) -> str:
|
||||||
|
repo_name = git_url.rstrip("/").rsplit("/", 1)[-1]
|
||||||
|
return repo_name[:-4] if repo_name.endswith(".git") else repo_name
|
||||||
|
|
||||||
|
|
||||||
|
def _print_manual_git_install_hint(requirement: str) -> None:
|
||||||
|
git_url = _git_url_from_requirement(requirement)
|
||||||
|
if not git_url:
|
||||||
|
return
|
||||||
|
|
||||||
|
repo_dir = _repo_dir_name(git_url)
|
||||||
|
install_cmd = (
|
||||||
|
f'uv pip install --python "{sys.executable}" -e .'
|
||||||
|
if _has_uv()
|
||||||
|
else f"{sys.executable} -m pip install -e ."
|
||||||
|
)
|
||||||
|
if _is_chinese_locale() and not _has_uv():
|
||||||
|
install_cmd += " -i https://mirrors.tuna.tsinghua.edu.cn/pypi/web/simple"
|
||||||
|
|
||||||
|
print_status("Git 依赖自动安装失败,通常是网络连接被重置或代码托管站点暂时不可达。", "warning")
|
||||||
|
print_status("可以手动拉取代码后在本地安装:", "warning")
|
||||||
|
print_status(f" git clone {git_url}", "warning")
|
||||||
|
print_status(f" cd {repo_dir}", "warning")
|
||||||
|
print_status(" git pull", "warning")
|
||||||
|
print_status(f" {install_cmd}", "warning")
|
||||||
|
print_status(f"如果目录 {repo_dir} 已存在,直接进入该目录执行 git pull 后再安装。", "warning")
|
||||||
|
print_status("如果 git clone 仍失败,请切换网络/代理,或从浏览器下载源码后进入源码目录执行本地安装命令。", "warning")
|
||||||
|
|
||||||
|
|
||||||
def _install_packages(
|
def _install_packages(
|
||||||
packages: List[str],
|
packages: List[str],
|
||||||
upgrade: bool = False,
|
upgrade: bool = False,
|
||||||
@@ -53,7 +126,7 @@ def _install_packages(
|
|||||||
return True
|
return True
|
||||||
|
|
||||||
is_chinese = _is_chinese_locale()
|
is_chinese = _is_chinese_locale()
|
||||||
use_uv = _has_uv()
|
installers = _installer_candidates()
|
||||||
failed: List[str] = []
|
failed: List[str] = []
|
||||||
|
|
||||||
for pkg in packages:
|
for pkg in packages:
|
||||||
@@ -63,35 +136,30 @@ def _install_packages(
|
|||||||
else:
|
else:
|
||||||
print_status(f"正在{action_word} {pkg}...", "info")
|
print_status(f"正在{action_word} {pkg}...", "info")
|
||||||
|
|
||||||
if use_uv:
|
pkg_installed = False
|
||||||
cmd = ["uv", "pip", "install"]
|
last_error = "unknown error"
|
||||||
if upgrade:
|
|
||||||
cmd.append("--upgrade")
|
|
||||||
cmd.append(pkg)
|
|
||||||
if is_chinese:
|
|
||||||
cmd.extend(["--index-url", "https://mirrors.tuna.tsinghua.edu.cn/pypi/web/simple"])
|
|
||||||
else:
|
|
||||||
cmd = [sys.executable, "-m", "pip", "install"]
|
|
||||||
if upgrade:
|
|
||||||
cmd.append("--upgrade")
|
|
||||||
cmd.append(pkg)
|
|
||||||
if is_chinese:
|
|
||||||
cmd.extend(["-i", "https://mirrors.tuna.tsinghua.edu.cn/pypi/web/simple"])
|
|
||||||
|
|
||||||
|
for installer in installers:
|
||||||
|
cmd = _install_command(installer, pkg, upgrade, is_chinese)
|
||||||
try:
|
try:
|
||||||
result = subprocess.run(cmd, capture_output=True, text=True, timeout=300)
|
result = subprocess.run(cmd, capture_output=True, text=True, timeout=300)
|
||||||
if result.returncode == 0:
|
if result.returncode == 0:
|
||||||
installer = "uv" if use_uv else "pip"
|
|
||||||
print_status(f"✓ {pkg} {action_word}成功 (via {installer})", "success")
|
print_status(f"✓ {pkg} {action_word}成功 (via {installer})", "success")
|
||||||
else:
|
pkg_installed = True
|
||||||
stderr_short = result.stderr.strip().split("\n")[-1] if result.stderr else "unknown error"
|
break
|
||||||
print_status(f"× {pkg} {action_word}失败: {stderr_short}", "error")
|
|
||||||
failed.append(pkg)
|
last_error = result.stderr.strip().split("\n")[-1] if result.stderr else "unknown error"
|
||||||
|
print_status(f"× {pkg} {action_word}失败 (via {installer}): {last_error}", "warning")
|
||||||
except subprocess.TimeoutExpired:
|
except subprocess.TimeoutExpired:
|
||||||
print_status(f"× {pkg} {action_word}超时 (300s)", "error")
|
last_error = "timeout after 300s"
|
||||||
failed.append(pkg)
|
print_status(f"× {pkg} {action_word}超时 (via {installer}, 300s)", "warning")
|
||||||
except Exception as e:
|
except Exception as e:
|
||||||
print_status(f"× {pkg} {action_word}异常: {e}", "error")
|
last_error = str(e)
|
||||||
|
print_status(f"× {pkg} {action_word}异常 (via {installer}): {e}", "warning")
|
||||||
|
|
||||||
|
if not pkg_installed:
|
||||||
|
print_status(f"× {pkg} {action_word}失败: {last_error}", "error")
|
||||||
|
_print_manual_git_install_hint(pkg)
|
||||||
failed.append(pkg)
|
failed.append(pkg)
|
||||||
|
|
||||||
if failed:
|
if failed:
|
||||||
@@ -188,7 +256,13 @@ class EnvironmentChecker:
|
|||||||
"crcmod": "crcmod-plus",
|
"crcmod": "crcmod-plus",
|
||||||
}
|
}
|
||||||
|
|
||||||
self.special_packages = {"pylabrobot": "git+https://github.com/Xuwznln/pylabrobot.git"}
|
# 中文 locale 下走 Gitee 镜像,规避 GitHub 拉取失败
|
||||||
|
pylabrobot_url = (
|
||||||
|
"git+https://gitee.com/xuwznln/pylabrobot.git"
|
||||||
|
if _is_chinese_locale()
|
||||||
|
else "git+https://github.com/Xuwznln/pylabrobot.git"
|
||||||
|
)
|
||||||
|
self.special_packages = {"pylabrobot": pylabrobot_url}
|
||||||
|
|
||||||
self.version_requirements = {
|
self.version_requirements = {
|
||||||
"msgcenterpy": "0.1.8",
|
"msgcenterpy": "0.1.8",
|
||||||
|
|||||||
@@ -206,6 +206,7 @@ class ImportManager:
|
|||||||
"ast_analysis_success": False,
|
"ast_analysis_success": False,
|
||||||
"import_map": {},
|
"import_map": {},
|
||||||
"init_params": [],
|
"init_params": [],
|
||||||
|
"init_docstring": None,
|
||||||
"status_methods": {},
|
"status_methods": {},
|
||||||
"action_methods": {},
|
"action_methods": {},
|
||||||
}
|
}
|
||||||
@@ -251,6 +252,7 @@ class ImportManager:
|
|||||||
|
|
||||||
# 映射到统一字段名(与 registry.py complete_registry 消费端一致)
|
# 映射到统一字段名(与 registry.py complete_registry 消费端一致)
|
||||||
result["init_params"] = body.get("init_params", [])
|
result["init_params"] = body.get("init_params", [])
|
||||||
|
result["init_docstring"] = body.get("init_docstring")
|
||||||
result["status_methods"] = body.get("status_properties", {})
|
result["status_methods"] = body.get("status_properties", {})
|
||||||
result["action_methods"] = {
|
result["action_methods"] = {
|
||||||
k: {
|
k: {
|
||||||
|
|||||||
0
unilabos/workflow/__init__.py
Normal file
0
unilabos/workflow/__init__.py
Normal file
241
unilabos/workflow/from_python_script.py
Normal file
241
unilabos/workflow/from_python_script.py
Normal file
@@ -0,0 +1,241 @@
|
|||||||
|
import ast
|
||||||
|
import json
|
||||||
|
from typing import Dict, List, Any, Tuple, Optional
|
||||||
|
|
||||||
|
from .common import WorkflowGraph, RegistryAdapter
|
||||||
|
|
||||||
|
Json = Dict[str, Any]
|
||||||
|
|
||||||
|
# ---------------- Converter ----------------
|
||||||
|
|
||||||
|
class DeviceMethodConverter:
|
||||||
|
"""
|
||||||
|
- 字段统一:resource_name(原 device_class)、template_name(原 action_key)
|
||||||
|
- params 单层;inputs 使用 'params.' 前缀
|
||||||
|
- SimpleGraph.add_workflow_node 负责变量连线与边
|
||||||
|
"""
|
||||||
|
def __init__(self, device_registry: Optional[Dict[str, Any]] = None):
|
||||||
|
self.graph = WorkflowGraph()
|
||||||
|
self.variable_sources: Dict[str, Dict[str, Any]] = {} # var -> {node_id, output_name}
|
||||||
|
self.instance_to_resource: Dict[str, Optional[str]] = {} # 实例名 -> resource_name
|
||||||
|
self.node_id_counter: int = 0
|
||||||
|
self.registry = RegistryAdapter(device_registry or {})
|
||||||
|
|
||||||
|
# ---- helpers ----
|
||||||
|
def _new_node_id(self) -> int:
|
||||||
|
nid = self.node_id_counter
|
||||||
|
self.node_id_counter += 1
|
||||||
|
return nid
|
||||||
|
|
||||||
|
def _assign_targets(self, targets) -> List[str]:
|
||||||
|
names: List[str] = []
|
||||||
|
import ast
|
||||||
|
if isinstance(targets, ast.Tuple):
|
||||||
|
for elt in targets.elts:
|
||||||
|
if isinstance(elt, ast.Name):
|
||||||
|
names.append(elt.id)
|
||||||
|
elif isinstance(targets, ast.Name):
|
||||||
|
names.append(targets.id)
|
||||||
|
return names
|
||||||
|
|
||||||
|
def _extract_device_instantiation(self, node) -> Optional[Tuple[str, str]]:
|
||||||
|
import ast
|
||||||
|
if not isinstance(node.value, ast.Call):
|
||||||
|
return None
|
||||||
|
callee = node.value.func
|
||||||
|
if isinstance(callee, ast.Name):
|
||||||
|
class_name = callee.id
|
||||||
|
elif isinstance(callee, ast.Attribute) and isinstance(callee.value, ast.Name):
|
||||||
|
class_name = callee.attr
|
||||||
|
else:
|
||||||
|
return None
|
||||||
|
if isinstance(node.targets[0], ast.Name):
|
||||||
|
instance = node.targets[0].id
|
||||||
|
return instance, class_name
|
||||||
|
return None
|
||||||
|
|
||||||
|
def _extract_call(self, call) -> Tuple[str, str, Dict[str, Any], str]:
|
||||||
|
import ast
|
||||||
|
owner_name, method_name, call_kind = "", "", "func"
|
||||||
|
if isinstance(call.func, ast.Attribute):
|
||||||
|
method_name = call.func.attr
|
||||||
|
if isinstance(call.func.value, ast.Name):
|
||||||
|
owner_name = call.func.value.id
|
||||||
|
call_kind = "instance" if owner_name in self.instance_to_resource else "class_or_module"
|
||||||
|
elif isinstance(call.func.value, ast.Attribute) and isinstance(call.func.value.value, ast.Name):
|
||||||
|
owner_name = call.func.value.attr
|
||||||
|
call_kind = "class_or_module"
|
||||||
|
elif isinstance(call.func, ast.Name):
|
||||||
|
method_name = call.func.id
|
||||||
|
call_kind = "func"
|
||||||
|
|
||||||
|
def pack(node):
|
||||||
|
if isinstance(node, ast.Name):
|
||||||
|
return {"type": "variable", "value": node.id}
|
||||||
|
if isinstance(node, ast.Constant):
|
||||||
|
return {"type": "constant", "value": node.value}
|
||||||
|
if isinstance(node, ast.Dict):
|
||||||
|
return {"type": "dict", "value": self._parse_dict(node)}
|
||||||
|
if isinstance(node, ast.List):
|
||||||
|
return {"type": "list", "value": self._parse_list(node)}
|
||||||
|
return {"type": "raw", "value": ast.unparse(node) if hasattr(ast, "unparse") else str(node)}
|
||||||
|
|
||||||
|
args: Dict[str, Any] = {}
|
||||||
|
pos: List[Any] = []
|
||||||
|
for a in call.args:
|
||||||
|
pos.append(pack(a))
|
||||||
|
for kw in call.keywords:
|
||||||
|
args[kw.arg] = pack(kw.value)
|
||||||
|
if pos:
|
||||||
|
args["_positional"] = pos
|
||||||
|
return owner_name, method_name, args, call_kind
|
||||||
|
|
||||||
|
def _parse_dict(self, node) -> Dict[str, Any]:
|
||||||
|
import ast
|
||||||
|
out: Dict[str, Any] = {}
|
||||||
|
for k, v in zip(node.keys, node.values):
|
||||||
|
if isinstance(k, ast.Constant):
|
||||||
|
key = str(k.value)
|
||||||
|
if isinstance(v, ast.Name):
|
||||||
|
out[key] = f"var:{v.id}"
|
||||||
|
elif isinstance(v, ast.Constant):
|
||||||
|
out[key] = v.value
|
||||||
|
elif isinstance(v, ast.Dict):
|
||||||
|
out[key] = self._parse_dict(v)
|
||||||
|
elif isinstance(v, ast.List):
|
||||||
|
out[key] = self._parse_list(v)
|
||||||
|
return out
|
||||||
|
|
||||||
|
def _parse_list(self, node) -> List[Any]:
|
||||||
|
import ast
|
||||||
|
out: List[Any] = []
|
||||||
|
for elt in node.elts:
|
||||||
|
if isinstance(elt, ast.Name):
|
||||||
|
out.append(f"var:{elt.id}")
|
||||||
|
elif isinstance(elt, ast.Constant):
|
||||||
|
out.append(elt.value)
|
||||||
|
elif isinstance(elt, ast.Dict):
|
||||||
|
out.append(self._parse_dict(elt))
|
||||||
|
elif isinstance(elt, ast.List):
|
||||||
|
out.append(self._parse_list(elt))
|
||||||
|
return out
|
||||||
|
|
||||||
|
def _normalize_var_tokens(self, x: Any) -> Any:
|
||||||
|
if isinstance(x, str) and x.startswith("var:"):
|
||||||
|
return {"__var__": x[4:]}
|
||||||
|
if isinstance(x, list):
|
||||||
|
return [self._normalize_var_tokens(i) for i in x]
|
||||||
|
if isinstance(x, dict):
|
||||||
|
return {k: self._normalize_var_tokens(v) for k, v in x.items()}
|
||||||
|
return x
|
||||||
|
|
||||||
|
def _make_params_payload(self, resource_name: Optional[str], template_name: str, call_args: Dict[str, Any]) -> Dict[str, Any]:
|
||||||
|
input_keys = self.registry.get_action_input_keys(resource_name, template_name) if resource_name else []
|
||||||
|
defaults = self.registry.get_action_goal_default(resource_name, template_name) if resource_name else {}
|
||||||
|
params: Dict[str, Any] = dict(defaults)
|
||||||
|
|
||||||
|
def unpack(p):
|
||||||
|
t, v = p.get("type"), p.get("value")
|
||||||
|
if t == "variable":
|
||||||
|
return {"__var__": v}
|
||||||
|
if t == "dict":
|
||||||
|
return self._normalize_var_tokens(v)
|
||||||
|
if t == "list":
|
||||||
|
return self._normalize_var_tokens(v)
|
||||||
|
return v
|
||||||
|
|
||||||
|
for k, p in call_args.items():
|
||||||
|
if k == "_positional":
|
||||||
|
continue
|
||||||
|
params[k] = unpack(p)
|
||||||
|
|
||||||
|
pos = call_args.get("_positional", [])
|
||||||
|
if pos:
|
||||||
|
if input_keys:
|
||||||
|
for i, p in enumerate(pos):
|
||||||
|
if i >= len(input_keys):
|
||||||
|
break
|
||||||
|
name = input_keys[i]
|
||||||
|
if name in params:
|
||||||
|
continue
|
||||||
|
params[name] = unpack(p)
|
||||||
|
else:
|
||||||
|
for i, p in enumerate(pos):
|
||||||
|
params[f"arg_{i}"] = unpack(p)
|
||||||
|
return params
|
||||||
|
|
||||||
|
# ---- handlers ----
|
||||||
|
def _on_assign(self, stmt):
|
||||||
|
import ast
|
||||||
|
inst = self._extract_device_instantiation(stmt)
|
||||||
|
if inst:
|
||||||
|
instance, code_class = inst
|
||||||
|
resource_name = self.registry.resolve_resource_by_classname(code_class)
|
||||||
|
self.instance_to_resource[instance] = resource_name
|
||||||
|
return
|
||||||
|
|
||||||
|
if isinstance(stmt.value, ast.Call):
|
||||||
|
owner, method, call_args, kind = self._extract_call(stmt.value)
|
||||||
|
if kind == "instance":
|
||||||
|
device_key = owner
|
||||||
|
resource_name = self.instance_to_resource.get(owner)
|
||||||
|
else:
|
||||||
|
device_key = owner
|
||||||
|
resource_name = self.registry.resolve_resource_by_classname(owner)
|
||||||
|
|
||||||
|
module = self.registry.get_device_module(resource_name)
|
||||||
|
params = self._make_params_payload(resource_name, method, call_args)
|
||||||
|
|
||||||
|
nid = self._new_node_id()
|
||||||
|
self.graph.add_workflow_node(
|
||||||
|
nid,
|
||||||
|
device_key=device_key,
|
||||||
|
resource_name=resource_name, # ✅
|
||||||
|
module=module,
|
||||||
|
template_name=method, # ✅
|
||||||
|
params=params,
|
||||||
|
variable_sources=self.variable_sources,
|
||||||
|
add_ready_if_no_vars=True,
|
||||||
|
prev_node_id=(nid - 1) if nid > 0 else None,
|
||||||
|
)
|
||||||
|
|
||||||
|
out_vars = self._assign_targets(stmt.targets[0])
|
||||||
|
for var in out_vars:
|
||||||
|
self.variable_sources[var] = {"node_id": nid, "output_name": "result"}
|
||||||
|
|
||||||
|
def _on_expr(self, stmt):
|
||||||
|
import ast
|
||||||
|
if not isinstance(stmt.value, ast.Call):
|
||||||
|
return
|
||||||
|
owner, method, call_args, kind = self._extract_call(stmt.value)
|
||||||
|
if kind == "instance":
|
||||||
|
device_key = owner
|
||||||
|
resource_name = self.instance_to_resource.get(owner)
|
||||||
|
else:
|
||||||
|
device_key = owner
|
||||||
|
resource_name = self.registry.resolve_resource_by_classname(owner)
|
||||||
|
|
||||||
|
module = self.registry.get_device_module(resource_name)
|
||||||
|
params = self._make_params_payload(resource_name, method, call_args)
|
||||||
|
|
||||||
|
nid = self._new_node_id()
|
||||||
|
self.graph.add_workflow_node(
|
||||||
|
nid,
|
||||||
|
device_key=device_key,
|
||||||
|
resource_name=resource_name, # ✅
|
||||||
|
module=module,
|
||||||
|
template_name=method, # ✅
|
||||||
|
params=params,
|
||||||
|
variable_sources=self.variable_sources,
|
||||||
|
add_ready_if_no_vars=True,
|
||||||
|
prev_node_id=(nid - 1) if nid > 0 else None,
|
||||||
|
)
|
||||||
|
|
||||||
|
def convert(self, python_code: str):
|
||||||
|
tree = ast.parse(python_code)
|
||||||
|
for stmt in tree.body:
|
||||||
|
if isinstance(stmt, ast.Assign):
|
||||||
|
self._on_assign(stmt)
|
||||||
|
elif isinstance(stmt, ast.Expr):
|
||||||
|
self._on_expr(stmt)
|
||||||
|
return self
|
||||||
131
unilabos/workflow/from_xdl.py
Normal file
131
unilabos/workflow/from_xdl.py
Normal file
@@ -0,0 +1,131 @@
|
|||||||
|
from typing import List, Any, Dict
|
||||||
|
import xml.etree.ElementTree as ET
|
||||||
|
|
||||||
|
|
||||||
|
def convert_to_type(val: str) -> Any:
|
||||||
|
"""将字符串值转换为适当的数据类型"""
|
||||||
|
if val == "True":
|
||||||
|
return True
|
||||||
|
if val == "False":
|
||||||
|
return False
|
||||||
|
if val == "?":
|
||||||
|
return None
|
||||||
|
if val.endswith(" g"):
|
||||||
|
return float(val.split(" ")[0])
|
||||||
|
if val.endswith("mg"):
|
||||||
|
return float(val.split("mg")[0])
|
||||||
|
elif val.endswith("mmol"):
|
||||||
|
return float(val.split("mmol")[0]) / 1000
|
||||||
|
elif val.endswith("mol"):
|
||||||
|
return float(val.split("mol")[0])
|
||||||
|
elif val.endswith("ml"):
|
||||||
|
return float(val.split("ml")[0])
|
||||||
|
elif val.endswith("RPM"):
|
||||||
|
return float(val.split("RPM")[0])
|
||||||
|
elif val.endswith(" °C"):
|
||||||
|
return float(val.split(" ")[0])
|
||||||
|
elif val.endswith(" %"):
|
||||||
|
return float(val.split(" ")[0])
|
||||||
|
return val
|
||||||
|
|
||||||
|
|
||||||
|
def flatten_xdl_procedure(procedure_elem: ET.Element) -> List[ET.Element]:
|
||||||
|
"""展平嵌套的XDL程序结构"""
|
||||||
|
flattened_operations = []
|
||||||
|
TEMP_UNSUPPORTED_PROTOCOL = ["Purge", "Wait", "Stir", "ResetHandling"]
|
||||||
|
|
||||||
|
def extract_operations(element: ET.Element):
|
||||||
|
if element.tag not in ["Prep", "Reaction", "Workup", "Purification", "Procedure"]:
|
||||||
|
if element.tag not in TEMP_UNSUPPORTED_PROTOCOL:
|
||||||
|
flattened_operations.append(element)
|
||||||
|
|
||||||
|
for child in element:
|
||||||
|
extract_operations(child)
|
||||||
|
|
||||||
|
for child in procedure_elem:
|
||||||
|
extract_operations(child)
|
||||||
|
|
||||||
|
return flattened_operations
|
||||||
|
|
||||||
|
|
||||||
|
def parse_xdl_content(xdl_content: str) -> tuple:
|
||||||
|
"""解析XDL内容"""
|
||||||
|
try:
|
||||||
|
xdl_content_cleaned = "".join(c for c in xdl_content if c.isprintable())
|
||||||
|
root = ET.fromstring(xdl_content_cleaned)
|
||||||
|
|
||||||
|
synthesis_elem = root.find("Synthesis")
|
||||||
|
if synthesis_elem is None:
|
||||||
|
return None, None, None
|
||||||
|
|
||||||
|
# 解析硬件组件
|
||||||
|
hardware_elem = synthesis_elem.find("Hardware")
|
||||||
|
hardware = []
|
||||||
|
if hardware_elem is not None:
|
||||||
|
hardware = [{"id": c.get("id"), "type": c.get("type")} for c in hardware_elem.findall("Component")]
|
||||||
|
|
||||||
|
# 解析试剂
|
||||||
|
reagents_elem = synthesis_elem.find("Reagents")
|
||||||
|
reagents = []
|
||||||
|
if reagents_elem is not None:
|
||||||
|
reagents = [{"name": r.get("name"), "role": r.get("role", "")} for r in reagents_elem.findall("Reagent")]
|
||||||
|
|
||||||
|
# 解析程序
|
||||||
|
procedure_elem = synthesis_elem.find("Procedure")
|
||||||
|
if procedure_elem is None:
|
||||||
|
return None, None, None
|
||||||
|
|
||||||
|
flattened_operations = flatten_xdl_procedure(procedure_elem)
|
||||||
|
return hardware, reagents, flattened_operations
|
||||||
|
|
||||||
|
except ET.ParseError as e:
|
||||||
|
raise ValueError(f"Invalid XDL format: {e}")
|
||||||
|
|
||||||
|
|
||||||
|
def convert_xdl_to_dict(xdl_content: str) -> Dict[str, Any]:
|
||||||
|
"""
|
||||||
|
将XDL XML格式转换为标准的字典格式
|
||||||
|
|
||||||
|
Args:
|
||||||
|
xdl_content: XDL XML内容
|
||||||
|
|
||||||
|
Returns:
|
||||||
|
转换结果,包含步骤和器材信息
|
||||||
|
"""
|
||||||
|
try:
|
||||||
|
hardware, reagents, flattened_operations = parse_xdl_content(xdl_content)
|
||||||
|
if hardware is None:
|
||||||
|
return {"error": "Failed to parse XDL content", "success": False}
|
||||||
|
|
||||||
|
# 将XDL元素转换为字典格式
|
||||||
|
steps_data = []
|
||||||
|
for elem in flattened_operations:
|
||||||
|
# 转换参数类型
|
||||||
|
parameters = {}
|
||||||
|
for key, val in elem.attrib.items():
|
||||||
|
converted_val = convert_to_type(val)
|
||||||
|
if converted_val is not None:
|
||||||
|
parameters[key] = converted_val
|
||||||
|
|
||||||
|
step_dict = {
|
||||||
|
"operation": elem.tag,
|
||||||
|
"parameters": parameters,
|
||||||
|
"description": elem.get("purpose", f"Operation: {elem.tag}"),
|
||||||
|
}
|
||||||
|
steps_data.append(step_dict)
|
||||||
|
|
||||||
|
# 合并硬件和试剂为统一的labware_info格式
|
||||||
|
labware_data = []
|
||||||
|
labware_data.extend({"id": hw["id"], "type": "hardware", **hw} for hw in hardware)
|
||||||
|
labware_data.extend({"name": reagent["name"], "type": "reagent", **reagent} for reagent in reagents)
|
||||||
|
|
||||||
|
return {
|
||||||
|
"success": True,
|
||||||
|
"steps": steps_data,
|
||||||
|
"labware": labware_data,
|
||||||
|
"message": f"Successfully converted XDL to dict format. Found {len(steps_data)} steps and {len(labware_data)} labware items.",
|
||||||
|
}
|
||||||
|
|
||||||
|
except Exception as e:
|
||||||
|
error_msg = f"XDL conversion failed: {str(e)}"
|
||||||
|
return {"error": error_msg, "success": False}
|
||||||
@@ -2,7 +2,7 @@
|
|||||||
<?xml-model href="http://download.ros.org/schema/package_format3.xsd" schematypens="http://www.w3.org/2001/XMLSchema"?>
|
<?xml-model href="http://download.ros.org/schema/package_format3.xsd" schematypens="http://www.w3.org/2001/XMLSchema"?>
|
||||||
<package format="3">
|
<package format="3">
|
||||||
<name>unilabos_msgs</name>
|
<name>unilabos_msgs</name>
|
||||||
<version>0.11.0</version>
|
<version>0.11.3</version>
|
||||||
<description>ROS2 Messages package for unilabos devices</description>
|
<description>ROS2 Messages package for unilabos devices</description>
|
||||||
<maintainer email="changjh@pku.edu.cn">Junhan Chang</maintainer>
|
<maintainer email="changjh@pku.edu.cn">Junhan Chang</maintainer>
|
||||||
<maintainer email="18435084+Xuwznln@users.noreply.github.com">Xuwznln</maintainer>
|
<maintainer email="18435084+Xuwznln@users.noreply.github.com">Xuwznln</maintainer>
|
||||||
|
|||||||
Reference in New Issue
Block a user