Browse Source

Merge pull request #261 from ionite34/misc-fixes

misc fixes:
pull/165/head
JT 1 year ago committed by GitHub
parent
commit
08c52f06e4
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
  1. 6
      CHANGELOG.md
  2. 24
      StabilityMatrix.Avalonia/ViewModels/CheckpointBrowserViewModel.cs
  3. 1
      StabilityMatrix.Avalonia/ViewModels/SettingsViewModel.cs
  4. 2
      StabilityMatrix.Core/Models/Packages/VladAutomatic.cs

6
CHANGELOG.md

@ -5,8 +5,12 @@ 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/), 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). and this project adheres to [Semantic Versioning 2.0](https://semver.org/spec/v2.0.0.html).
## v2.4.7 ## v2.5.0
### Changed
- Model Browser page size is now 20 instead of 14
### Fixed ### Fixed
- Fixed [#141](https://github.com/LykosAI/StabilityMatrix/issues/141) - Search not working when sorting by Installed on Model Browser
- Fixed SD.Next not showing "Open Web UI" button when finished loading
- Fixed model index startup errors when `./Models` contains unknown custom folder names - Fixed model index startup errors when `./Models` contains unknown custom folder names
## v2.4.6 ## v2.4.6

24
StabilityMatrix.Avalonia/ViewModels/CheckpointBrowserViewModel.cs

@ -50,7 +50,7 @@ public partial class CheckpointBrowserViewModel : PageViewModelBase
private readonly ServiceManager<ViewModelBase> dialogFactory; private readonly ServiceManager<ViewModelBase> dialogFactory;
private readonly ILiteDbContext liteDbContext; private readonly ILiteDbContext liteDbContext;
private readonly INotificationService notificationService; private readonly INotificationService notificationService;
private const int MaxModelsPerPage = 14; private const int MaxModelsPerPage = 20;
private LRUCache< private LRUCache<
int /* model id */ int /* model id */
, ,
@ -446,19 +446,15 @@ public partial class CheckpointBrowserViewModel : PageViewModelBase
connectedModels = connectedModels.Where(c => c.ModelType == SelectedModelType); connectedModels = connectedModels.Where(c => c.ModelType == SelectedModelType);
} }
modelRequest = new CivitModelsRequest modelRequest.CommaSeparatedModelIds = string.Join(
{ ",",
CommaSeparatedModelIds = string.Join( connectedModels
",", .Select(c => c.ConnectedModel!.ModelId)
connectedModels .GroupBy(m => m)
.Select(c => c.ConnectedModel!.ModelId) .Select(g => g.First())
.GroupBy(m => m) );
.Select(g => g.First()) modelRequest.Sort = null;
), modelRequest.Period = null;
Types =
SelectedModelType == CivitModelType.All ? null : new[] { SelectedModelType },
Page = CurrentPageNumber,
};
} }
// See if query is cached // See if query is cached

1
StabilityMatrix.Avalonia/ViewModels/SettingsViewModel.cs

@ -168,6 +168,7 @@ public partial class SettingsViewModel : PageViewModelBase
{ {
if (oldValue is null || newValue.Name == Cultures.Current.Name) if (oldValue is null || newValue.Name == Cultures.Current.Name)
return; return;
// Set locale // Set locale
if (AvailableLanguages.Contains(newValue)) if (AvailableLanguages.Contains(newValue))
{ {

2
StabilityMatrix.Core/Models/Packages/VladAutomatic.cs

@ -262,7 +262,7 @@ public class VladAutomatic : BaseGitPackage
void HandleConsoleOutput(ProcessOutput s) void HandleConsoleOutput(ProcessOutput s)
{ {
onConsoleOutput?.Invoke(s); onConsoleOutput?.Invoke(s);
if (s.Text.Contains("Running on local URL", StringComparison.OrdinalIgnoreCase)) if (s.Text.Contains("Local URL", StringComparison.OrdinalIgnoreCase))
{ {
var regex = new Regex(@"(https?:\/\/)([^:\s]+):(\d+)"); var regex = new Regex(@"(https?:\/\/)([^:\s]+):(\d+)");
var match = regex.Match(s.Text); var match = regex.Match(s.Text);

Loading…
Cancel
Save