OpenWebUI/open-webui
1
0
Fork 0
mirror of https://github.com/open-webui/open-webui synced 2025-06-09 16:07:54 +00:00
Code Issues Actions 4 Packages Projects Releases Wiki Activity

refac: folder id -> uuid

Browse Source
This commit is contained in:
Timothy J. Baek 2024-10-16 21:49:22 -07:00
parent a942c30ca8
commit dea12360f4
7 changed files with 144 additions and 69 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

63
backend/open_webui/apps/webui/models/folders.py
View File

@ -67,14 +67,17 @@ class FolderItemsUpdateForm(BaseModel):
class FolderTable: class FolderTable:
def insert_new_folder(self, name: str, user_id: str) -> Optional[FolderModel]: def insert_new_folder(
self, user_id: str, name: str, parent_id: Optional[str] = None
) -> Optional[FolderModel]:
with get_db() as db: with get_db() as db:
id = name.lower() id = str(uuid.uuid4())
folder = FolderModel( folder = FolderModel(
**{ **{
"id": id, "id": id,
"user_id": user_id, "user_id": user_id,
"name": name, "name": name,
"parent_id": parent_id,
"created_at": int(time.time()), "created_at": int(time.time()),
"updated_at": int(time.time()), "updated_at": int(time.time()),
} }
@ -92,11 +95,10 @@ class FolderTable:
print(e) print(e)
return None return None
def get_folder_by_name_and_user_id( def get_folder_by_id_and_user_id(
self, name: str, user_id: str self, id: str, user_id: str
) -> Optional[FolderModel]: ) -> Optional[FolderModel]:
try: try:
id = name.lower()
with get_db() as db: with get_db() as db:
folder = db.query(Folder).filter_by(id=id, user_id=user_id).first() folder = db.query(Folder).filter_by(id=id, user_id=user_id).first()
return FolderModel.model_validate(folder) return FolderModel.model_validate(folder)
@ -110,7 +112,24 @@ class FolderTable:
for folder in db.query(Folder).filter_by(user_id=user_id).all() for folder in db.query(Folder).filter_by(user_id=user_id).all()
] ]
def get_folders_by_parent_id_and_user_id(self, parent_id: str, user_id: str): def get_folder_by_parent_id_and_user_id_and_name(
self, parent_id: Optional[str], user_id: str, name: str
) -> Optional[FolderModel]:
try:
with get_db() as db:
folder = (
db.query(Folder)
.filter_by(parent_id=parent_id, user_id=user_id, name=name)
.first()
)
return FolderModel.model_validate(folder)
except Exception as e:
log.error(f"get_folder_by_name_and_user_id: {e}")
return None
def get_folders_by_parent_id_and_user_id(
self, parent_id: Optional[str], user_id: str
) -> list[FolderModel]:
with get_db() as db: with get_db() as db:
return [ return [
FolderModel.model_validate(folder) FolderModel.model_validate(folder)
@ -138,21 +157,23 @@ class FolderTable:
log.error(f"update_folder: {e}") log.error(f"update_folder: {e}")
return return
def update_folder_name_by_name_and_user_id( def update_folder_name_by_id_and_user_id(
self, name: str, user_id: str, new_name: str self, id: str, user_id: str, name: str
) -> Optional[FolderModel]: ) -> Optional[FolderModel]:
try: try:
id = name.lower()
new_id = new_name.lower()
with get_db() as db: with get_db() as db:
# Check if new folder name already exists folder = db.query(Folder).filter_by(id=id, user_id=user_id).first()
folder = db.query(Folder).filter_by(id=new_id, user_id=user_id).first()
if folder: existing_folder = (
db.query(Folder)
.filter_by(name=name, parent_id=folder.parent_id, user_id=user_id)
.first()
)
if existing_folder:
return None return None
folder = db.query(Folder).filter_by(id=id, user_id=user_id).first() folder.name = name
folder.id = new_id
folder.name = new_name
folder.updated_at = int(time.time()) folder.updated_at = int(time.time())
db.commit() db.commit()
@ -162,11 +183,10 @@ class FolderTable:
log.error(f"update_folder: {e}") log.error(f"update_folder: {e}")
return return
def update_folder_items_by_name_and_user_id( def update_folder_items_by_id_and_user_id(
self, name: str, user_id: str, items: FolderItems self, id: str, user_id: str, items: FolderItems
) -> Optional[FolderModel]: ) -> Optional[FolderModel]:
try: try:
id = name.lower()
with get_db() as db: with get_db() as db:
folder = db.query(Folder).filter_by(id=id, user_id=user_id).first() folder = db.query(Folder).filter_by(id=id, user_id=user_id).first()
@ -180,14 +200,11 @@ class FolderTable:
log.error(f"update_folder: {e}") log.error(f"update_folder: {e}")
return return
def delete_folder_by_name_and_user_id(self, name: str, user_id: str) -> bool: def delete_folder_by_id_and_user_id(self, id: str, user_id: str) -> bool:
try: try:
with get_db() as db: with get_db() as db:
id = name.lower()
folder = db.query(Folder).filter_by(id=id, user_id=user_id).first() folder = db.query(Folder).filter_by(id=id, user_id=user_id).first()
db.delete(folder) db.delete(folder)
db.commit() db.commit()
return True return True
except Exception as e: except Exception as e:

81
backend/open_webui/apps/webui/routers/folders.py
View File

@ -52,7 +52,10 @@ async def get_folders(user=Depends(get_verified_user)):
@router.post("/") @router.post("/")
def create_folder(form_data: FolderForm, user=Depends(get_verified_user)): def create_folder(form_data: FolderForm, user=Depends(get_verified_user)):
folder = Folders.get_folder_by_name_and_user_id(form_data.name, user.id) folder = Folders.get_folder_by_parent_id_and_user_id_and_name(
None, user.id, form_data.name
)
if folder: if folder:
raise HTTPException( raise HTTPException(
status_code=status.HTTP_400_BAD_REQUEST, status_code=status.HTTP_400_BAD_REQUEST,
@ -60,11 +63,11 @@ def create_folder(form_data: FolderForm, user=Depends(get_verified_user)):
) )
try: try:
folder = Folders.insert_new_folder(form_data.name, user.id) folder = Folders.insert_new_folder(user.id, form_data.name)
return folder return folder
except Exception as e: except Exception as e:
log.exception(e) log.exception(e)
log.error(f"Error creating folder: {form_data.name}") log.error("Error creating folder")
raise HTTPException( raise HTTPException(
status_code=status.HTTP_400_BAD_REQUEST, status_code=status.HTTP_400_BAD_REQUEST,
detail=ERROR_MESSAGES.DEFAULT("Error creating folder"), detail=ERROR_MESSAGES.DEFAULT("Error creating folder"),
@ -78,7 +81,7 @@ def create_folder(form_data: FolderForm, user=Depends(get_verified_user)):
@router.get("/{id}", response_model=Optional[FolderModel]) @router.get("/{id}", response_model=Optional[FolderModel])
async def get_folder_by_id(id: str, user=Depends(get_verified_user)): async def get_folder_by_id(id: str, user=Depends(get_verified_user)):
folder = Folders.get_folder_by_name_and_user_id(id, user.id) folder = Folders.get_folder_by_id_and_user_id(id, user.id)
if folder: if folder:
return folder return folder
else: else:
@ -97,35 +100,65 @@ async def get_folder_by_id(id: str, user=Depends(get_verified_user)):
async def update_folder_name_by_id( async def update_folder_name_by_id(
id: str, form_data: FolderForm, user=Depends(get_verified_user) id: str, form_data: FolderForm, user=Depends(get_verified_user)
): ):
new_id = form_data.name.lower() folder = Folders.get_folder_by_id_and_user_id(id, user.id)
folder = Folders.get_folder_by_name_and_user_id(new_id, user.id)
if folder: if folder:
existing_folder = Folders.get_folder_by_parent_id_and_user_id_and_name(
folder.parent_id, user.id, form_data.name
)
if existing_folder:
raise HTTPException( raise HTTPException(
status_code=status.HTTP_400_BAD_REQUEST, status_code=status.HTTP_400_BAD_REQUEST,
detail=ERROR_MESSAGES.DEFAULT("Folder already exists"), detail=ERROR_MESSAGES.DEFAULT("Folder already exists"),
) )
folder = Folders.get_folder_by_name_and_user_id(id, user.id)
if folder:
try: try:
folder = Folders.update_folder_name_by_name_and_user_id( folder = Folders.update_folder_name_by_id_and_user_id(
id, user.id, form_data.name id, user.id, form_data.name
) )
return folder
# Update children folders parent_id except Exception as e:
children_folders = Folders.get_folders_by_parent_id_and_user_id(id, user.id) log.exception(e)
for child in children_folders: log.error(f"Error updating folder: {id}")
Folders.update_folder_parent_id_by_id_and_user_id( raise HTTPException(
child.id, user.id, folder.id status_code=status.HTTP_400_BAD_REQUEST,
detail=ERROR_MESSAGES.DEFAULT("Error updating folder"),
)
else:
raise HTTPException(
status_code=status.HTTP_404_NOT_FOUND,
detail=ERROR_MESSAGES.NOT_FOUND,
) )
# Update children items parent_id
chats = Chats.get_chats_by_folder_id_and_user_id(id, user.id) ############################
for chat in chats: # Update Folder Name By Id
Chats.update_chat_folder_id_by_id_and_user_id( ############################
chat.id, user.id, folder.id
class FolderParentIdForm(BaseModel):
parent_id: str
@router.post("/{id}/update/parent")
async def update_folder_parent_id_by_id(
id: str, form_data: FolderParentIdForm, user=Depends(get_verified_user)
):
folder = Folders.get_folder_by_id_and_user_id(id, user.id)
if folder:
existing_folder = Folders.get_folder_by_parent_id_and_user_id_and_name(
form_data.parent_id, user.id, folder.name
) )
if existing_folder:
raise HTTPException(
status_code=status.HTTP_400_BAD_REQUEST,
detail=ERROR_MESSAGES.DEFAULT("Folder already exists"),
)
try:
folder = Folders.update_folder_parent_id_by_id_and_user_id(
id, user.id, form_data.parent_id
)
return folder return folder
except Exception as e: except Exception as e:
log.exception(e) log.exception(e)
@ -150,10 +183,10 @@ async def update_folder_name_by_id(
async def update_folder_items_by_id( async def update_folder_items_by_id(
id: str, form_data: FolderItemsUpdateForm, user=Depends(get_verified_user) id: str, form_data: FolderItemsUpdateForm, user=Depends(get_verified_user)
): ):
folder = Folders.get_folder_by_name_and_user_id(id, user.id) folder = Folders.get_folder_by_id_and_user_id(id, user.id)
if folder: if folder:
try: try:
folder = Folders.update_folder_by_name_and_user_id( folder = Folders.update_folder_items_by_id_and_user_id(
id, user.id, form_data.items id, user.id, form_data.items
) )
return folder return folder
@ -178,10 +211,10 @@ async def update_folder_items_by_id(
@router.delete("/{id}") @router.delete("/{id}")
async def delete_folder_by_id(id: str, user=Depends(get_verified_user)): async def delete_folder_by_id(id: str, user=Depends(get_verified_user)):
folder = Folders.get_folder_by_name_and_user_id(id, user.id) folder = Folders.get_folder_by_id_and_user_id(id, user.id)
if folder: if folder:
try: try:
result = Folders.delete_folder_by_name_and_user_id(id, user.id) result = Folders.delete_folder_by_id_and_user_id(id, user.id)
return result return result
except Exception as e: except Exception as e:
log.exception(e) log.exception(e)

15
src/lib/components/layout/Sidebar.svelte
View File

@ -75,6 +75,8 @@
return []; return [];
}); });
folders = {};
for (const folder of folderList) { for (const folder of folderList) {
folders[folder.id] = { ...(folders[folder.id] ? folders[folder.id] : {}), ...folder }; folders[folder.id] = { ...(folders[folder.id] ? folders[folder.id] : {}), ...folder };
@ -636,15 +638,15 @@
</div> </div>
{/if} {/if}
{#if folders} <div class=" flex-1 flex flex-col overflow-y-auto scrollbar-hidden">
<div class=" flex flex-col"> {#if !search && folders}
<Folders {folders} /> <Folders {folders} />
</div>
{/if} {/if}
<div class="flex-1 flex flex-col space-y-1 overflow-y-auto scrollbar-hidden">
<Folder <Folder
collapsible={false} collapsible={!search}
className="px-2"
name={$i18n.t('All chats')}
on:drop={async (e) => { on:drop={async (e) => {
const { type, id } = e.detail; const { type, id } = e.detail;
@ -662,7 +664,7 @@
} }
}} }}
> >
<div class="pt-2 pl-2"> <div class="pt-1.5">
{#if $chats} {#if $chats}
{#each $chats as chat, idx} {#each $chats as chat, idx}
{#if idx === 0 || (idx > 0 && chat.time_range !== $chats[idx - 1].time_range)} {#if idx === 0 || (idx > 0 && chat.time_range !== $chats[idx - 1].time_range)}
@ -695,6 +697,7 @@
{/if} {/if}
<ChatItem <ChatItem
className=""
id={chat.id} id={chat.id}
title={chat.title} title={chat.title}
{shiftKey} {shiftKey}

4
src/lib/components/layout/Sidebar/ChatItem.svelte
View File

@ -158,9 +158,9 @@
{#if dragged && x && y} {#if dragged && x && y}
<DragGhost {x} {y}> <DragGhost {x} {y}>
<div class=" bg-black/80 backdrop-blur-2xl px-2 py-1 rounded-lg w-40"> <div class=" bg-black/80 backdrop-blur-2xl px-2 py-1 rounded-lg w-fit max-w-40">
<div class="flex items-center gap-1"> <div class="flex items-center gap-1">
<Document className="size-4" strokeWidth="2" /> <Document className=" size-[18px]" strokeWidth="2" />
<div class=" text-xs text-white line-clamp-1"> <div class=" text-xs text-white line-clamp-1">
{title} {title}
</div> </div>

7
src/lib/components/layout/Sidebar/Folders.svelte
View File

@ -6,7 +6,12 @@
// Get the list of folders that have no parent, sorted by name alphabetically // Get the list of folders that have no parent, sorted by name alphabetically
$: folderList = Object.keys(folders) $: folderList = Object.keys(folders)
.filter((key) => folders[key].parent_id === null) .filter((key) => folders[key].parent_id === null)
.sort((a, b) => folders[a].name.localeCompare(folders[b].name)); .sort((a, b) =>
folders[a].name.localeCompare(folders[b].name, undefined, {
numeric: true,
sensitivity: 'base'
})
);
</script> </script>
{#each folderList as folderId (folderId)} {#each folderList as folderId (folderId)}

0
src/lib/components/layout/Sidebar/Folders/FolderMenu.svelte Normal file
View File

27
src/lib/components/layout/Sidebar/RecursiveFolder.svelte
View File

@ -10,13 +10,14 @@
import DragGhost from '$lib/components/common/DragGhost.svelte'; import DragGhost from '$lib/components/common/DragGhost.svelte';
import FolderOpen from '$lib/components/icons/FolderOpen.svelte'; import FolderOpen from '$lib/components/icons/FolderOpen.svelte';
import EllipsisHorizontal from '$lib/components/icons/EllipsisHorizontal.svelte';
export let open = true; export let open = true;
export let folders; export let folders;
export let folderId; export let folderId;
export let className; export let className = '';
let folderElement; let folderElement;
@ -67,6 +68,7 @@
let y; let y;
const onDragStart = (event) => { const onDragStart = (event) => {
event.stopPropagation();
event.dataTransfer.setDragImage(dragImage, 0, 0); event.dataTransfer.setDragImage(dragImage, 0, 0);
// Set the data to be transferred // Set the data to be transferred
@ -83,11 +85,15 @@
}; };
const onDrag = (event) => { const onDrag = (event) => {
event.stopPropagation();
x = event.clientX; x = event.clientX;
y = event.clientY; y = event.clientY;
}; };
const onDragEnd = (event) => { const onDragEnd = (event) => {
event.stopPropagation();
folderElement.style.opacity = '1'; // Reset visual cue after drag folderElement.style.opacity = '1'; // Reset visual cue after drag
dragged = false; dragged = false;
}; };
@ -122,7 +128,7 @@
{#if dragged && x && y} {#if dragged && x && y}
<DragGhost {x} {y}> <DragGhost {x} {y}>
<div class=" bg-black/80 backdrop-blur-2xl px-2 py-1 rounded-lg w-40"> <div class=" bg-black/80 backdrop-blur-2xl px-2 py-1 rounded-lg w-fit max-w-40">
<div class="flex items-center gap-1"> <div class="flex items-center gap-1">
<FolderOpen className="size-3.5" strokeWidth="2" /> <FolderOpen className="size-3.5" strokeWidth="2" />
<div class=" text-xs text-white line-clamp-1"> <div class=" text-xs text-white line-clamp-1">
@ -149,7 +155,7 @@
}} }}
> >
<!-- svelte-ignore a11y-no-static-element-interactions --> <!-- svelte-ignore a11y-no-static-element-interactions -->
<div class="w-full"> <div class="w-full group">
<button <button
class="w-full py-1.5 px-2 rounded-md flex items-center gap-1.5 text-xs text-gray-500 dark:text-gray-500 font-medium hover:bg-gray-100 dark:hover:bg-gray-900 transition" class="w-full py-1.5 px-2 rounded-md flex items-center gap-1.5 text-xs text-gray-500 dark:text-gray-500 font-medium hover:bg-gray-100 dark:hover:bg-gray-900 transition"
on:dblclick={() => { on:dblclick={() => {
@ -194,6 +200,17 @@
{folders[folderId].name} {folders[folderId].name}
{/if} {/if}
</div> </div>
<div class=" hidden group-hover:flex">
<button
on:click={(e) => {
e.stopPropagation();
console.log('clicked');
}}
>
<EllipsisHorizontal className="size-3.5" strokeWidth="2.5" />
</button>
</div>
</button> </button>
</div> </div>
@ -203,8 +220,8 @@
class="ml-3 pl-1 mt-[1px] flex flex-col overflow-y-auto scrollbar-hidden border-s dark:border-gray-850" class="ml-3 pl-1 mt-[1px] flex flex-col overflow-y-auto scrollbar-hidden border-s dark:border-gray-850"
> >
{#if folders[folderId]?.childrenIds} {#if folders[folderId]?.childrenIds}
{#each folders[folderId]?.childrenIds as folderId (folderId)} {#each folders[folderId]?.childrenIds as childId (`${folderId}-${childId}`)}
<svelte:self {folders} {folderId} /> <svelte:self {folders} folderId={childId} />
{/each} {/each}
{/if} {/if}