Skip to content

Commit 8bdd62b

Browse files
committed
refactor: update tasks file
1 parent b11dafa commit 8bdd62b

File tree

1 file changed

+84
-81
lines changed

1 file changed

+84
-81
lines changed

src/rai_bench/rai_bench/examples/tool_calling_agent_bench_tasks.py

+84-81
Original file line numberDiff line numberDiff line change
@@ -17,88 +17,91 @@
1717
from rai_bench.tool_calling_agent_bench.agent_tasks_interfaces import (
1818
ToolCallingAgentTask,
1919
)
20-
from rai_bench.tool_calling_agent_bench.ros2_agent_tasks import (
21-
GetAllROS2RGBCamerasTask,
22-
GetObjectPositionsTask,
23-
GetROS2DepthCameraTask,
24-
GetROS2MessageTask,
25-
GetROS2RGBCameraTask,
26-
GetROS2TopicsTask,
27-
GetROS2TopicsTask2,
28-
GrabExistingObjectTask,
29-
GrabNotExistingObjectTask,
30-
MoveExistingObjectFrontTask,
31-
MoveExistingObjectLeftTask,
32-
MoveToPointTask,
33-
PublishROS2CustomMessageTask,
34-
SwapObjectsTask,
20+
from rai_bench.tool_calling_agent_bench.ros2_agent_tasks.custom_interfaces_tasks import (
21+
CallGetLogDigestTask,
22+
CallGroundedSAMSegmentTask,
23+
CallGroundingDinoClassifyTask,
24+
CallROS2ManipulatorMoveToServiceTask,
25+
CallVectorStoreRetrievalTask,
26+
CallWhatISeeTask,
27+
PublishROS2AudioMessageTask,
28+
PublishROS2DetectionArrayTask,
29+
PublishROS2HRIMessageTask,
3530
)
3631

3732
tasks: Sequence[ToolCallingAgentTask] = [
38-
PublishROS2CustomMessageTask(),
39-
GetROS2RGBCameraTask(),
40-
GetROS2TopicsTask(),
41-
GetROS2DepthCameraTask(),
42-
GetAllROS2RGBCamerasTask(),
43-
GetROS2TopicsTask2(),
44-
GetROS2MessageTask(),
45-
MoveToPointTask(args={"x": 1.0, "y": 2.0, "z": 3.0, "task": "grab"}),
46-
MoveToPointTask(args={"x": 1.2, "y": 2.3, "z": 3.4, "task": "drop"}),
47-
GetObjectPositionsTask(
48-
objects={
49-
"carrot": [{"x": 1.0, "y": 2.0, "z": 3.0}],
50-
"apple": [{"x": 4.0, "y": 5.0, "z": 6.0}],
51-
"banana": [
52-
{"x": 7.0, "y": 8.0, "z": 9.0},
53-
{"x": 10.0, "y": 11.0, "z": 12.0},
54-
],
55-
},
56-
),
57-
GrabExistingObjectTask(
58-
object_to_grab="banana",
59-
objects={
60-
"banana": [{"x": 7.0, "y": 8.0, "z": 9.0}],
61-
"apple": [
62-
{"x": 4.0, "y": 5.0, "z": 6.0},
63-
{"x": 10.0, "y": 11.0, "z": 12.0},
64-
],
65-
},
66-
),
67-
GrabNotExistingObjectTask(
68-
object_to_grab="apple",
69-
objects={
70-
"banana": [{"x": 7.0, "y": 8.0, "z": 9.0}],
71-
"cube": [
72-
{"x": 4.0, "y": 5.0, "z": 6.0},
73-
{"x": 10.0, "y": 11.0, "z": 12.0},
74-
],
75-
},
76-
),
77-
MoveExistingObjectLeftTask(
78-
object_to_grab="banana",
79-
objects={
80-
"banana": [{"x": 7.0, "y": 8.0, "z": 9.0}],
81-
"apple": [
82-
{"x": 4.0, "y": 5.0, "z": 6.0},
83-
{"x": 10.0, "y": 11.0, "z": 12.0},
84-
],
85-
},
86-
),
87-
MoveExistingObjectFrontTask(
88-
object_to_grab="banana",
89-
objects={
90-
"banana": [{"x": 7.0, "y": 8.0, "z": 9.0}],
91-
"apple": [
92-
{"x": 4.0, "y": 5.0, "z": 6.0},
93-
{"x": 10.0, "y": 11.0, "z": 12.0},
94-
],
95-
},
96-
),
97-
SwapObjectsTask(
98-
objects={
99-
"banana": [{"x": 1.0, "y": 2.0, "z": 3.0}],
100-
"apple": [{"x": 4.0, "y": 5.0, "z": 6.0}],
101-
},
102-
objects_to_swap=["banana", "apple"],
103-
),
33+
PublishROS2HRIMessageTask(),
34+
PublishROS2AudioMessageTask(),
35+
PublishROS2DetectionArrayTask(),
36+
CallGetLogDigestTask(),
37+
CallGroundedSAMSegmentTask(),
38+
CallGroundingDinoClassifyTask(),
39+
CallROS2ManipulatorMoveToServiceTask(),
40+
CallVectorStoreRetrievalTask(),
41+
CallWhatISeeTask(),
42+
# GetROS2RGBCameraTask(),
43+
# GetROS2TopicsTask(),
44+
# GetROS2DepthCameraTask(),
45+
# GetAllROS2RGBCamerasTask(),
46+
# GetROS2TopicsTask2(),
47+
# GetROS2MessageTask(),
48+
# MoveToPointTask(args={"x": 1.0, "y": 2.0, "z": 3.0, "task": "grab"}),
49+
# MoveToPointTask(args={"x": 1.2, "y": 2.3, "z": 3.4, "task": "drop"}),
50+
# GetObjectPositionsTask(
51+
# objects={
52+
# "carrot": [{"x": 1.0, "y": 2.0, "z": 3.0}],
53+
# "apple": [{"x": 4.0, "y": 5.0, "z": 6.0}],
54+
# "banana": [
55+
# {"x": 7.0, "y": 8.0, "z": 9.0},
56+
# {"x": 10.0, "y": 11.0, "z": 12.0},
57+
# ],
58+
# },
59+
# ),
60+
# GrabExistingObjectTask(
61+
# object_to_grab="banana",
62+
# objects={
63+
# "banana": [{"x": 7.0, "y": 8.0, "z": 9.0}],
64+
# "apple": [
65+
# {"x": 4.0, "y": 5.0, "z": 6.0},
66+
# {"x": 10.0, "y": 11.0, "z": 12.0},
67+
# ],
68+
# },
69+
# ),
70+
# GrabNotExistingObjectTask(
71+
# object_to_grab="apple",
72+
# objects={
73+
# "banana": [{"x": 7.0, "y": 8.0, "z": 9.0}],
74+
# "cube": [
75+
# {"x": 4.0, "y": 5.0, "z": 6.0},
76+
# {"x": 10.0, "y": 11.0, "z": 12.0},
77+
# ],
78+
# },
79+
# ),
80+
# MoveExistingObjectLeftTask(
81+
# object_to_grab="banana",
82+
# objects={
83+
# "banana": [{"x": 7.0, "y": 8.0, "z": 9.0}],
84+
# "apple": [
85+
# {"x": 4.0, "y": 5.0, "z": 6.0},
86+
# {"x": 10.0, "y": 11.0, "z": 12.0},
87+
# ],
88+
# },
89+
# ),
90+
# MoveExistingObjectFrontTask(
91+
# object_to_grab="banana",
92+
# objects={
93+
# "banana": [{"x": 7.0, "y": 8.0, "z": 9.0}],
94+
# "apple": [
95+
# {"x": 4.0, "y": 5.0, "z": 6.0},
96+
# {"x": 10.0, "y": 11.0, "z": 12.0},
97+
# ],
98+
# },
99+
# ),
100+
# SwapObjectsTask(
101+
# objects={
102+
# "banana": [{"x": 1.0, "y": 2.0, "z": 3.0}],
103+
# "apple": [{"x": 4.0, "y": 5.0, "z": 6.0}],
104+
# },
105+
# objects_to_swap=["banana", "apple"],
106+
# ),
104107
]

0 commit comments

Comments
 (0)