Sort model names when loading models-dev.json

Author: fabpot

src/platform/src/Bridge/ModelsDev/DataLoader.php

@@ -55,10 +55,13 @@ public static function load(?string $dataPath = null): array
             throw new RuntimeException('Invalid models.dev API data.');
         }
 
-        self::$cachedData = $data;
+        // Sort providers alphabetically and sort models within each provider by release date
+        $sortedData = self::sortData($data);
+
+        self::$cachedData = $sortedData;
         self::$cachedPath = $dataPath;
 
-        return $data;
+        return $sortedData;
     }
 
     /**
@@ -71,4 +74,38 @@ public static function clearCache(): void
         self::$cachedData = null;
         self::$cachedPath = null;
     }
+
+    /**
+     * Sort providers alphabetically and models by release date (newest first).
+     *
+     * @param array<string, array<string, mixed>> $data
+     *
+     * @return array<string, array<string, mixed>>
+     */
+    private static function sortData(array $data): array
+    {
+        // Sort providers alphabetically
+        ksort($data);
+
+        // Sort models within each provider by release date (newest first)
+        foreach ($data as $providerId => &$provider) {
+            if (isset($provider['models']) && \is_array($provider['models'])) {
+                // Convert models to array with keys preserved
+                $models = $provider['models'];
+
+                // Sort models by release_date descending
+                uasort($models, static function ($a, $b) {
+                    $dateA = $a['release_date'] ?? '1970-01-01';
+                    $dateB = $b['release_date'] ?? '1970-01-01';
+
+                    // Compare dates in descending order (newer dates first)
+                    return strcmp($dateB, $dateA);
+                });
+
+                $provider['models'] = $models;
+            }
+        }
+
+        return $data;
+    }
 }

src/platform/src/Bridge/ModelsDev/ModelResolver.php

@@ -18,7 +18,7 @@
  *
  * Accepted input formats (resolved in that order):
  *
- *   * "provider:model": Explicit form like "anthropic:claude-opus-4-5"
+ *   * "provider::model": Explicit form like "anthropic::claude-opus-4-5"
  *
  *   * "provider": Provider-only, returns the first non-deprecated model listed
  *     in that provider's catalog.
@@ -51,15 +51,15 @@ public function __construct(
     /**
      * Resolves a model specification to a (provider, modelId) pair.
      *
-     * @return array{provider: string, modelId: string}
+     * @return array{provider: string, model_id: string}
      *
      * @throws InvalidArgumentException when the provider or model cannot be determined
      */
     public function resolve(string $modelSpec): array
     {
-        // "provider:model"
-        if (str_contains($modelSpec, ':')) {
-            [$provider, $modelId] = explode(':', $modelSpec, 2);
+        // "provider::model"
+        if (str_contains($modelSpec, '::')) {
+            [$provider, $modelId] = explode('::', $modelSpec, 2);
 
             if ('' === $provider) {
                 throw new InvalidArgumentException(\sprintf('Invalid model specification "%s": provider part is empty.', $modelSpec));
@@ -71,7 +71,7 @@ public function resolve(string $modelSpec): array
             return ['provider' => $provider, 'model_id' => $modelId];
         }
 
-        // "provider" 
+        // "provider"
         if ($this->registry->has($modelSpec)) {
             return ['provider' => $modelSpec, 'model_id' => $this->resolveFirstModel($modelSpec)];
         }
@@ -87,12 +87,12 @@ public function resolve(string $modelSpec): array
      */
     private function resolveFirstModel(string $provider): string
     {
-        if (null === $catalog = $this->getCatalog($provider)) {
-            throw new InvalidArgumentException(\sprintf('No model catalog found for provider "%s"; use "provider:model" format.', $provider));
+        if (null === $catalog = $this->registry->getCatalog($provider)) {
+            throw new InvalidArgumentException(\sprintf('No model catalog found for provider "%s"; use "provider::model" format.', $provider));
         }
 
         if ([] === $models = array_keys($catalog->getModels())) {
-            throw new InvalidArgumentException(\sprintf('No models found for provider "%s"; use "provider:model" format.', $provider));
+            throw new InvalidArgumentException(\sprintf('No models found for provider "%s"; use "provider::model" format.', $provider));
         }
 
         return $models[0];
@@ -109,12 +109,7 @@ private function findProviderForModel(string $modelId): string
     {
         // Check canonical providers first for deterministic resolution
         foreach (self::CANONICAL_PROVIDERS as $providerId) {
-            if (!$this->registry->has($providerId)) {
-                continue;
-            }
-
-            $catalog = $this->getCatalog($providerId);
-            if (null !== $catalog && isset($catalog->getModels()[$modelId])) {
+            if (isset($this->registry->getCatalog($providerId)?->getModels()[$modelId])) {
                 return $providerId;
             }
         }
@@ -125,21 +120,11 @@ private function findProviderForModel(string $modelId): string
                 continue; // already checked
             }
 
-            $catalog = $this->getCatalog($providerId);
-            if (null !== $catalog && isset($catalog->getModels()[$modelId])) {
+            if (isset($this->registry->getCatalog($providerId)?->getModels()[$modelId])) {
                 return $providerId;
             }
         }
 
-        throw new InvalidArgumentException(\sprintf('Cannot determine provider for model "%s"; Use "provider:model" format to specify it explicitly.', $modelId));
-    }
-
-    private function getCatalog(string $provider): ?ModelCatalog
-    {
-        try {
-            return new ModelCatalog($provider, $this->dataPath);
-        } catch (\Throwable) {
-            return null;
-        }
+        throw new InvalidArgumentException(\sprintf('Cannot determine provider for model "%s"; Use "provider::model" format to specify it explicitly.', $modelId));
     }
 }

src/platform/src/Bridge/ModelsDev/ProviderRegistry.php

@@ -25,8 +25,9 @@ final class ProviderRegistry
      */
     private readonly array $providers;
 
-    public function __construct(?string $dataPath = null)
-    {
+    public function __construct(
+        private ?string $dataPath = null,
+    ) {
         $providers = [];
         foreach (DataLoader::load($dataPath) as $providerId => $providerData) {
             $providers[$providerId] = [
@@ -59,6 +60,15 @@ public function getProviderName(string $providerId): string
         return $this->providers[$providerId]['name'];
     }
 
+    public function getCatalog(string $providerId): ?ModelCatalog
+    {
+        if (!isset($this->providers[$providerId])) {
+            return null;
+        }
+
+        return new ModelCatalog($providerId, $this->dataPath);
+    }
+
     public function has(string $providerId): bool
     {
         return isset($this->providers[$providerId]);