Skip to content

Commit 173a139

Browse files
committed
buncha gh issue fixes
1 parent 0c8aa6e commit 173a139

9 files changed

Lines changed: 56 additions & 17 deletions

File tree

CHANGELOG.md

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@ and this project adheres to [Semantic Versioning 2.0](https://semver.org/spec/v2
1111
- Added Manual Install button for installing Package extensions that aren't in the indexes
1212
- Added Next and Previous buttons to the Civitai details page to navigate between results
1313
- Added Negative Rejection Steering (NRS) by @reithan to Inference
14+
- Added Czech translation thanks to @PEKArt!
1415
### Changed
1516
- Brought back the "size remaining after download" tooltip in the new Civitai details page
1617
- Updated ComfyUI installs for AMD users on Linux to use the latest rocm6.4 torch index
@@ -20,6 +21,10 @@ and this project adheres to [Semantic Versioning 2.0](https://semver.org/spec/v2
2021
- Fixed duplicate Python versions appearing in the Advanced Options when installing a package
2122
- Fixed [#1360](https://github.com/LykosAI/StabilityMatrix/issues/1360) - A1111 install not using correct torch for 5000-series GPUs
2223
- Fixed [#1361](https://github.com/LykosAI/StabilityMatrix/issues/1361) - numpy and other Forge startup errors
24+
- Fixed [#1317](https://github.com/LykosAI/StabilityMatrix/issues/1317) - Inference missing GGUF text encoders
25+
- Fixed [#1300](https://github.com/LykosAI/StabilityMatrix/issues/1300) - Git errors when installing Extension Packs
26+
- Fixed [#1294](https://github.com/LykosAI/StabilityMatrix/issues/1294) - Improper sorting of output folders in Output Browser
27+
- Fixed [#1324](https://github.com/LykosAI/StabilityMatrix/issues/1324) - Window height slightly increasing every launch
2328

2429
## v2.15.0-pre.1
2530
### Added

README.md

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -132,6 +132,7 @@ Stability Matrix is now available in the following languages, thanks to our comm
132132
- 🇷🇺 Русский
133133
- aolko
134134
- den1251
135+
- vanja-san
135136
- 🇹🇷 Türkçe
136137
- Progesor
137138
- 🇩🇪 Deutsch
@@ -143,6 +144,10 @@ Stability Matrix is now available in the following languages, thanks to our comm
143144
- thiagojramos
144145
- 🇰🇷 한국어
145146
- maakcode
147+
- 🇺🇦 Українська
148+
- rodtty
149+
- 🇨🇿 Čeština
150+
- PEKArt!
146151

147152
If you would like to contribute a translation, please create an issue or contact us on Discord. Include an email where we'll send an invite to our [POEditor](https://poeditor.com/) project.
148153

StabilityMatrix.Avalonia/Controls/Inference/SamplerCard.axaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@
3838
VerticalAlignment="Center"
3939
IsVisible="{Binding IsSamplerSelectionEnabled}"
4040
Text="{x:Static lang:Resources.Label_Sampler}" />
41-
<ui:FAComboBox
41+
<controls:BetterComboBox
4242
Grid.Row="0"
4343
Grid.Column="2"
4444
Margin="8,0,0,8"

StabilityMatrix.Avalonia/Languages/Cultures.cs

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -34,6 +34,7 @@ public static class Cultures
3434
["pt-BR"] = new CultureInfo("pt-BR"),
3535
["ko-KR"] = new CultureInfo("ko-KR"),
3636
["uk-UA"] = new CultureInfo("uk-UA"),
37+
["cs-CZ"] = new CultureInfo("cs-CZ"),
3738
};
3839

3940
public static IReadOnlyList<CultureInfo> SupportedCultures =>

StabilityMatrix.Avalonia/ViewModels/MainWindowViewModel.cs

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -84,6 +84,7 @@ public partial class MainWindowViewModel : ViewModelBase
8484
{ Name: "pt-PT" } => 300,
8585
{ Name: "pt-BR" } => 260,
8686
{ Name: "ko-KR" } => 235,
87+
{ Name: "cs-CZ" } => 250,
8788
_ => 200,
8889
};
8990

StabilityMatrix.Avalonia/ViewModels/OutputsPageViewModel.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -160,7 +160,7 @@ IServiceManager<ViewModelBase> vmFactory
160160
categoriesCache
161161
.Connect()
162162
.DeferUntilLoaded()
163-
.Bind(Categories)
163+
.SortAndBind(Categories, SortExpressionComparer<TreeViewDirectory>.Ascending(d => d.Name))
164164
.ObserveOn(SynchronizationContext.Current)
165165
.Subscribe();
166166

StabilityMatrix.Avalonia/Views/MainWindow.axaml.cs

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -172,7 +172,7 @@ private void StartupInitialize(
172172

173173
Observable
174174
.FromEventPattern<SizeChangedEventArgs>(this, nameof(SizeChanged))
175-
.Where(x => x.EventArgs.PreviousSize != x.EventArgs.NewSize)
175+
.Where(x => x.EventArgs.NewSize != x.EventArgs.PreviousSize)
176176
.Throttle(TimeSpan.FromMilliseconds(100))
177177
.Select(x => x.EventArgs.NewSize)
178178
.ObserveOn(SynchronizationContext.Current!)
@@ -190,9 +190,13 @@ private void StartupInitialize(
190190
}
191191
else
192192
{
193+
// idk where these 30 pixels come from. need to see if is actually just windows thing
194+
var newHeight = Compat.IsWindows
195+
? Math.Max(0, newSize.Height - 30)
196+
: newSize.Height;
193197
s.WindowSettings = new WindowSettings(
194198
newSize.Width,
195-
newSize.Height,
199+
newHeight,
196200
validWindowPosition ? Position.X : 0,
197201
validWindowPosition ? Position.Y : 0,
198202
WindowState == WindowState.Maximized
@@ -224,8 +228,8 @@ private void StartupInitialize(
224228
else
225229
{
226230
s.WindowSettings = new WindowSettings(
227-
Width,
228-
Height,
231+
s.WindowSettings?.Width ?? Width,
232+
s.WindowSettings?.Height ?? Height,
229233
validWindowPosition ? position.X : 0,
230234
validWindowPosition ? position.Y : 0,
231235
WindowState == WindowState.Maximized

StabilityMatrix.Core/Helper/HardwareInfo/HardwareHelper.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -70,7 +70,7 @@ private static IEnumerable<GpuInfo> IterGpuInfoWindows()
7070
[SupportedOSPlatform("linux")]
7171
private static IEnumerable<GpuInfo> IterGpuInfoLinux()
7272
{
73-
var output = RunBashCommand("lspci | grep -E \"(VGA|3D)\"");
73+
var output = RunBashCommand("lspci | grep -E '(VGA|3D)'");
7474
var gpuLines = output.Split("\n");
7575

7676
var gpuIndex = 0;

StabilityMatrix.Core/Helper/IPrerequisiteHelper.cs

Lines changed: 33 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
using System.Diagnostics;
22
using System.Runtime.Versioning;
3+
using StabilityMatrix.Core.Exceptions;
34
using StabilityMatrix.Core.Models;
45
using StabilityMatrix.Core.Models.FileInterfaces;
56
using StabilityMatrix.Core.Models.Packages;
@@ -113,16 +114,38 @@ async Task CloneGitRepository(
113114
// If pinning to a specific commit, we need a destination directory to continue
114115
if (!string.IsNullOrWhiteSpace(version?.CommitSha))
115116
{
116-
await RunGit(["fetch", "--depth", "1", "origin", version.CommitSha!], onProcessOutput, rootDir)
117-
.ConfigureAwait(false);
118-
await RunGit(["checkout", "--force", version.CommitSha!], onProcessOutput, rootDir)
119-
.ConfigureAwait(false);
120-
await RunGit(
121-
["submodule", "update", "--init", "--recursive", "--depth", "1"],
122-
onProcessOutput,
123-
rootDir
124-
)
125-
.ConfigureAwait(false);
117+
try
118+
{
119+
await RunGit(
120+
["fetch", "--depth", "1", "origin", version.CommitSha!],
121+
onProcessOutput,
122+
rootDir
123+
)
124+
.ConfigureAwait(false);
125+
await RunGit(["checkout", "--force", version.CommitSha!], onProcessOutput, rootDir)
126+
.ConfigureAwait(false);
127+
await RunGit(
128+
["submodule", "update", "--init", "--recursive", "--depth", "1"],
129+
onProcessOutput,
130+
rootDir
131+
)
132+
.ConfigureAwait(false);
133+
}
134+
catch (ProcessException ex)
135+
{
136+
if (ex.Message.Contains("Git exited with code 128"))
137+
{
138+
onProcessOutput?.Invoke(
139+
ProcessOutput.FromStdErrLine(
140+
$"Unable to check out commit {version.CommitSha} - continuing with latest commit from {version.Branch}\n\n{ex.ProcessResult?.StandardError}\n"
141+
)
142+
);
143+
}
144+
else
145+
{
146+
throw;
147+
}
148+
}
126149
}
127150
}
128151

0 commit comments

Comments
 (0)