feat(usage_count): sorting by usage_count + usage_count on ModelCard

py/services/base_model_service.py

@@ -7,6 +7,7 @@ import os
 from ..utils.constants import VALID_LORA_TYPES
 from ..utils.models import BaseModelMetadata
 from ..utils.metadata_manager import MetadataManager
+from ..utils.usage_stats import UsageStats
 from .model_query import (
     FilterCriteria,
     ModelCacheRepository,
@@ -81,7 +82,10 @@ class BaseModelService(ABC):
         """Get paginated and filtered model data"""
 
         sort_params = self.cache_repository.parse_sort(sort_by)
-        sorted_data = await self.cache_repository.fetch_sorted(sort_params)
+        if sort_params.key == 'usage':
+            sorted_data = await self._fetch_with_usage_sort(sort_params)
+        else:
+            sorted_data = await self.cache_repository.fetch_sorted(sort_params)
 
         if hash_filters:
             filtered_data = await self._apply_hash_filters(sorted_data, hash_filters)
@@ -132,6 +136,37 @@ class BaseModelService(ABC):
             )
         return paginated
 
+    async def _fetch_with_usage_sort(self, sort_params):
+        """Fetch data sorted by usage count (desc/asc)."""
+        cache = await self.cache_repository.get_cache()
+        raw_items = cache.raw_data or []
+
+        # Map model type to usage stats bucket
+        bucket_map = {
+            'lora': 'loras',
+            'checkpoint': 'checkpoints',
+            # 'embedding': 'embeddings',  # TODO: Enable when embedding usage tracking is implemented
+        }
+        bucket_key = bucket_map.get(self.model_type, '')
+
+        usage_stats = UsageStats()
+        stats = await usage_stats.get_stats()
+        usage_bucket = stats.get(bucket_key, {}) if bucket_key else {}
+
+        annotated = []
+        for item in raw_items:
+            sha = (item.get('sha256') or '').lower()
+            usage_info = usage_bucket.get(sha, {}) if isinstance(usage_bucket, dict) else {}
+            usage_count = usage_info.get('total', 0) if isinstance(usage_info, dict) else 0
+            annotated.append({**item, 'usage_count': usage_count})
+
+        reverse = sort_params.order == 'desc'
+        annotated.sort(
+            key=lambda x: (x.get('usage_count', 0), x.get('model_name', '').lower()),
+            reverse=reverse
+        )
+        return annotated
+
     
     async def _apply_hash_filters(self, data: List[Dict], hash_filters: Dict) -> List[Dict]:
         """Apply hash-based filtering"""

py/services/checkpoint_service.py

@@ -35,6 +35,7 @@ class CheckpointService(BaseModelService):
             "modified": checkpoint_data.get("modified", ""),
             "tags": checkpoint_data.get("tags", []),
             "from_civitai": checkpoint_data.get("from_civitai", True),
+            "usage_count": checkpoint_data.get("usage_count", 0),
             "notes": checkpoint_data.get("notes", ""),
             "model_type": checkpoint_data.get("model_type", "checkpoint"),
             "favorite": checkpoint_data.get("favorite", False),

py/services/embedding_service.py

@@ -35,6 +35,7 @@ class EmbeddingService(BaseModelService):
             "modified": embedding_data.get("modified", ""),
             "tags": embedding_data.get("tags", []),
             "from_civitai": embedding_data.get("from_civitai", True),
+            # "usage_count": embedding_data.get("usage_count", 0), # TODO: Enable when embedding usage tracking is implemented
             "notes": embedding_data.get("notes", ""),
             "model_type": embedding_data.get("model_type", "embedding"),
             "favorite": embedding_data.get("favorite", False),

py/services/lora_service.py

@@ -35,6 +35,7 @@ class LoraService(BaseModelService):
             "modified": lora_data.get("modified", ""),
             "tags": lora_data.get("tags", []),
             "from_civitai": lora_data.get("from_civitai", True),
+            "usage_count": lora_data.get("usage_count", 0),
             "usage_tips": lora_data.get("usage_tips", ""),
             "notes": lora_data.get("notes", ""),
             "favorite": lora_data.get("favorite", False),

py/services/model_cache.py

@@ -13,7 +13,10 @@ SUPPORTED_SORT_MODES = [
     ('date', 'desc'),
     ('size', 'asc'),
     ('size', 'desc'),
+    ('usage', 'asc'),
+    ('usage', 'desc'),
 ]
+# Is this in use?
 
 DISPLAY_NAME_MODES = {"model_name", "file_name"}
 
@@ -234,6 +237,16 @@ class ModelCache:
                 key=itemgetter('size'),
                 reverse=reverse
             )
+        elif sort_key == 'usage':
+            # Sort by usage count, fallback to 0, then name for stability
+            return sorted(
+                data,
+                key=lambda x: (
+                    x.get('usage_count', 0),
+                    self._get_display_name(x).lower()
+                ),
+                reverse=reverse
+            )
         else:
             # Fallback: no sort
             return list(data)