Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Receptionist update with deepface #212

Closed
wants to merge 17 commits into from

Conversation

haiwei-luo
Copy link
Collaborator

@haiwei-luo haiwei-luo commented Jun 5, 2024

Added into receptionist:

  • Handling for an individual failed drink or name
  • Handling head stuck when looking towards a desired seat
  • Learning a guest's face
  • Recognising (detecting) a guest's face
  • Additions to output speech to make it more clear what Tiago is doing

@haiwei-luo haiwei-luo changed the title Merge test to main in Haiwei's base Merge test to main from Haiwei's branch Jun 5, 2024
@haiwei-luo haiwei-luo changed the title Merge test to main from Haiwei's branch Merge test to main from Haiwei's branch (Receptionist update) Jun 5, 2024
@haiwei-luo
Copy link
Collaborator Author

Not sure the "tasks/receptionist/src/receptionist/states/get_attributes.py" file has been resolved correctly, would appreciate another look

@haiwei-luo haiwei-luo changed the title Merge test to main from Haiwei's branch (Receptionist update) Receptionist update with deepface Jun 5, 2024
Copy link
Member

@jws-1 jws-1 left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Really great work, very impressive first contributions! I've left some comments for you to address before we can merge this in 😄!

skills/src/lasr_skills/__init__.py Outdated Show resolved Hide resolved
skills/src/lasr_skills/look_to_point.py Outdated Show resolved Hide resolved
skills/src/lasr_skills/look_to_point.py Outdated Show resolved Hide resolved
@@ -13,7 +13,7 @@ class ParseNameAndDrink(smach.State):
def __init__(
self,
guest_id: str,
param_key: str = "receptionist/priors",
param_key: str = "/priors",
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggested change
param_key: str = "/priors",
param_key: str = "/receptionist/priors",

Copy link
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

/receptionist/... breaks the code.

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I feel like this should be a skill instead

Copy link
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I'll look into this.

Comment on lines +12 to +25
class GuestSeatWait(smach.State):
def __init__(self):
smach.State.__init__(self, outcomes=["succeeded", "failed"])

def execute(self, userdata) -> str:
# Wait 5 seconds for user to sit down
try:
wait_time = 5
print(f"Waiting for {wait_time} seconds for the user to sit down.")
rospy.sleep(wait_time)
return "succeeded"
except:
print("Waiting for the guest to sit down failed")
return "failed"
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Might be worth adding a generic Sleep skill that takes the number of seconds to sleep for in the constructor?

Copy link
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I'll look into it

@haiwei-luo
Copy link
Collaborator Author

This PR is deprecated as PR #221 has taken over

@haiwei-luo haiwei-luo closed this Jun 14, 2024
@haiwei-luo haiwei-luo deleted the test branch June 24, 2024 10:50
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants