Merge pull request #585 from ionite34/fix-invoke-and-civit

Fix invoke and civit

CHANGELOG.md

@@ -5,6 +5,13 @@ All notable changes to Stability Matrix will be documented in this file.
 The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.1.0/),
 and this project adheres to [Semantic Versioning 2.0](https://semver.org/spec/v2.0.0.html).
 
+## v2.9.3
+### Changed
+- Removed Symlink option for InvokeAI to prevent InvokeAI from moving models into its own directories (will be replaced with a Config option in a future update)
+### Fixed
+- Fixed images not appearing in Civitai Model Browser when "Show NSFW" was disabled
+- Fixed [#556](https://github.com/LykosAI/StabilityMatrix/issues/556) - "Could not find entry point for InvokeAI" error
+
 ## v2.9.2
 ### Changed
 - Due to changes with the CivitAI API, you can no longer select a specific page in the CivitAI Model Browser

StabilityMatrix.Avalonia/DesignData/DesignData.cs

@@ -345,7 +345,7 @@ public static class DesignData
                             {
                                 new()
                                 {
-                                    Nsfw = "None",
+                                    NsfwLevel = 1,
                                     Url =
                                         "https://image.civitai.com/xG1nkqKTMzGDvpLrqFT7WA/"
                                         + "78fd2a0a-42b6-42b0-9815-81cb11bb3d05/00009-2423234823.jpeg"

StabilityMatrix.Avalonia/ViewModels/CheckpointBrowser/CheckpointBrowserCardViewModel.cs

@@ -158,7 +158,7 @@ public partial class CheckpointBrowserCardViewModel : Base.ProgressViewModel
         // Try to find a valid image
         var image = images
             ?.Where(img => LocalModelFile.SupportedImageExtensions.Any(img.Url.Contains))
-            .FirstOrDefault(image => nsfwEnabled || image.Nsfw == "None");
+            .FirstOrDefault(image => nsfwEnabled || image.NsfwLevel <= 1);
         if (image != null)
         {
             CardImage = new Uri(image.Url);

StabilityMatrix.Avalonia/ViewModels/Dialogs/SelectModelVersionViewModel.cs

@@ -99,7 +99,7 @@ public partial class SelectModelVersionViewModel(
         var allImages = value
             ?.ModelVersion
             ?.Images
-            ?.Where(img => nsfwEnabled || img.Nsfw == "None")
+            ?.Where(img => nsfwEnabled || img.NsfwLevel <= 1)
             ?.Select(x => new ImageSource(x.Url))
             .ToList();
 

StabilityMatrix.Core/Models/Api/CivitImage.cs

@@ -7,8 +7,8 @@ public class CivitImage
     [JsonPropertyName("url")]
     public string Url { get; set; }
 
-    [JsonPropertyName("nsfw")]
-    public string Nsfw { get; set; }
+    [JsonPropertyName("nsfwLevel")]
+    public int? NsfwLevel { get; set; }
 
     [JsonPropertyName("width")]
     public int Width { get; set; }

StabilityMatrix.Core/Models/Packages/InvokeAI.cs

@@ -32,23 +32,14 @@ public class InvokeAI : BaseGitPackage
     public override PackageDifficulty InstallerSortOrder => PackageDifficulty.Nightmare;
 
     public override IReadOnlyList<string> ExtraLaunchCommands =>
-        new[]
-        {
-            "invokeai-configure",
-            "invokeai-merge",
-            "invokeai-metadata",
-            "invokeai-model-install",
-            "invokeai-node-cli",
-            "invokeai-ti",
-            "invokeai-update",
-        };
+        new[] { "invokeai-db-maintenance", "invokeai-import-images", };
 
     public override Uri PreviewImageUri =>
         new("https://raw.githubusercontent.com/invoke-ai/InvokeAI/main/docs/assets/canvas_preview.png");
 
     public override IEnumerable<SharedFolderMethod> AvailableSharedFolderMethods =>
-        new[] { SharedFolderMethod.Symlink, SharedFolderMethod.None };
-    public override SharedFolderMethod RecommendedSharedFolderMethod => SharedFolderMethod.Symlink;
+        new[] { SharedFolderMethod.None };
+    public override SharedFolderMethod RecommendedSharedFolderMethod => SharedFolderMethod.None;
 
     public override string MainBranch => "main";
 
@@ -127,23 +118,11 @@ public class InvokeAI : BaseGitPackage
                 Options = ["--allow-origins"]
             },
             new LaunchOptionDefinition
-            {
-                Name = "Always use CPU",
-                Type = LaunchOptionType.Bool,
-                Options = ["--always_use_cpu"]
-            },
-            new LaunchOptionDefinition
             {
                 Name = "Precision",
                 Type = LaunchOptionType.Bool,
                 Options = ["--precision auto", "--precision float16", "--precision float32"]
             },
-            new LaunchOptionDefinition
-            {
-                Name = "Aggressively free up GPU memory after each operation",
-                Type = LaunchOptionType.Bool,
-                Options = ["--free_gpu_mem"]
-            },
             LaunchOptionDefinition.Extras
         ];
 
@@ -223,9 +202,9 @@ public class InvokeAI : BaseGitPackage
                 await venvRunner
                     .PipInstall(
                         new PipInstallArgs(args.Any() ? args.ToArray() : Array.Empty<Argument>())
-                            .WithTorch("==2.1.2")
-                            .WithTorchVision("==0.16.2")
-                            .WithXFormers("==0.0.23post1")
+                            .WithTorch("==2.2.1")
+                            .WithTorchVision("==0.17.1")
+                            .WithXFormers("==0.0.25")
                             .WithTorchExtraIndex("cu121"),
                         onConsoleOutput
                     )
@@ -262,24 +241,6 @@ public class InvokeAI : BaseGitPackage
             .ConfigureAwait(false);
 
         await venvRunner.PipInstall("rich packaging python-dotenv", onConsoleOutput).ConfigureAwait(false);
-
-        progress?.Report(new ProgressReport(-1f, "Configuring InvokeAI", isIndeterminate: true));
-
-        // need to setup model links before running invokeai-configure so it can do its conversion
-        await SetupModelFolders(installLocation, selectedSharedFolderMethod).ConfigureAwait(false);
-
-        await RunInvokeCommand(
-                installLocation,
-                "invokeai-configure",
-                "--yes --skip-sd-weights",
-                true,
-                onConsoleOutput,
-                spam3: true
-            )
-            .ConfigureAwait(false);
-
-        await VenvRunner.Process.WaitForExitAsync();
-
         progress?.Report(new ProgressReport(1f, "Done!", isIndeterminate: false));
     }
 
@@ -362,12 +323,6 @@ public class InvokeAI : BaseGitPackage
 
         await SetupVenv(installedPackagePath).ConfigureAwait(false);
 
-        arguments = command switch
-        {
-            "invokeai-configure" => "--yes --skip-sd-weights",
-            _ => arguments
-        };
-
         VenvRunner.EnvironmentVariables = GetEnvVars(installedPackagePath);
 
         // fix frontend build missing for people who updated to v3.6 before the fix