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

patch pydantic config into old config

Browse source 
- convert pydantic to dict to avoid errors with current files
- fix formatting
This commit is contained in:
TerminalMan 2024-09-06 14:31:28 +01:00
parent 36e991c16e
commit 8e9344642e
2 changed files with 26 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

9
main.py
View file

@ -69,12 +69,14 @@ async def entrypoint_async():
model_path = pathlib.Path(config.model.model_dir)
model_path = model_path / model_name
await model.load_model(model_path.resolve(), **config.model)
# TODO: remove model_dump()
await model.load_model(model_path.resolve(), **config.model.model_dump())
# Load loras after loading the model
if config.lora.loras:
lora_dir = pathlib.Path(config.lora.lora_dir)
await model.container.load_loras(lora_dir.resolve(), **config.lora)
# TODO: remove model_dump()
await model.container.load_loras(lora_dir.resolve(), **config.lora.model_dump())
# If an initial embedding model name is specified, create a separate container
# and load the model
@ -84,7 +86,8 @@ async def entrypoint_async():
embedding_model_path = embedding_model_path / embedding_model_name
try:
await model.load_embedding_model(embedding_model_path, **config.embeddings)
# TODO: remove model_dump()
await model.load_embedding_model(embedding_model_path, **config.embeddings.model_dump())
except ImportError as ex:
logger.error(ex.msg)