From 01c4647dfc242d00514d56674e0dcdae4878b13d Mon Sep 17 00:00:00 2001 From: "Timothy J. Baek" Date: Sat, 27 Apr 2024 19:19:47 -0400 Subject: [PATCH] fix: ollama version string issue #1800 --- backend/apps/ollama/main.py | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/backend/apps/ollama/main.py b/backend/apps/ollama/main.py index 4ca5c4380..f1c836faa 100644 --- a/backend/apps/ollama/main.py +++ b/backend/apps/ollama/main.py @@ -16,6 +16,7 @@ from fastapi.concurrency import run_in_threadpool from pydantic import BaseModel, ConfigDict import os +import re import copy import random import requests @@ -216,7 +217,9 @@ async def get_ollama_versions(url_idx: Optional[int] = None): if len(responses) > 0: lowest_version = min( responses, - key=lambda x: tuple(map(int, x["version"].split("-")[0].split("."))), + key=lambda x: tuple( + map(int, re.sub(r"^v|-.*", "", x["version"]).split(".")) + ), ) return {"version": lowest_version["version"]}