diff --git a/robowaiter/algos/explore/camera.py b/robowaiter/algos/explore/camera.py index bfe9600..f5d0653 100644 --- a/robowaiter/algos/explore/camera.py +++ b/robowaiter/algos/explore/camera.py @@ -238,7 +238,7 @@ def save_obj_info(img_data, objs_name): def get_semantic_map(camera, cur_objs, objs_name): scene = Observe(0) - print(scene.objects) + # print(scene.objects) objs = scene.objects img_data = get_camera([camera]) diff --git a/robowaiter/llm_client/tool_register.py b/robowaiter/llm_client/tool_register.py index 23850b7..2bdcff9 100644 --- a/robowaiter/llm_client/tool_register.py +++ b/robowaiter/llm_client/tool_register.py @@ -143,14 +143,18 @@ def get_object_info( obj: Annotated[str, '需要获取信息的物体名称', True] ) -> str: """ - 获取场景中指定物体 `object` 的信息,如果`object` 是一个地点,例如洗手间,地方,则输出。如果`object`是一个咖啡,则输出。 + 获取场景中指定物体 `object` 在哪里, + 如果`object` 是一个地点,例如洗手间,地方,则输出。 + 如果`object`是一个咖啡,则输出。 + 如果`object` 是空桌子,则输出一号桌 """ near_object = None if obj == "Table": near_object = "Bar" if obj == "洗手间": near_object = "大门" - + if obj == "空桌子": + near_object = "一号桌" return near_object diff --git a/robowaiter/scene/tasks/GQA.py b/robowaiter/scene/tasks/GQA.py index ebe0311..c44f9e5 100644 --- a/robowaiter/scene/tasks/GQA.py +++ b/robowaiter/scene/tasks/GQA.py @@ -16,16 +16,15 @@ class SceneGQA(Scene): super().__init__(robot) # 在这里加入场景中发生的事件, (事件发生的时间,事件函数) self.event_list = [ - (5, self.create_chat_event("洗手间在哪里")), + (5, self.create_chat_event("哪里有空桌子")), (12, self.create_chat_event("可以带我去吗")), ] def _reset(self): - self.clean_walker() - + # self.clean_walker() self.add_walker(50, 500, 0) - self.walker_bubble("洗手间在哪里") + # self.walker_bubble("洗手间在哪里") # self.control_walker([self.walker_control_generator(0, False, 100, 755, 1900, 180)]) diff --git a/robowaiter/scene/tasks/Open_tasks_test.py b/robowaiter/scene/tasks/Open_tasks_test.py index c39eb10..e251d79 100644 --- a/robowaiter/scene/tasks/Open_tasks_test.py +++ b/robowaiter/scene/tasks/Open_tasks_test.py @@ -23,7 +23,13 @@ class SceneOT(Scene): ] def _reset(self): - self.add_walker(50, 300, 0) + scene = self.add_walkers([[50, 300, 0]]) + # time.sleep(2.0) + # print("我有点热,能开个空调吗?") + print("scene.walkers:",scene.walkers) + cont = scene.walkers[0].name+":我有点热,能开个空调吗?" + self.control_robot_action(0,3,cont) + # self.add_walker(1085, 2630, 220) # self.control_walker([self.walker_control_generator(0, False, 100, 755, 1900, 180)])