Merge pull request LykosAI#1109 from ionite34/update-base-model-parsing

update base model parsing from error response cuz civit changed response model

(cherry picked from commit a397926)

# Conflicts:
#	CHANGELOG.md

Author: mohnjiles

CHANGELOG.md

@@ -23,6 +23,33 @@ and this project adheres to [Semantic Versioning 2.0](https://semver.org/spec/v2
 - Fixed [#1305](https://github.com/LykosAI/StabilityMatrix/issues/1305) - FluxGym installing incorrect packages for Blackwell GPUs
 - Fixed [#1316](https://github.com/LykosAI/StabilityMatrix/issues/1316) - Errors when installing Triton & SageAttention
 - Fixed "directory is not empty" error when updating packages with symlinks
+<<<<<<< HEAD
+=======
+- Fixed missing base model types in the Checkpoint Manager & Civitai Model Browser
+### Supporters
+#### 🌟 Visionaries
+A huge thank you to our amazing Visionary-tier Patrons: **Waterclouds**, **Corey T**, **bluepopsicle**, **Bob S**, **Ibixat**, and our newest Visionary, **whudunit**! 🚀 Your generous support enables Stability Matrix to grow faster and tackle ambitious new ideas. You're truly making all the magic happen!
+
+## v2.15.0-dev.1
+### Added
+- Added Python Version selector for all new package installs
+- Added the ability to rename packages
+### Changed
+- Updated all Python version management, virtual environment creation, and pip installs to use `uv` for improved reliability, compatibility, and speed
+- The Civitai model browser Download Location selector will now remember the last location used based on the model type
+- New installs of ComfyUI, SD.Next, and InvokeAI will now use Python 3.12.10, unless otherwise specified in the Advanced Options during installation
+- New installs of all other packages will now use Python 3.10.17, unless otherwise specified in the Advanced Options during installation
+### Supporters
+#### 🌟 Visionaries
+A massive thank you to our esteemed Visionary-tier Patrons: **Waterclouds**, **bluepopsicle**, **Bob S**, **Ibixat**, and **Corey T**! Your exceptional commitment propels Stability Matrix to new heights and allows us to push the boundaries of innovation. We're incredibly grateful for your foundational support! 🚀
+
+## v2.14.3
+### Changed
+- Inference is now able to load image metadata from Civitai generated images via drag & drop
+- Updated process tracking for ComfyUI to help mitigate restart issues when using Comfy Manager
+### Fixed
+- Fixed ComfyUI-Zluda not being recognized as a valid Comfy install for the workflow browser
+>>>>>>> a397926b (Merge pull request #1109 from ionite34/update-base-model-parsing)
 
 ## v2.14.2
 ### Changed

StabilityMatrix.Avalonia/Services/CivitBaseModelTypeService.cs

@@ -3,6 +3,7 @@
 using Microsoft.Extensions.Logging;
 using StabilityMatrix.Core.Api;
 using StabilityMatrix.Core.Database;
+using StabilityMatrix.Core.Extensions;
 using StabilityMatrix.Core.Models.Api;
 using StabilityMatrix.Core.Models.Database;
 
@@ -42,18 +43,18 @@ public async Task<List<string>> GetBaseModelTypes(bool forceRefresh = false, boo
                 var jsonContent = await baseModelsResponse.Content.ReadAsStringAsync();
                 var baseModels = JsonNode.Parse(jsonContent);
 
-                var jArray =
-                    baseModels?["error"]?["issues"]?[0]?["unionErrors"]?[0]?["issues"]?[0]?["options"]
-                    as JsonArray;
+                var innerJson = baseModels?["error"]?["message"]?.GetValue<string>();
+                var jArray = JsonNode.Parse(innerJson).AsArray();
+                var baseModelValues = jArray[0]?["errors"]?[0]?[0]?["values"]?.AsArray();
 
-                civitBaseModels = jArray?.GetValues<string>().ToList() ?? [];
+                civitBaseModels = baseModelValues?.GetValues<string>().ToList() ?? [];
 
                 // Cache the results
                 var cacheEntry = new CivitBaseModelTypeCacheEntry
                 {
                     Id = CacheId,
                     ModelTypes = civitBaseModels,
-                    CreatedAt = DateTimeOffset.UtcNow
+                    CreatedAt = DateTimeOffset.UtcNow,
                 };
 
                 await dbContext.UpsertCivitBaseModelTypeCacheEntry(cacheEntry);
@@ -78,7 +79,8 @@ public async Task<List<string>> GetBaseModelTypes(bool forceRefresh = false, boo
 
             // Return cached results if available, even if expired
             var expiredCache = await dbContext.GetCivitBaseModelTypeCacheEntry(CacheId);
-            return expiredCache?.ModelTypes ?? [];
+            return expiredCache?.ModelTypes
+                ?? Enum.GetValues<CivitBaseModelType>().Select(b => b.GetStringValue()).ToList();
         }
     }