Merge branch 'main' into backport/main/pr-902

Author: mohnjiles

CHANGELOG.md

@@ -5,83 +5,19 @@ 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).
 
-<<<<<<< HEAD
-=======
-## v2.13.0-pre.1
-### Added
-- Added file sizes to the Checkpoint Manager tab
-### Changed
-- Improved Packages Page grid layout to dynamically stretch to fill available space
-### Fixed
-- Fixed missing package thumbnails due to moved or inaccessible urls
-
-## v2.13.0-dev.3
-### Added
-- Added support for SD3.5 in Inference
-- Added CLIP_G to HuggingFace model browser
-- Added search bar to the Installed Workflows tab
-- Added "Search with Google" and "Search with ChatGPT" to the package console output & install progress console output context menus
-- Added "Date Created" and "Date Last Modified" sorting options to the Checkpoints tab
-### Changed
-- Text Encoder / CLIP selection in Inference is now enabled via the cogwheel ⚙️ button next to the model selector 
-- Added more base model types to the CivitAI Model Browser & Checkpoint Manager
-- Model browser base model types are now loaded dynamically from CivitAI, reducing the need for updates to add new types
-- Updated Civitai model descriptions to properly render the interactive elements
-- Updated Russian translations thanks to @vanja-san
-- Updated Simplified Chinese translations thanks to @QL-boy
-- (Internal) Updated to Avalonia 11.2.0
-### Fixed
-- Fixed some instances of Civitai model browser not loading new results
-- Fixed "Unsupported Torch Version: Cuda" errors when installing a1111
-- Fixed crash when clicking "Remind me Later" on the update dialog
-- Fixed some cases of crashing when GitHub API rate limits are exceeded
-- Fixed Git missing from env vars when running SwarmUI
-### Supporters
-#### Visionaries
-- Big shoutout to our amazing Visionary-tier Patreon supporter, **Waterclouds**! We are very grateful for your continued support!
-
-## v2.13.0-dev.2
-### Added
-- Added new package - [SimpleSDXL](https://github.com/metercai/SimpleSDXL) - many thanks to @NullDev for the contribution!
-- Added new package - [FluxGym](https://github.com/cocktailpeanut/fluxgym) - many thanks to @NullDev for the contribution!
-- Added a new "Extension Packs" section to the extension manager, allowing you to create packs for easier installation of multiple extensions at once
-- Added "Search by Creator" command to Civitai browser context menu
-- Added Beta scheduler to the scheduler selector in Inference
-- Added zipping of log files and "Show Log in Explorer" button on exceptions dialog for easier support
-- Added max concurrent downloads option & download queueing for most downloads
-### Changed
-- (Internal) Updated to Avalonia 11.1.4
-- Adjusted the Branch/Release toggle during package install flow to be a little more obvious
-- Updated the Dock library used for Inference - fixes some weirdness with resizing / rearranging panels
-### Fixed
-- Fixed ComfyUI NF4 extension not installing properly when prompted in Inference
-- Fixed [#932](https://github.com/LykosAI/StabilityMatrix/issues/932), [#935](https://github.com/LykosAI/StabilityMatrix/issues/935), [#939](https://github.com/LykosAI/StabilityMatrix/issues/939) - InvokeAI failing to update
-- Fixed repeated nested folders being created in `Models/StableDiffusion` when using Forge in Symlink mode in certain conditions. Existing folders will be repaired to their original structure on launch.
-- Fixed minimize button not working on macOS
-- Fixed InvokeAI model sharing spamming the console with "This may take awhile" in certain conditions
-- Fixed text alignment issues in the Downloads tab for certain long names / progress infos
-### Supporters
-#### Visionaries
-- A big thank you to our amazing Visionary-tier Patreon supporter, **Waterclouds**! Your continued support is invaluable!
-
-## v2.13.0-dev.1
-### Added
-- Added the ability to change the Models directory separately from the rest of the Data directory. This can be set in `Settings > Select new Models Folder`
-- Added "Copy" menu to the Inference gallery context menu, allowing you to copy the image or the seed (other params coming soon™️)
-- Added InvokeAI model sharing option
-### Supporters
-#### Visionaries
-- A heartfelt thank you to our incredible Visionary-tier Patreon supporter, **Waterclouds**! Your ongoing support means a lot to us, and we’re grateful to have you with us on this journey!
-
->>>>>>> 746ee01a (Merge pull request #902 from ionite34/fix-package-images)
 ## v2.12.4
+### Added
+- Added new package - [CogVideo](https://github.com/THUDM/CogVideo) - many thanks to @NullDev for the contribution!
+- Added more formatting options for Inference output filenames - thanks to @yansigit!
 ### Changed
 - Model browser base model types are now loaded dynamically from CivitAI, reducing the need for updates to add new types
 ### Fixed
 - Fixed crash when clicking "Remind me Later" on the update dialog
 - Fixed some cases of crashing when GitHub API rate limits are exceeded
 - Fixed Git missing from env vars when running SwarmUI
 - Fixed missing package thumbnails due to moved or inaccessible urls
+- Fixed an issue with updating FluxGym in certain cases - thanks to @NullDev!
+- Fixed a typo in the Japanese translation - thanks to @mattyatea!
 ### Supporters
 #### Visionaries
 - A huge thank you to our dedicated Visionary-tier Patreon supporter, **Waterclouds**! We’re thrilled to have your ongoing support!

StabilityMatrix.Avalonia/Languages/Resources.ja-JP.resx

@@ -1032,7 +1032,7 @@
     <value>Checkpoints</value>
   </data>
   <data name="Label_ModelBrowser" xml:space="preserve">
-    <value>Model Brouser</value>
+    <value>Model Browser</value>
   </data>
   <data name="Label_Workflows" xml:space="preserve">
     <value>ワークフロー</value>
@@ -1148,4 +1148,4 @@
   <data name="Warning_PleaseExtractFirst" xml:space="preserve">
     <value>Stability Matrixを実行する前に、ZIPファイルからアプリを抽出してください</value>
   </data>
-</root>
+</root>

StabilityMatrix.Avalonia/Models/Inference/FileNameFormatProvider.cs

@@ -30,6 +30,9 @@ public partial class FileNameFormatProvider
             { "negative_prompt", () => GenerationParameters?.NegativePrompt },
             { "model_name", () => Path.GetFileNameWithoutExtension(GenerationParameters?.ModelName) },
             { "model_hash", () => GenerationParameters?.ModelHash },
+            { "sampler", () => GenerationParameters?.Sampler },
+            { "cfgscale", () => GenerationParameters?.CfgScale.ToString() },
+            { "steps", () => GenerationParameters?.Steps.ToString() },
             { "width", () => GenerationParameters?.Width.ToString() },
             { "height", () => GenerationParameters?.Height.ToString() },
             { "project_type", () => ProjectType?.GetStringValue() },