Skip to content
GitLab
Menu
Projects
Groups
Snippets
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Menu
Open sidebar
chenpangpang
open-webui
Commits
a8b92e5e
Commit
a8b92e5e
authored
May 18, 2024
by
Timothy J. Baek
Browse files
fix: display username in shared chats
parent
75491b2f
Changes
6
Show whitespace changes
Inline
Side-by-side
Showing
6 changed files
with
64 additions
and
5 deletions
+64
-5
backend/apps/web/routers/users.py
backend/apps/web/routers/users.py
+25
-1
src/lib/apis/users/index.ts
src/lib/apis/users/index.ts
+27
-0
src/lib/components/chat/Messages.svelte
src/lib/components/chat/Messages.svelte
+3
-2
src/lib/components/chat/Messages/UserMessage.svelte
src/lib/components/chat/Messages/UserMessage.svelte
+3
-1
src/lib/components/chat/Settings/Personalization.svelte
src/lib/components/chat/Settings/Personalization.svelte
+1
-1
src/routes/s/[id]/+page.svelte
src/routes/s/[id]/+page.svelte
+5
-0
No files found.
backend/apps/web/routers/users.py
View file @
a8b92e5e
...
...
@@ -12,7 +12,7 @@ import logging
from
apps.web.models.users
import
UserModel
,
UserUpdateForm
,
UserRoleUpdateForm
,
Users
from
apps.web.models.auths
import
Auths
from
utils.utils
import
get_
current
_user
,
get_password_hash
,
get_admin_user
from
utils.utils
import
get_
verified
_user
,
get_password_hash
,
get_admin_user
from
constants
import
ERROR_MESSAGES
from
config
import
SRC_LOG_LEVELS
...
...
@@ -67,6 +67,30 @@ async def update_user_role(form_data: UserRoleUpdateForm, user=Depends(get_admin
)
############################
# GetUserById
############################
class
UserResponse
(
BaseModel
):
name
:
str
profile_image_url
:
str
@
router
.
get
(
"/{user_id}"
,
response_model
=
UserResponse
)
async
def
get_user_by_id
(
user_id
:
str
,
user
=
Depends
(
get_verified_user
)):
user
=
Users
.
get_user_by_id
(
user_id
)
if
user
:
return
UserResponse
(
name
=
user
.
name
,
profile_image_url
=
user
.
profile_image_url
)
else
:
raise
HTTPException
(
status_code
=
status
.
HTTP_400_BAD_REQUEST
,
detail
=
ERROR_MESSAGES
.
USER_NOT_FOUND
,
)
############################
# UpdateUserById
############################
...
...
src/lib/apis/users/index.ts
View file @
a8b92e5e
...
...
@@ -115,6 +115,33 @@ export const getUsers = async (token: string) => {
return
res
?
res
:
[];
};
export
const
getUserById
=
async
(
token
:
string
,
userId
:
string
)
=>
{
let
error
=
null
;
const
res
=
await
fetch
(
`
${
WEBUI_API_BASE_URL
}
/users/
${
userId
}
`
,
{
method
:
'
GET
'
,
headers
:
{
'
Content-Type
'
:
'
application/json
'
,
Authorization
:
`Bearer
${
token
}
`
}
})
.
then
(
async
(
res
)
=>
{
if
(
!
res
.
ok
)
throw
await
res
.
json
();
return
res
.
json
();
})
.
catch
((
err
)
=>
{
console
.
log
(
err
);
error
=
err
.
detail
;
return
null
;
});
if
(
error
)
{
throw
error
;
}
return
res
;
};
export
const
deleteUserById
=
async
(
token
:
string
,
userId
:
string
)
=>
{
let
error
=
null
;
...
...
src/lib/components/chat/Messages.svelte
View file @
a8b92e5e
<script lang="ts">
import { v4 as uuidv4 } from 'uuid';
import { chats, config, modelfiles, settings, user } from '$lib/stores';
import { chats, config, modelfiles, settings, user
as _user
} from '$lib/stores';
import { tick, getContext } from 'svelte';
import { toast } from 'svelte-sonner';
...
...
@@ -22,6 +22,7 @@
export let continueGeneration: Function;
export let regenerateResponse: Function;
export let user = $_user;
export let prompt;
export let suggestionPrompts = [];
export let processing = '';
...
...
@@ -294,7 +295,7 @@
{#if message.role === 'user'}
<UserMessage
on:delete={() => messageDeleteHandler(message.id)}
user={$
user}
{
user}
{readOnly}
{message}
isFirstMessage={messageIdx === 0}
...
...
src/lib/components/chat/Messages/UserMessage.svelte
View file @
a8b92e5e
...
...
@@ -7,6 +7,8 @@
import { modelfiles, settings } from '$lib/stores';
import Tooltip from '$lib/components/common/Tooltip.svelte';
import { user as _user } from '$lib/stores';
const i18n = getContext('i18n');
const dispatch = createEventDispatcher();
...
...
@@ -74,7 +76,7 @@
{$i18n.t('You')}
<span class=" text-gray-500 text-sm font-medium">{message?.user ?? ''}</span>
{/if}
{:else if $settings.showUsername}
{:else if $settings.showUsername
|| $_user.name !== user.name
}
{user.name}
{:else}
{$i18n.t('You')}
...
...
src/lib/components/chat/Settings/Personalization.svelte
View file @
a8b92e5e
...
...
@@ -63,7 +63,7 @@
<div class="mt-3 mb-1 ml-1">
<button
type="button"
class=" px-3.5 py-1.5 font-medium hover:bg-black/5 dark:hover:bg-white/5 outline outline-gray-300 dark:outline-gray-800 rounded-3xl"
class=" px-3.5 py-1.5 font-medium hover:bg-black/5 dark:hover:bg-white/5 outline
outline-1
outline-gray-300 dark:outline-gray-800 rounded-3xl"
>
Manage
</button>
...
...
src/routes/s/[id]/+page.svelte
View file @
a8b92e5e
...
...
@@ -12,6 +12,7 @@
import Messages from '$lib/components/chat/Messages.svelte';
import Navbar from '$lib/components/layout/Navbar.svelte';
import { getUserById } from '$lib/apis/users';
const i18n = getContext('i18n');
...
...
@@ -37,6 +38,7 @@
}, {});
let chat = null;
let user = null;
let title = '';
let files = [];
...
...
@@ -88,6 +90,8 @@
});
if (chat) {
user = await getUserById(localStorage.token, chat.user_id);
const chatContent = chat.chat;
if (chatContent) {
...
...
@@ -156,6 +160,7 @@
<div class=" h-full w-full flex flex-col py-4">
<div class="py-2">
<Messages
{user}
chatId={$chatId}
readOnly={true}
{selectedModels}
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment