ti.sil/open-webui
1
0
Fork 0
mirror of https://github.com/open-webui/open-webui.git synced 2025-12-14 05:15:18 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

refac: rename projects -> knowledge

Browse source
This commit is contained in:
Timothy J. Baek 2024-10-01 22:45:04 -07:00
parent 3e012f0219
commit 08969ecf89
24 changed files with 335 additions and 258 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
backend/open_webui/apps/webui/main.py
View file

@ -10,11 +10,11 @@ from open_webui.apps.webui.routers import (
auths, auths,
chats, chats,
configs, configs,
projects,
files, files,
functions, functions,
memories, memories,
models, models,
knowledge,
prompts, prompts,
tools, tools,
users, users,
@ -111,15 +111,15 @@ app.include_router(auths.router, prefix="/auths", tags=["auths"])
app.include_router(users.router, prefix="/users", tags=["users"]) app.include_router(users.router, prefix="/users", tags=["users"])
app.include_router(chats.router, prefix="/chats", tags=["chats"]) app.include_router(chats.router, prefix="/chats", tags=["chats"])
app.include_router(projects.router, prefix="/projects", tags=["projects"])
app.include_router(models.router, prefix="/models", tags=["models"]) app.include_router(models.router, prefix="/models", tags=["models"])
app.include_router(knowledge.router, prefix="/knowledge", tags=["knowledge"])
app.include_router(prompts.router, prefix="/prompts", tags=["prompts"]) app.include_router(prompts.router, prefix="/prompts", tags=["prompts"])
app.include_router(memories.router, prefix="/memories", tags=["memories"])
app.include_router(files.router, prefix="/files", tags=["files"]) app.include_router(files.router, prefix="/files", tags=["files"])
app.include_router(tools.router, prefix="/tools", tags=["tools"]) app.include_router(tools.router, prefix="/tools", tags=["tools"])
app.include_router(functions.router, prefix="/functions", tags=["functions"]) app.include_router(functions.router, prefix="/functions", tags=["functions"])
app.include_router(memories.router, prefix="/memories", tags=["memories"])
app.include_router(utils.router, prefix="/utils", tags=["utils"]) app.include_router(utils.router, prefix="/utils", tags=["utils"])

56
backend/open_webui/apps/webui/models/projects.py → backend/open_webui/apps/webui/models/knowledge.py
View file

@ -14,12 +14,12 @@ log = logging.getLogger(__name__)
log.setLevel(SRC_LOG_LEVELS["MODELS"]) log.setLevel(SRC_LOG_LEVELS["MODELS"])
#################### ####################
# Projects DB Schema # Knowledge DB Schema
#################### ####################
class Project(Base): class Knowledge(Base):
__tablename__ = "project" __tablename__ = "knowledge"
id = Column(Text, unique=True, primary_key=True) id = Column(Text, unique=True, primary_key=True)
user_id = Column(Text) user_id = Column(Text)
@ -34,7 +34,7 @@ class Project(Base):
updated_at = Column(BigInteger) updated_at = Column(BigInteger)
class ProjectModel(BaseModel): class KnowledgeModel(BaseModel):
model_config = ConfigDict(from_attributes=True) model_config = ConfigDict(from_attributes=True)
id: str id: str
@ -55,7 +55,7 @@ class ProjectModel(BaseModel):
#################### ####################
class ProjectResponse(BaseModel): class KnowledgeResponse(BaseModel):
id: str id: str
name: str name: str
description: str description: str
@ -65,18 +65,18 @@ class ProjectResponse(BaseModel):
updated_at: int # timestamp in epoch updated_at: int # timestamp in epoch
class ProjectForm(BaseModel): class KnowledgeForm(BaseModel):
name: str name: str
description: str description: str
data: Optional[dict] = None data: Optional[dict] = None
class ProjectTable: class KnowledgeTable:
def insert_new_project( def insert_new_knowledge(
self, user_id: str, form_data: ProjectForm self, user_id: str, form_data: KnowledgeForm
) -> Optional[ProjectModel]: ) -> Optional[KnowledgeModel]:
with get_db() as db: with get_db() as db:
project = ProjectModel( knowledge = KnowledgeModel(
**{ **{
**form_data.model_dump(), **form_data.model_dump(),
"id": str(uuid.uuid4()), "id": str(uuid.uuid4()),
@ -87,59 +87,59 @@ class ProjectTable:
) )
try: try:
result = Project(**project.model_dump()) result = Knowledge(**knowledge.model_dump())
db.add(result) db.add(result)
db.commit() db.commit()
db.refresh(result) db.refresh(result)
if result: if result:
return ProjectModel.model_validate(result) return KnowledgeModel.model_validate(result)
else: else:
return None return None
except Exception: except Exception:
return None return None
def get_projects(self) -> list[ProjectModel]: def get_knowledge_items(self) -> list[KnowledgeModel]:
with get_db() as db: with get_db() as db:
return [ return [
ProjectModel.model_validate(project) KnowledgeModel.model_validate(knowledge)
for project in db.query(Project) for knowledge in db.query(Knowledge)
.order_by(Project.updated_at.desc()) .order_by(Knowledge.updated_at.desc())
.all() .all()
] ]
def get_project_by_id(self, id: str) -> Optional[ProjectModel]: def get_knowledge_by_id(self, id: str) -> Optional[KnowledgeModel]:
try: try:
with get_db() as db: with get_db() as db:
project = db.query(Project).filter_by(id=id).first() knowledge = db.query(Knowledge).filter_by(id=id).first()
return ProjectModel.model_validate(project) if project else None return KnowledgeModel.model_validate(knowledge) if knowledge else None
except Exception: except Exception:
return None return None
def update_project_by_id( def update_knowledge_by_id(
self, id: str, form_data: ProjectForm self, id: str, form_data: KnowledgeForm
) -> Optional[ProjectModel]: ) -> Optional[KnowledgeModel]:
try: try:
with get_db() as db: with get_db() as db:
db.query(Project).filter_by(id=id).update( db.query(Knowledge).filter_by(id=id).update(
{ {
"name": form_data.name, "name": form_data.name,
"updated_id": int(time.time()), "updated_id": int(time.time()),
} }
) )
db.commit() db.commit()
return self.get_project_by_id(id=form_data.id) return self.get_knowledge_by_id(id=form_data.id)
except Exception as e: except Exception as e:
log.exception(e) log.exception(e)
return None return None
def delete_project_by_id(self, id: str) -> bool: def delete_knowledge_by_id(self, id: str) -> bool:
try: try:
with get_db() as db: with get_db() as db:
db.query(Project).filter_by(id=id).delete() db.query(Knowledge).filter_by(id=id).delete()
db.commit() db.commit()
return True return True
except Exception: except Exception:
return False return False
Projects = ProjectTable() Knowledges = KnowledgeTable()

112
backend/open_webui/apps/webui/routers/knowledge.py Normal file
View file

@ -0,0 +1,112 @@
import json
from typing import Optional, Union
from pydantic import BaseModel
from fastapi import APIRouter, Depends, HTTPException, status
from open_webui.apps.webui.models.knowledge import (
Knowledges,
KnowledgeModel,
KnowledgeForm,
KnowledgeResponse,
)
from open_webui.constants import ERROR_MESSAGES
from open_webui.utils.utils import get_admin_user, get_verified_user
router = APIRouter()
############################
# GetKnowledgeItems
############################
@router.get(
"/", response_model=Optional[Union[list[KnowledgeResponse], KnowledgeResponse]]
)
async def get_knowledge_items(
id: Optional[str] = None, user=Depends(get_verified_user)
):
if id:
knowledge = Knowledges.get_knowledge_by_id(id=id)
if knowledge:
return knowledge
else:
raise HTTPException(
status_code=status.HTTP_401_UNAUTHORIZED,
detail=ERROR_MESSAGES.NOT_FOUND,
)
else:
return [
KnowledgeResponse(**knowledge.model_dump())
for knowledge in Knowledges.get_knowledge_items()
]
############################
# CreateNewKnowledge
############################
@router.post("/create", response_model=Optional[KnowledgeResponse])
async def create_new_knowledge(form_data: KnowledgeForm, user=Depends(get_admin_user)):
knowledge = Knowledges.insert_new_knowledge(user.id, form_data)
if knowledge:
return knowledge
else:
raise HTTPException(
status_code=status.HTTP_400_BAD_REQUEST,
detail=ERROR_MESSAGES.FILE_EXISTS,
)
############################
# GetKnowledgeById
############################
@router.get("/{id}", response_model=Optional[KnowledgeResponse])
async def get_knowledge_by_id(id: str, user=Depends(get_verified_user)):
knowledge = Knowledges.get_knowledge_by_id(id=id)
if knowledge:
return knowledge
else:
raise HTTPException(
status_code=status.HTTP_401_UNAUTHORIZED,
detail=ERROR_MESSAGES.NOT_FOUND,
)
############################
# UpdateKnowledgeById
############################
@router.post("/{id}/update", response_model=Optional[KnowledgeResponse])
async def update_knowledge_by_id(
id: str,
form_data: KnowledgeForm,
user=Depends(get_admin_user),
):
knowledge = Knowledges.update_knowledge_by_id(id=id, form_data=form_data)
if knowledge:
return knowledge
else:
raise HTTPException(
status_code=status.HTTP_400_BAD_REQUEST,
detail=ERROR_MESSAGES.ID_TAKEN,
)
############################
# DeleteKnowledgeById
############################
@router.delete("/{id}/delete", response_model=bool)
async def delete_knowledge_by_id(id: str, user=Depends(get_admin_user)):
result = Knowledges.delete_knowledge_by_id(id=id)
return result

107
backend/open_webui/apps/webui/routers/projects.py
View file

@ -1,107 +0,0 @@
import json
from typing import Optional, Union
from pydantic import BaseModel
from fastapi import APIRouter, Depends, HTTPException, status
from open_webui.apps.webui.models.projects import (
Projects,
ProjectModel,
ProjectForm,
ProjectResponse,
)
from open_webui.constants import ERROR_MESSAGES
from open_webui.utils.utils import get_admin_user, get_verified_user
router = APIRouter()
############################
# GetProjects
############################
@router.get("/", response_model=Optional[Union[list[ProjectResponse], ProjectResponse]])
async def get_projects(id: Optional[str] = None, user=Depends(get_verified_user)):
if id:
project = Projects.get_project_by_id(id=id)
if project:
return project
else:
raise HTTPException(
status_code=status.HTTP_401_UNAUTHORIZED,
detail=ERROR_MESSAGES.NOT_FOUND,
)
else:
return [
ProjectResponse(**project.model_dump())
for project in Projects.get_projects()
]
############################
# CreateNewProject
############################
@router.post("/create", response_model=Optional[ProjectResponse])
async def create_new_project(form_data: ProjectForm, user=Depends(get_admin_user)):
project = Projects.insert_new_project(user.id, form_data)
if project:
return project
else:
raise HTTPException(
status_code=status.HTTP_400_BAD_REQUEST,
detail=ERROR_MESSAGES.FILE_EXISTS,
)
############################
# GetProjectById
############################
@router.get("/{id}", response_model=Optional[ProjectResponse])
async def get_projects(id: str, user=Depends(get_verified_user)):
project = Projects.get_project_by_id(id=id)
if project:
return project
else:
raise HTTPException(
status_code=status.HTTP_401_UNAUTHORIZED,
detail=ERROR_MESSAGES.NOT_FOUND,
)
############################
# UpdateProjectById
############################
@router.post("/{id}/update", response_model=Optional[ProjectResponse])
async def update_project_by_id(
id: str,
form_data: ProjectForm,
user=Depends(get_admin_user),
):
project = Projects.update_project_by_id(form_data)
if project:
return project
else:
raise HTTPException(
status_code=status.HTTP_400_BAD_REQUEST,
detail=ERROR_MESSAGES.ID_TAKEN,
)
############################
# DeleteProjectById
############################
@router.delete("/{id}/delete", response_model=bool)
async def delete_project_by_id(id: str, user=Depends(get_admin_user)):
result = Projects.delete_project_by_id(id=id)
return result

18
backend/open_webui/migrations/versions/6a39f3d8e55c_add_project_table.py → backend/open_webui/migrations/versions/6a39f3d8e55c_add_knowledge_table.py
View file

@ -1,4 +1,4 @@
"""Add project table """Add knowledge table
Revision ID: 6a39f3d8e55c Revision ID: 6a39f3d8e55c
Revises: c0fbf31ca0db Revises: c0fbf31ca0db
@ -19,10 +19,10 @@ depends_on = None
def upgrade(): def upgrade():
# Creating the 'project' table # Creating the 'knowledge' table
print("Creating project table") print("Creating knowledge table")
project_table = op.create_table( knowledge_table = op.create_table(
"project", "knowledge",
sa.Column("id", sa.Text(), primary_key=True), sa.Column("id", sa.Text(), primary_key=True),
sa.Column("user_id", sa.Text(), nullable=False), sa.Column("user_id", sa.Text(), nullable=False),
sa.Column("name", sa.Text(), nullable=False), sa.Column("name", sa.Text(), nullable=False),
@ -33,7 +33,7 @@ def upgrade():
sa.Column("updated_at", sa.BigInteger(), nullable=True), sa.Column("updated_at", sa.BigInteger(), nullable=True),
) )
print("Migrating data from document table to project table") print("Migrating data from document table to knowledge table")
# Representation of the existing 'document' table # Representation of the existing 'document' table
document_table = table( document_table = table(
"document", "document",
@ -57,10 +57,10 @@ def upgrade():
) )
) )
# Insert data into project table from document table # Insert data into knowledge table from document table
for doc in documents: for doc in documents:
op.get_bind().execute( op.get_bind().execute(
project_table.insert().values( knowledge_table.insert().values(
id=doc.collection_name, id=doc.collection_name,
user_id=doc.user_id, user_id=doc.user_id,
description=doc.name, description=doc.name,
@ -76,4 +76,4 @@ def upgrade():
def downgrade(): def downgrade():
op.drop_table("project") op.drop_table("knowledge")

28
src/lib/apis/projects/index.ts → src/lib/apis/knowledge/index.ts
View file

@ -1,9 +1,9 @@
import { WEBUI_API_BASE_URL } from '$lib/constants'; import { WEBUI_API_BASE_URL } from '$lib/constants';
export const createNewProject = async (token: string, name: string, description: string) => { export const createNewKnowledge = async (token: string, name: string, description: string) => {
let error = null; let error = null;
const res = await fetch(`${WEBUI_API_BASE_URL}/projects/create`, { const res = await fetch(`${WEBUI_API_BASE_URL}/knowledge/create`, {
method: 'POST', method: 'POST',
headers: { headers: {
Accept: 'application/json', Accept: 'application/json',
@ -32,10 +32,10 @@ export const createNewProject = async (token: string, name: string, description:
return res; return res;
}; };
export const getProjects = async (token: string = '') => { export const getKnowledgeItems = async (token: string = '') => {
let error = null; let error = null;
const res = await fetch(`${WEBUI_API_BASE_URL}/projects/`, { const res = await fetch(`${WEBUI_API_BASE_URL}/knowledge/`, {
method: 'GET', method: 'GET',
headers: { headers: {
Accept: 'application/json', Accept: 'application/json',
@ -63,10 +63,10 @@ export const getProjects = async (token: string = '') => {
return res; return res;
}; };
export const getProjectById = async (token: string, id: string) => { export const getKnowledgeById = async (token: string, id: string) => {
let error = null; let error = null;
const res = await fetch(`${WEBUI_API_BASE_URL}/projects/${id}`, { const res = await fetch(`${WEBUI_API_BASE_URL}/knowledge/${id}`, {
method: 'GET', method: 'GET',
headers: { headers: {
Accept: 'application/json', Accept: 'application/json',
@ -95,14 +95,16 @@ export const getProjectById = async (token: string, id: string) => {
return res; return res;
}; };
type ProjectForm = { type KnowledgeForm = {
name: string; name: string;
description: string;
data: object;
}; };
export const updateProjectById = async (token: string, id: string, form: ProjectForm) => { export const updateKnowledgeById = async (token: string, id: string, form: KnowledgeForm) => {
let error = null; let error = null;
const res = await fetch(`${WEBUI_API_BASE_URL}/projects/${id}/update`, { const res = await fetch(`${WEBUI_API_BASE_URL}/knowledge/${id}/update`, {
method: 'POST', method: 'POST',
headers: { headers: {
Accept: 'application/json', Accept: 'application/json',
@ -110,7 +112,9 @@ export const updateProjectById = async (token: string, id: string, form: Project
authorization: `Bearer ${token}` authorization: `Bearer ${token}`
}, },
body: JSON.stringify({ body: JSON.stringify({
name: form.name name: form.name,
description: form.description,
data: form.data
}) })
}) })
.then(async (res) => { .then(async (res) => {
@ -134,10 +138,10 @@ export const updateProjectById = async (token: string, id: string, form: Project
return res; return res;
}; };
export const deleteProjectById = async (token: string, id: string) => { export const deleteKnowledgeById = async (token: string, id: string) => {
let error = null; let error = null;
const res = await fetch(`${WEBUI_API_BASE_URL}/projects/${id}/delete`, { const res = await fetch(`${WEBUI_API_BASE_URL}/knowledge/${id}/delete`, {
method: 'DELETE', method: 'DELETE',
headers: { headers: {
Accept: 'application/json', Accept: 'application/json',

6
src/lib/components/admin/Settings/Documents.svelte
View file

@ -19,8 +19,8 @@
updateRAGConfig updateRAGConfig
} from '$lib/apis/retrieval'; } from '$lib/apis/retrieval';
import { projects, models } from '$lib/stores'; import { knowledge, models } from '$lib/stores';
import { getProjects } from '$lib/apis/projects'; import { getKnowledgeItems } from '$lib/apis/knowledge';
import { deleteAllFiles, deleteFileById } from '$lib/apis/files'; import { deleteAllFiles, deleteFileById } from '$lib/apis/files';
import ResetUploadDirConfirmDialog from '$lib/components/common/ConfirmDialog.svelte'; import ResetUploadDirConfirmDialog from '$lib/components/common/ConfirmDialog.svelte';
@ -69,7 +69,7 @@
scanDirLoading = false; scanDirLoading = false;
if (res) { if (res) {
await projects.set(await getProjects(localStorage.token)); await knowledge.set(await getKnowledgeItems(localStorage.token));
toast.success($i18n.t('Scan complete!')); toast.success($i18n.t('Scan complete!'));
} }
}; };

6
src/lib/components/chat/MessageInput/Commands.svelte
View file

@ -5,7 +5,7 @@
const dispatch = createEventDispatcher(); const dispatch = createEventDispatcher();
import Prompts from './Commands/Prompts.svelte'; import Prompts from './Commands/Prompts.svelte';
import Projects from './Commands/Projects.svelte'; import Knowledge from './Commands/Knowledge.svelte';
import Models from './Commands/Models.svelte'; import Models from './Commands/Models.svelte';
import { removeLastWordFromString } from '$lib/utils'; import { removeLastWordFromString } from '$lib/utils';
@ -97,7 +97,7 @@
{#if command?.charAt(0) === '/'} {#if command?.charAt(0) === '/'}
<Prompts bind:this={commandElement} bind:prompt bind:files {command} /> <Prompts bind:this={commandElement} bind:prompt bind:files {command} />
{:else if command?.charAt(0) === '#'} {:else if command?.charAt(0) === '#'}
<Projects <Knowledge
bind:this={commandElement} bind:this={commandElement}
bind:prompt bind:prompt
{command} {command}
@ -114,7 +114,7 @@
files = [ files = [
...files, ...files,
{ {
type: e?.detail?.meta?.document ? 'file' : 'project', type: e?.detail?.meta?.document ? 'file' : 'collection',
...e.detail, ...e.detail,
status: 'processed' status: 'processed'
} }

28
src/lib/components/chat/MessageInput/Commands/Projects.svelte → src/lib/components/chat/MessageInput/Commands/Knowledge.svelte
View file

@ -4,7 +4,7 @@
import { createEventDispatcher, tick, getContext, onMount } from 'svelte'; import { createEventDispatcher, tick, getContext, onMount } from 'svelte';
import { removeLastWordFromString, isValidHttpUrl } from '$lib/utils'; import { removeLastWordFromString, isValidHttpUrl } from '$lib/utils';
import { projects } from '$lib/stores'; import { knowledge } from '$lib/stores';
const i18n = getContext('i18n'); const i18n = getContext('i18n');
@ -16,13 +16,13 @@
let fuse = null; let fuse = null;
let filteredProjects = []; let filteredItems = [];
$: if (fuse) { $: if (fuse) {
filteredProjects = command.slice(1) filteredItems = command.slice(1)
? fuse.search(command).map((e) => { ? fuse.search(command).map((e) => {
return e.item; return e.item;
}) })
: $projects; : $knowledge;
} }
$: if (command) { $: if (command) {
@ -34,7 +34,7 @@
}; };
export const selectDown = () => { export const selectDown = () => {
selectedIdx = Math.min(selectedIdx + 1, filteredProjects.length - 1); selectedIdx = Math.min(selectedIdx + 1, filteredItems.length - 1);
}; };
const confirmSelect = async (item) => { const confirmSelect = async (item) => {
@ -71,13 +71,13 @@
}; };
onMount(() => { onMount(() => {
fuse = new Fuse($projects, { fuse = new Fuse($knowledge, {
keys: ['name', 'description'] keys: ['name', 'description']
}); });
}); });
</script> </script>
{#if filteredProjects.length > 0 || prompt.split(' ')?.at(0)?.substring(1).startsWith('http')} {#if filteredItems.length > 0 || prompt.split(' ')?.at(0)?.substring(1).startsWith('http')}
<div <div
id="commands-container" id="commands-container"
class="pl-1 pr-12 mb-3 text-left w-full absolute bottom-0 left-0 right-0 z-10" class="pl-1 pr-12 mb-3 text-left w-full absolute bottom-0 left-0 right-0 z-10"
@ -91,15 +91,15 @@
class="max-h-60 flex flex-col w-full rounded-r-xl bg-white dark:bg-gray-900 dark:text-gray-100" class="max-h-60 flex flex-col w-full rounded-r-xl bg-white dark:bg-gray-900 dark:text-gray-100"
> >
<div class="m-1 overflow-y-auto p-1 rounded-r-xl space-y-0.5 scrollbar-hidden"> <div class="m-1 overflow-y-auto p-1 rounded-r-xl space-y-0.5 scrollbar-hidden">
{#each filteredProjects as project, idx} {#each filteredItems as item, idx}
<button <button
class=" px-3 py-1.5 rounded-xl w-full text-left {idx === selectedIdx class=" px-3 py-1.5 rounded-xl w-full text-left {idx === selectedIdx
? ' bg-gray-50 dark:bg-gray-850 dark:text-gray-100 selected-command-option-button' ? ' bg-gray-50 dark:bg-gray-850 dark:text-gray-100 selected-command-option-button'
: ''}" : ''}"
type="button" type="button"
on:click={() => { on:click={() => {
console.log(project); console.log(item);
confirmSelect(project); confirmSelect(item);
}} }}
on:mousemove={() => { on:mousemove={() => {
selectedIdx = idx; selectedIdx = idx;
@ -108,10 +108,10 @@
> >
<div class=" font-medium text-black dark:text-gray-100 flex items-center gap-1"> <div class=" font-medium text-black dark:text-gray-100 flex items-center gap-1">
<div class="line-clamp-1"> <div class="line-clamp-1">
{project.name} {item.name}
</div> </div>
{#if project?.meta?.document} {#if item?.meta?.document}
<div <div
class="bg-gray-500/20 text-gray-700 dark:text-gray-200 rounded uppercase text-xs px-1" class="bg-gray-500/20 text-gray-700 dark:text-gray-200 rounded uppercase text-xs px-1"
> >
@ -121,13 +121,13 @@
<div <div
class="bg-green-500/20 text-green-700 dark:text-green-200 rounded uppercase text-xs px-1" class="bg-green-500/20 text-green-700 dark:text-green-200 rounded uppercase text-xs px-1"
> >
Project Collection
</div> </div>
{/if} {/if}
</div> </div>
<div class=" text-xs text-gray-600 dark:text-gray-100 line-clamp-1"> <div class=" text-xs text-gray-600 dark:text-gray-100 line-clamp-1">
{project.description} {item.description}
</div> </div>
</button> </button>
{/each} {/each}

60
src/lib/components/workspace/Projects.svelte → src/lib/components/workspace/Knowledge.svelte
View file

@ -7,9 +7,9 @@
import { onMount, getContext } from 'svelte'; import { onMount, getContext } from 'svelte';
const i18n = getContext('i18n'); const i18n = getContext('i18n');
import { WEBUI_NAME, projects } from '$lib/stores'; import { WEBUI_NAME, knowledge } from '$lib/stores';
import { getProjects, deleteProjectById } from '$lib/apis/projects'; import { getKnowledgeItems, deleteKnowledgeById } from '$lib/apis/knowledge';
import { blobToFile, transformFileName } from '$lib/utils'; import { blobToFile, transformFileName } from '$lib/utils';
@ -18,50 +18,50 @@
import GarbageBin from '../icons/GarbageBin.svelte'; import GarbageBin from '../icons/GarbageBin.svelte';
import Pencil from '../icons/Pencil.svelte'; import Pencil from '../icons/Pencil.svelte';
import DeleteConfirmDialog from '../common/ConfirmDialog.svelte'; import DeleteConfirmDialog from '../common/ConfirmDialog.svelte';
import ProjectMenu from './Projects/ProjectMenu.svelte'; import ItemMenu from './Knowledge/ItemMenu.svelte';
let query = ''; let query = '';
let selectedProject = null; let selectedItem = null;
let showDeleteConfirm = false; let showDeleteConfirm = false;
let filteredProjects; let filteredItems;
$: filteredProjects = $projects.filter((project) => query === '' || project.name.includes(query)); $: filteredItems = $knowledge.filter((item) => query === '' || item.name.includes(query));
const deleteHandler = async (project) => { const deleteHandler = async (item) => {
const res = await deleteProjectById(localStorage.token, project.id).catch((e) => { const res = await deleteKnowledgeById(localStorage.token, item.id).catch((e) => {
toast.error(e); toast.error(e);
}); });
if (res) { if (res) {
projects.set(await getProjects(localStorage.token)); knowledge.set(await getKnowledgeItems(localStorage.token));
toast.success($i18n.t('Project deleted successfully.')); toast.success($i18n.t('Knowledge deleted successfully.'));
} }
}; };
onMount(async () => { onMount(async () => {
projects.set(await getProjects(localStorage.token)); knowledge.set(await getKnowledgeItems(localStorage.token));
}); });
</script> </script>
<svelte:head> <svelte:head>
<title> <title>
{$i18n.t('Projects')} | {$WEBUI_NAME} {$i18n.t('Knowledge')} | {$WEBUI_NAME}
</title> </title>
</svelte:head> </svelte:head>
<DeleteConfirmDialog <DeleteConfirmDialog
bind:show={showDeleteConfirm} bind:show={showDeleteConfirm}
on:confirm={() => { on:confirm={() => {
deleteHandler(selectedProject); deleteHandler(selectedItem);
}} }}
/> />
<div class="mb-3"> <div class="mb-3">
<div class="flex justify-between items-center"> <div class="flex justify-between items-center">
<div class="flex md:self-center text-lg font-medium px-0.5"> <div class="flex md:self-center text-lg font-medium px-0.5">
{$i18n.t('Projects')} {$i18n.t('Knowledge')}
<div class="flex self-center w-[1px] h-6 mx-2.5 bg-gray-200 dark:bg-gray-700" /> <div class="flex self-center w-[1px] h-6 mx-2.5 bg-gray-200 dark:bg-gray-700" />
<span class="text-lg font-medium text-gray-500 dark:text-gray-300">{$projects.length}</span> <span class="text-lg font-medium text-gray-500 dark:text-gray-300">{$knowledge.length}</span>
</div> </div>
</div> </div>
</div> </div>
@ -85,16 +85,16 @@
<input <input
class=" w-full text-sm pr-4 py-1 rounded-r-xl outline-none bg-transparent" class=" w-full text-sm pr-4 py-1 rounded-r-xl outline-none bg-transparent"
bind:value={query} bind:value={query}
placeholder={$i18n.t('Search Projects')} placeholder={$i18n.t('Search Knowledge')}
/> />
</div> </div>
<div> <div>
<button <button
class=" px-2 py-2 rounded-xl border border-gray-200 dark:border-gray-600 dark:border-0 hover:bg-gray-100 dark:bg-gray-800 dark:hover:bg-gray-700 transition font-medium text-sm flex items-center space-x-1" class=" px-2 py-2 rounded-xl border border-gray-200 dark:border-gray-600 dark:border-0 hover:bg-gray-100 dark:bg-gray-800 dark:hover:bg-gray-700 transition font-medium text-sm flex items-center space-x-1"
aria-label={$i18n.t('Create Project')} aria-label={$i18n.t('Create Knowledge')}
on:click={() => { on:click={() => {
goto('/workspace/projects/create'); goto('/workspace/knowledge/create');
}} }}
> >
<svg <svg
@ -114,25 +114,25 @@
<hr class=" border-gray-50 dark:border-gray-850 my-2.5" /> <hr class=" border-gray-50 dark:border-gray-850 my-2.5" />
<div class="my-3 mb-5 grid lg:grid-cols-2 xl:grid-cols-3 gap-2"> <div class="my-3 mb-5 grid lg:grid-cols-2 xl:grid-cols-3 gap-2">
{#each filteredProjects as project} {#each filteredItems as item}
<button <button
class=" flex space-x-4 cursor-pointer text-left w-full px-4 py-3 border border-gray-50 dark:border-gray-850 hover:bg-gray-50 dark:hover:bg-gray-850 rounded-xl" class=" flex space-x-4 cursor-pointer text-left w-full px-4 py-3 border border-gray-50 dark:border-gray-850 hover:bg-gray-50 dark:hover:bg-gray-850 rounded-xl"
on:click={() => { on:click={() => {
if (project?.meta?.document) { if (item?.meta?.document) {
toast.error($i18n.t('Documents cannot be edited, please create a new project.')); toast.error($i18n.t('Only collections can be edited, create a new knowledge instead.'));
} else { } else {
goto(`/workspace/projects/${project.id}`); goto(`/workspace/knowledge/${item.id}`);
} }
}} }}
> >
<div class=" w-full"> <div class=" w-full">
<div class="flex items-center justify-between -mt-1"> <div class="flex items-center justify-between -mt-1">
<div class=" font-semibold line-clamp-1 h-fit">{project.name}</div> <div class=" font-semibold line-clamp-1 h-fit">{item.name}</div>
<div class=" flex self-center"> <div class=" flex self-center">
<ProjectMenu <ItemMenu
on:delete={() => { on:delete={() => {
selectedProject = project; selectedItem = item;
showDeleteConfirm = true; showDeleteConfirm = true;
}} }}
/> />
@ -141,12 +141,12 @@
<div class=" self-center flex-1"> <div class=" self-center flex-1">
<div class=" text-xs overflow-hidden text-ellipsis line-clamp-1"> <div class=" text-xs overflow-hidden text-ellipsis line-clamp-1">
{project.description} {item.description}
</div> </div>
<div class="mt-5 flex justify-between"> <div class="mt-5 flex justify-between">
<div> <div>
{#if project?.meta?.document} {#if item?.meta?.document}
<div <div
class="bg-gray-500/20 text-gray-700 dark:text-gray-200 rounded uppercase text-xs font-bold px-1" class="bg-gray-500/20 text-gray-700 dark:text-gray-200 rounded uppercase text-xs font-bold px-1"
> >
@ -156,12 +156,12 @@
<div <div
class="bg-green-500/20 text-green-700 dark:text-green-200 rounded uppercase text-xs font-bold px-1" class="bg-green-500/20 text-green-700 dark:text-green-200 rounded uppercase text-xs font-bold px-1"
> >
{$i18n.t('Project')} {$i18n.t('Collection')}
</div> </div>
{/if} {/if}
</div> </div>
<div class=" text-xs text-gray-500"> <div class=" text-xs text-gray-500">
Updated {dayjs(project.updated_at * 1000).fromNow()} Updated {dayjs(item.updated_at * 1000).fromNow()}
</div> </div>
</div> </div>
</div> </div>
@ -171,5 +171,5 @@
</div> </div>
<div class=" text-gray-500 text-xs mt-1 mb-2"> <div class=" text-gray-500 text-xs mt-1 mb-2">
ⓘ {$i18n.t("Use '#' in the prompt input to load and select your projects.")} ⓘ {$i18n.t("Use '#' in the prompt input to load and include your knowledge.")}
</div> </div>

22
src/lib/components/workspace/Projects/CreateProject.svelte → src/lib/components/workspace/Knowledge/CreateKnowledge.svelte
View file

@ -3,9 +3,9 @@
import { getContext } from 'svelte'; import { getContext } from 'svelte';
const i18n = getContext('i18n'); const i18n = getContext('i18n');
import { createNewProject, getProjects } from '$lib/apis/projects'; import { createNewKnowledge, getKnowledgeItems } from '$lib/apis/knowledge';
import { toast } from 'svelte-sonner'; import { toast } from 'svelte-sonner';
import { projects } from '$lib/stores'; import { knowledge } from '$lib/stores';
let loading = false; let loading = false;
@ -15,14 +15,14 @@
const submitHandler = async () => { const submitHandler = async () => {
loading = true; loading = true;
const res = await createNewProject(localStorage.token, name, description).catch((e) => { const res = await createNewKnowledge(localStorage.token, name, description).catch((e) => {
toast.error(e); toast.error(e);
}); });
if (res) { if (res) {
toast.success($i18n.t('Project created successfully.')); toast.success($i18n.t('Knowledge created successfully.'));
projects.set(await getProjects(localStorage.token)); knowledge.set(await getKnowledgeItems(localStorage.token));
goto(`/workspace/projects/${res.id}`); goto(`/workspace/knowledge/${res.id}`);
} }
loading = false; loading = false;
@ -33,7 +33,7 @@
<button <button
class="flex space-x-1" class="flex space-x-1"
on:click={() => { on:click={() => {
goto('/workspace/projects'); goto('/workspace/knowledge');
}} }}
> >
<div class=" self-center"> <div class=" self-center">
@ -60,7 +60,7 @@
}} }}
> >
<div class=" w-full flex flex-col justify-center"> <div class=" w-full flex flex-col justify-center">
<div class=" text-2xl font-medium font-primary mb-2.5">Create a project</div> <div class=" text-2xl font-medium font-primary mb-2.5">Create a knowledge base</div>
<div class="w-full flex flex-col gap-2.5"> <div class="w-full flex flex-col gap-2.5">
<div class="w-full"> <div class="w-full">
@ -71,7 +71,7 @@
class="w-full rounded-lg py-2 px-4 text-sm bg-gray-50 dark:text-gray-300 dark:bg-gray-850 outline-none" class="w-full rounded-lg py-2 px-4 text-sm bg-gray-50 dark:text-gray-300 dark:bg-gray-850 outline-none"
type="text" type="text"
bind:value={name} bind:value={name}
placeholder={`Name your project`} placeholder={`Name your knowledge base`}
required required
/> />
</div> </div>
@ -85,7 +85,7 @@
class="w-full resize-none rounded-lg py-2 px-4 text-sm bg-gray-50 dark:text-gray-300 dark:bg-gray-850 outline-none" class="w-full resize-none rounded-lg py-2 px-4 text-sm bg-gray-50 dark:text-gray-300 dark:bg-gray-850 outline-none"
rows="4" rows="4"
bind:value={description} bind:value={description}
placeholder={`Describe your project, its goals, and objectives`} placeholder={`Describe your knowledge base and objectives`}
required required
/> />
</div> </div>
@ -102,7 +102,7 @@
type="submit" type="submit"
disabled={loading} disabled={loading}
> >
<div class=" self-center font-medium">{$i18n.t('Create Project')}</div> <div class=" self-center font-medium">{$i18n.t('Create Knowledge')}</div>
{#if loading} {#if loading}
<div class="ml-1.5 self-center"> <div class="ml-1.5 self-center">

68
src/lib/components/workspace/Knowledge/Item.svelte Normal file
View file

@ -0,0 +1,68 @@
<script lang="ts">
import { onMount, getContext } from 'svelte';
const i18n = getContext('i18n');
import { goto } from '$app/navigation';
import { page } from '$app/stores';
import { getKnowledgeById } from '$lib/apis/knowledge';
import Spinner from '$lib/components/common/Spinner.svelte';
let id = null;
let knowledge = null;
onMount(async () => {
id = $page.params.id;
const res = await getKnowledgeById(localStorage.token, id).catch((e) => {
console.error(e);
});
if (res) {
knowledge = res;
} else {
goto('/workspace/knowledge');
}
});
</script>
<div class="w-full max-h-full">
<button
class="flex space-x-1"
on:click={() => {
goto('/workspace/knowledge');
}}
>
<div class=" self-center">
<svg
xmlns="http://www.w3.org/2000/svg"
viewBox="0 0 20 20"
fill="currentColor"
class="w-4 h-4"
>
<path
fill-rule="evenodd"
d="M17 10a.75.75 0 01-.75.75H5.612l4.158 3.96a.75.75 0 11-1.04 1.08l-5.5-5.25a.75.75 0 010-1.08l5.5-5.25a.75.75 0 111.04 1.08L5.612 9.25H16.25A.75.75 0 0117 10z"
clip-rule="evenodd"
/>
</svg>
</div>
<div class=" self-center font-medium text-sm">{$i18n.t('Back')}</div>
</button>
<div class="flex flex-col my-2">
{#if id && knowledge}
<div>
<div>
<div class=" font-medium text-xl font-primary">
{knowledge.name}
</div>
<div class=" line-clamp-2 font-medium text-sm">
{knowledge.description}
</div>
</div>
</div>
{:else}
<Spinner />
{/if}
</div>
</div>

0
src/lib/components/workspace/Projects/ProjectMenu.svelte → src/lib/components/workspace/Knowledge/ItemMenu.svelte
View file

16
src/lib/components/workspace/Models/Knowledge/Selector.svelte
View file

@ -3,33 +3,33 @@
import { onMount, getContext } from 'svelte'; import { onMount, getContext } from 'svelte';
import { flyAndScale } from '$lib/utils/transitions'; import { flyAndScale } from '$lib/utils/transitions';
import { projects } from '$lib/stores'; import { knowledge } from '$lib/stores';
import Dropdown from '$lib/components/common/Dropdown.svelte'; import Dropdown from '$lib/components/common/Dropdown.svelte';
const i18n = getContext('i18n'); const i18n = getContext('i18n');
export let onClose: Function = () => {}; export let onClose: Function = () => {};
export let knowledge = []; export let _knowledge = [];
let items = []; let items = [];
onMount(() => { onMount(() => {
let collections = [ let collections = [
...$projects ...$knowledge
.reduce((a, e, i, arr) => { .reduce((a, e, i, arr) => {
return [...new Set([...a, ...(e?.content?.tags ?? []).map((tag) => tag.name)])]; return [...new Set([...a, ...(e?.content?.tags ?? []).map((tag) => tag.name)])];
}, []) }, [])
.map((tag) => ({ .map((tag) => ({
name: tag, name: tag,
type: 'collection', type: 'collection',
collection_names: $projects collection_names: $knowledge
.filter((doc) => (doc?.content?.tags ?? []).map((tag) => tag.name).includes(tag)) .filter((doc) => (doc?.content?.tags ?? []).map((tag) => tag.name).includes(tag))
.map((doc) => doc.collection_name) .map((doc) => doc.collection_name)
})) }))
]; ];
items = [...collections, ...$projects]; items = [...collections, ...$knowledge];
}); });
</script> </script>
@ -60,9 +60,9 @@
<DropdownMenu.Item <DropdownMenu.Item
class="flex gap-2.5 items-center px-3 py-2 text-sm cursor-pointer hover:bg-gray-50 dark:hover:bg-gray-800 rounded-md" class="flex gap-2.5 items-center px-3 py-2 text-sm cursor-pointer hover:bg-gray-50 dark:hover:bg-gray-800 rounded-md"
on:click={() => { on:click={() => {
if (!knowledge.find((k) => k.name === item.name)) { if (!_knowledge.find((k) => k.name === item.name)) {
knowledge = [ _knowledge = [
...knowledge, ..._knowledge,
{ {
...item, ...item,
type: item?.type ?? 'doc' type: item?.type ?? 'doc'

0
src/lib/components/workspace/Projects/Project.svelte
View file

2
src/lib/stores/index.ts
View file

@ -29,7 +29,7 @@ export const tags = writable([]);
export const models: Writable<Model[]> = writable([]); export const models: Writable<Model[]> = writable([]);
export const prompts: Writable<Prompt[]> = writable([]); export const prompts: Writable<Prompt[]> = writable([]);
export const projects: Writable<Document[]> = writable([]); export const knowledge: Writable<Document[]> = writable([]);
export const tools = writable([]); export const tools = writable([]);
export const functions = writable([]); export const functions = writable([]);

6
src/routes/(app)/+layout.svelte
View file

@ -10,7 +10,7 @@
import { page } from '$app/stores'; import { page } from '$app/stores';
import { fade } from 'svelte/transition'; import { fade } from 'svelte/transition';
import { getProjects } from '$lib/apis/projects'; import { getKnowledgeItems } from '$lib/apis/knowledge';
import { getFunctions } from '$lib/apis/functions'; import { getFunctions } from '$lib/apis/functions';
import { getModels as _getModels, getVersionUpdates } from '$lib/apis'; import { getModels as _getModels, getVersionUpdates } from '$lib/apis';
import { getAllChatTags } from '$lib/apis/chats'; import { getAllChatTags } from '$lib/apis/chats';
@ -28,7 +28,7 @@
settings, settings,
models, models,
prompts, prompts,
projects, knowledge,
tools, tools,
functions, functions,
tags, tags,
@ -105,7 +105,7 @@
prompts.set(await getPrompts(localStorage.token)); prompts.set(await getPrompts(localStorage.token));
})(), })(),
(async () => { (async () => {
projects.set(await getProjects(localStorage.token)); knowledge.set(await getKnowledgeItems(localStorage.token));
})(), })(),
(async () => { (async () => {
tools.set(await getTools(localStorage.token)); tools.set(await getTools(localStorage.token));

20
src/routes/(app)/workspace/+layout.svelte
View file

@ -61,6 +61,17 @@
href="/workspace/models">{$i18n.t('Models')}</a href="/workspace/models">{$i18n.t('Models')}</a
> >
<a
class="min-w-fit rounded-lg p-1.5 px-3 {$page.url.pathname.includes(
'/workspace/knowledge'
)
? 'bg-gray-50 dark:bg-gray-850'
: ''} transition"
href="/workspace/knowledge"
>
{$i18n.t('Knowledge')}
</a>
<a <a
class="min-w-fit rounded-lg p-1.5 px-3 {$page.url.pathname.includes('/workspace/prompts') class="min-w-fit rounded-lg p-1.5 px-3 {$page.url.pathname.includes('/workspace/prompts')
? 'bg-gray-50 dark:bg-gray-850' ? 'bg-gray-50 dark:bg-gray-850'
@ -68,15 +79,6 @@
href="/workspace/prompts">{$i18n.t('Prompts')}</a href="/workspace/prompts">{$i18n.t('Prompts')}</a
> >
<a
class="min-w-fit rounded-lg p-1.5 px-3 {$page.url.pathname.includes('/workspace/projects')
? 'bg-gray-50 dark:bg-gray-850'
: ''} transition"
href="/workspace/projects"
>
{$i18n.t('Projects')}
</a>
<a <a
class="min-w-fit rounded-lg p-1.5 px-3 {$page.url.pathname.includes('/workspace/tools') class="min-w-fit rounded-lg p-1.5 px-3 {$page.url.pathname.includes('/workspace/tools')
? 'bg-gray-50 dark:bg-gray-850' ? 'bg-gray-50 dark:bg-gray-850'

5
src/routes/(app)/workspace/knowledge/+page.svelte Normal file
View file

@ -0,0 +1,5 @@
<script>
import Knowledge from '$lib/components/workspace/Knowledge.svelte';
</script>
<Knowledge />

5
src/routes/(app)/workspace/knowledge/[id]/+page.svelte Normal file
View file

@ -0,0 +1,5 @@
<script>
import Knowledge from '$lib/components/workspace/Knowledge/Item.svelte';
</script>
<Knowledge />

5
src/routes/(app)/workspace/knowledge/create/+page.svelte Normal file
View file

@ -0,0 +1,5 @@
<script>
import CreateKnowledge from '$lib/components/workspace/Knowledge/CreateKnowledge.svelte';
</script>
<CreateKnowledge />

5
src/routes/(app)/workspace/projects/+page.svelte
View file

@ -1,5 +0,0 @@
<script>
import Projects from '$lib/components/workspace/Projects.svelte';
</script>
<Projects />

7
src/routes/(app)/workspace/projects/[id]/+page.svelte
View file

@ -1,7 +0,0 @@
<script>
import { page } from '$app/stores';
import Project from '$lib/components/workspace/Projects/Project.svelte';
</script>
<Project />

5
src/routes/(app)/workspace/projects/create/+page.svelte
View file

@ -1,5 +0,0 @@
<script>
import CreateProject from '$lib/components/workspace/Projects/CreateProject.svelte';
</script>
<CreateProject />