Merge pull request #603 from ionite34/downmerge

Downmerge

CHANGELOG.md

@@ -11,6 +11,8 @@ and this project adheres to [Semantic Versioning 2.0](https://semver.org/spec/v2
 ### Fixed
 - Fixed package launch not working when environment variable `SETUPTOOLS_USE_DISTUTILS` is set due to conflict with a default environment variable. User environment variables will now correctly override any default environment variables.
 - Fixed "No refresh token found" error when failing to login with Lykos account in some cases.
+- Fixed [#584](https://github.com/LykosAI/StabilityMatrix/issues/584) - `--launch-package` argument not working
+- Fixed [#581](https://github.com/LykosAI/StabilityMatrix/issues/581) - Inference teaching tip showing more often than it should
 - Fixed [#574](https://github.com/LykosAI/StabilityMatrix/issues/574) - local images not showing on macOS or Linux
 - Fixed [#578](https://github.com/LykosAI/StabilityMatrix/issues/578) - "python setup.py egg_info did not run successfully" failure when installing Auto1111 or SDWebUI Forge
 
@@ -114,6 +116,13 @@ and this project adheres to [Semantic Versioning 2.0](https://semver.org/spec/v2
 ### Removed
 - Removed the main Launch page, as it is no longer needed with the new Packages page
 
+## 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/Controls/Inference/PromptCard.axaml

@@ -72,7 +72,7 @@
                                     <ui:TeachingTip 
                                         Target="{Binding #PART_HelpButton}"
                                         Title="{x:Static lang:Resources.TeachingTip_InferencePromptHelpButton}"
-                                        IsOpen="{Binding IsHelpButtonTeachingTipOpen}"/>
+                                        IsOpen="{Binding IsHelpButtonTeachingTipOpen, Mode=TwoWay}"/>
                                 </Panel>
                                 
                                 <Button

StabilityMatrix.Avalonia/ViewModels/PackageManagerViewModel.cs

@@ -42,6 +42,7 @@ public partial class PackageManagerViewModel : PageViewModelBase
     private readonly INotificationService notificationService;
     private readonly INavigationService<NewPackageManagerViewModel> packageNavigationService;
     private readonly ILogger<PackageManagerViewModel> logger;
+    private readonly RunningPackageService runningPackageService;
 
     public override string Title => Resources.Label_Packages;
     public override IconSource IconSource => new SymbolIconSource { Symbol = Symbol.Box, IsFilled = true };
@@ -69,7 +70,8 @@ public partial class PackageManagerViewModel : PageViewModelBase
         ServiceManager<ViewModelBase> dialogFactory,
         INotificationService notificationService,
         INavigationService<NewPackageManagerViewModel> packageNavigationService,
-        ILogger<PackageManagerViewModel> logger
+        ILogger<PackageManagerViewModel> logger,
+        RunningPackageService runningPackageService
     )
     {
         this.settingsManager = settingsManager;
@@ -77,6 +79,7 @@ public partial class PackageManagerViewModel : PageViewModelBase
         this.notificationService = notificationService;
         this.packageNavigationService = packageNavigationService;
         this.logger = logger;
+        this.runningPackageService = runningPackageService;
 
         EventManager.Instance.InstalledPackagesChanged += OnInstalledPackagesChanged;
         EventManager.Instance.OneClickInstallFinished += OnOneClickInstallFinished;
@@ -118,15 +121,39 @@ public partial class PackageManagerViewModel : PageViewModelBase
         unknownInstalledPackages.Edit(s => s.Load(packages));
     }
 
+    protected override async Task OnInitialLoadedAsync()
+    {
+        if (string.IsNullOrWhiteSpace(Program.Args.LaunchPackageName))
+        {
+            await base.OnInitialLoadedAsync();
+            return;
+        }
+
+        await LoadPackages();
+
+        var package = Packages.FirstOrDefault(x => x.DisplayName == Program.Args.LaunchPackageName);
+        if (package is not null)
+        {
+            await runningPackageService.StartPackage(package);
+            return;
+        }
+
+        package = Packages.FirstOrDefault(x => x.Id.ToString() == Program.Args.LaunchPackageName);
+        if (package is null)
+        {
+            await base.OnInitialLoadedAsync();
+            return;
+        }
+
+        await runningPackageService.StartPackage(package);
+    }
+
     public override async Task OnLoadedAsync()
     {
         if (Design.IsDesignMode || !settingsManager.IsLibraryDirSet)
             return;
 
-        installedPackages.EditDiff(settingsManager.Settings.InstalledPackages, InstalledPackage.Comparer);
+        await LoadPackages();
-
-        var currentUnknown = await Task.Run(IndexUnknownPackages);
-        unknownInstalledPackages.Edit(s => s.Load(currentUnknown));
 
         timer.Start();
     }
@@ -142,6 +169,14 @@ public partial class PackageManagerViewModel : PageViewModelBase
         NavigateToSubPage(typeof(PackageInstallBrowserViewModel));
     }
 
+    private async Task LoadPackages()
+    {
+        installedPackages.EditDiff(settingsManager.Settings.InstalledPackages, InstalledPackage.Comparer);
+
+        var currentUnknown = await Task.Run(IndexUnknownPackages);
+        unknownInstalledPackages.Edit(s => s.Load(currentUnknown));
+    }
+
     private async Task CheckPackagesForUpdates()
     {
         foreach (var package in PackageCards)