fixing conflict

MBTMBTMBT · May 28, 2024 · 4d34852 · 4d34852
2 parents 0c3b2a8 + 00bcbe0
commit 4d34852
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 0 deletions.
diff --git a/tasks/receptionist/doc/PREREQUISITES.md b/tasks/receptionist/doc/PREREQUISITES.md
@@ -1 +1,8 @@
 If you would like to view the documentation in the browser, ensure you have at [Node.js v16.x](https://nodejs.org/en) installed.
+
+
+Please make sure the following models are installed in order to run this code: 
+
+- lasr_vision_yolov8 requires yolov8n-seg.pt in lasr_vision_yolov8/models/
+- lasr_vision_feature_extraction requires model.pth in lasr_vision_feature_extraction/models/ 
+- lasr_vision_clip requires a model from hugging face, this can be downloaded by running 'rosrun lasr_vision_clip vqa' 
diff --git a/tasks/receptionist/src/receptionist/states/get_attributes.py b/tasks/receptionist/src/receptionist/states/get_attributes.py
@@ -7,8 +7,13 @@
 import smach
 from smach import UserData
 from typing import List, Any, Dict, Union
+<<<<<<< HEAD
 from lasr_vision_msgs.srv import VqaRequest, VqaResponse, Vqa
 
+=======
+#from lasr_vision_clip.srv import VqaRequest, VqaResponse, Vqa
+from lasr_vision_msgs.srv import VqaRequest, VqaResponse, Vqa
+>>>>>>> 00bcbe018d9c9789c4aac12a77642f8d5d668455
 
 class GetGuestAttributes(smach.State):
     def __init__(