diff --git a/backend/apps/web/main.py b/backend/apps/web/main.py index 2cda11eb5..9704cde77 100644 --- a/backend/apps/web/main.py +++ b/backend/apps/web/main.py @@ -40,6 +40,9 @@ app.state.config.DEFAULT_PROMPT_SUGGESTIONS = DEFAULT_PROMPT_SUGGESTIONS app.state.config.DEFAULT_USER_ROLE = DEFAULT_USER_ROLE app.state.config.USER_PERMISSIONS = USER_PERMISSIONS app.state.config.WEBHOOK_URL = WEBHOOK_URL + + +app.state.MODELS = {} app.state.AUTH_TRUSTED_EMAIL_HEADER = WEBUI_AUTH_TRUSTED_EMAIL_HEADER diff --git a/backend/apps/web/models/models.py b/backend/apps/web/models/models.py index 94e349cbf..a50c9b5d2 100644 --- a/backend/apps/web/models/models.py +++ b/backend/apps/web/models/models.py @@ -33,6 +33,8 @@ class ModelParams(BaseModel): # ModelMeta is a model for the data stored in the meta field of the Model table # It isn't currently used in the backend, but it's here as a reference class ModelMeta(BaseModel): + profile_image_url: Optional[str] = "/favicon.png" + description: Optional[str] = None """ User-facing description of the model. @@ -84,6 +86,7 @@ class Model(pw.Model): class ModelModel(BaseModel): id: str + user_id: str base_model_id: Optional[str] = None name: str @@ -123,18 +126,26 @@ class ModelsTable: self.db = db self.db.create_tables([Model]) - def insert_new_model(self, model: ModelForm, user_id: str) -> Optional[ModelModel]: + def insert_new_model( + self, form_data: ModelForm, user_id: str + ) -> Optional[ModelModel]: + model = ModelModel( + **{ + **form_data.model_dump(), + "user_id": user_id, + "created_at": int(time.time()), + "updated_at": int(time.time()), + } + ) try: - model = Model.create( - **{ - **model.model_dump(), - "user_id": user_id, - "created_at": int(time.time()), - "updated_at": int(time.time()), - } - ) - return ModelModel(**model_to_dict(model)) - except: + result = Model.create(**model.model_dump()) + + if result: + return model + else: + return None + except Exception as e: + print(e) return None def get_all_models(self) -> List[ModelModel]: diff --git a/backend/apps/web/routers/models.py b/backend/apps/web/routers/models.py index 8b9b380b4..132f296ac 100644 --- a/backend/apps/web/routers/models.py +++ b/backend/apps/web/routers/models.py @@ -1,4 +1,4 @@ -from fastapi import Depends, FastAPI, HTTPException, status +from fastapi import Depends, FastAPI, HTTPException, status, Request from datetime import datetime, timedelta from typing import List, Union, Optional @@ -65,17 +65,28 @@ async def get_model_by_id(id: str, user=Depends(get_verified_user)): @router.post("/{id}/update", response_model=Optional[ModelModel]) async def update_model_by_id( - id: str, form_data: ModelForm, user=Depends(get_admin_user) + request: Request, id: str, form_data: ModelForm, user=Depends(get_admin_user) ): model = Models.get_model_by_id(id) if model: model = Models.update_model_by_id(id, form_data) return model else: - raise HTTPException( - status_code=status.HTTP_401_UNAUTHORIZED, - detail=ERROR_MESSAGES.ACCESS_PROHIBITED, - ) + if form_data.id in request.app.state.MODELS: + model = Models.insert_new_model(form_data, user.id) + print(model) + if model: + return model + else: + raise HTTPException( + status_code=status.HTTP_401_UNAUTHORIZED, + detail=ERROR_MESSAGES.DEFAULT(), + ) + else: + raise HTTPException( + status_code=status.HTTP_401_UNAUTHORIZED, + detail=ERROR_MESSAGES.DEFAULT(), + ) ############################ diff --git a/backend/main.py b/backend/main.py index 0c8ce8e8d..dca90fc09 100644 --- a/backend/main.py +++ b/backend/main.py @@ -122,6 +122,9 @@ app.state.config.MODEL_FILTER_LIST = MODEL_FILTER_LIST app.state.config.WEBHOOK_URL = WEBHOOK_URL + +app.state.MODELS = {} + origins = ["*"] @@ -238,6 +241,11 @@ app.add_middleware( @app.middleware("http") async def check_url(request: Request, call_next): + if len(app.state.MODELS) == 0: + await get_all_models() + else: + pass + start_time = int(time.time()) response = await call_next(request) process_time = int(time.time()) - start_time @@ -269,8 +277,7 @@ app.mount("/api/v1", webui_app) webui_app.state.EMBEDDING_FUNCTION = rag_app.state.EMBEDDING_FUNCTION -@app.get("/api/models") -async def get_models(user=Depends(get_verified_user)): +async def get_all_models(): openai_models = [] ollama_models = [] @@ -282,8 +289,6 @@ async def get_models(user=Depends(get_verified_user)): if app.state.config.ENABLE_OLLAMA_API: ollama_models = await get_ollama_models() - print(ollama_models) - ollama_models = [ { "id": model["model"], @@ -296,9 +301,6 @@ async def get_models(user=Depends(get_verified_user)): for model in ollama_models["models"] ] - print("openai", openai_models) - print("ollama", ollama_models) - models = openai_models + ollama_models custom_models = Models.get_all_models() @@ -330,6 +332,16 @@ async def get_models(user=Depends(get_verified_user)): } ) + app.state.MODELS = {model["id"]: model for model in models} + + webui_app.state.MODELS = app.state.MODELS + + return models + + +@app.get("/api/models") +async def get_models(user=Depends(get_verified_user)): + models = await get_all_models() if app.state.config.ENABLE_MODEL_FILTER: if user.role == "user": models = list( diff --git a/src/lib/components/workspace/Models.svelte b/src/lib/components/workspace/Models.svelte index daa2f79d7..d5e9cf8a5 100644 --- a/src/lib/components/workspace/Models.svelte +++ b/src/lib/components/workspace/Models.svelte @@ -7,6 +7,8 @@ import { WEBUI_NAME, modelfiles, models, settings, user } from '$lib/stores'; import { addNewModel, deleteModelById, getModelInfos } from '$lib/apis/models'; + + import { deleteModel } from '$lib/apis/ollama'; import { goto } from '$app/navigation'; import { getModels } from '$lib/apis'; @@ -17,13 +19,42 @@ let importFiles; let modelfilesImportInputElement: HTMLInputElement; - const deleteModelHandler = async (id) => { - const res = await deleteModelById(localStorage.token, id); + const deleteModelHandler = async (model) => { + if (model?.info?.base_model_id) { + const res = await deleteModelById(localStorage.token, model.id); - if (res) { - toast.success($i18n.t(`Deleted {{tagName}}`, { id })); + if (res) { + toast.success($i18n.t(`Deleted {{name}}`, { name: model.id })); + } + await models.set(await getModels(localStorage.token)); + } else if (model?.owned_by === 'ollama') { + const res = await deleteModel(localStorage.token, model.id); + + if (res) { + toast.success($i18n.t(`Deleted {{name}}`, { name: model.id })); + } + await models.set(await getModels(localStorage.token)); + } else { + toast.error( + $i18n.t('{{ owner }}: You cannot delete this model', { + owner: model.owned_by.toUpperCase() + }) + ); + } + }; + + const cloneModelHandler = async (model) => { + if ((model?.info?.base_model_id ?? null) === null) { + toast.error($i18n.t('You cannot clone a base model')); + return; + } else { + sessionStorage.model = JSON.stringify({ + ...model, + id: `${model.id}-clone`, + name: `${model.name} (Clone)` + }); + goto('/workspace/models/create'); } - await models.set(await getModels(localStorage.token)); }; const shareModelHandler = async (model) => { @@ -104,7 +135,7 @@
modelfile profile @@ -114,7 +145,7 @@
{model.name}
- {model?.meta?.description ?? 'No description'} + {model?.info?.meta?.description ?? model.id}
@@ -122,7 +153,7 @@ { - sessionStorage.model = JSON.stringify(model); - goto('/workspace/models/create'); + cloneModelHandler(model); }} > { - deleteModelHandler(model.id); + deleteModelHandler(model); }} > { - tagName = $page.url.searchParams.get('tag'); - - if (tagName) { - modelfile = $modelfiles.filter((modelfile) => modelfile.tagName === tagName)[0]; - - console.log(modelfile); - - imageUrl = modelfile.imageUrl; - title = modelfile.title; - desc = modelfile.desc; - content = modelfile.content; - suggestions = - modelfile.suggestionPrompts.length != 0 - ? modelfile.suggestionPrompts - : [ - { - content: '' - } - ]; - - for (const category of modelfile.categories) { - categories[category.toLowerCase()] = true; - } - } else { - goto('/workspace/modelfiles'); - } - }); - - const updateModelfile = async (modelfile) => { - await updateModelById(localStorage.token, modelfile.tagName, modelfile); - await modelfiles.set(await getModelInfos(localStorage.token)); + let model = null; + let info = { + id: '', + base_model_id: null, + name: '', + meta: { + profile_image_url: '/favicon.png', + description: '', + content: '', + suggestion_prompts: [] + }, + params: {} }; const updateHandler = async () => { loading = true; + const res = await updateModelById(localStorage.token, info.id, info); - if (Object.keys(categories).filter((category) => categories[category]).length == 0) { - toast.error( - 'Uh-oh! It looks like you missed selecting a category. Please choose one to complete your modelfile.' - ); + if (res) { + await goto('/workspace/models'); + await models.set(await getModels(localStorage.token)); } - if ( - title !== '' && - desc !== '' && - content !== '' && - Object.keys(categories).filter((category) => categories[category]).length > 0 - ) { - const res = await createModel(localStorage.token, tagName, content); - - if (res) { - const reader = res.body - .pipeThrough(new TextDecoderStream()) - .pipeThrough(splitStream('\n')) - .getReader(); - - while (true) { - const { value, done } = await reader.read(); - if (done) break; - - try { - let lines = value.split('\n'); - - for (const line of lines) { - if (line !== '') { - console.log(line); - let data = JSON.parse(line); - console.log(data); - - if (data.error) { - throw data.error; - } - if (data.detail) { - throw data.detail; - } - - if (data.status) { - if ( - !data.digest && - !data.status.includes('writing') && - !data.status.includes('sha256') - ) { - toast.success(data.status); - - if (data.status === 'success') { - success = true; - } - } else { - if (data.digest) { - digest = data.digest; - - if (data.completed) { - pullProgress = Math.round((data.completed / data.total) * 1000) / 10; - } else { - pullProgress = 100; - } - } - } - } - } - } - } catch (error) { - console.log(error); - toast.error(error); - } - } - } - - if (success) { - await updateModelfile({ - tagName: tagName, - imageUrl: imageUrl, - title: title, - desc: desc, - content: content, - suggestionPrompts: suggestions.filter((prompt) => prompt.content !== ''), - categories: Object.keys(categories).filter((category) => categories[category]) - }); - await goto('/workspace/modelfiles'); - } - } loading = false; success = false; }; + + onMount(() => { + const id = $page.url.searchParams.get('id'); + + if (id) { + model = $models.find((m) => m.id === id); + if (model) { + info = { + ...info, + ...JSON.parse( + JSON.stringify( + model?.info + ? model?.info + : { + id: model.id, + name: model.name + } + ) + ) + }; + console.log(model); + } else { + goto('/workspace/models'); + } + } else { + goto('/workspace/models'); + } + });
@@ -229,7 +131,7 @@ const compressedSrc = canvas.toDataURL('image/jpeg'); // Display the compressed image - imageUrl = compressedSrc; + info.meta.profile_image_url = compressedSrc; inputFiles = null; }; @@ -270,238 +172,230 @@
{$i18n.t('Back')}
-
{ - updateHandler(); - }} - > -
-
- +
+
+ +
+
+
{$i18n.t('Name')}*
+ +
+ - {:else} +
+
+ +
+
{$i18n.t('Model ID')}*
+ +
+ +
+
+
+ +
+
{$i18n.t('description')}*
+ +
+ +
+
+ +
+
+
{$i18n.t('Model')}
+
+ + + +
+
{$i18n.t('Params')}*
+ +
+ +
+
+
+ +
+
+
{$i18n.t('Prompt suggestions')}
+ + +
+
+ {#each info.meta.suggestion_prompts as prompt, promptIdx} +
+ + + +
+ {/each} +
+
+ + {#if pullProgress !== null} +
+
{$i18n.t('Pull Progress')}
+
+
+ {pullProgress ?? 0}% +
+
+
+ {digest} +
+
+ {/if} + +
+
-
- -
-
-
{$i18n.t('Name')}*
- -
- -
-
- -
-
{$i18n.t('Model Tag Name')}*
- -
- -
-
-
- -
-
{$i18n.t('Description')}*
- -
- -
-
- -
-
-
{$i18n.t('Modelfile')}
-
- - - -
-
{$i18n.t('Content')}*
- -
-