jalr/tabbyAPI-ollama
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Main: Don't load if model_name/loras is blank

Browse source 
Previously, if model_name was commented out, a load would not occur.
Add the case if model_name or loras is blank which returns None when
parsing the YAML.

Signed-off-by: kingbri <bdashore3@proton.me>
This commit is contained in:
kingbri 2024-01-02 13:56:25 -05:00
parent 6b04463051
commit 451042aadf
1 changed files with 4 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

7
main.py
View file

@ -525,9 +525,10 @@ def entrypoint(args: Optional[dict] = None):
# If an initial model name is specified, create a container
# and load the model
model_config = get_model_config()
if "model_name" in model_config:
model_name = model_config.get("model_name")
if model_name:
model_path = pathlib.Path(unwrap(model_config.get("model_dir"), "models"))
model_path = model_path / model_config.get("model_name")
model_path = model_path / model_name
MODEL_CONTAINER = ModelContainer(model_path.resolve(), False, **model_config)
load_status = MODEL_CONTAINER.load_gen(load_progress)
@ -542,7 +543,7 @@ def entrypoint(args: Optional[dict] = None):
# Load loras after loading the model
lora_config = get_lora_config()
if "loras" in lora_config:
if lora_config.get("loras"):
lora_dir = pathlib.Path(unwrap(lora_config.get("lora_dir"), "loras"))
MODEL_CONTAINER.load_loras(lora_dir.resolve(), **lora_config)