mirror of
https://github.com/open-webui/open-webui.git
synced 2025-12-12 12:25:20 +00:00
refac: MODEL_LIST_CACHE_TTL -> MODELS_CACHE_TTL
This commit is contained in:
parent
53a08eb00d
commit
2b88f66762
3 changed files with 22 additions and 13 deletions
|
|
@ -399,19 +399,28 @@ ENABLE_COMPRESSION_MIDDLEWARE = (
|
||||||
os.environ.get("ENABLE_COMPRESSION_MIDDLEWARE", "True").lower() == "true"
|
os.environ.get("ENABLE_COMPRESSION_MIDDLEWARE", "True").lower() == "true"
|
||||||
)
|
)
|
||||||
|
|
||||||
|
####################################
|
||||||
|
# MODELS
|
||||||
|
####################################
|
||||||
|
|
||||||
|
MODELS_CACHE_TTL = os.environ.get("MODELS_CACHE_TTL", "1")
|
||||||
|
if MODELS_CACHE_TTL == "":
|
||||||
|
MODELS_CACHE_TTL = None
|
||||||
|
else:
|
||||||
|
try:
|
||||||
|
MODELS_CACHE_TTL = int(MODELS_CACHE_TTL)
|
||||||
|
except Exception:
|
||||||
|
MODELS_CACHE_TTL = 1
|
||||||
|
|
||||||
|
|
||||||
|
####################################
|
||||||
|
# WEBSOCKET SUPPORT
|
||||||
|
####################################
|
||||||
|
|
||||||
ENABLE_WEBSOCKET_SUPPORT = (
|
ENABLE_WEBSOCKET_SUPPORT = (
|
||||||
os.environ.get("ENABLE_WEBSOCKET_SUPPORT", "True").lower() == "true"
|
os.environ.get("ENABLE_WEBSOCKET_SUPPORT", "True").lower() == "true"
|
||||||
)
|
)
|
||||||
|
|
||||||
MODEL_LIST_CACHE_TTL = os.environ.get("MODEL_LIST_CACHE_TTL", "1")
|
|
||||||
if MODEL_LIST_CACHE_TTL == "":
|
|
||||||
MODEL_LIST_CACHE_TTL = None
|
|
||||||
else:
|
|
||||||
try:
|
|
||||||
MODEL_LIST_CACHE_TTL = int(MODEL_LIST_CACHE_TTL)
|
|
||||||
except Exception:
|
|
||||||
MODEL_LIST_CACHE_TTL = 1
|
|
||||||
|
|
||||||
|
|
||||||
WEBSOCKET_MANAGER = os.environ.get("WEBSOCKET_MANAGER", "")
|
WEBSOCKET_MANAGER = os.environ.get("WEBSOCKET_MANAGER", "")
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -59,7 +59,7 @@ from open_webui.config import (
|
||||||
from open_webui.env import (
|
from open_webui.env import (
|
||||||
ENV,
|
ENV,
|
||||||
SRC_LOG_LEVELS,
|
SRC_LOG_LEVELS,
|
||||||
MODEL_LIST_CACHE_TTL,
|
MODELS_CACHE_TTL,
|
||||||
AIOHTTP_CLIENT_SESSION_SSL,
|
AIOHTTP_CLIENT_SESSION_SSL,
|
||||||
AIOHTTP_CLIENT_TIMEOUT,
|
AIOHTTP_CLIENT_TIMEOUT,
|
||||||
AIOHTTP_CLIENT_TIMEOUT_MODEL_LIST,
|
AIOHTTP_CLIENT_TIMEOUT_MODEL_LIST,
|
||||||
|
|
@ -331,7 +331,7 @@ def merge_ollama_models_lists(model_lists):
|
||||||
return list(merged_models.values())
|
return list(merged_models.values())
|
||||||
|
|
||||||
|
|
||||||
@cached(ttl=MODEL_LIST_CACHE_TTL)
|
@cached(ttl=MODELS_CACHE_TTL)
|
||||||
async def get_all_models(request: Request, user: UserModel = None):
|
async def get_all_models(request: Request, user: UserModel = None):
|
||||||
log.info("get_all_models()")
|
log.info("get_all_models()")
|
||||||
if request.app.state.config.ENABLE_OLLAMA_API:
|
if request.app.state.config.ENABLE_OLLAMA_API:
|
||||||
|
|
|
||||||
|
|
@ -21,7 +21,7 @@ from open_webui.config import (
|
||||||
CACHE_DIR,
|
CACHE_DIR,
|
||||||
)
|
)
|
||||||
from open_webui.env import (
|
from open_webui.env import (
|
||||||
MODEL_LIST_CACHE_TTL,
|
MODELS_CACHE_TTL,
|
||||||
AIOHTTP_CLIENT_SESSION_SSL,
|
AIOHTTP_CLIENT_SESSION_SSL,
|
||||||
AIOHTTP_CLIENT_TIMEOUT,
|
AIOHTTP_CLIENT_TIMEOUT,
|
||||||
AIOHTTP_CLIENT_TIMEOUT_MODEL_LIST,
|
AIOHTTP_CLIENT_TIMEOUT_MODEL_LIST,
|
||||||
|
|
@ -387,7 +387,7 @@ async def get_filtered_models(models, user):
|
||||||
return filtered_models
|
return filtered_models
|
||||||
|
|
||||||
|
|
||||||
@cached(ttl=MODEL_LIST_CACHE_TTL)
|
@cached(ttl=MODELS_CACHE_TTL)
|
||||||
async def get_all_models(request: Request, user: UserModel) -> dict[str, list]:
|
async def get_all_models(request: Request, user: UserModel) -> dict[str, list]:
|
||||||
log.info("get_all_models()")
|
log.info("get_all_models()")
|
||||||
|
|
||||||
|
|
|
||||||
Loading…
Reference in a new issue