Improved error handling for model loading (#732)

app/MindWork AI Studio/Provider/OpenRouter/ProviderOpenRouter.cs

@@ -81,102 +81,70 @@ public sealed class ProviderOpenRouter() : BaseProvider(LLMProviders.OPEN_ROUTER
     }
 
     /// <inheritdoc />
-    public override Task<IEnumerable<Model>> GetTextModels(string? apiKeyProvisional = null, CancellationToken token = default)
+    public override Task<ModelLoadResult> GetTextModels(string? apiKeyProvisional = null, CancellationToken token = default)
     {
         return this.LoadModels(SecretStoreType.LLM_PROVIDER, token, apiKeyProvisional);
     }
 
     /// <inheritdoc />
-    public override Task<IEnumerable<Model>> GetImageModels(string? apiKeyProvisional = null, CancellationToken token = default)
+    public override Task<ModelLoadResult> GetImageModels(string? apiKeyProvisional = null, CancellationToken token = default)
     {
-        return Task.FromResult(Enumerable.Empty<Model>());
+        return Task.FromResult(ModelLoadResult.FromModels([]));
     }
 
     /// <inheritdoc />
-    public override Task<IEnumerable<Model>> GetEmbeddingModels(string? apiKeyProvisional = null, CancellationToken token = default)
+    public override Task<ModelLoadResult> GetEmbeddingModels(string? apiKeyProvisional = null, CancellationToken token = default)
     {
         return this.LoadEmbeddingModels(token, apiKeyProvisional);
     }
     
     /// <inheritdoc />
-    public override Task<IEnumerable<Model>> GetTranscriptionModels(string? apiKeyProvisional = null, CancellationToken token = default)
+    public override Task<ModelLoadResult> GetTranscriptionModels(string? apiKeyProvisional = null, CancellationToken token = default)
     {
-        return Task.FromResult(Enumerable.Empty<Model>());
+        return Task.FromResult(ModelLoadResult.FromModels([]));
     }
 
     #endregion
 
-    private async Task<IEnumerable<Model>> LoadModels(SecretStoreType storeType, CancellationToken token, string? apiKeyProvisional = null)
+    private Task<ModelLoadResult> LoadModels(SecretStoreType storeType, CancellationToken token, string? apiKeyProvisional = null)
     {
-        var secretKey = apiKeyProvisional switch
-        {
-            not null => apiKeyProvisional,
-            _ => await RUST_SERVICE.GetAPIKey(this, storeType) switch
+        return this.LoadModelsResponse<OpenRouterModelsResponse>(
+            storeType,
+            "models",
+            modelResponse => modelResponse.Data
+                .Where(n =>
+                    !n.Id.Contains("whisper", StringComparison.OrdinalIgnoreCase) &&
+                    !n.Id.Contains("dall-e", StringComparison.OrdinalIgnoreCase) &&
+                    !n.Id.Contains("tts", StringComparison.OrdinalIgnoreCase) &&
+                    !n.Id.Contains("embedding", StringComparison.OrdinalIgnoreCase) &&
+                    !n.Id.Contains("moderation", StringComparison.OrdinalIgnoreCase) &&
+                    !n.Id.Contains("stable-diffusion", StringComparison.OrdinalIgnoreCase) &&
+                    !n.Id.Contains("flux", StringComparison.OrdinalIgnoreCase) &&
+                    !n.Id.Contains("midjourney", StringComparison.OrdinalIgnoreCase))
+                .Select(n => new Model(n.Id, n.Name)),
+            token,
+            apiKeyProvisional,
+            requestConfigurator: (request, secretKey) =>
             {
-                { Success: true } result => await result.Secret.Decrypt(ENCRYPTION),
-                _ => null,
-            }
-        };
-
-        if (secretKey is null)
-            return [];
-
-        using var request = new HttpRequestMessage(HttpMethod.Get, "models");
-        request.Headers.Authorization = new AuthenticationHeaderValue("Bearer", secretKey);
-        
-        // Set custom headers for project identification:
-        request.Headers.Add("HTTP-Referer", PROJECT_WEBSITE);
-        request.Headers.Add("X-Title", PROJECT_NAME);
-
-        using var response = await this.httpClient.SendAsync(request, token);
-        if(!response.IsSuccessStatusCode)
-            return [];
-
-        var modelResponse = await response.Content.ReadFromJsonAsync<OpenRouterModelsResponse>(token);
-
-        // Filter out non-text models (image, audio, embedding models) and convert to Model
-        return modelResponse.Data
-            .Where(n =>
-                !n.Id.Contains("whisper", StringComparison.OrdinalIgnoreCase) &&
-                !n.Id.Contains("dall-e", StringComparison.OrdinalIgnoreCase) &&
-                !n.Id.Contains("tts", StringComparison.OrdinalIgnoreCase) &&
-                !n.Id.Contains("embedding", StringComparison.OrdinalIgnoreCase) &&
-                !n.Id.Contains("moderation", StringComparison.OrdinalIgnoreCase) &&
-                !n.Id.Contains("stable-diffusion", StringComparison.OrdinalIgnoreCase) &&
-                !n.Id.Contains("flux", StringComparison.OrdinalIgnoreCase) &&
-                !n.Id.Contains("midjourney", StringComparison.OrdinalIgnoreCase))
-            .Select(n => new Model(n.Id, n.Name));
+                request.Headers.Authorization = new AuthenticationHeaderValue("Bearer", secretKey);
+                request.Headers.Add("HTTP-Referer", PROJECT_WEBSITE);
+                request.Headers.Add("X-Title", PROJECT_NAME);
+            });
     }
 
-    private async Task<IEnumerable<Model>> LoadEmbeddingModels(CancellationToken token, string? apiKeyProvisional = null)
+    private Task<ModelLoadResult> LoadEmbeddingModels(CancellationToken token, string? apiKeyProvisional = null)
     {
-        var secretKey = apiKeyProvisional switch
-        {
-            not null => apiKeyProvisional,
-            _ => await RUST_SERVICE.GetAPIKey(this, SecretStoreType.EMBEDDING_PROVIDER) switch
+        return this.LoadModelsResponse<OpenRouterModelsResponse>(
+            SecretStoreType.EMBEDDING_PROVIDER,
+            "embeddings/models",
+            modelResponse => modelResponse.Data.Select(n => new Model(n.Id, n.Name)),
+            token,
+            apiKeyProvisional,
+            requestConfigurator: (request, secretKey) =>
             {
-                { Success: true } result => await result.Secret.Decrypt(ENCRYPTION),
-                _ => null,
-            }
-        };
-
-        if (secretKey is null)
-            return [];
-
-        using var request = new HttpRequestMessage(HttpMethod.Get, "embeddings/models");
-        request.Headers.Authorization = new AuthenticationHeaderValue("Bearer", secretKey);
-        
-        // Set custom headers for project identification:
-        request.Headers.Add("HTTP-Referer", PROJECT_WEBSITE);
-        request.Headers.Add("X-Title", PROJECT_NAME);
-
-        using var response = await this.httpClient.SendAsync(request, token);
-        if(!response.IsSuccessStatusCode)
-            return [];
-
-        var modelResponse = await response.Content.ReadFromJsonAsync<OpenRouterModelsResponse>(token);
-
-        // Convert all embedding models to Model
-        return modelResponse.Data.Select(n => new Model(n.Id, n.Name));
+                request.Headers.Authorization = new AuthenticationHeaderValue("Bearer", secretKey);
+                request.Headers.Add("HTTP-Referer", PROJECT_WEBSITE);
+                request.Headers.Add("X-Title", PROJECT_NAME);
+            });
     }
-}
+}