Commit Graph

209 Commits

Author SHA1 Message Date
liwang_zhang 9958906253 Merge branch 'main' of https://github.com/HPCL-EI/RoboWaiter 2023-11-20 21:24:19 +08:00
liwang_zhang 298dc8efa5 更新 2023-11-20 21:24:16 +08:00
Caiyishuai 897920beb9 增加复杂任务,点餐和动作规划。OT_coffee_water_dessert.py 2023-11-20 21:12:18 +08:00
Caiyishuai a841970dc3 更新了 VLM 2023-11-20 20:10:31 +08:00
Caiyishuai 8cfc34a558 caiyishuai 2023-11-20 19:41:36 +08:00
Caiyishuai 0383860d99 更新了地图人显示 2023-11-20 18:40:33 +08:00
liwang_zhang 6ba90a804c 提交VLN 2023-11-20 17:47:39 +08:00
Caiyishuai 360a647376 更新了 scene 2023-11-20 17:28:21 +08:00
liwang_zhang 7dad1cd0a4 Merge branch 'main' of https://github.com/HPCL-EI/RoboWaiter 2023-11-20 17:21:01 +08:00
liwang_zhang c72da5c280 更新map接口 2023-11-20 17:20:50 +08:00
Caiyishuai b16ac98ffe 更加了 VLN 视觉语言导航的录屏脚本 2023-11-20 17:18:36 +08:00
liwang_zhang 8acc0ca451 Merge branch 'main' of https://github.com/HPCL-EI/RoboWaiter 2023-11-20 17:07:08 +08:00
liwang_zhang 2098b14e51 更改地图接口 2023-11-20 17:07:05 +08:00
Caiyishuai 6ea4d91a44 更新了 行人地图信息 2023-11-20 17:04:22 +08:00
Caiyishuai 14fde64ce3 更新了 scene 中的相机算法 2023-11-20 16:40:00 +08:00
liwang_zhang e4591b2efe Update scene.py 2023-11-20 16:18:26 +08:00
liwang_zhang 54efdc65a9 提供地图接口 2023-11-20 16:17:45 +08:00
liwang_zhang 3304d38618 提供地图接口 2023-11-20 16:14:49 +08:00
Caiyishuai b4e04641eb 更新了 VLM 的两个场景 2023-11-20 15:48:03 +08:00
ChenXL97 95abf77d32 Merge branch 'main' of github.com:HPCL-EI/RoboWaiter 2023-11-20 14:23:44 +08:00
ChenXL97 69ac9f1357 实现自主任务,太暗开灯 2023-11-20 14:23:26 +08:00
liwang_zhang 454713976c Merge branch 'main' of https://github.com/HPCL-EI/RoboWaiter 2023-11-20 14:06:57 +08:00
liwang_zhang dd943e39af 优化AEM 2023-11-20 14:06:03 +08:00
Caiyishuai 20706a28d1 在操作任务中增加了 视觉图像分割 2023-11-20 11:12:36 +08:00
liwang_zhang 66ce119e12 提供目标检测接口 2023-11-20 09:39:38 +08:00
Caiyishuai 7c39125819 增加了两个 VLM 场景 2023-11-20 00:01:33 +08:00
Caiyishuai 37871c6d77 AEM 2023-11-19 22:24:17 +08:00
Caiyishuai e00abe6a8c AEM测试 2023-11-19 22:22:28 +08:00
liwang_zhang 9cbb25eba7 Merge branch 'main' of https://github.com/HPCL-EI/RoboWaiter 2023-11-19 22:13:20 +08:00
liwang_zhang 938d2a5a6e 完善AEM 2023-11-19 22:13:14 +08:00
ChenXL97 7b62bc9eb4 Merge branch 'main' of github.com:HPCL-EI/RoboWaiter 2023-11-19 21:55:46 +08:00
ChenXL97 69c3fea7f4 太暗的异常检测 2023-11-19 21:55:42 +08:00
Caiyishuai f737887bb5 Merge branch 'main' of https://github.com/HPCL-EI/RoboWaiter 2023-11-19 21:48:11 +08:00
Caiyishuai eae3a20bf2 更新了咖啡厅的一天 2023-11-19 21:48:02 +08:00
liwang_zhang 504aeb40fe Merge branch 'main' of https://github.com/HPCL-EI/RoboWaiter 2023-11-19 20:27:56 +08:00
liwang_zhang 35a1cc868f 添加目标检测功能,可以区分同类别不同物体
采用聚类算法实现区分同类别不同物体
2023-11-19 20:27:49 +08:00
ChenXL97 5b9526b5d0 修复serve逻辑 2023-11-19 17:42:56 +08:00
Caiyishuai c4dd4f4378 Merge branch 'main' of https://github.com/HPCL-EI/RoboWaiter 2023-11-19 16:47:55 +08:00
Caiyishuai 8c0896a19e 更新了咖啡厅的一天的场景 2023-11-19 16:47:52 +08:00
ChenXL97 d44b0389b8 方便NLP的测试 2023-11-19 14:46:31 +08:00
ChenXL97 de79f4c448 实现具身场景查询 2023-11-19 14:44:22 +08:00
Netceor f5bfe0c5b1 Merge branch 'main' of https://github.com/HPCL-EI/RoboWaiter
# Conflicts:
#	robowaiter/behavior_lib/act/DealChat.py
2023-11-19 14:24:06 +08:00
Netceor 90ce854cdc 更新工具调用 2023-11-19 14:21:58 +08:00
ChenXL97 f82ef1a7b0 更好的编写事件逻辑 2023-11-19 10:48:45 +08:00
Caiyishuai 1cd40c7bb7 增加了【咖啡厅的一天】中的三个场景 2023-11-19 00:48:55 +08:00
Caiyishuai caaddc988a Merge branch 'main' of https://github.com/HPCL-EI/RoboWaiter 2023-11-18 22:51:03 +08:00
Caiyishuai 5d2c9009f3 新增了咖啡厅的一天:带领顾客和点单 2023-11-18 22:50:38 +08:00
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