Merge pull request #512 from ionite34/backport/main/pr-511

[main] Merge pull request #511 from ionite34/recommended-fix
LykosAI · Feb 9, 2024 · dfc27fc · dfc27fc
2 parents 735a2aa + 587fee5
commit dfc27fc
Showing 1 changed file with 29 additions and 15 deletions.
diff --git a/StabilityMatrix.Avalonia/ViewModels/Dialogs/RecommendedModelsViewModel.cs b/StabilityMatrix.Avalonia/ViewModels/Dialogs/RecommendedModelsViewModel.cs
@@ -8,6 +8,7 @@
 using DynamicData;
 using DynamicData.Binding;
 using Microsoft.Extensions.Logging;
+using Refit;
 using StabilityMatrix.Avalonia.Services;
 using StabilityMatrix.Avalonia.ViewModels.Base;
 using StabilityMatrix.Core.Api;
@@ -86,21 +87,34 @@ public override async Task OnLoadedAsync()
 
         IsLoading = true;
 
-        var recommendedModels = await lykosApi.GetRecommendedModels();
-
-        CivitModels.AddOrUpdate(
-            recommendedModels.Items.Select(
-                model =>
-                    new RecommendedModelItemViewModel
-                    {
-                        ModelVersion = model.ModelVersions.First(
-                            x => !x.BaseModel.Contains("Turbo", StringComparison.OrdinalIgnoreCase)
-                        ),
-                        Author = $"by {model.Creator.Username}",
-                        CivitModel = model
-                    }
-            )
-        );
+        try
+        {
+            var recommendedModels = await lykosApi.GetRecommendedModels();
+
+            CivitModels.AddOrUpdate(
+                recommendedModels.Items.Select(
+                    model =>
+                        new RecommendedModelItemViewModel
+                        {
+                            ModelVersion = model.ModelVersions.First(
+                                x => !x.BaseModel.Contains("Turbo", StringComparison.OrdinalIgnoreCase)
+                            ),
+                            Author = $"by {model.Creator.Username}",
+                            CivitModel = model
+                        }
+                )
+            );
+        }
+        catch (ApiException e)
+        {
+            // hide dialog and show error msg
+            logger.LogError(e, "Failed to get recommended models");
+            notificationService.Show(
+                "Failed to get recommended models",
+                "Please try again later or check the Model Browser tab for more models."
+            );
+            OnCloseButtonClick();
+        }
 
         IsLoading = false;
     }