diff --git a/CHANGELOG.md b/CHANGELOG.md index 565b0c301..03ec80e5b 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -26,6 +26,8 @@ - Allow dlc without pre-existing tracking data #973, #975 - Raise `KeyError` for missing input parameters across helper funcs #966 - `DLCPosVideo` table now inserts into self after `make` #966 +- Common + - Don't insert lab member when creating lab team #983 ## [0.5.2] (April 22, 2024) diff --git a/src/spyglass/common/common_lab.py b/src/spyglass/common/common_lab.py index c5a6fbc00..de2ad8079 100644 --- a/src/spyglass/common/common_lab.py +++ b/src/spyglass/common/common_lab.py @@ -64,9 +64,9 @@ def insert_from_nwbfile(cls, nwbf): # each person is by default the member of their own LabTeam # (same as their name) - full_name, _, _ = decompose_name(experimenter) + full_name, first, last = decompose_name(experimenter) LabTeam.create_new_team( - team_name=full_name, team_members=[full_name] + team_name=full_name, team_members=[f"{last}, {first}"] ) @classmethod @@ -193,9 +193,10 @@ def create_new_team( member_list = [] for team_member in team_members: LabMember.insert_from_name(team_member) - query = ( - LabMember.LabMemberInfo() & {"lab_member_name": team_member} - ).fetch("google_user_name") + member_dict = {"lab_member_name": decompose_name(team_member)[0]} + query = (LabMember.LabMemberInfo() & member_dict).fetch( + "google_user_name" + ) if not query: logger.info( f"Please add the Google user ID for {team_member} in " @@ -203,7 +204,7 @@ def create_new_team( ) labteammember_dict = { "team_name": team_name, - "lab_member_name": team_member, + **member_dict, } member_list.append(labteammember_dict) # clear cache for this member