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

Model: Store directory paths

Browse source 
Storing a pathlib type makes it easier to manipulate the model
directory path in the long run without constantly fetching it
from the config.

Signed-off-by: kingbri <bdashore3@proton.me>
This commit is contained in:
kingbri 2024-08-29 22:49:20 -04:00 • committed by Brian Dashore
parent 523709741c
commit dd55b99af5
4 changed files with 17 additions and 21 deletions
Download patch file Download diff file Expand all files Collapse all files

4
endpoints/OAI/router.py
View file

@ -52,7 +52,7 @@ async def completion_request(
If stream = true, this returns an SSE stream.
"""
model_path = model.container.get_model_path()
model_path = model.container.model_dir
if isinstance(data.prompt, list):
data.prompt = "\n".join(data.prompt)
@ -105,7 +105,7 @@ async def chat_completion_request(
raise HTTPException(422, error_message)
model_path = model.container.get_model_path()
model_path = model.container.model_dir
if isinstance(data.messages, str):
prompt = data.messages

11
endpoints/core/utils/model.py
View file

@ -43,11 +43,12 @@ async def get_current_model_list(model_type: str = "model"):
model_path = None
# Make sure the model container exists
if model_type == "model" or model_type == "draft":
if model.container:
model_path = model.container.get_model_path(model_type == "draft")
elif model_type == "embedding":
if model.embeddings_container:
match model_type:
case "model":
model_path = model.container.model_dir
case "draft":
model_path = model.container.draft_model_dir
case "embedding":
model_path = model.embeddings_container.model_dir
if model_path: