Args: Add api-servers to parser
Also run OpenAPI export after args/config are parsed. Signed-off-by: kingbri <bdashore3@proton.me>
This commit is contained in:
parent
63650d2c3c
commit
685e3836e9
2 changed files with 16 additions and 9 deletions
|
|
@ -72,6 +72,12 @@ def add_network_args(parser: argparse.ArgumentParser):
|
||||||
type=str_to_bool,
|
type=str_to_bool,
|
||||||
help="Decide whether to send error tracebacks over the API",
|
help="Decide whether to send error tracebacks over the API",
|
||||||
)
|
)
|
||||||
|
network_group.add_argument(
|
||||||
|
"--api-servers",
|
||||||
|
type=str,
|
||||||
|
nargs="+",
|
||||||
|
help="API servers to enable. Options: (OAI, Kobold)",
|
||||||
|
)
|
||||||
|
|
||||||
|
|
||||||
def add_model_args(parser: argparse.ArgumentParser):
|
def add_model_args(parser: argparse.ArgumentParser):
|
||||||
|
|
|
||||||
19
main.py
19
main.py
|
|
@ -110,15 +110,6 @@ def entrypoint(arguments: Optional[dict] = None):
|
||||||
signal.signal(signal.SIGINT, signal_handler)
|
signal.signal(signal.SIGINT, signal_handler)
|
||||||
signal.signal(signal.SIGTERM, signal_handler)
|
signal.signal(signal.SIGTERM, signal_handler)
|
||||||
|
|
||||||
if do_export_openapi:
|
|
||||||
openapi_json = export_openapi()
|
|
||||||
|
|
||||||
with open("openapi.json", "w") as f:
|
|
||||||
f.write(json.dumps(openapi_json))
|
|
||||||
logger.info("Successfully wrote OpenAPI spec to openapi.json")
|
|
||||||
|
|
||||||
return
|
|
||||||
|
|
||||||
# Load from YAML config
|
# Load from YAML config
|
||||||
config.from_file(pathlib.Path("config.yml"))
|
config.from_file(pathlib.Path("config.yml"))
|
||||||
|
|
||||||
|
|
@ -128,6 +119,16 @@ def entrypoint(arguments: Optional[dict] = None):
|
||||||
arguments = convert_args_to_dict(parser.parse_args(), parser)
|
arguments = convert_args_to_dict(parser.parse_args(), parser)
|
||||||
|
|
||||||
config.from_args(arguments)
|
config.from_args(arguments)
|
||||||
|
|
||||||
|
if do_export_openapi:
|
||||||
|
openapi_json = export_openapi()
|
||||||
|
|
||||||
|
with open("openapi.json", "w") as f:
|
||||||
|
f.write(json.dumps(openapi_json))
|
||||||
|
logger.info("Successfully wrote OpenAPI spec to openapi.json")
|
||||||
|
|
||||||
|
return
|
||||||
|
|
||||||
developer_config = config.developer_config()
|
developer_config = config.developer_config()
|
||||||
|
|
||||||
# Check exllamav2 version and give a descriptive error if it's too old
|
# Check exllamav2 version and give a descriptive error if it's too old
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue