Commit Graph

233 Commits

Author SHA1 Message Date
ChenXL97 51d7dde8b1 Merge branch 'main' of github.com:HPCL-EI/RoboWaiter 2023-11-14 23:08:23 +08:00
ChenXL97 2a5695d80e 修改工具调用 2023-11-14 23:08:07 +08:00
Caiyishuai cbd910a776 更新了 goal_states 相关文件 2023-11-14 21:53:30 +08:00
wuziji d7ee6a1249 IMPROVE: 增加目标状态数据,删除非holding谓词的nothing 2023-11-14 20:31:19 +08:00
wuziji 271b5c67e8 Merge remote-tracking branch 'origin/main'
# Conflicts:
#	sub_task.ptml
2023-11-14 20:23:12 +08:00
wuziji 6adc7c750e IMPROVE: 增加目标状态数据,删除非holding谓词的nothing 2023-11-14 20:22:53 +08:00
ChenXL97 900ec490e9 修复找不到sub_task_seq的Bug 2023-11-14 20:08:54 +08:00
ChenXL97 3e7f631f3c Merge branch 'main' of github.com:HPCL-EI/RoboWaiter 2023-11-14 19:41:38 +08:00
ChenXL97 14e2fce6d1 工具调用 2023-11-14 19:41:34 +08:00
Caiyishuai a012fabf6d 更改了 ptml 输出格式 2023-11-14 19:30:06 +08:00
wuziji 7c3ba9edee Merge remote-tracking branch 'origin/main' 2023-11-14 17:31:23 +08:00
wuziji 0a3e3a8f3c FIX: 增加sub_task_seq为空的错误处理,由异常更改为警告⚠(问题并没有完全解决) 2023-11-14 17:31:13 +08:00
Caiyishuai 69dd918675 Merge branch 'main' of https://github.com/HPCL-EI/RoboWaiter 2023-11-14 17:04:30 +08:00
Caiyishuai 3166a6b57a 更新了部分动作节点 2023-11-14 17:04:26 +08:00
wuziji 5ad86fe560 New: 完成目标状态数据集的构建 2023-11-14 16:54:30 +08:00
wuziji f73245c13a Merge remote-tracking branch 'origin/main' 2023-11-14 16:18:23 +08:00
wuziji 5cfd97ba17 New: 完成目标状态数据集的构建 2023-11-14 16:18:13 +08:00
ChenXL97 03016764eb Merge branch 'main' of github.com:HPCL-EI/RoboWaiter 2023-11-14 15:26:06 +08:00
ChenXL97 5f0520d1eb 工具调用 2023-11-14 15:26:02 +08:00
Netceor 257cc0297c
Update scene.py 2023-11-14 14:55:46 +08:00
Netceor 71f758e9df
新增抹布桌的抓放 2023-11-14 14:55:07 +08:00
Netceor e6cd1e337b
新增抹布桌的物品抓放 2023-11-14 14:42:03 +08:00
Netceor 01c111db42
新增抹布桌的物品抓放 2023-11-14 14:41:02 +08:00
ChenXL97 9fd0d2abfe Merge branch 'main' of github.com:HPCL-EI/RoboWaiter 2023-11-14 12:10:28 +08:00
ChenXL97 c9e8dc3981 现在可以调用大模型的function call 2023-11-14 12:10:23 +08:00
Caiyishuai da224f745d 更新了部分动作节点 2023-11-14 12:09:53 +08:00
wuziji f7a2b9b5d7 Merge remote-tracking branch 'origin/main' 2023-11-14 09:24:21 +08:00
wuziji f30745058c New: 增加枚举所有目标状态的实现 2023-11-14 09:23:59 +08:00
ChenXL97 e5a9f4e583 Merge branch 'main' of github.com:HPCL-EI/RoboWaiter 2023-11-14 08:53:15 +08:00
ChenXL97 8f23c6ae47 现在执行moveto导航时会获取视觉图片
但是一段时间后有概率会闪退
2023-11-14 08:53:11 +08:00
Caiyishuai 34bfe6c3c0 Merge branch 'main' of https://github.com/HPCL-EI/RoboWaiter 2023-11-13 23:36:16 +08:00
Caiyishuai 31615f32cb 更新了动作节点 2023-11-13 23:36:12 +08:00
wuziji 355f1fac7b Merge remote-tracking branch 'origin/main' 2023-11-13 23:06:32 +08:00
wuziji 075f9ca6fe New: 新增了自动生成bt-expansion目标状态的实现 2023-11-13 23:06:22 +08:00
Caiyishuai de54741d57 Merge branch 'main' of https://github.com/HPCL-EI/RoboWaiter 2023-11-13 22:15:03 +08:00
Caiyishuai 0284830b0a 更新了部分动作节点 2023-11-13 22:14:55 +08:00
ChenXL97 04b5c73355 更新了导航算法 2023-11-13 21:52:15 +08:00
Caiyishuai d5f8c289bf Merge branch 'main' of https://github.com/HPCL-EI/RoboWaiter 2023-11-13 15:43:23 +08:00
Caiyishuai 806847ac15 更改了memgpt 2023-11-13 15:40:19 +08:00
ChenXL97 abe3af9601 Merge branch 'main' of github.com:HPCL-EI/RoboWaiter
# Conflicts:
#	robowaiter/robot/robot.py
#	robowaiter/utils/bt/load.py
#	sub_task.ptml
2023-11-13 15:09:30 +08:00
ChenXL97 2d933bf7a4 现在无参数节点打印时也会带空括号() 2023-11-13 15:05:21 +08:00
ChenXL97 9a3143cafc 现在可以自动生成行为树扩展动作 2023-11-13 14:53:00 +08:00
Caiyishuai a7007aeea7 更改了obea的sequence 2023-11-13 14:48:58 +08:00
wuziji ed5b99e69b 修复括号不匹配的bug 2023-11-13 11:53:50 +08:00
ChenXL97 3f1f8d9d06 增加AEM的测试 2023-11-13 10:32:56 +08:00
ChenXL97 ce6d83f3d5 Merge branch 'main' of github.com:HPCL-EI/RoboWaiter 2023-11-12 14:40:04 +08:00
ChenXL97 a9f17f7bdb 添加了一些数据集处理的脚本 2023-11-12 14:36:41 +08:00
Netceor 2d52c27c36
操作任务:12官方接口、3空调、2抓握放置物体 2023-11-11 16:32:48 +08:00
Netceor 1049792d72
更新操作任务:官方接口、空调、抓握放置物体 2023-11-11 14:58:20 +08:00
Netceor b7a625d221
Update scene.py
更新操作任务:官方接口、空调、抓握放置物体
2023-11-11 14:56:37 +08:00
Antiman-cmyk 38b57bc997 Merge remote-tracking branch 'origin/main' 2023-11-10 09:51:18 +08:00
Antiman-cmyk 08642f5b12 MemGPT简化版,提示词待更新 2023-11-10 09:50:58 +08:00
ChenXL97 3acfa5bc77 Merge branch 'main' of github.com:HPCL-EI/RoboWaiter 2023-11-09 21:52:36 +08:00
ChenXL97 30c8968ec0 修复bug 2023-11-09 21:52:13 +08:00
Netceor 02a196549d
Update scene.py 2023-11-09 19:22:51 +08:00
wuziji 7bd1edeeb2 Merge branch 'main' of github.com:HPCL-EI/RoboWaiter into main 2023-11-09 17:07:23 +08:00
wuziji 714c5a4c8e 🐛 FIX: 修复了ptml转换过程中括号匹配不对的问题 2023-11-09 17:07:07 +08:00
ChenXL97 4c4bbfde31 测试导航算法 2023-11-09 17:06:34 +08:00
ChenXL97 5320acc838 修复删除子行为树bug 2023-11-09 16:07:02 +08:00
ChenXL97 ced6f521f5 Merge branch 'main' of github.com:HPCL-EI/RoboWaiter 2023-11-09 08:50:20 +08:00
ChenXL97 5c893d72e1 跑通子任务树生成 2023-11-09 08:47:57 +08:00
Netceor 9eee9a9f6d
Update scene.py 2023-11-08 19:54:12 +08:00
Netceor 3fec85cbc0
Update scene.py 2023-11-08 19:51:51 +08:00
Netceor 4fc639cb45
Update VLM.py 2023-11-08 19:46:01 +08:00
Netceor 67add81c1f
Update scene.py 2023-11-08 19:45:26 +08:00
ChenXL97 0c0355af46 Merge branch 'main' of github.com:HPCL-EI/RoboWaiter 2023-11-08 17:38:09 +08:00
ChenXL97 98852e6276 实现事件驱动的场景 2023-11-08 17:37:49 +08:00
Netceor e1d53edde8
Update scene.py 2023-11-08 17:15:23 +08:00
Netceor 0aa34fef61
Update scene.py 2023-11-08 17:14:51 +08:00
Netceor 8aee653664
操作接口
7个动画操作
op_type 1-7 代表 "制作咖啡","倒水","夹点心","拖地","擦桌子","关闭窗帘","关筒灯","开大厅灯","搬椅子","打开窗帘","关大厅灯","开筒灯"
2023-11-08 17:13:25 +08:00
ChenXL97 02e3de9ccf Merge branch 'main' of github.com:HPCL-EI/RoboWaiter 2023-11-08 16:21:28 +08:00
ChenXL97 c39a13fd5b 开始整合dstar_lite 2023-11-08 16:20:02 +08:00
wuziji dde492970a Merge branch 'main' of https://github.com/HPCL-EI/RoboWaiter into main 2023-11-08 16:18:13 +08:00
wuziji 075da2de7f 📦 NEW: 新增从tab缩进到{}格式的转换 2023-11-08 16:17:59 +08:00
Netceor 39ef2709da
Update scene.py 2023-11-08 15:40:35 +08:00
Netceor 628f231247
Add files via upload 2023-11-08 15:39:58 +08:00
ChenXL97 f3802952e8 新增行为树子任务节点 2023-11-08 15:28:01 +08:00
ChenXL97 aa205e21e6 需要实现chatglm3上的多轮对话 2023-11-08 11:28:50 +08:00
ChenXL97 3aa386c5c3 更新了与chatglm3的通信 2023-11-08 10:26:22 +08:00
ChenXL97 3aaab6c308 现在ptml可以解析string类型参数 2023-11-08 10:03:40 +08:00
ChenXL97 b6ecd45617 跑通简单的GQA问答 2023-10-25 22:12:15 +08:00
ChenXL97 86c6c39302 重构了项目代码,进行了项目打包 2023-10-25 10:34:46 +08:00
ChenXL97 38534d3b05 重构了项目代码,进行了项目打包 2023-10-25 10:34:24 +08:00