Commit Graph

162 Commits

Author SHA1 Message Date
liwang_zhang 356c99a138 Merge branch 'main' of https://github.com/HPCL-EI/RoboWaiter 2023-11-18 22:43:54 +08:00
liwang_zhang 3859c810d1 修改AEM,通过视觉构建更加精细化的2D地图
完善了AEM,障碍物识别,2D地图构建
2023-11-18 22:42:54 +08:00
ChenXL97 8bdf5a96b4 查询函数融入场景中 2023-11-18 22:30:14 +08:00
Caiyishuai 65fadd68fb 增加了场景 2023-11-18 21:24:11 +08:00
ChenXL97 45d1874867 修改处理两个目标的bug 2023-11-18 21:09:14 +08:00
Caiyishuai 6f3a01eb3f 更新了场景 2023-11-18 21:03:10 +08:00
Caiyishuai 3684d43f5e 添加了场景 2023-11-18 21:02:14 +08:00
ChenXL97 2cbbde3e13 Merge branch 'main' of github.com:HPCL-EI/RoboWaiter 2023-11-18 18:00:07 +08:00
ChenXL97 f8e4f0053c 修改固定组合 2023-11-18 17:56:48 +08:00
Caiyishuai fdd6b18c79 增加了警察通知下班 机器人打扫卫生关灯关门关窗帘的场景 VLM_cafe_shutdown 2023-11-18 17:44:05 +08:00
Caiyishuai 25902b6182 添加了顾客提出点单和提出开关空调的场景 VLM_order 2023-11-18 17:20:13 +08:00
ChenXL97 7e63d9658b Merge branch 'main' of github.com:HPCL-EI/RoboWaiter 2023-11-18 14:55:41 +08:00
ChenXL97 f637e871ba 实现顾客领路 2023-11-18 14:51:17 +08:00
Caiyishuai bad1b8fb3d Merge branch 'main' of https://github.com/HPCL-EI/RoboWaiter 2023-11-18 14:26:10 +08:00
ChenXL97 7b83578e0e Merge branch 'main' of github.com:HPCL-EI/RoboWaiter 2023-11-18 14:13:29 +08:00
ChenXL97 40642b86a0 实现单次带路VLN_greet_lead 2023-11-18 14:13:07 +08:00
liwang_zhang d7b5fc9f6c Update scene.py
解决AEM机器人转向问题
2023-11-18 13:59:30 +08:00
ChenXL97 ae314d58e3 Merge branch 'main' of github.com:HPCL-EI/RoboWaiter 2023-11-18 12:07:49 +08:00
ChenXL97 935c359317 增加顾客记忆 2023-11-18 12:07:30 +08:00
Netceor c4373d86cb Update scene.py 2023-11-17 22:14:49 +08:00
Netceor 260957ec7f Update scene.py 2023-11-17 21:44:56 +08:00
Netceor a5efb60dde Update scene.py 2023-11-17 21:31:58 +08:00
Netceor 37c6302a5d Merge branch 'main' of https://github.com/HPCL-EI/RoboWaiter
# Conflicts:
#	robowaiter/llm_client/tool_register.py
2023-11-17 21:18:08 +08:00
Netceor bef5faa12a Update 2023-11-17 21:17:19 +08:00
wuziji da4ed7280e Merge remote-tracking branch 'origin/main' 2023-11-17 20:39:55 +08:00
wuziji 462287b392 UPDATE: 更新了数据集内部描述, 将其转化为json标准格式 2023-11-17 20:39:43 +08:00
Caiyishuai aed3cd9aae 更新 VLM2 机器人带小女孩到窗边的位置 2023-11-17 20:04:39 +08:00
Caiyishuai 68fcf72d62 注释了工具调用 2023-11-17 19:08:00 +08:00
Caiyishuai 077bff8775 更新指引顾客的多个地点 2023-11-17 18:56:58 +08:00
Netceor 5e1801986c Update scene.py 2023-11-17 16:12:34 +08:00
Netceor e71b1c217f 初始化时清空行人 2023-11-17 13:18:09 +08:00
Netceor 5ccd53b02f Merge branch 'main' of https://github.com/HPCL-EI/RoboWaiter
# Conflicts:
#	robowaiter/scene/scene.py
2023-11-17 13:12:05 +08:00
Netceor 30eb82f7a8 Update scene.py 2023-11-17 13:07:34 +08:00
Caiyishuai b899599b04 更新 AEM 地图路径 2023-11-17 12:53:16 +08:00
liwang zhang 956203300b 添加map接口 2023-11-17 09:57:58 +08:00
Caiyishuai a5a4a1badc 增加检测行人到 Bar 前并自动 打招呼 的条件节点和动作节点 2023-11-16 22:48:54 +08:00
Caiyishuai edc12cae25 更新了 VLM 场景 2023-11-16 21:37:18 +08:00
Caiyishuai fc66252285 设计了第一个 VLM 场景 2023-11-16 21:05:54 +08:00
ChenXL97 4feb75e80d Merge branch 'main' of github.com:HPCL-EI/RoboWaiter 2023-11-16 20:48:22 +08:00
ChenXL97 d3ab61bf8d 加入交互测试场景 2023-11-16 20:48:01 +08:00
Caiyishuai 8d40d43c5a 增加 VLM 场景 2023-11-16 17:57:27 +08:00
liwang zhang bfb5dd3ef5 Merge remote-tracking branch 'origin/main' 2023-11-16 16:37:59 +08:00
liwang zhang 7181d84743 已更新AEM 2023-11-16 16:37:11 +08:00
Caiyishuai 311a0cc2b9 删除转向测试的问代码 2023-11-16 15:31:38 +08:00
Caiyishuai c379f15a5c 更新了 导航算法 和 部分动作节点 2023-11-16 15:28:08 +08:00
ChenXL97 f2aef8fdc9 Merge branch 'main' of github.com:HPCL-EI/RoboWaiter 2023-11-16 15:04:46 +08:00
ChenXL97 b032548d55 在tool_api_multi_round.py中可以进行多轮对话 2023-11-16 15:04:27 +08:00
Caiyishuai 249100c9d6 Merge branch 'main' of https://github.com/HPCL-EI/RoboWaiter 2023-11-15 15:41:00 +08:00
Caiyishuai 4250bfbefb 更新了 VLN 的转向问题 2023-11-15 15:40:57 +08:00
ChenXL97 13776107e7 加入多轮对话 2023-11-15 15:24:10 +08:00
ChenXL97 543db85007 Merge branch 'main' of github.com:HPCL-EI/RoboWaiter 2023-11-15 15:11:36 +08:00
ChenXL97 07528d49cc 多轮对话 2023-11-15 15:11:17 +08:00
Netceor b07e0dbd3f
Update scene.py 2023-11-15 15:10:27 +08:00
Netceor b360cff1a6
更新了AEM 2023-11-15 15:09:51 +08:00
Netceor e63005800c
更新了AEM 2023-11-15 15:09:08 +08:00
ChenXL97 a8de1008dd Merge branch 'main' of github.com:HPCL-EI/RoboWaiter 2023-11-15 14:58:59 +08:00
ChenXL97 1b88eefc4e 更新主动探索 2023-11-15 14:58:09 +08:00
Caiyishuai 55d36162ed Merge branch 'main' of https://github.com/HPCL-EI/RoboWaiter 2023-11-15 14:56:17 +08:00
Caiyishuai af6f164c84 更新了 VLN 2023-11-15 14:56:03 +08:00
ChenXL97 3c643b4091 Merge branch 'main' of github.com:HPCL-EI/RoboWaiter 2023-11-15 14:39:03 +08:00
ChenXL97 4aa6e8f282 Merge branch 'main' of github.com:HPCL-EI/RoboWaiter 2023-11-15 14:38:43 +08:00
Caiyishuai 2ac24bad61 更新了 add_walkers 2023-11-15 14:38:13 +08:00
Caiyishuai f2df712f2e 更新了部分动作节点 2023-11-15 14:33:18 +08:00
ChenXL97 254f070c5c 简单多轮对话 2023-11-15 14:30:57 +08:00
Caiyishuai 0e55e18cbf 更新了开放任务和 VLM 2023-11-15 14:30:55 +08:00
Netceor ecb89247d4
Update scene.py 2023-11-15 13:40:46 +08:00
Netceor 67f501182e
Update VLM.py 2023-11-15 13:16:40 +08:00
Netceor 1748507f8f
Update scene.py 2023-11-15 13:15:47 +08:00
Netceor df425d9615
Update VLM.py 2023-11-15 13:14:49 +08:00
Caiyishuai ad5e8cbd12 更新了部分动作节点 2023-11-15 12:04:49 +08:00
ChenXL97 70af2a7eaa Merge branch 'main' of github.com:HPCL-EI/RoboWaiter 2023-11-15 09:41:17 +08:00
ChenXL97 05f790e635 现在测试场景可以直接运行 2023-11-15 09:40:57 +08:00
Caiyishuai 8637135281 Merge branch 'main' of https://github.com/HPCL-EI/RoboWaiter 2023-11-14 23:49:30 +08:00
Caiyishuai c3563e4fca 更新了部分动作节点 2023-11-14 23:16:48 +08:00
ChenXL97 2a5695d80e 修改工具调用 2023-11-14 23:08:07 +08:00
ChenXL97 900ec490e9 修复找不到sub_task_seq的Bug 2023-11-14 20:08:54 +08:00
Caiyishuai a012fabf6d 更改了 ptml 输出格式 2023-11-14 19:30:06 +08:00
Caiyishuai 3166a6b57a 更新了部分动作节点 2023-11-14 17:04:26 +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
Caiyishuai da224f745d 更新了部分动作节点 2023-11-14 12:09:53 +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 0284830b0a 更新了部分动作节点 2023-11-13 22:14:55 +08:00
Caiyishuai 806847ac15 更改了memgpt 2023-11-13 15:40:19 +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
Netceor 02a196549d
Update scene.py 2023-11-09 19:22:51 +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