Mirrors/open-webui
1
0
Fork 0
mirror of https://github.com/open-webui/open-webui.git synced 2025-12-16 03:47:49 +01:00
Code Issues Packages Projects Releases Wiki Activity

feat: save UI config changes to config.json

Browse Source
This commit is contained in:
Jun Siang Cheah
2024-05-10 13:36:10 +08:00
parent 9a95767062
commit 058eb76568
11 changed files with 611 additions and 336 deletions
Download Patch File Download Diff File Expand all files Collapse all files

31
backend/apps/audio/main.py
View File

@@ -45,6 +45,8 @@ from config import (
AUDIO_OPENAI_API_KEY,
AUDIO_OPENAI_API_MODEL,
AUDIO_OPENAI_API_VOICE,
config_get,
config_set,
)
log = logging.getLogger(__name__)
@@ -83,10 +85,10 @@ class OpenAIConfigUpdateForm(BaseModel):
@app.get("/config")
async def get_openai_config(user=Depends(get_admin_user)):
return {
"OPENAI_API_BASE_URL": app.state.OPENAI_API_BASE_URL,
"OPENAI_API_KEY": app.state.OPENAI_API_KEY,
"OPENAI_API_MODEL": app.state.OPENAI_API_MODEL,
"OPENAI_API_VOICE": app.state.OPENAI_API_VOICE,
"OPENAI_API_BASE_URL": config_get(app.state.OPENAI_API_BASE_URL),
"OPENAI_API_KEY": config_get(app.state.OPENAI_API_KEY),
"OPENAI_API_MODEL": config_get(app.state.OPENAI_API_MODEL),
"OPENAI_API_VOICE": config_get(app.state.OPENAI_API_VOICE),
}
@@ -97,17 +99,22 @@ async def update_openai_config(
if form_data.key == "":
raise HTTPException(status_code=400, detail=ERROR_MESSAGES.API_KEY_NOT_FOUND)
app.state.OPENAI_API_BASE_URL = form_data.url
app.state.OPENAI_API_KEY = form_data.key
app.state.OPENAI_API_MODEL = form_data.model
app.state.OPENAI_API_VOICE = form_data.speaker
config_set(app.state.OPENAI_API_BASE_URL, form_data.url)
config_set(app.state.OPENAI_API_KEY, form_data.key)
config_set(app.state.OPENAI_API_MODEL, form_data.model)
config_set(app.state.OPENAI_API_VOICE, form_data.speaker)
app.state.OPENAI_API_BASE_URL.save()
app.state.OPENAI_API_KEY.save()
app.state.OPENAI_API_MODEL.save()
app.state.OPENAI_API_VOICE.save()
return {
"status": True,
"OPENAI_API_BASE_URL": app.state.OPENAI_API_BASE_URL,
"OPENAI_API_KEY": app.state.OPENAI_API_KEY,
"OPENAI_API_MODEL": app.state.OPENAI_API_MODEL,
"OPENAI_API_VOICE": app.state.OPENAI_API_VOICE,
"OPENAI_API_BASE_URL": config_get(app.state.OPENAI_API_BASE_URL),
"OPENAI_API_KEY": config_get(app.state.OPENAI_API_KEY),
"OPENAI_API_MODEL": config_get(app.state.OPENAI_API_MODEL),
"OPENAI_API_VOICE": config_get(app.state.OPENAI_API_VOICE),
}

105
backend/apps/images/main.py
View File

@@ -42,6 +42,8 @@ from config import (
IMAGE_GENERATION_MODEL,
IMAGE_SIZE,
IMAGE_STEPS,
config_get,
config_set,
)
@@ -79,7 +81,10 @@ app.state.IMAGE_STEPS = IMAGE_STEPS
@app.get("/config")
async def get_config(request: Request, user=Depends(get_admin_user)):
return {"engine": app.state.ENGINE, "enabled": app.state.ENABLED}
return {
"engine": config_get(app.state.ENGINE),
"enabled": config_get(app.state.ENABLED),
}
class ConfigUpdateForm(BaseModel):
@@ -89,9 +94,12 @@ class ConfigUpdateForm(BaseModel):
@app.post("/config/update")
async def update_config(form_data: ConfigUpdateForm, user=Depends(get_admin_user)):
app.state.ENGINE = form_data.engine
app.state.ENABLED = form_data.enabled
return {"engine": app.state.ENGINE, "enabled": app.state.ENABLED}
config_set(app.state.ENGINE, form_data.engine)
config_set(app.state.ENABLED, form_data.enabled)
return {
"engine": config_get(app.state.ENGINE),
"enabled": config_get(app.state.ENABLED),
}
class EngineUrlUpdateForm(BaseModel):
@@ -102,8 +110,8 @@ class EngineUrlUpdateForm(BaseModel):
@app.get("/url")
async def get_engine_url(user=Depends(get_admin_user)):
return {
"AUTOMATIC1111_BASE_URL": app.state.AUTOMATIC1111_BASE_URL,
"COMFYUI_BASE_URL": app.state.COMFYUI_BASE_URL,
"AUTOMATIC1111_BASE_URL": config_get(app.state.AUTOMATIC1111_BASE_URL),
"COMFYUI_BASE_URL": config_get(app.state.COMFYUI_BASE_URL),
}
@@ -113,29 +121,29 @@ async def update_engine_url(
):
if form_data.AUTOMATIC1111_BASE_URL == None:
app.state.AUTOMATIC1111_BASE_URL = AUTOMATIC1111_BASE_URL
config_set(app.state.AUTOMATIC1111_BASE_URL, config_get(AUTOMATIC1111_BASE_URL))
else:
url = form_data.AUTOMATIC1111_BASE_URL.strip("/")
try:
r = requests.head(url)
app.state.AUTOMATIC1111_BASE_URL = url
config_set(app.state.AUTOMATIC1111_BASE_URL, url)
except Exception as e:
raise HTTPException(status_code=400, detail=ERROR_MESSAGES.DEFAULT(e))
if form_data.COMFYUI_BASE_URL == None:
app.state.COMFYUI_BASE_URL = COMFYUI_BASE_URL
config_set(app.state.COMFYUI_BASE_URL, COMFYUI_BASE_URL)
else:
url = form_data.COMFYUI_BASE_URL.strip("/")
try:
r = requests.head(url)
app.state.COMFYUI_BASE_URL = url
config_set(app.state.COMFYUI_BASE_URL, url)
except Exception as e:
raise HTTPException(status_code=400, detail=ERROR_MESSAGES.DEFAULT(e))
return {
"AUTOMATIC1111_BASE_URL": app.state.AUTOMATIC1111_BASE_URL,
"COMFYUI_BASE_URL": app.state.COMFYUI_BASE_URL,
"AUTOMATIC1111_BASE_URL": config_get(app.state.AUTOMATIC1111_BASE_URL),
"COMFYUI_BASE_URL": config_get(app.state.COMFYUI_BASE_URL),
"status": True,
}
@@ -148,8 +156,8 @@ class OpenAIConfigUpdateForm(BaseModel):
@app.get("/openai/config")
async def get_openai_config(user=Depends(get_admin_user)):
return {
"OPENAI_API_BASE_URL": app.state.OPENAI_API_BASE_URL,
"OPENAI_API_KEY": app.state.OPENAI_API_KEY,
"OPENAI_API_BASE_URL": config_get(app.state.OPENAI_API_BASE_URL),
"OPENAI_API_KEY": config_get(app.state.OPENAI_API_KEY),
}
@@ -160,13 +168,13 @@ async def update_openai_config(
if form_data.key == "":
raise HTTPException(status_code=400, detail=ERROR_MESSAGES.API_KEY_NOT_FOUND)
app.state.OPENAI_API_BASE_URL = form_data.url
app.state.OPENAI_API_KEY = form_data.key
config_set(app.state.OPENAI_API_BASE_URL, form_data.url)
config_set(app.state.OPENAI_API_KEY, form_data.key)
return {
"status": True,
"OPENAI_API_BASE_URL": app.state.OPENAI_API_BASE_URL,
"OPENAI_API_KEY": app.state.OPENAI_API_KEY,
"OPENAI_API_BASE_URL": config_get(app.state.OPENAI_API_BASE_URL),
"OPENAI_API_KEY": config_get(app.state.OPENAI_API_KEY),
}
@@ -176,7 +184,7 @@ class ImageSizeUpdateForm(BaseModel):
@app.get("/size")
async def get_image_size(user=Depends(get_admin_user)):
return {"IMAGE_SIZE": app.state.IMAGE_SIZE}
return {"IMAGE_SIZE": config_get(app.state.IMAGE_SIZE)}
@app.post("/size/update")
@@ -185,9 +193,9 @@ async def update_image_size(
):
pattern = r"^\d+x\d+$" # Regular expression pattern
if re.match(pattern, form_data.size):
app.state.IMAGE_SIZE = form_data.size
config_set(app.state.IMAGE_SIZE, form_data.size)
return {
"IMAGE_SIZE": app.state.IMAGE_SIZE,
"IMAGE_SIZE": config_get(app.state.IMAGE_SIZE),
"status": True,
}
else:
@@ -203,7 +211,7 @@ class ImageStepsUpdateForm(BaseModel):
@app.get("/steps")
async def get_image_size(user=Depends(get_admin_user)):
return {"IMAGE_STEPS": app.state.IMAGE_STEPS}
return {"IMAGE_STEPS": config_get(app.state.IMAGE_STEPS)}
@app.post("/steps/update")
@@ -211,9 +219,9 @@ async def update_image_size(
form_data: ImageStepsUpdateForm, user=Depends(get_admin_user)
):
if form_data.steps >= 0:
app.state.IMAGE_STEPS = form_data.steps
config_set(app.state.IMAGE_STEPS, form_data.steps)
return {
"IMAGE_STEPS": app.state.IMAGE_STEPS,
"IMAGE_STEPS": config_get(app.state.IMAGE_STEPS),
"status": True,
}
else:
@@ -263,15 +271,25 @@ def get_models(user=Depends(get_current_user)):
async def get_default_model(user=Depends(get_admin_user)):
try:
if app.state.ENGINE == "openai":
return {"model": app.state.MODEL if app.state.MODEL else "dall-e-2"}
return {
"model": (
config_get(app.state.MODEL)
if config_get(app.state.MODEL)
else "dall-e-2"
)
}
elif app.state.ENGINE == "comfyui":
return {"model": app.state.MODEL if app.state.MODEL else ""}
return {
"model": (
config_get(app.state.MODEL) if config_get(app.state.MODEL) else ""
)
}
else:
r = requests.get(url=f"{app.state.AUTOMATIC1111_BASE_URL}/sdapi/v1/options")
options = r.json()
return {"model": options["sd_model_checkpoint"]}
except Exception as e:
app.state.ENABLED = False
config_set(app.state.ENABLED, False)
raise HTTPException(status_code=400, detail=ERROR_MESSAGES.DEFAULT(e))
@@ -280,12 +298,9 @@ class UpdateModelForm(BaseModel):
def set_model_handler(model: str):
if app.state.ENGINE == "openai":
app.state.MODEL = model
return app.state.MODEL
if app.state.ENGINE == "comfyui":
app.state.MODEL = model
return app.state.MODEL
if app.state.ENGINE in ["openai", "comfyui"]:
config_set(app.state.MODEL, model)
return config_get(app.state.MODEL)
else:
r = requests.get(url=f"{app.state.AUTOMATIC1111_BASE_URL}/sdapi/v1/options")
options = r.json()
@@ -382,7 +397,7 @@ def generate_image(
user=Depends(get_current_user),
):
width, height = tuple(map(int, app.state.IMAGE_SIZE.split("x")))
width, height = tuple(map(int, config_get(app.state.IMAGE_SIZE).split("x")))
r = None
try:
@@ -396,7 +411,11 @@ def generate_image(
"model": app.state.MODEL if app.state.MODEL != "" else "dall-e-2",
"prompt": form_data.prompt,
"n": form_data.n,
"size": form_data.size if form_data.size else app.state.IMAGE_SIZE,
"size": (
form_data.size
if form_data.size
else config_get(app.state.IMAGE_SIZE)
),
"response_format": "b64_json",
}
@@ -430,19 +449,19 @@ def generate_image(
"n": form_data.n,
}
if app.state.IMAGE_STEPS != None:
data["steps"] = app.state.IMAGE_STEPS
if config_get(app.state.IMAGE_STEPS) is not None:
data["steps"] = config_get(app.state.IMAGE_STEPS)
if form_data.negative_prompt != None:
if form_data.negative_prompt is not None:
data["negative_prompt"] = form_data.negative_prompt
data = ImageGenerationPayload(**data)
res = comfyui_generate_image(
app.state.MODEL,
config_get(app.state.MODEL),
data,
user.id,
app.state.COMFYUI_BASE_URL,
config_get(app.state.COMFYUI_BASE_URL),
)
log.debug(f"res: {res}")
@@ -469,10 +488,10 @@ def generate_image(
"height": height,
}
if app.state.IMAGE_STEPS != None:
data["steps"] = app.state.IMAGE_STEPS
if config_get(app.state.IMAGE_STEPS) is not None:
data["steps"] = config_get(app.state.IMAGE_STEPS)
if form_data.negative_prompt != None:
if form_data.negative_prompt is not None:
data["negative_prompt"] = form_data.negative_prompt
r = requests.post(

56
backend/apps/ollama/main.py
View File

@@ -46,6 +46,8 @@ from config import (
ENABLE_MODEL_FILTER,
MODEL_FILTER_LIST,
UPLOAD_DIR,
config_set,
config_get,
)
from utils.misc import calculate_sha256
@@ -96,7 +98,7 @@ async def get_status():
@app.get("/urls")
async def get_ollama_api_urls(user=Depends(get_admin_user)):
return {"OLLAMA_BASE_URLS": app.state.OLLAMA_BASE_URLS}
return {"OLLAMA_BASE_URLS": config_get(app.state.OLLAMA_BASE_URLS)}
class UrlUpdateForm(BaseModel):
@@ -105,10 +107,10 @@ class UrlUpdateForm(BaseModel):
@app.post("/urls/update")
async def update_ollama_api_url(form_data: UrlUpdateForm, user=Depends(get_admin_user)):
app.state.OLLAMA_BASE_URLS = form_data.urls
config_set(app.state.OLLAMA_BASE_URLS, form_data.urls)
log.info(f"app.state.OLLAMA_BASE_URLS: {app.state.OLLAMA_BASE_URLS}")
return {"OLLAMA_BASE_URLS": app.state.OLLAMA_BASE_URLS}
return {"OLLAMA_BASE_URLS": config_get(app.state.OLLAMA_BASE_URLS)}
@app.get("/cancel/{request_id}")
@@ -153,7 +155,9 @@ def merge_models_lists(model_lists):
async def get_all_models():
log.info("get_all_models()")
tasks = [fetch_url(f"{url}/api/tags") for url in app.state.OLLAMA_BASE_URLS]
tasks = [
fetch_url(f"{url}/api/tags") for url in config_get(app.state.OLLAMA_BASE_URLS)
]
responses = await asyncio.gather(*tasks)
models = {
@@ -179,14 +183,15 @@ async def get_ollama_tags(
if user.role == "user":
models["models"] = list(
filter(
lambda model: model["name"] in app.state.MODEL_FILTER_LIST,
lambda model: model["name"]
in config_get(app.state.MODEL_FILTER_LIST),
models["models"],
)
)
return models
return models
else:
url = app.state.OLLAMA_BASE_URLS[url_idx]
url = config_get(app.state.OLLAMA_BASE_URLS)[url_idx]
try:
r = requests.request(method="GET", url=f"{url}/api/tags")
r.raise_for_status()
@@ -216,7 +221,10 @@ async def get_ollama_versions(url_idx: Optional[int] = None):
if url_idx == None:
# returns lowest version
tasks = [fetch_url(f"{url}/api/version") for url in app.state.OLLAMA_BASE_URLS]
tasks = [
fetch_url(f"{url}/api/version")
for url in config_get(app.state.OLLAMA_BASE_URLS)
]
responses = await asyncio.gather(*tasks)
responses = list(filter(lambda x: x is not None, responses))
@@ -235,7 +243,7 @@ async def get_ollama_versions(url_idx: Optional[int] = None):
detail=ERROR_MESSAGES.OLLAMA_NOT_FOUND,
)
else:
url = app.state.OLLAMA_BASE_URLS[url_idx]
url = config_get(app.state.OLLAMA_BASE_URLS)[url_idx]
try:
r = requests.request(method="GET", url=f"{url}/api/version")
r.raise_for_status()
@@ -267,7 +275,7 @@ class ModelNameForm(BaseModel):
async def pull_model(
form_data: ModelNameForm, url_idx: int = 0, user=Depends(get_admin_user)
):
url = app.state.OLLAMA_BASE_URLS[url_idx]
url = config_get(app.state.OLLAMA_BASE_URLS)[url_idx]
log.info(f"url: {url}")
r = None
@@ -355,7 +363,7 @@ async def push_model(
detail=ERROR_MESSAGES.MODEL_NOT_FOUND(form_data.name),
)
url = app.state.OLLAMA_BASE_URLS[url_idx]
url = config_get(app.state.OLLAMA_BASE_URLS)[url_idx]
log.debug(f"url: {url}")
r = None
@@ -417,7 +425,7 @@ async def create_model(
form_data: CreateModelForm, url_idx: int = 0, user=Depends(get_admin_user)
):
log.debug(f"form_data: {form_data}")
url = app.state.OLLAMA_BASE_URLS[url_idx]
url = config_get(app.state.OLLAMA_BASE_URLS)[url_idx]
log.info(f"url: {url}")
r = None
@@ -490,7 +498,7 @@ async def copy_model(
detail=ERROR_MESSAGES.MODEL_NOT_FOUND(form_data.source),
)
url = app.state.OLLAMA_BASE_URLS[url_idx]
url = config_get(app.state.OLLAMA_BASE_URLS)[url_idx]
log.info(f"url: {url}")
try:
@@ -537,7 +545,7 @@ async def delete_model(
detail=ERROR_MESSAGES.MODEL_NOT_FOUND(form_data.name),
)
url = app.state.OLLAMA_BASE_URLS[url_idx]
url = config_get(app.state.OLLAMA_BASE_URLS)[url_idx]
log.info(f"url: {url}")
try:
@@ -577,7 +585,7 @@ async def show_model_info(form_data: ModelNameForm, user=Depends(get_verified_us
)
url_idx = random.choice(app.state.MODELS[form_data.name]["urls"])
url = app.state.OLLAMA_BASE_URLS[url_idx]
url = config_get(app.state.OLLAMA_BASE_URLS)[url_idx]
log.info(f"url: {url}")
try:
@@ -634,7 +642,7 @@ async def generate_embeddings(
detail=ERROR_MESSAGES.MODEL_NOT_FOUND(form_data.model),
)
url = app.state.OLLAMA_BASE_URLS[url_idx]
url = config_get(app.state.OLLAMA_BASE_URLS)[url_idx]
log.info(f"url: {url}")
try:
@@ -684,7 +692,7 @@ def generate_ollama_embeddings(
detail=ERROR_MESSAGES.MODEL_NOT_FOUND(form_data.model),
)
url = app.state.OLLAMA_BASE_URLS[url_idx]
url = config_get(app.state.OLLAMA_BASE_URLS)[url_idx]
log.info(f"url: {url}")
try:
@@ -753,7 +761,7 @@ async def generate_completion(
detail=ERROR_MESSAGES.MODEL_NOT_FOUND(form_data.model),
)
url = app.state.OLLAMA_BASE_URLS[url_idx]
url = config_get(app.state.OLLAMA_BASE_URLS)[url_idx]
log.info(f"url: {url}")
r = None
@@ -856,7 +864,7 @@ async def generate_chat_completion(
detail=ERROR_MESSAGES.MODEL_NOT_FOUND(form_data.model),
)
url = app.state.OLLAMA_BASE_URLS[url_idx]
url = config_get(app.state.OLLAMA_BASE_URLS)[url_idx]
log.info(f"url: {url}")
r = None
@@ -965,7 +973,7 @@ async def generate_openai_chat_completion(
detail=ERROR_MESSAGES.MODEL_NOT_FOUND(form_data.model),
)
url = app.state.OLLAMA_BASE_URLS[url_idx]
url = config_get(app.state.OLLAMA_BASE_URLS)[url_idx]
log.info(f"url: {url}")
r = None
@@ -1064,7 +1072,7 @@ async def get_openai_models(
}
else:
url = app.state.OLLAMA_BASE_URLS[url_idx]
url = config_get(app.state.OLLAMA_BASE_URLS)[url_idx]
try:
r = requests.request(method="GET", url=f"{url}/api/tags")
r.raise_for_status()
@@ -1198,7 +1206,7 @@ async def download_model(
if url_idx == None:
url_idx = 0
url = app.state.OLLAMA_BASE_URLS[url_idx]
url = config_get(app.state.OLLAMA_BASE_URLS)[url_idx]
file_name = parse_huggingface_url(form_data.url)
@@ -1217,7 +1225,7 @@ async def download_model(
def upload_model(file: UploadFile = File(...), url_idx: Optional[int] = None):
if url_idx == None:
url_idx = 0
ollama_url = app.state.OLLAMA_BASE_URLS[url_idx]
ollama_url = config_get(app.state.OLLAMA_BASE_URLS)[url_idx]
file_path = f"{UPLOAD_DIR}/{file.filename}"
@@ -1282,7 +1290,7 @@ def upload_model(file: UploadFile = File(...), url_idx: Optional[int] = None):
# async def upload_model(file: UploadFile = File(), url_idx: Optional[int] = None):
# if url_idx == None:
# url_idx = 0
# url = app.state.OLLAMA_BASE_URLS[url_idx]
# url = config_get(app.state.OLLAMA_BASE_URLS)[url_idx]
# file_location = os.path.join(UPLOAD_DIR, file.filename)
# total_size = file.size
@@ -1319,7 +1327,7 @@ def upload_model(file: UploadFile = File(...), url_idx: Optional[int] = None):
async def deprecated_proxy(
path: str, request: Request, user=Depends(get_verified_user)
):
url = app.state.OLLAMA_BASE_URLS[0]
url = config_get(app.state.OLLAMA_BASE_URLS)[0]
target_url = f"{url}/{path}"
body = await request.body()

47
backend/apps/openai/main.py
View File

@@ -26,6 +26,8 @@ from config import (
CACHE_DIR,
ENABLE_MODEL_FILTER,
MODEL_FILTER_LIST,
config_set,
config_get,
)
from typing import List, Optional
@@ -75,32 +77,34 @@ class KeysUpdateForm(BaseModel):
@app.get("/urls")
async def get_openai_urls(user=Depends(get_admin_user)):
return {"OPENAI_API_BASE_URLS": app.state.OPENAI_API_BASE_URLS}
return {"OPENAI_API_BASE_URLS": config_get(app.state.OPENAI_API_BASE_URLS)}
@app.post("/urls/update")
async def update_openai_urls(form_data: UrlsUpdateForm, user=Depends(get_admin_user)):
await get_all_models()
app.state.OPENAI_API_BASE_URLS = form_data.urls
return {"OPENAI_API_BASE_URLS": app.state.OPENAI_API_BASE_URLS}
config_set(app.state.OPENAI_API_BASE_URLS, form_data.urls)
return {"OPENAI_API_BASE_URLS": config_get(app.state.OPENAI_API_BASE_URLS)}
@app.get("/keys")
async def get_openai_keys(user=Depends(get_admin_user)):
return {"OPENAI_API_KEYS": app.state.OPENAI_API_KEYS}
return {"OPENAI_API_KEYS": config_get(app.state.OPENAI_API_KEYS)}
@app.post("/keys/update")
async def update_openai_key(form_data: KeysUpdateForm, user=Depends(get_admin_user)):
app.state.OPENAI_API_KEYS = form_data.keys
return {"OPENAI_API_KEYS": app.state.OPENAI_API_KEYS}
config_set(app.state.OPENAI_API_KEYS, form_data.keys)
return {"OPENAI_API_KEYS": config_get(app.state.OPENAI_API_KEYS)}
@app.post("/audio/speech")
async def speech(request: Request, user=Depends(get_verified_user)):
idx = None
try:
idx = app.state.OPENAI_API_BASE_URLS.index("https://api.openai.com/v1")
idx = config_get(app.state.OPENAI_API_BASE_URLS).index(
"https://api.openai.com/v1"
)
body = await request.body()
name = hashlib.sha256(body).hexdigest()
@@ -114,13 +118,15 @@ async def speech(request: Request, user=Depends(get_verified_user)):
return FileResponse(file_path)
headers = {}
headers["Authorization"] = f"Bearer {app.state.OPENAI_API_KEYS[idx]}"
headers["Authorization"] = (
f"Bearer {config_get(app.state.OPENAI_API_KEYS)[idx]}"
)
headers["Content-Type"] = "application/json"
r = None
try:
r = requests.post(
url=f"{app.state.OPENAI_API_BASE_URLS[idx]}/audio/speech",
url=f"{config_get(app.state.OPENAI_API_BASE_URLS)[idx]}/audio/speech",
data=body,
headers=headers,
stream=True,
@@ -180,7 +186,8 @@ def merge_models_lists(model_lists):
[
{**model, "urlIdx": idx}
for model in models
if "api.openai.com" not in app.state.OPENAI_API_BASE_URLS[idx]
if "api.openai.com"
not in config_get(app.state.OPENAI_API_BASE_URLS)[idx]
or "gpt" in model["id"]
]
)
@@ -191,12 +198,15 @@ def merge_models_lists(model_lists):
async def get_all_models():
log.info("get_all_models()")
if len(app.state.OPENAI_API_KEYS) == 1 and app.state.OPENAI_API_KEYS[0] == "":
if (
len(config_get(app.state.OPENAI_API_KEYS)) == 1
and config_get(app.state.OPENAI_API_KEYS)[0] == ""
):
models = {"data": []}
else:
tasks = [
fetch_url(f"{url}/models", app.state.OPENAI_API_KEYS[idx])
for idx, url in enumerate(app.state.OPENAI_API_BASE_URLS)
fetch_url(f"{url}/models", config_get(app.state.OPENAI_API_KEYS)[idx])
for idx, url in enumerate(config_get(app.state.OPENAI_API_BASE_URLS))
]
responses = await asyncio.gather(*tasks)
@@ -228,18 +238,19 @@ async def get_all_models():
async def get_models(url_idx: Optional[int] = None, user=Depends(get_current_user)):
if url_idx == None:
models = await get_all_models()
if app.state.ENABLE_MODEL_FILTER:
if config_get(app.state.ENABLE_MODEL_FILTER):
if user.role == "user":
models["data"] = list(
filter(
lambda model: model["id"] in app.state.MODEL_FILTER_LIST,
lambda model: model["id"]
in config_get(app.state.MODEL_FILTER_LIST),
models["data"],
)
)
return models
return models
else:
url = app.state.OPENAI_API_BASE_URLS[url_idx]
url = config_get(app.state.OPENAI_API_BASE_URLS)[url_idx]
r = None
@@ -303,8 +314,8 @@ async def proxy(path: str, request: Request, user=Depends(get_verified_user)):
except json.JSONDecodeError as e:
log.error("Error loading request body into a dictionary:", e)
url = app.state.OPENAI_API_BASE_URLS[idx]
key = app.state.OPENAI_API_KEYS[idx]
url = config_get(app.state.OPENAI_API_BASE_URLS)[idx]
key = config_get(app.state.OPENAI_API_KEYS)[idx]
target_url = f"{url}/{path}"

237
backend/apps/rag/main.py
View File

@@ -93,6 +93,8 @@ from config import (
RAG_TEMPLATE,
ENABLE_RAG_LOCAL_WEB_FETCH,
YOUTUBE_LOADER_LANGUAGE,
config_set,
config_get,
)
from constants import ERROR_MESSAGES
@@ -133,7 +135,7 @@ def update_embedding_model(
embedding_model: str,
update_model: bool = False,
):
if embedding_model and app.state.RAG_EMBEDDING_ENGINE == "":
if embedding_model and config_get(app.state.RAG_EMBEDDING_ENGINE) == "":
app.state.sentence_transformer_ef = sentence_transformers.SentenceTransformer(
get_model_path(embedding_model, update_model),
device=DEVICE_TYPE,
@@ -158,22 +160,22 @@ def update_reranking_model(
update_embedding_model(
app.state.RAG_EMBEDDING_MODEL,
config_get(app.state.RAG_EMBEDDING_MODEL),
RAG_EMBEDDING_MODEL_AUTO_UPDATE,
)
update_reranking_model(
app.state.RAG_RERANKING_MODEL,
config_get(app.state.RAG_RERANKING_MODEL),
RAG_RERANKING_MODEL_AUTO_UPDATE,
)
app.state.EMBEDDING_FUNCTION = get_embedding_function(
app.state.RAG_EMBEDDING_ENGINE,
app.state.RAG_EMBEDDING_MODEL,
config_get(app.state.RAG_EMBEDDING_ENGINE),
config_get(app.state.RAG_EMBEDDING_MODEL),
app.state.sentence_transformer_ef,
app.state.OPENAI_API_KEY,
app.state.OPENAI_API_BASE_URL,
config_get(app.state.OPENAI_API_KEY),
config_get(app.state.OPENAI_API_BASE_URL),
)
origins = ["*"]
@@ -200,12 +202,12 @@ class UrlForm(CollectionNameForm):
async def get_status():
return {
"status": True,
"chunk_size": app.state.CHUNK_SIZE,
"chunk_overlap": app.state.CHUNK_OVERLAP,
"template": app.state.RAG_TEMPLATE,
"embedding_engine": app.state.RAG_EMBEDDING_ENGINE,
"embedding_model": app.state.RAG_EMBEDDING_MODEL,
"reranking_model": app.state.RAG_RERANKING_MODEL,
"chunk_size": config_get(app.state.CHUNK_SIZE),
"chunk_overlap": config_get(app.state.CHUNK_OVERLAP),
"template": config_get(app.state.RAG_TEMPLATE),
"embedding_engine": config_get(app.state.RAG_EMBEDDING_ENGINE),
"embedding_model": config_get(app.state.RAG_EMBEDDING_MODEL),
"reranking_model": config_get(app.state.RAG_RERANKING_MODEL),
}
@@ -213,18 +215,21 @@ async def get_status():
async def get_embedding_config(user=Depends(get_admin_user)):
return {
"status": True,
"embedding_engine": app.state.RAG_EMBEDDING_ENGINE,
"embedding_model": app.state.RAG_EMBEDDING_MODEL,
"embedding_engine": config_get(app.state.RAG_EMBEDDING_ENGINE),
"embedding_model": config_get(app.state.RAG_EMBEDDING_MODEL),
"openai_config": {
"url": app.state.OPENAI_API_BASE_URL,
"key": app.state.OPENAI_API_KEY,
"url": config_get(app.state.OPENAI_API_BASE_URL),
"key": config_get(app.state.OPENAI_API_KEY),
},
}
@app.get("/reranking")
async def get_reraanking_config(user=Depends(get_admin_user)):
return {"status": True, "reranking_model": app.state.RAG_RERANKING_MODEL}
return {
"status": True,
"reranking_model": config_get(app.state.RAG_RERANKING_MODEL),
}
class OpenAIConfigForm(BaseModel):
@@ -246,31 +251,31 @@ async def update_embedding_config(
f"Updating embedding model: {app.state.RAG_EMBEDDING_MODEL} to {form_data.embedding_model}"
)
try:
app.state.RAG_EMBEDDING_ENGINE = form_data.embedding_engine
app.state.RAG_EMBEDDING_MODEL = form_data.embedding_model
config_set(app.state.RAG_EMBEDDING_ENGINE, form_data.embedding_engine)
config_set(app.state.RAG_EMBEDDING_MODEL, form_data.embedding_model)
if app.state.RAG_EMBEDDING_ENGINE in ["ollama", "openai"]:
if config_get(app.state.RAG_EMBEDDING_ENGINE) in ["ollama", "openai"]:
if form_data.openai_config != None:
app.state.OPENAI_API_BASE_URL = form_data.openai_config.url
app.state.OPENAI_API_KEY = form_data.openai_config.key
config_set(app.state.OPENAI_API_BASE_URL, form_data.openai_config.url)
config_set(app.state.OPENAI_API_KEY, form_data.openai_config.key)
update_embedding_model(app.state.RAG_EMBEDDING_MODEL, True)
update_embedding_model(config_get(app.state.RAG_EMBEDDING_MODEL), True)
app.state.EMBEDDING_FUNCTION = get_embedding_function(
app.state.RAG_EMBEDDING_ENGINE,
app.state.RAG_EMBEDDING_MODEL,
config_get(app.state.RAG_EMBEDDING_ENGINE),
config_get(app.state.RAG_EMBEDDING_MODEL),
app.state.sentence_transformer_ef,
app.state.OPENAI_API_KEY,
app.state.OPENAI_API_BASE_URL,
config_get(app.state.OPENAI_API_KEY),
config_get(app.state.OPENAI_API_BASE_URL),
)
return {
"status": True,
"embedding_engine": app.state.RAG_EMBEDDING_ENGINE,
"embedding_model": app.state.RAG_EMBEDDING_MODEL,
"embedding_engine": config_get(app.state.RAG_EMBEDDING_ENGINE),
"embedding_model": config_get(app.state.RAG_EMBEDDING_MODEL),
"openai_config": {
"url": app.state.OPENAI_API_BASE_URL,
"key": app.state.OPENAI_API_KEY,
"url": config_get(app.state.OPENAI_API_BASE_URL),
"key": config_get(app.state.OPENAI_API_KEY),
},
}
except Exception as e:
@@ -293,13 +298,13 @@ async def update_reranking_config(
f"Updating reranking model: {app.state.RAG_RERANKING_MODEL} to {form_data.reranking_model}"
)
try:
app.state.RAG_RERANKING_MODEL = form_data.reranking_model
config_set(app.state.RAG_RERANKING_MODEL, form_data.reranking_model)
update_reranking_model(app.state.RAG_RERANKING_MODEL, True)
update_reranking_model(config_get(app.state.RAG_RERANKING_MODEL), True)
return {
"status": True,
"reranking_model": app.state.RAG_RERANKING_MODEL,
"reranking_model": config_get(app.state.RAG_RERANKING_MODEL),
}
except Exception as e:
log.exception(f"Problem updating reranking model: {e}")
@@ -313,14 +318,16 @@ async def update_reranking_config(
async def get_rag_config(user=Depends(get_admin_user)):
return {
"status": True,
"pdf_extract_images": app.state.PDF_EXTRACT_IMAGES,
"pdf_extract_images": config_get(app.state.PDF_EXTRACT_IMAGES),
"chunk": {
"chunk_size": app.state.CHUNK_SIZE,
"chunk_overlap": app.state.CHUNK_OVERLAP,
"chunk_size": config_get(app.state.CHUNK_SIZE),
"chunk_overlap": config_get(app.state.CHUNK_OVERLAP),
},
"web_loader_ssl_verification": app.state.ENABLE_RAG_WEB_LOADER_SSL_VERIFICATION,
"web_loader_ssl_verification": config_get(
app.state.ENABLE_RAG_WEB_LOADER_SSL_VERIFICATION
),
"youtube": {
"language": app.state.YOUTUBE_LOADER_LANGUAGE,
"language": config_get(app.state.YOUTUBE_LOADER_LANGUAGE),
"translation": app.state.YOUTUBE_LOADER_TRANSLATION,
},
}
@@ -345,50 +352,69 @@ class ConfigUpdateForm(BaseModel):
@app.post("/config/update")
async def update_rag_config(form_data: ConfigUpdateForm, user=Depends(get_admin_user)):
app.state.PDF_EXTRACT_IMAGES = (
form_data.pdf_extract_images
if form_data.pdf_extract_images != None
else app.state.PDF_EXTRACT_IMAGES
config_set(
app.state.PDF_EXTRACT_IMAGES,
(
form_data.pdf_extract_images
if form_data.pdf_extract_images is not None
else config_get(app.state.PDF_EXTRACT_IMAGES)
),
)
app.state.CHUNK_SIZE = (
form_data.chunk.chunk_size if form_data.chunk != None else app.state.CHUNK_SIZE
config_set(
app.state.CHUNK_SIZE,
(
form_data.chunk.chunk_size
if form_data.chunk is not None
else config_get(app.state.CHUNK_SIZE)
),
)
app.state.CHUNK_OVERLAP = (
form_data.chunk.chunk_overlap
if form_data.chunk != None
else app.state.CHUNK_OVERLAP
config_set(
app.state.CHUNK_OVERLAP,
(
form_data.chunk.chunk_overlap
if form_data.chunk is not None
else config_get(app.state.CHUNK_OVERLAP)
),
)
app.state.ENABLE_RAG_WEB_LOADER_SSL_VERIFICATION = (
form_data.web_loader_ssl_verification
if form_data.web_loader_ssl_verification != None
else app.state.ENABLE_RAG_WEB_LOADER_SSL_VERIFICATION
config_set(
app.state.ENABLE_RAG_WEB_LOADER_SSL_VERIFICATION,
(
form_data.web_loader_ssl_verification
if form_data.web_loader_ssl_verification != None
else config_get(app.state.ENABLE_RAG_WEB_LOADER_SSL_VERIFICATION)
),
)
app.state.YOUTUBE_LOADER_LANGUAGE = (
form_data.youtube.language
if form_data.youtube != None
else app.state.YOUTUBE_LOADER_LANGUAGE
config_set(
app.state.YOUTUBE_LOADER_LANGUAGE,
(
form_data.youtube.language
if form_data.youtube is not None
else config_get(app.state.YOUTUBE_LOADER_LANGUAGE)
),
)
app.state.YOUTUBE_LOADER_TRANSLATION = (
form_data.youtube.translation
if form_data.youtube != None
if form_data.youtube is not None
else app.state.YOUTUBE_LOADER_TRANSLATION
)
return {
"status": True,
"pdf_extract_images": app.state.PDF_EXTRACT_IMAGES,
"pdf_extract_images": config_get(app.state.PDF_EXTRACT_IMAGES),
"chunk": {
"chunk_size": app.state.CHUNK_SIZE,
"chunk_overlap": app.state.CHUNK_OVERLAP,
"chunk_size": config_get(app.state.CHUNK_SIZE),
"chunk_overlap": config_get(app.state.CHUNK_OVERLAP),
},
"web_loader_ssl_verification": app.state.ENABLE_RAG_WEB_LOADER_SSL_VERIFICATION,
"web_loader_ssl_verification": config_get(
app.state.ENABLE_RAG_WEB_LOADER_SSL_VERIFICATION
),
"youtube": {
"language": app.state.YOUTUBE_LOADER_LANGUAGE,
"language": config_get(app.state.YOUTUBE_LOADER_LANGUAGE),
"translation": app.state.YOUTUBE_LOADER_TRANSLATION,
},
}
@@ -398,7 +424,7 @@ async def update_rag_config(form_data: ConfigUpdateForm, user=Depends(get_admin_
async def get_rag_template(user=Depends(get_current_user)):
return {
"status": True,
"template": app.state.RAG_TEMPLATE,
"template": config_get(app.state.RAG_TEMPLATE),
}
@@ -406,10 +432,10 @@ async def get_rag_template(user=Depends(get_current_user)):
async def get_query_settings(user=Depends(get_admin_user)):
return {
"status": True,
"template": app.state.RAG_TEMPLATE,
"k": app.state.TOP_K,
"r": app.state.RELEVANCE_THRESHOLD,
"hybrid": app.state.ENABLE_RAG_HYBRID_SEARCH,
"template": config_get(app.state.RAG_TEMPLATE),
"k": config_get(app.state.TOP_K),
"r": config_get(app.state.RELEVANCE_THRESHOLD),
"hybrid": config_get(app.state.ENABLE_RAG_HYBRID_SEARCH),
}
@@ -424,16 +450,22 @@ class QuerySettingsForm(BaseModel):
async def update_query_settings(
form_data: QuerySettingsForm, user=Depends(get_admin_user)
):
app.state.RAG_TEMPLATE = form_data.template if form_data.template else RAG_TEMPLATE
app.state.TOP_K = form_data.k if form_data.k else 4
app.state.RELEVANCE_THRESHOLD = form_data.r if form_data.r else 0.0
app.state.ENABLE_RAG_HYBRID_SEARCH = form_data.hybrid if form_data.hybrid else False
config_set(
app.state.RAG_TEMPLATE,
form_data.template if form_data.template else RAG_TEMPLATE,
)
config_set(app.state.TOP_K, form_data.k if form_data.k else 4)
config_set(app.state.RELEVANCE_THRESHOLD, form_data.r if form_data.r else 0.0)
config_set(
app.state.ENABLE_RAG_HYBRID_SEARCH,
form_data.hybrid if form_data.hybrid else False,
)
return {
"status": True,
"template": app.state.RAG_TEMPLATE,
"k": app.state.TOP_K,
"r": app.state.RELEVANCE_THRESHOLD,
"hybrid": app.state.ENABLE_RAG_HYBRID_SEARCH,
"template": config_get(app.state.RAG_TEMPLATE),
"k": config_get(app.state.TOP_K),
"r": config_get(app.state.RELEVANCE_THRESHOLD),
"hybrid": config_get(app.state.ENABLE_RAG_HYBRID_SEARCH),
}
@@ -451,21 +483,25 @@ def query_doc_handler(
user=Depends(get_current_user),
):
try:
if app.state.ENABLE_RAG_HYBRID_SEARCH:
if config_get(app.state.ENABLE_RAG_HYBRID_SEARCH):
return query_doc_with_hybrid_search(
collection_name=form_data.collection_name,
query=form_data.query,
embedding_function=app.state.EMBEDDING_FUNCTION,
k=form_data.k if form_data.k else app.state.TOP_K,
k=form_data.k if form_data.k else config_get(app.state.TOP_K),
reranking_function=app.state.sentence_transformer_rf,
r=form_data.r if form_data.r else app.state.RELEVANCE_THRESHOLD,
r=(
form_data.r
if form_data.r
else config_get(app.state.RELEVANCE_THRESHOLD)
),
)
else:
return query_doc(
collection_name=form_data.collection_name,
query=form_data.query,
embedding_function=app.state.EMBEDDING_FUNCTION,
k=form_data.k if form_data.k else app.state.TOP_K,
k=form_data.k if form_data.k else config_get(app.state.TOP_K),
)
except Exception as e:
log.exception(e)
@@ -489,21 +525,25 @@ def query_collection_handler(
user=Depends(get_current_user),
):
try:
if app.state.ENABLE_RAG_HYBRID_SEARCH:
if config_get(app.state.ENABLE_RAG_HYBRID_SEARCH):
return query_collection_with_hybrid_search(
collection_names=form_data.collection_names,
query=form_data.query,
embedding_function=app.state.EMBEDDING_FUNCTION,
k=form_data.k if form_data.k else app.state.TOP_K,
k=form_data.k if form_data.k else config_get(app.state.TOP_K),
reranking_function=app.state.sentence_transformer_rf,
r=form_data.r if form_data.r else app.state.RELEVANCE_THRESHOLD,
r=(
form_data.r
if form_data.r
else config_get(app.state.RELEVANCE_THRESHOLD)
),
)
else:
return query_collection(
collection_names=form_data.collection_names,
query=form_data.query,
embedding_function=app.state.EMBEDDING_FUNCTION,
k=form_data.k if form_data.k else app.state.TOP_K,
k=form_data.k if form_data.k else config_get(app.state.TOP_K),
)
except Exception as e:
@@ -520,8 +560,8 @@ def store_youtube_video(form_data: UrlForm, user=Depends(get_current_user)):
loader = YoutubeLoader.from_youtube_url(
form_data.url,
add_video_info=True,
language=app.state.YOUTUBE_LOADER_LANGUAGE,
translation=app.state.YOUTUBE_LOADER_TRANSLATION,
language=config_get(app.state.YOUTUBE_LOADER_LANGUAGE),
translation=config_get(app.state.YOUTUBE_LOADER_TRANSLATION),
)
data = loader.load()
@@ -548,7 +588,8 @@ def store_web(form_data: UrlForm, user=Depends(get_current_user)):
# "https://www.gutenberg.org/files/1727/1727-h/1727-h.htm"
try:
loader = get_web_loader(
form_data.url, verify_ssl=app.state.ENABLE_RAG_WEB_LOADER_SSL_VERIFICATION
form_data.url,
verify_ssl=config_get(app.state.ENABLE_RAG_WEB_LOADER_SSL_VERIFICATION),
)
data = loader.load()
@@ -604,8 +645,8 @@ def resolve_hostname(hostname):
def store_data_in_vector_db(data, collection_name, overwrite: bool = False) -> bool:
text_splitter = RecursiveCharacterTextSplitter(
chunk_size=app.state.CHUNK_SIZE,
chunk_overlap=app.state.CHUNK_OVERLAP,
chunk_size=config_get(app.state.CHUNK_SIZE),
chunk_overlap=config_get(app.state.CHUNK_OVERLAP),
add_start_index=True,
)
@@ -622,8 +663,8 @@ def store_text_in_vector_db(
text, metadata, collection_name, overwrite: bool = False
) -> bool:
text_splitter = RecursiveCharacterTextSplitter(
chunk_size=app.state.CHUNK_SIZE,
chunk_overlap=app.state.CHUNK_OVERLAP,
chunk_size=config_get(app.state.CHUNK_SIZE),
chunk_overlap=config_get(app.state.CHUNK_OVERLAP),
add_start_index=True,
)
docs = text_splitter.create_documents([text], metadatas=[metadata])
@@ -646,11 +687,11 @@ def store_docs_in_vector_db(docs, collection_name, overwrite: bool = False) -> b
collection = CHROMA_CLIENT.create_collection(name=collection_name)
embedding_func = get_embedding_function(
app.state.RAG_EMBEDDING_ENGINE,
app.state.RAG_EMBEDDING_MODEL,
config_get(app.state.RAG_EMBEDDING_ENGINE),
config_get(app.state.RAG_EMBEDDING_MODEL),
app.state.sentence_transformer_ef,
app.state.OPENAI_API_KEY,
app.state.OPENAI_API_BASE_URL,
config_get(app.state.OPENAI_API_KEY),
config_get(app.state.OPENAI_API_BASE_URL),
)
embedding_texts = list(map(lambda x: x.replace("\n", " "), texts))
@@ -724,7 +765,9 @@ def get_loader(filename: str, file_content_type: str, file_path: str):
]
if file_ext == "pdf":
loader = PyPDFLoader(file_path, extract_images=app.state.PDF_EXTRACT_IMAGES)
loader = PyPDFLoader(
file_path, extract_images=config_get(app.state.PDF_EXTRACT_IMAGES)
)
elif file_ext == "csv":
loader = CSVLoader(file_path)
elif file_ext == "rst":

8
backend/apps/web/main.py
View File

@@ -21,6 +21,8 @@ from config import (
USER_PERMISSIONS,
WEBHOOK_URL,
WEBUI_AUTH_TRUSTED_EMAIL_HEADER,
JWT_EXPIRES_IN,
config_get,
)
app = FastAPI()
@@ -28,7 +30,7 @@ app = FastAPI()
origins = ["*"]
app.state.ENABLE_SIGNUP = ENABLE_SIGNUP
app.state.JWT_EXPIRES_IN = "-1"
app.state.JWT_EXPIRES_IN = JWT_EXPIRES_IN
app.state.DEFAULT_MODELS = DEFAULT_MODELS
app.state.DEFAULT_PROMPT_SUGGESTIONS = DEFAULT_PROMPT_SUGGESTIONS
@@ -61,6 +63,6 @@ async def get_status():
return {
"status": True,
"auth": WEBUI_AUTH,
"default_models": app.state.DEFAULT_MODELS,
"default_prompt_suggestions": app.state.DEFAULT_PROMPT_SUGGESTIONS,
"default_models": config_get(app.state.DEFAULT_MODELS),
"default_prompt_suggestions": config_get(app.state.DEFAULT_PROMPT_SUGGESTIONS),
}

38
backend/apps/web/routers/auths.py
View File

@@ -33,7 +33,7 @@ from utils.utils import (
from utils.misc import parse_duration, validate_email_format
from utils.webhook import post_webhook
from constants import ERROR_MESSAGES, WEBHOOK_MESSAGES
from config import WEBUI_AUTH, WEBUI_AUTH_TRUSTED_EMAIL_HEADER
from config import WEBUI_AUTH, WEBUI_AUTH_TRUSTED_EMAIL_HEADER, config_get, config_set
router = APIRouter()
@@ -140,7 +140,7 @@ async def signin(request: Request, form_data: SigninForm):
if user:
token = create_token(
data={"id": user.id},
expires_delta=parse_duration(request.app.state.JWT_EXPIRES_IN),
expires_delta=parse_duration(config_get(request.app.state.JWT_EXPIRES_IN)),
)
return {
@@ -163,7 +163,7 @@ async def signin(request: Request, form_data: SigninForm):
@router.post("/signup", response_model=SigninResponse)
async def signup(request: Request, form_data: SignupForm):
if not request.app.state.ENABLE_SIGNUP and WEBUI_AUTH:
if not config_get(request.app.state.ENABLE_SIGNUP) and WEBUI_AUTH:
raise HTTPException(
status.HTTP_403_FORBIDDEN, detail=ERROR_MESSAGES.ACCESS_PROHIBITED
)
@@ -180,7 +180,7 @@ async def signup(request: Request, form_data: SignupForm):
role = (
"admin"
if Users.get_num_users() == 0
else request.app.state.DEFAULT_USER_ROLE
else config_get(request.app.state.DEFAULT_USER_ROLE)
)
hashed = get_password_hash(form_data.password)
user = Auths.insert_new_auth(
@@ -194,13 +194,15 @@ async def signup(request: Request, form_data: SignupForm):
if user:
token = create_token(
data={"id": user.id},
expires_delta=parse_duration(request.app.state.JWT_EXPIRES_IN),
expires_delta=parse_duration(
config_get(request.app.state.JWT_EXPIRES_IN)
),
)
# response.set_cookie(key='token', value=token, httponly=True)
if request.app.state.WEBHOOK_URL:
if config_get(request.app.state.WEBHOOK_URL):
post_webhook(
request.app.state.WEBHOOK_URL,
config_get(request.app.state.WEBHOOK_URL),
WEBHOOK_MESSAGES.USER_SIGNUP(user.name),
{
"action": "signup",
@@ -276,13 +278,15 @@ async def add_user(form_data: AddUserForm, user=Depends(get_admin_user)):
@router.get("/signup/enabled", response_model=bool)
async def get_sign_up_status(request: Request, user=Depends(get_admin_user)):
return request.app.state.ENABLE_SIGNUP
return config_get(request.app.state.ENABLE_SIGNUP)
@router.get("/signup/enabled/toggle", response_model=bool)
async def toggle_sign_up(request: Request, user=Depends(get_admin_user)):
request.app.state.ENABLE_SIGNUP = not request.app.state.ENABLE_SIGNUP
return request.app.state.ENABLE_SIGNUP
config_set(
request.app.state.ENABLE_SIGNUP, not config_get(request.app.state.ENABLE_SIGNUP)
)
return config_get(request.app.state.ENABLE_SIGNUP)
############################
@@ -292,7 +296,7 @@ async def toggle_sign_up(request: Request, user=Depends(get_admin_user)):
@router.get("/signup/user/role")
async def get_default_user_role(request: Request, user=Depends(get_admin_user)):
return request.app.state.DEFAULT_USER_ROLE
return config_get(request.app.state.DEFAULT_USER_ROLE)
class UpdateRoleForm(BaseModel):
@@ -304,8 +308,8 @@ async def update_default_user_role(
request: Request, form_data: UpdateRoleForm, user=Depends(get_admin_user)
):
if form_data.role in ["pending", "user", "admin"]:
request.app.state.DEFAULT_USER_ROLE = form_data.role
return request.app.state.DEFAULT_USER_ROLE
config_set(request.app.state.DEFAULT_USER_ROLE, form_data.role)
return config_get(request.app.state.DEFAULT_USER_ROLE)
############################
@@ -315,7 +319,7 @@ async def update_default_user_role(
@router.get("/token/expires")
async def get_token_expires_duration(request: Request, user=Depends(get_admin_user)):
return request.app.state.JWT_EXPIRES_IN
return config_get(request.app.state.JWT_EXPIRES_IN)
class UpdateJWTExpiresDurationForm(BaseModel):
@@ -332,10 +336,10 @@ async def update_token_expires_duration(
# Check if the input string matches the pattern
if re.match(pattern, form_data.duration):
request.app.state.JWT_EXPIRES_IN = form_data.duration
return request.app.state.JWT_EXPIRES_IN
config_set(request.app.state.JWT_EXPIRES_IN, form_data.duration)
return config_get(request.app.state.JWT_EXPIRES_IN)
else:
return request.app.state.JWT_EXPIRES_IN
return config_get(request.app.state.JWT_EXPIRES_IN)
############################

9
backend/apps/web/routers/configs.py
View File

@@ -9,6 +9,7 @@ import time
import uuid
from apps.web.models.users import Users
from config import config_set, config_get
from utils.utils import (
get_password_hash,
@@ -44,8 +45,8 @@ class SetDefaultSuggestionsForm(BaseModel):
async def set_global_default_models(
request: Request, form_data: SetDefaultModelsForm, user=Depends(get_admin_user)
):
request.app.state.DEFAULT_MODELS = form_data.models
return request.app.state.DEFAULT_MODELS
config_set(request.app.state.DEFAULT_MODELS, form_data.models)
return config_get(request.app.state.DEFAULT_MODELS)
@router.post("/default/suggestions", response_model=List[PromptSuggestion])
@@ -55,5 +56,5 @@ async def set_global_default_suggestions(
user=Depends(get_admin_user),
):
data = form_data.model_dump()
request.app.state.DEFAULT_PROMPT_SUGGESTIONS = data["suggestions"]
return request.app.state.DEFAULT_PROMPT_SUGGESTIONS
config_set(request.app.state.DEFAULT_PROMPT_SUGGESTIONS, data["suggestions"])
return config_get(request.app.state.DEFAULT_PROMPT_SUGGESTIONS)

8
backend/apps/web/routers/users.py
View File

@@ -15,7 +15,7 @@ from apps.web.models.auths import Auths
from utils.utils import get_current_user, get_password_hash, get_admin_user
from constants import ERROR_MESSAGES
from config import SRC_LOG_LEVELS
from config import SRC_LOG_LEVELS, config_set, config_get
log = logging.getLogger(__name__)
log.setLevel(SRC_LOG_LEVELS["MODELS"])
@@ -39,15 +39,15 @@ async def get_users(skip: int = 0, limit: int = 50, user=Depends(get_admin_user)
@router.get("/permissions/user")
async def get_user_permissions(request: Request, user=Depends(get_admin_user)):
return request.app.state.USER_PERMISSIONS
return config_get(request.app.state.USER_PERMISSIONS)
@router.post("/permissions/user")
async def update_user_permissions(
request: Request, form_data: dict, user=Depends(get_admin_user)
):
request.app.state.USER_PERMISSIONS = form_data
return request.app.state.USER_PERMISSIONS
config_set(request.app.state.USER_PERMISSIONS, form_data)
return config_get(request.app.state.USER_PERMISSIONS)
############################