forked from open-webui/open-webui
refac: RAG_EMBEDDING_MODEL_PATH removed
This commit is contained in:
parent
cb2158a794
commit
582d11f191
1 changed files with 17 additions and 30 deletions
|
@ -80,16 +80,15 @@ app.state.RAG_TEMPLATE = RAG_TEMPLATE
|
||||||
|
|
||||||
|
|
||||||
app.state.RAG_EMBEDDING_MODEL = RAG_EMBEDDING_MODEL
|
app.state.RAG_EMBEDDING_MODEL = RAG_EMBEDDING_MODEL
|
||||||
app.state.RAG_EMBEDDING_MODEL_PATH = get_embedding_model_path(
|
|
||||||
app.state.RAG_EMBEDDING_MODEL, RAG_EMBEDDING_MODEL_AUTO_UPDATE
|
|
||||||
)
|
|
||||||
|
|
||||||
|
|
||||||
app.state.TOP_K = 4
|
app.state.TOP_K = 4
|
||||||
|
|
||||||
app.state.sentence_transformer_ef = (
|
app.state.sentence_transformer_ef = (
|
||||||
embedding_functions.SentenceTransformerEmbeddingFunction(
|
embedding_functions.SentenceTransformerEmbeddingFunction(
|
||||||
model_name=app.state.RAG_EMBEDDING_MODEL_PATH,
|
model_name=get_embedding_model_path(
|
||||||
|
app.state.RAG_EMBEDDING_MODEL, RAG_EMBEDDING_MODEL_AUTO_UPDATE
|
||||||
|
),
|
||||||
device=DEVICE_TYPE,
|
device=DEVICE_TYPE,
|
||||||
)
|
)
|
||||||
)
|
)
|
||||||
|
@ -130,7 +129,6 @@ async def get_embedding_model(user=Depends(get_admin_user)):
|
||||||
return {
|
return {
|
||||||
"status": True,
|
"status": True,
|
||||||
"embedding_model": app.state.RAG_EMBEDDING_MODEL,
|
"embedding_model": app.state.RAG_EMBEDDING_MODEL,
|
||||||
"embedding_model_path": app.state.RAG_EMBEDDING_MODEL_PATH,
|
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
@ -143,22 +141,26 @@ async def update_embedding_model(
|
||||||
form_data: EmbeddingModelUpdateForm, user=Depends(get_admin_user)
|
form_data: EmbeddingModelUpdateForm, user=Depends(get_admin_user)
|
||||||
):
|
):
|
||||||
|
|
||||||
log.debug(f"form_data.embedding_model: {form_data.embedding_model}")
|
|
||||||
log.info(
|
log.info(
|
||||||
f"Updating embedding model: {app.state.RAG_EMBEDDING_MODEL} to {form_data.embedding_model}"
|
f"Updating embedding model: {app.state.RAG_EMBEDDING_MODEL} to {form_data.embedding_model}"
|
||||||
)
|
)
|
||||||
|
|
||||||
embedding_model_path = None
|
|
||||||
sentence_transformer_ef = None
|
|
||||||
try:
|
try:
|
||||||
embedding_model_path = get_embedding_model_path(form_data.embedding_model, True)
|
sentence_transformer_ef = (
|
||||||
if app.state.RAG_EMBEDDING_MODEL_PATH != embedding_model_path:
|
embedding_functions.SentenceTransformerEmbeddingFunction(
|
||||||
sentence_transformer_ef = (
|
model_name=get_embedding_model_path(form_data.embedding_model, True),
|
||||||
embedding_functions.SentenceTransformerEmbeddingFunction(
|
device=DEVICE_TYPE,
|
||||||
model_name=embedding_model_path,
|
|
||||||
device=DEVICE_TYPE,
|
|
||||||
)
|
|
||||||
)
|
)
|
||||||
|
)
|
||||||
|
|
||||||
|
app.state.RAG_EMBEDDING_MODEL = form_data.embedding_model
|
||||||
|
app.state.sentence_transformer_ef = sentence_transformer_ef
|
||||||
|
|
||||||
|
return {
|
||||||
|
"status": True,
|
||||||
|
"embedding_model": app.state.RAG_EMBEDDING_MODEL,
|
||||||
|
}
|
||||||
|
|
||||||
except Exception as e:
|
except Exception as e:
|
||||||
log.exception(f"Problem updating embedding model: {e}")
|
log.exception(f"Problem updating embedding model: {e}")
|
||||||
raise HTTPException(
|
raise HTTPException(
|
||||||
|
@ -166,21 +168,6 @@ async def update_embedding_model(
|
||||||
detail=ERROR_MESSAGES.DEFAULT(e),
|
detail=ERROR_MESSAGES.DEFAULT(e),
|
||||||
)
|
)
|
||||||
|
|
||||||
if sentence_transformer_ef:
|
|
||||||
app.state.RAG_EMBEDDING_MODEL = form_data.embedding_model
|
|
||||||
app.state.RAG_EMBEDDING_MODEL_PATH = embedding_model_path
|
|
||||||
app.state.sentence_transformer_ef = sentence_transformer_ef
|
|
||||||
|
|
||||||
log.debug(
|
|
||||||
f"app.state.RAG_EMBEDDING_MODEL_PATH: {app.state.RAG_EMBEDDING_MODEL_PATH}"
|
|
||||||
)
|
|
||||||
|
|
||||||
return {
|
|
||||||
"status": sentence_transformer_ef != None,
|
|
||||||
"embedding_model": app.state.RAG_EMBEDDING_MODEL,
|
|
||||||
"embedding_model_path": app.state.RAG_EMBEDDING_MODEL_PATH,
|
|
||||||
}
|
|
||||||
|
|
||||||
|
|
||||||
@app.get("/config")
|
@app.get("/config")
|
||||||
async def get_rag_config(user=Depends(get_admin_user)):
|
async def get_rag_config(user=Depends(get_admin_user)):
|
||||||
|
|
Loading…
Reference in a new issue