Skip to content

Commit 6be741f

Browse files
authored
Merge pull request #676 from ionite34/v2.11.0
v2.11.0
2 parents 615f7ba + 8861bd5 commit 6be741f

File tree

243 files changed

+12244
-5913
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

243 files changed

+12244
-5913
lines changed

.editorconfig

+68-2
Original file line numberDiff line numberDiff line change
@@ -2,12 +2,78 @@ root = true
22

33
[*.cs]
44
max_line_length = 120
5-
csharp_style_var_for_built_in_types = true
5+
csharp_style_var_for_built_in_types = true:suggestion
66
dotnet_sort_system_directives_first = true
77

88
# ReSharper properties
99
resharper_csharp_max_line_length = 120
10+
resharper_place_field_attribute_on_same_line = false
1011

1112
# dotnet code quality
1213
# noinspection EditorConfigKeyCorrectness
13-
dotnet_code_quality.CA1826.exclude_ordefault_methods = true
14+
dotnet_code_quality.ca1826.exclude_ordefault_methods = true
15+
16+
# Microsoft .NET properties
17+
csharp_new_line_before_members_in_object_initializers = false
18+
csharp_preferred_modifier_order = public, private, protected, internal, file, static, new, abstract, virtual, sealed, readonly, override, extern, unsafe, volatile, async, required:suggestion
19+
csharp_style_prefer_utf8_string_literals = true:suggestion
20+
csharp_style_var_elsewhere = true:suggestion
21+
csharp_style_var_when_type_is_apparent = true:suggestion
22+
dotnet_naming_rule.private_constants_rule.import_to_resharper = True
23+
dotnet_naming_rule.private_constants_rule.resharper_description = Constant fields (private)
24+
dotnet_naming_rule.private_constants_rule.resharper_guid = 236f7aa5-7b06-43ca-bf2a-9b31bfcff09a
25+
dotnet_naming_rule.private_constants_rule.severity = warning
26+
dotnet_naming_rule.private_constants_rule.style = upper_camel_case_style
27+
dotnet_naming_rule.private_constants_rule.symbols = private_constants_symbols
28+
dotnet_naming_rule.private_instance_fields_rule.import_to_resharper = True
29+
dotnet_naming_rule.private_instance_fields_rule.resharper_description = Instance fields (private)
30+
dotnet_naming_rule.private_instance_fields_rule.resharper_guid = 4a98fdf6-7d98-4f5a-afeb-ea44ad98c70c
31+
dotnet_naming_rule.private_instance_fields_rule.resharper_style = aaBb, _ + aaBb
32+
dotnet_naming_rule.private_instance_fields_rule.severity = warning
33+
dotnet_naming_rule.private_instance_fields_rule.style = lower_camel_case_style_1
34+
dotnet_naming_rule.private_instance_fields_rule.symbols = private_instance_fields_symbols
35+
dotnet_naming_rule.private_static_fields_rule.import_to_resharper = True
36+
dotnet_naming_rule.private_static_fields_rule.resharper_description = Static fields (private)
37+
dotnet_naming_rule.private_static_fields_rule.resharper_guid = f9fce829-e6f4-4cb2-80f1-5497c44f51df
38+
dotnet_naming_rule.private_static_fields_rule.severity = warning
39+
dotnet_naming_rule.private_static_fields_rule.style = lower_camel_case_style
40+
dotnet_naming_rule.private_static_fields_rule.symbols = private_static_fields_symbols
41+
dotnet_naming_rule.private_static_readonly_rule.import_to_resharper = True
42+
dotnet_naming_rule.private_static_readonly_rule.resharper_description = Static readonly fields (private)
43+
dotnet_naming_rule.private_static_readonly_rule.resharper_guid = 15b5b1f1-457c-4ca6-b278-5615aedc07d3
44+
dotnet_naming_rule.private_static_readonly_rule.severity = warning
45+
dotnet_naming_rule.private_static_readonly_rule.style = upper_camel_case_style
46+
dotnet_naming_rule.private_static_readonly_rule.symbols = private_static_readonly_symbols
47+
dotnet_naming_style.lower_camel_case_style.capitalization = camel_case
48+
dotnet_naming_style.lower_camel_case_style.required_prefix = _
49+
dotnet_naming_style.lower_camel_case_style_1.capitalization = camel_case
50+
dotnet_naming_style.upper_camel_case_style.capitalization = pascal_case
51+
dotnet_naming_symbols.private_constants_symbols.applicable_accessibilities = private
52+
dotnet_naming_symbols.private_constants_symbols.applicable_kinds = field
53+
dotnet_naming_symbols.private_constants_symbols.required_modifiers = const
54+
dotnet_naming_symbols.private_constants_symbols.resharper_applicable_kinds = constant_field
55+
dotnet_naming_symbols.private_constants_symbols.resharper_required_modifiers = any
56+
dotnet_naming_symbols.private_instance_fields_symbols.applicable_accessibilities = private
57+
dotnet_naming_symbols.private_instance_fields_symbols.applicable_kinds = field
58+
dotnet_naming_symbols.private_instance_fields_symbols.resharper_applicable_kinds = field,readonly_field
59+
dotnet_naming_symbols.private_instance_fields_symbols.resharper_required_modifiers = instance
60+
dotnet_naming_symbols.private_static_fields_symbols.applicable_accessibilities = private
61+
dotnet_naming_symbols.private_static_fields_symbols.applicable_kinds = field
62+
dotnet_naming_symbols.private_static_fields_symbols.required_modifiers = static
63+
dotnet_naming_symbols.private_static_fields_symbols.resharper_applicable_kinds = field
64+
dotnet_naming_symbols.private_static_fields_symbols.resharper_required_modifiers = static
65+
dotnet_naming_symbols.private_static_readonly_symbols.applicable_accessibilities = private
66+
dotnet_naming_symbols.private_static_readonly_symbols.applicable_kinds = field
67+
dotnet_naming_symbols.private_static_readonly_symbols.required_modifiers = readonly,static
68+
dotnet_naming_symbols.private_static_readonly_symbols.resharper_applicable_kinds = readonly_field
69+
dotnet_naming_symbols.private_static_readonly_symbols.resharper_required_modifiers = static
70+
dotnet_style_parentheses_in_arithmetic_binary_operators = never_if_unnecessary:none
71+
dotnet_style_parentheses_in_other_binary_operators = always_for_clarity:none
72+
dotnet_style_parentheses_in_relational_binary_operators = never_if_unnecessary:none
73+
dotnet_style_predefined_type_for_locals_parameters_members = true:suggestion
74+
dotnet_style_predefined_type_for_member_access = true:suggestion
75+
dotnet_style_qualification_for_event = false:suggestion
76+
dotnet_style_qualification_for_field = false:suggestion
77+
dotnet_style_qualification_for_method = false:suggestion
78+
dotnet_style_qualification_for_property = false:suggestion
79+
dotnet_style_require_accessibility_modifiers = for_non_interface_members:suggestion

CHANGELOG.md

+151
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,157 @@ All notable changes to Stability Matrix will be documented in this file.
55
The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.1.0/),
66
and this project adheres to [Semantic Versioning 2.0](https://semver.org/spec/v2.0.0.html).
77

8+
## v2.11.0
9+
### Added
10+
#### Packages
11+
- Added new package: [SDFX](https://github.com/sdfxai/sdfx/) by sdfxai
12+
- Added ZLUDA option for SD.Next
13+
- Added more launch options for Forge - [#618](https://github.com/LykosAI/StabilityMatrix/issues/618)
14+
- Added search bar to the Python Packages dialog
15+
#### Inference
16+
- Added Inpainting support for Image To Image projects using the new image mask canvas editor
17+
- Added alternate Lora / LyCORIS drop-down model selection, can be toggled via the model settings button. Allows choosing both CLIP and Model Weights. The existing prompt-based `<lora:model:1.0>` method is still available.
18+
- Added optional Recycle Bin mode when deleting images in the Inference image browser, can be disabled in settings (Currently available on Windows and macOS)
19+
#### Model Browsers
20+
- Added PixArt, SDXL Hyper, and SD3 options to the CivitAI Model Browser
21+
- Added XL ControlNets section to HuggingFace model browser
22+
- Added download speed indicator to model downloads in the Downloads tab
23+
#### Output Browser
24+
- Added support for indexing and displaying jpg/jpeg & gif images (in additional to png and webp / animated webp), with metadata parsing and search for compatible formats
25+
#### Settings
26+
- Added setting for locale specific or invariant number formatting
27+
- Added setting for toggling model browser auto-search on load
28+
- Added option in Settings to choose whether to Copy or Move files when dragging and dropping files into the Checkpoint Manager
29+
- Added folder shortcuts in Settings for opening common app and system folders, such as Data Directory and Logs
30+
#### Translations
31+
- Added Brazilian Portuguese language option, thanks to jbostroski for the translation!
32+
### Changed
33+
- Maximized state is now stored on exit and restored on launch
34+
- Drag & drop imports now move files by default instead of copying
35+
- Clicking outside the Select Model Version dialog will now close it
36+
- Changed Package card buttons to better indicate that they are buttons
37+
- Log file storage has been moved from `%AppData%/StabilityMatrix` to a subfolder: `%AppData%/StabilityMatrix/Logs`
38+
- Archived log files now have an increased rolling limit of 9 files, from 2 files previously. Their file names will now be in the format `app.{yyyy-MM-dd HH_mm_ss}.log`. The current session log file remains named `app.log`.
39+
- Updated image controls on Recommended Models dialog to match the rest of the app
40+
- Improved app shutdown clean-up process reliability and speed
41+
- Improved ProcessTracker speed and clean-up safety for faster subprocess and package launching performance
42+
- Updated HuggingFace page so the command bar stays fixed at the top
43+
- Revamped Checkpoints page now shows available model updates and has better drag & drop functionality
44+
- Revamped file deletion confirmation dialog with affected file paths display and recycle bin / permanent delete options (Checkpoint and Output Browsers) (Currently available on Windows and macOS)
45+
### Fixed
46+
- Fixed crash when parsing invalid generated images in Output Browser and Inference image viewer, errors will be logged instead and the image will be skipped
47+
- Fixed missing progress text during package updates
48+
- (Windows) Fixed "Open in Explorer" buttons across the app not opening the correct path on ReFS partitions
49+
- (macOS, Linux) Fixed Subprocesses of packages sometimes not being closed when the app is closed
50+
- Fixed Inference tabs sometimes not being restored from previous sessions
51+
- Fixed multiple log files being archived in a single session, and losing some log entries
52+
- Fixed error when installing certain packages with comments in the requirements file
53+
- Fixed error when deleting Inference browser images in a nested project path with recycle bin mode
54+
- Fixed extra text in positive prompt when loading image parameters in Inference with empty negative prompt value
55+
- Fixed NullReferenceException that sometimes occurred when closing Inference tabs with images due to Avalonia.Bitmap.Size accessor issue
56+
- Fixed [#598](https://github.com/LykosAI/StabilityMatrix/issues/598) - program not exiting after printing help or version text
57+
- Fixed [#630](https://github.com/LykosAI/StabilityMatrix/issues/630) - InvokeAI update hangs forever waiting for input
58+
- Fixed issue where the "installed" state on HuggingFace model browser was not always correct
59+
- Fixed model folders not being created on startup
60+
61+
### Supporters
62+
#### Visionaries
63+
- Shoutout to our Visionary-tier supporters on Patreon, **Scopp Mcdee** and **Waterclouds**! Your generous support is appreciated and helps us continue to make Stability Matrix better for everyone!
64+
#### Pioneers
65+
- A big thank you to our Pioneer-tier supporters on Patreon, **tankfox** and **tanangular**! Your support helps us continue to improve Stability Matrix!
66+
67+
## v2.11.0-pre.2
68+
### Added
69+
- Added folder shortcuts in Settings for opening common app and system folders, such as Data Directory and Logs.
70+
### Changed
71+
- Log file storage have been moved from `%AppData%/StabilityMatrix` to a subfolder: `%AppData%/StabilityMatrix/Logs`
72+
- Archived log files now have an increased rolling limit of 9 files, from 2 files previously. Their file names will now be in the format `app.{yyyy-MM-dd HH_mm_ss}.log`. The current session log file remains named `app.log`.
73+
- Updated image controls on Recommended Models dialog to match the rest of the app
74+
- Improved app shutdown clean-up process reliability and speed
75+
- Improved ProcessTracker speed and clean-up safety for faster subprocess and package launching performance
76+
### Fixed
77+
- Fixed crash when parsing invalid generated images in Output Browser and Inference image viewer, errors will be logged instead and the image will be skipped
78+
- Fixed issue where blue and red color channels were swapped in the mask editor dialog
79+
- Fixed missing progress text during package updates
80+
- Fixed "Git and Node.js are required" error during SDFX install
81+
- (Windows) Fixed "Open in Explorer" buttons across the app not opening the correct path on ReFS partitions
82+
- (Windows) Fixed Sdfx electron window not closing when stopping the package
83+
- (macOS, Linux) Fixed Subprocesses of packages sometimes not being closed when the app is closed
84+
- Fixed Inference tabs sometimes not being restored from previous sessions
85+
- Fixed multiple log files being archived in a single session, and losing some log entries
86+
- Fixed error when installing certain packages with comments in the requirements file
87+
- Fixed some more missing progress texts during various activities
88+
### Supporters
89+
#### Visionaries
90+
- A heartfelt thank you to our Visionary-tier Patreon supporters, **Scopp Mcdee** and **Waterclouds**! Your generous contributions enable us to keep enhancing Stability Matrix!
91+
92+
## v2.11.0-pre.1
93+
### Added
94+
- Added new package: [SDFX](https://github.com/sdfxai/sdfx/) by sdfxai
95+
- Added "Show Nested Models" toggle for new Checkpoints page, allowing users to show or hide models in subfolders of the selected folder
96+
- Added ZLUDA option for SD.Next
97+
- Added PixArt & SDXL Hyper options to the Civitai model browser
98+
- Added release date to model update notification card on the Checkpoints page
99+
- Added option in Settings to choose whether to Copy or Move files when dragging and dropping files into the Checkpoint Manager
100+
- Added more launch options for Forge - [#618](https://github.com/LykosAI/StabilityMatrix/issues/618)
101+
#### Inference
102+
- Added Inpainting support for Image To Image projects using the new image mask canvas editor
103+
### Changed
104+
- Maximized state is now stored on exit and restored on launch
105+
- Clicking outside the Select Model Version dialog will now close it
106+
- Changed Package card buttons to better indicate that they are buttons
107+
### Fixed
108+
- Fixed error when deleting Inference browser images in a nested project path with recycle bin mode
109+
- Fixed extra text in positive prompt when loading image parameters in Inference with empty negative prompt value
110+
- Fixed NullReferenceException that sometimes occured when closing Inference tabs with images due to Avalonia.Bitmap.Size accessor issue
111+
- Fixed package installs not showing any progress messages
112+
- Fixed crash when viewing model details for Unknown model types in the Checkpoint Manager
113+
- Fixed [#598](https://github.com/LykosAI/StabilityMatrix/issues/598) - program not exiting after printing help or version text
114+
- Fixed [#630](https://github.com/LykosAI/StabilityMatrix/issues/630) - InvokeAI update hangs forever waiting for input
115+
### Supporters
116+
#### Visionaries
117+
- Many thanks to our Visionary-tier supporters on Patreon, **Scopp Mcdee** and **Waterclouds**! Your generous support helps us continue to improve Stability Matrix!
118+
119+
## v2.11.0-dev.3
120+
### Added
121+
- Added download speed indicator to model downloads in the Downloads tab
122+
- Added XL ControlNets section to HuggingFace model browser
123+
- Added toggle in Settings for model browser auto-search on load
124+
- Added optional Recycle Bin mode when deleting images in the Inference image browser, can be disabled in settings (Currently on Windows only)
125+
### Changed
126+
- Revamped Checkpoints page now shows available model updates and has better drag & drop functionality
127+
- Updated HuggingFace page so the command bar stays fixed at the top
128+
- Revamped file deletion confirmation dialog with affected file paths display and recycle bin / permanent delete options (Checkpoint and Output Browsers) (Currently on Windows only)
129+
### Fixed
130+
- Fixed issue where the "installed" state on HuggingFace model browser was not always correct
131+
### Supporters
132+
#### Visionaries
133+
- Special shoutout to our first two Visionaries on Patreon, **Scopp Mcdee** and **Waterclouds**! Thank you for your generous support!
134+
135+
## v2.11.0-dev.2
136+
### Added
137+
- Added Brazilian Portuguese language option, thanks to jbostroski for the translation!
138+
- Added setting for locale specific or invariant number formatting
139+
- Added support for jpg/jpeg & gif images in the Output Browser
140+
### Changed
141+
- Centered OpenArt browser cards
142+
### Fixed
143+
- Fixed MPS install on macOS for ComfyUI, A1111, SDWebUI Forge, and SDWebUI UX causing torch to be upgraded to dev nightly versions and causing incompatibilities with dependencies.
144+
- Fixed "Auto Scroll to End" not working in some scenarios
145+
- Fixed "Auto Scroll to End" toggle button not scrolling to the end when toggled on
146+
- Fixed/reverted output folder name changes for Automatic1111
147+
- Fixed xformers being uninstalled with every ComfyUI update
148+
- Fixed Inference Lora menu strength resetting to default if out of slider range (0 to 1)
149+
- Fixed missing progress text during package installs
150+
151+
## v2.11.0-dev.1
152+
### Added
153+
- Added search bar to the Python Packages dialog
154+
#### Inference
155+
- Alternate Lora / LyCORIS drop-down model selection, can be toggled via the model settings button. The existing prompt-based Lora / LyCORIS method is still available.
156+
### Fixed
157+
- Fixed crash when failing to parse Python package details
158+
8159
## v2.10.3
9160
### Changed
10161
- Centered OpenArt browser cards

README.md

+7-2
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,10 @@
22

33
[![Build](https://github.com/LykosAI/StabilityMatrix/actions/workflows/build.yml/badge.svg)](https://github.com/LykosAI/StabilityMatrix/actions/workflows/build.yml)
44
[![Discord Server](https://img.shields.io/discord/1115555685476868168?logo=discord&logoColor=white&label=Discord%20Server)](https://discord.com/invite/TUrgfECxHz)
5-
[![Release](https://img.shields.io/github/v/release/LykosAI/StabilityMatrix?label=Latest%20Release&link=https%3A%2F%2Fgithub.com%2FLykosAI%2FStabilityMatrix%2Freleases%2Flatest)][release]
5+
6+
[![Latest Stable](https://img.shields.io/github/v/release/LykosAI/StabilityMatrix?label=Latest%20Stable&link=https%3A%2F%2Fgithub.com%2FLykosAI%2FStabilityMatrix%2Freleases%2Flatest)][release]
7+
[![Latest Preview](https://img.shields.io/badge/dynamic/json?url=https%3A%2F%2Fcdn.lykos.ai%2Fupdate-v3.json&query=%24.updates.preview%5B%22win-x64%22%5D.version&prefix=v&label=Latest%20Preview&color=b57400&cacheSeconds=60&link=https%3A%2F%2Flykos.ai%2Fdownloads)](https://lykos.ai/downloads)
8+
[![Latest Dev](https://img.shields.io/badge/dynamic/json?url=https%3A%2F%2Fcdn.lykos.ai%2Fupdate-v3.json&query=%24.updates.development%5B%22win-x64%22%5D.version&prefix=v&label=Latest%20Dev&color=880c21&cacheSeconds=60&link=https%3A%2F%2Flykos.ai%2Fdownloads)](https://lykos.ai/downloads)
69

710
[release]: https://github.com/LykosAI/StabilityMatrix/releases/latest
811
[download-win-x64]: https://github.com/LykosAI/StabilityMatrix/releases/latest/download/StabilityMatrix-win-x64.zip
@@ -11,7 +14,7 @@
1114
[download-macos-arm64]: https://github.com/LykosAI/StabilityMatrix/releases/latest/download/StabilityMatrix-macos-arm64.dmg
1215

1316
[auto1111]: https://github.com/AUTOMATIC1111/stable-diffusion-webui
14-
[sdwebui-directml]: https://github.com/lshqqytiger/stable-diffusion-webui-directml
17+
[auto1111-directml]: https://github.com/lshqqytiger/stable-diffusion-webui-directml
1518
[webui-ux]: https://github.com/anapnoe/stable-diffusion-webui-ux
1619
[comfy]: https://github.com/comfyanonymous/ComfyUI
1720
[sdnext]: https://github.com/vladmandic/automatic
@@ -25,6 +28,7 @@
2528
[onetrainer]: https://github.com/Nerogar/OneTrainer
2629
[forge]: https://github.com/lllyasviel/stable-diffusion-webui-forge
2730
[stable-swarm]: https://github.com/Stability-AI/StableSwarmUI
31+
[sdfx]: https://github.com/sdfxai/sdfx
2832

2933
[civitai]: https://civitai.com/
3034
[huggingface]: https://huggingface.co/
@@ -46,6 +50,7 @@ Multi-Platform Package Manager and Inference UI for Stable Diffusion
4650
- [StableSwarmUI][stable-swarm]
4751
- [VoltaML][voltaml]
4852
- [InvokeAI][invokeai]
53+
- [SDFX][sdfx]
4954
- [Kohya's GUI][kohya-ss]
5055
- [OneTrainer][onetrainer]
5156
- Manage plugins / extensions for supported packages ([Automatic1111][auto1111], [Comfy UI][comfy], [SD Web UI-UX][webui-ux], and [SD.Next][sdnext])

StabilityMatrix.Avalonia.Diagnostics/StabilityMatrix.Avalonia.Diagnostics.csproj

+1-1
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@
2525
<PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="8.0.0" />
2626
<PackageReference Include="Microsoft.Extensions.Hosting" Version="8.0.0" />
2727
<PackageReference Include="Microsoft.Extensions.Logging.Abstractions" Version="8.0.1" />
28-
<PackageReference Include="NLog" Version="5.2.8" />
28+
<PackageReference Include="NLog" Version="5.3.2" />
2929
</ItemGroup>
3030

3131
<ItemGroup>

0 commit comments

Comments
 (0)