Handle duplicate model rows when resolving routing targets

Author: successbyfailure

backend/__init__.py

@@ -1,3 +1,3 @@
 """Backend sync worker service."""
 
-__version__ = "0.6.28"
+__version__ = "0.6.29"

frontend/__init__.py

@@ -1,3 +1,3 @@
 """Frontend API and UI service."""
 
-__version__ = "0.6.28"
+__version__ = "0.6.29"

litellm_updater/crud.py

@@ -227,9 +227,29 @@ async def get_model_by_provider_and_name(
     result = await session.execute(
         select(Model)
         .where(Model.provider_id == provider_id, Model.model_id == model_id)
+        .order_by(
+            Model.is_orphaned.asc(),
+            Model.last_seen.desc(),
+            Model.updated_at.desc(),
+            Model.id.desc(),
+        )
         .options(selectinload(Model.provider))
     )
-    return result.scalar_one_or_none()
+    matches = list(result.scalars().all())
+    if not matches:
+        return None
+    if len(matches) > 1:
+        import logging
+
+        logger = logging.getLogger(__name__)
+        logger.warning(
+            "Duplicate model rows found for provider_id=%s model_id=%s (count=%s); using id=%s",
+            provider_id,
+            model_id,
+            len(matches),
+            matches[0].id,
+        )
+    return matches[0]
 
 
 async def create_model(

proxy/__init__.py

@@ -1 +1 @@
-__version__ = "0.6.28"
+__version__ = "0.6.29"

pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "litellm-companion"
-version = "0.6.28"
+version = "0.6.29"
 description = "Synchronize models from Ollama or OpenAI-compatible endpoints into LiteLLM"
 authors = [
   {name = "LiteLLM Companion Authors", email = "dev@example.com"}

shared/__init__.py

@@ -1,3 +1,3 @@
 """Shared code between backend and frontend services."""
 
-__version__ = "0.6.28"
+__version__ = "0.6.29"

shared/crud.py

@@ -269,9 +269,29 @@ async def get_model_by_provider_and_name(
     result = await session.execute(
         select(Model)
         .where(Model.provider_id == provider_id, Model.model_id == model_id)
+        .order_by(
+            Model.is_orphaned.asc(),
+            Model.last_seen.desc(),
+            Model.updated_at.desc(),
+            Model.id.desc(),
+        )
         .options(selectinload(Model.provider))
     )
-    return result.scalar_one_or_none()
+    matches = list(result.scalars().all())
+    if not matches:
+        return None
+    if len(matches) > 1:
+        import logging
+
+        logger = logging.getLogger(__name__)
+        logger.warning(
+            "Duplicate model rows found for provider_id=%s model_id=%s (count=%s); using id=%s",
+            provider_id,
+            model_id,
+            len(matches),
+            matches[0].id,
+        )
+    return matches[0]
 
 
 async def create_model(