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.

Sign up for GitHub

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

Ensure initials appear in collaborative mode #443

Merged
merged 9 commits into from
Nov 14, 2023
Merged

Ensure initials appear in collaborative mode #443

Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
0ce7702
Ensure initials appear in collaborative mode
aychang95 Nov 8, 2023
1fc580c
Set default initials and use instead of null current_user attr
aychang95 Nov 8, 2023
5699ae2
Merge branch 'jupyterlab:main' into main
aychang95 Nov 8, 2023
d62916a
Black format to avoid pre-commit failure
aychang95 Nov 8, 2023
ec00e2b
Getattr does not return default because initials attr still exists ev…
aychang95 Nov 8, 2023
82f901f
Merge branch 'main' into main
aychang95 Nov 11, 2023
2af7391
Merge branch 'jupyterlab:main' into main
aychang95 Nov 14, 2023
6a083f3
optimize and set to one initial var
aychang95 Nov 14, 2023
87b6e61
Merge branch 'main' of github.com:americandatascience/jupyter-ai
aychang95 Nov 14, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 10 additions & 6 deletions packages/jupyter-ai/jupyter_ai/handlers.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -121,15 +121,19 @@ def get_chat_user(self) -> ChatUser:

if collaborative:
names = self.current_user.name.split(" ", maxsplit=2)
initials = "".join(
[(name.capitalize()[0] if len(name) > 0 else "") for name in names]
)
initials = getattr(self.current_user, "initials", None)
if not initials:
# compute default initials in case IdentityProvider doesn't
# return initials, e.g. JupyterHub (#302)
names = self.current_user.name.split(" ", maxsplit=2)
initials = "".join(
[(name.capitalize()[0] if len(name) > 0 else "") for name in names]
)
chat_user_kwargs = {
# set in case IdentityProvider doesn't return initials, e.g.
# JupyterHub (#302)
"initials": initials,
**asdict(self.current_user),
"initials": initials,
dlqqq marked this conversation as resolved.
Show resolved Hide resolved
}

return ChatUser(**chat_user_kwargs)

login = getpass.getuser()
Expand Down
Loading