Merge pull request LykosAI#1043 from ionite34/fix-loras-and-recommended

Fix Extra Networks card duplicating Loras and updated RecommendedModels to use v2 endpoint

Author: mohnjiles

CHANGELOG.md

@@ -13,11 +13,13 @@ and this project adheres to [Semantic Versioning 2.0](https://semver.org/spec/v2
 - Added Prompt Amplifier to Inference - click the magic wand 🪄 in the prompt editor to expand and enrich your ideas. Tailor the vibe with the ‘Feel’ selector and watch as your generations come to life with extra detail, coherence, and flair!
 ### Changed
 - Updated install for kohya_ss to support RTX 5000-series GPUs
+- (pre.2 re-release) Merged Inference GGUF workflows into the UNet model loader option (no longer need to choose GGUF separately)
 ### Fixed
 - Fixed Inference ControlNet Preprocessors using incorrect resolution and increased maximum of smallest dimension to 16384
 - Fixed Triton/Sage install option showing for incompatible GPUs
 - Fixed errors from invalid pip specifiers in requirements files
 - Fixed package images sometimes showing as blank due to concurrent image caching. Requests to same image resources are now de-duplicated
+- (pre.2 re-release) Fixed Inference Extra Networks card not allowing for more than one model at a time
 ### Supporters
 #### Visionaries
 - Big shout-out to our Visionary-tier patrons: Waterclouds, Corey T, bluepopsicle, and Bob S! Your steadfast support keeps Stability Matrix moving forward, and we couldn’t do it without you. 🚀 Thank you!

StabilityMatrix.Avalonia/App.axaml.cs

@@ -660,6 +660,16 @@ internal static IServiceCollection ConfigureServices()
                     new TokenAuthHeaderHandler(serviceProvider.GetRequiredService<LykosAuthTokenProvider>())
             );
 
+        services
+            .AddRefitClient<IRecommendedModelsApi>(defaultRefitSettings)
+            .ConfigureHttpClient(c =>
+            {
+                c.BaseAddress = new Uri(LykosAuthApiBaseUrl);
+                c.Timeout = TimeSpan.FromHours(1);
+            })
+            .ConfigurePrimaryHttpMessageHandler(() => new HttpClientHandler { AllowAutoRedirect = false })
+            .AddPolicyHandler(retryPolicy);
+
         services
             .AddRefitClient<IPromptGenApi>(defaultRefitSettings)
             .ConfigureHttpClient(c =>

StabilityMatrix.Avalonia/DesignData/DesignData.cs

@@ -459,45 +459,71 @@ public static void Initialize()
     public static RecommendedModelsViewModel RecommendedModelsViewModel =>
         DialogFactory.Get<RecommendedModelsViewModel>(vm =>
         {
-            vm.Sd15Models = new ObservableCollectionExtended<RecommendedModelItemViewModel>()
-            {
-                new()
-                {
-                    ModelVersion = new CivitModelVersion
+            // Populate the single RecommendedModels collection for design time
+            vm.RecommendedModels.AddRange(
+                [
+                    new RecommendedModelItemViewModel
                     {
-                        Name = "BB95 Furry Mix",
-                        Description = "A furry mix of BB95",
-                        Stats = new CivitModelStats { Rating = 3.5, RatingCount = 24 },
-                        Images =
-                        [
-                            new CivitImage
-                            {
-                                Url =
-                                    "https://image.civitai.com/xG1nkqKTMzGDvpLrqFT7WA/78fd2a0a-42b6-42b0-9815-81cb11bb3d05/00009-2423234823.jpeg"
-                            }
-                        ],
+                        CivitModel = new CivitModel { Name = "BB95 Furry Mix", Id = 1 }, // Added Id for clarity
+                        ModelVersion = new CivitModelVersion
+                        {
+                            Id = 101, // Added Id for clarity
+                            Name = "v1.0", // Example version name
+                            BaseModel = "SD 1.5", // Example base model
+                            Stats = new CivitModelStats { Rating = 4.5, RatingCount = 124 },
+                            Files = [new CivitFile { Type = CivitFileType.Model }], // Example file
+                            Images =
+                            [
+                                new CivitImage
+                                {
+                                    Type = "image", // Ensure type is set
+                                    Url =
+                                        "https://image.civitai.com/xG1nkqKTMzGDvpLrqFT7WA/78fd2a0a-42b6-42b0-9815-81cb11bb3d05/00009-2423234823.jpeg"
+                                }
+                            ],
+                        },
+                        Author = "by bb95"
                     },
-                    Author = "bb95"
-                },
-                new()
-                {
-                    ModelVersion = new CivitModelVersion
+                    new RecommendedModelItemViewModel
                     {
-                        Name = "BB95 Furry Mix",
-                        Description = "A furry mix of BB95",
-                        Stats = new CivitModelStats { Rating = 3.5, RatingCount = 24 },
-                        Images =
-                        [
-                            new CivitImage
-                            {
-                                Url =
-                                    "https://image.civitai.com/xG1nkqKTMzGDvpLrqFT7WA/78fd2a0a-42b6-42b0-9815-81cb11bb3d05/00009-2423234823.jpeg"
-                            }
-                        ],
+                        CivitModel = new CivitModel { Name = "DreamShaper XL", Id = 2 },
+                        ModelVersion = new CivitModelVersion
+                        {
+                            Id = 201,
+                            Name = "v2.1 Turbo",
+                            BaseModel = "SDXL 1.0",
+                            Stats = new CivitModelStats { Rating = 4.8, RatingCount = 589 },
+                            Files = [new CivitFile { Type = CivitFileType.Model, IsPrimary = true }],
+                            Images =
+                            [
+                                new CivitImage
+                                {
+                                    Type = "image",
+                                    // Placeholder - replace with an actual relevant image URL if possible
+                                    Url =
+                                        "https://image.civitai.com/xG1nkqKTMzGDvpLrqFT7WA/0cf3e133-4dde-458b-8a70-7451a3361472/width=450/00016-3919014893.jpeg"
+                                }
+                            ],
+                        },
+                        Author = "by Lykon"
                     },
-                    Author = "bb95"
-                }
-            };
+                    new RecommendedModelItemViewModel
+                    {
+                        CivitModel = new CivitModel { Name = "Another Model SD1.5", Id = 3 },
+                        ModelVersion = new CivitModelVersion
+                        {
+                            Id = 301,
+                            Name = "Final",
+                            BaseModel = "SD 1.5",
+                            Stats = new CivitModelStats { Rating = 4.2, RatingCount = 99 },
+                            Files = [new CivitFile { Type = CivitFileType.Model }],
+                            Images = [new CivitImage { Type = "image", Url = Assets.NoImage.ToString() }], // Use placeholder
+                        },
+                        Author = "by Creator3"
+                    }
+                    // Add more items as needed for design-time preview
+                ]
+            );
         });
     public static OutputsPageViewModel OutputsPageViewModel
     {