From 6613e3843669acea307cd4b5ed7c90a38577a188 Mon Sep 17 00:00:00 2001 From: kingbri Date: Mon, 8 Jul 2024 14:52:17 -0400 Subject: [PATCH] Main: Make openapi export store locally This runs faster than always making a syscall to check if the env var is set. Signed-off-by: kingbri --- common/model.py | 3 ++- endpoints/utils.py | 3 +++ main.py | 5 ++++- 3 files changed, 9 insertions(+), 2 deletions(-) create mode 100644 endpoints/utils.py diff --git a/common/model.py b/common/model.py index f4982ea..72084df 100644 --- a/common/model.py +++ b/common/model.py @@ -12,8 +12,9 @@ from typing import Optional from common import config from common.logger import get_loading_progress_bar from common.utils import unwrap +from endpoints.utils import do_export_openapi -if os.getenv("EXPORT_OPENAPI", "").lower() not in ("true", "1"): +if not do_export_openapi: from backends.exllamav2.model import ExllamaV2Container # Global model container diff --git a/endpoints/utils.py b/endpoints/utils.py new file mode 100644 index 0000000..291fe34 --- /dev/null +++ b/endpoints/utils.py @@ -0,0 +1,3 @@ +import os + +do_export_openapi = os.getenv("EXPORT_OPENAPI", "").lower() in ("true", "1") diff --git a/main.py b/main.py index efb153f..e089d81 100644 --- a/main.py +++ b/main.py @@ -9,7 +9,6 @@ import signal from loguru import logger from typing import Optional -from backends.exllamav2.utils import check_exllama_version from common import config, gen_logging, sampling, model from common.args import convert_args_to_dict, init_argparser from common.auth import load_auth_keys @@ -18,6 +17,10 @@ from common.networking import is_port_in_use from common.signals import signal_handler from common.utils import unwrap from endpoints.server import export_openapi, start_api +from endpoints.utils import do_export_openapi + +if not do_export_openapi: + from backends.exllamav2.utils import check_exllama_version async def entrypoint(args: Optional[dict] = None):