KenSchae
/
StabilityMatrix
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

Add connection check dialog for text2image

pull/5/head
Ionite 1 year ago
parent
b13de07717
commit
02b7b68191
No known key found for this signature in database
5 changed files with 221 additions and 131 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 1
      StabilityMatrix/App.xaml.cs
  2. 8
      StabilityMatrix/Services/PageContentDialogService.cs
  3. 252
      StabilityMatrix/TextToImagePage.xaml
  4. 12
      StabilityMatrix/TextToImagePage.xaml.cs
  5. 79
      StabilityMatrix/ViewModels/TextToImageViewModel.cs

1
StabilityMatrix/App.xaml.cs
Unescape View File

@ -39,6 +39,7 @@ namespace StabilityMatrix
var serviceCollection = new ServiceCollection();
serviceCollection.AddSingleton<IPageService, PageService>();
serviceCollection.AddSingleton<IContentDialogService, ContentDialogService>();
serviceCollection.AddSingleton<PageContentDialogService>();
serviceCollection.AddSingleton<ISnackbarService, SnackbarService>();
serviceCollection.AddSingleton<IPackageFactory, PackageFactory>();
serviceCollection.AddSingleton<IPyRunner, PyRunner>();

8
StabilityMatrix/Services/PageContentDialogService.cs
Unescape View File

@ -0,0 +1,8 @@
using Wpf.Ui.Services;
namespace StabilityMatrix.Services;
public class PageContentDialogService : ContentDialogService
{
}

252
StabilityMatrix/TextToImagePage.xaml
Unescape View File

@ -1,6 +1,7 @@
<Page
Background="{DynamicResource ApplicationBackgroundBrush}"
Foreground="{DynamicResource TextFillColorPrimaryBrush}"
Loaded="TextToImagePage_OnLoaded"
Title="TextToImagePage"
d:DataContext="{d:DesignInstance Type=viewModels:TextToImageViewModel,
IsDesignTimeCreatable=True}"
@ -17,141 +18,144 @@
xmlns:viewModels="clr-namespace:StabilityMatrix.ViewModels"
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
<Grid Margin="20">
<Grid.RowDefinitions>
<RowDefinition Height="*" />
<RowDefinition Height="Auto" />
</Grid.RowDefinitions>
<Grid>
<Grid Margin="20">
<Grid.RowDefinitions>
<RowDefinition Height="*" />
<RowDefinition Height="Auto" />
</Grid.RowDefinitions>
<!-- Controls -->
<Grid>
<Grid.ColumnDefinitions>
<ColumnDefinition Width="*" />
<ColumnDefinition Width="*" />
</Grid.ColumnDefinitions>
<!-- Controls -->
<Grid>
<Grid.ColumnDefinitions>
<ColumnDefinition Width="*" />
<ColumnDefinition Width="*" />
</Grid.ColumnDefinitions>
<ScrollViewer
HorizontalAlignment="Stretch"
Margin="8,8,8,16"
VerticalAlignment="Stretch">
<StackPanel>
<ui:Card HorizontalAlignment="Stretch" Padding="8">
<StackPanel Margin="8">
<Label
Content="Prompt"
FontSize="14"
Margin="2" />
<ui:AutoSuggestBox
Margin="8"
Name="PositivePromptBox"
PlaceholderText="Prompt"
QuerySubmitted="PositivePromptBox_OnQuerySubmitted"
SuggestionChosen="PositivePromptBox_OnSuggestionChosen"
TextChanged="PositivePromptBox_OnTextChanged" />
<Label
Content="Negative Prompt"
FontSize="14"
Margin="2" />
<ui:AutoSuggestBox
Margin="8"
Name="NegativePromptBox"
PlaceholderText="Negative Prompt"
QuerySubmitted="NegativePromptBox_OnQuerySubmitted"
SuggestionChosen="NegativePromptBox_OnSuggestionChosen"
TextChanged="NegativePromptBox_OnTextChanged" />
<Grid Margin="8">
<Grid.ColumnDefinitions>
<ColumnDefinition Width="*" />
<ColumnDefinition Width="Auto" />
</Grid.ColumnDefinitions>
<ScrollViewer
HorizontalAlignment="Stretch"
Margin="8,8,8,16"
VerticalAlignment="Stretch">
<StackPanel>
<ui:Card HorizontalAlignment="Stretch" Padding="8">
<StackPanel Margin="8">
<Label
Content="Steps"
Content="Prompt"
FontSize="14"
Margin="2"
VerticalAlignment="Center" />
<TextBox
Margin="2" />
<ui:AutoSuggestBox
Margin="8"
Name="PositivePromptBox"
PlaceholderText="Prompt"
QuerySubmitted="PositivePromptBox_OnQuerySubmitted"
SuggestionChosen="PositivePromptBox_OnSuggestionChosen"
TextChanged="PositivePromptBox_OnTextChanged" />
<Label
Content="Negative Prompt"
FontSize="14"
Grid.Column="1"
Margin="2" />
<ui:AutoSuggestBox
Margin="8"
Text="{Binding GenerationSteps}"
VerticalAlignment="Bottom"
Width="64" />
</Grid>
Name="NegativePromptBox"
PlaceholderText="Negative Prompt"
QuerySubmitted="NegativePromptBox_OnQuerySubmitted"
SuggestionChosen="NegativePromptBox_OnSuggestionChosen"
TextChanged="NegativePromptBox_OnTextChanged" />
<Slider
IsSnapToTickEnabled="True"
Maximum="150"
Minimum="0"
TickFrequency="5"
TickPlacement="BottomRight"
Value="{Binding GenerationSteps}" />
</StackPanel>
</ui:Card>
</StackPanel>
</ScrollViewer>
<Grid Margin="8">
<Grid.ColumnDefinitions>
<ColumnDefinition Width="*" />
<ColumnDefinition Width="Auto" />
</Grid.ColumnDefinitions>
<Label
Content="Steps"
FontSize="14"
Margin="2"
VerticalAlignment="Center" />
<TextBox
FontSize="14"
Grid.Column="1"
Margin="8"
Text="{Binding GenerationSteps}"
VerticalAlignment="Bottom"
Width="64" />
</Grid>
<!-- Image Viewer -->
<ui:Card
Grid.Column="1"
HorizontalAlignment="Stretch"
Margin="8,8,8,16"
Padding="8"
VerticalAlignment="Top">
<Grid>
<Grid.RowDefinitions>
<RowDefinition Height="0.2*" />
<RowDefinition Height="0.7*" />
</Grid.RowDefinitions>
<StackPanel
Grid.Row="0"
Orientation="Vertical"
VerticalAlignment="Top">
<Label
Content="Image"
FontSize="14"
Margin="2" />
<ProgressBar
Maximum="100"
Value="{Binding ProgressValue, FallbackValue=10}"
Visibility="{Binding ProgressBarVisibility, FallbackValue=Visible}"
Width="500" />
<Slider
IsSnapToTickEnabled="True"
Maximum="150"
Minimum="0"
TickFrequency="5"
TickPlacement="BottomRight"
Value="{Binding GenerationSteps}" />
</StackPanel>
</ui:Card>
</StackPanel>
<Grid
Background="{DynamicResource ApplicationBackgroundBrush}"
Grid.Row="1"
MinHeight="512"
VerticalAlignment="Stretch">
<ui:ProgressRing
Background="DarkRed"
</ScrollViewer>
<!-- Image Viewer -->
<ui:Card
Grid.Column="1"
HorizontalAlignment="Stretch"
Margin="8,8,8,16"
Padding="8"
VerticalAlignment="Top">
<Grid>
<Grid.RowDefinitions>
<RowDefinition Height="0.2*" />
<RowDefinition Height="0.7*" />
</Grid.RowDefinitions>
<StackPanel
Grid.Row="0"
Height="72"
HorizontalAlignment="Center"
IsIndeterminate="True"
Margin="8"
VerticalAlignment="Center"
Visibility="{Binding ProgressRingVisibility, FallbackValue=Collapsed}"
Width="72"
x:Name="ImageProgressRing" />
<Image
HorizontalAlignment="Stretch"
Margin="8"
Source="{Binding ImagePreview}"
Stretch="Uniform"
VerticalAlignment="Stretch"
Visibility="{Binding ImagePreviewVisibility, FallbackValue=Visible}" />
Orientation="Vertical"
VerticalAlignment="Top">
<Label
Content="Image"
FontSize="14"
Margin="2" />
<ProgressBar
Maximum="100"
Value="{Binding ProgressValue, FallbackValue=10}"
Visibility="{Binding ProgressBarVisibility, FallbackValue=Visible}"
Width="500" />
</StackPanel>
<Grid
Background="{DynamicResource ApplicationBackgroundBrush}"
Grid.Row="1"
MinHeight="512"
VerticalAlignment="Stretch">
<ui:ProgressRing
Background="DarkRed"
Grid.Row="0"
Height="72"
HorizontalAlignment="Center"
IsIndeterminate="True"
Margin="8"
VerticalAlignment="Center"
Visibility="{Binding ProgressRingVisibility, FallbackValue=Collapsed}"
Width="72"
x:Name="ImageProgressRing" />
<Image
HorizontalAlignment="Stretch"
Margin="8"
Source="{Binding ImagePreview}"
Stretch="Uniform"
VerticalAlignment="Stretch"
Visibility="{Binding ImagePreviewVisibility, FallbackValue=Visible}" />
</Grid>
</Grid>
</Grid>
</ui:Card>
</Grid>
</ui:Card>
</Grid>
<ui:Button
Appearance="Primary"
Command="{Binding TextToImageGenerateCommand}"
Content="Generate Image"
Grid.Row="1"
HorizontalAlignment="Center"
Name="TextToImageButton" />
</Grid>
<ui:Button
Appearance="Primary"
Command="{Binding TextToImageGenerateCommand}"
Content="Generate Image"
Grid.Row="1"
HorizontalAlignment="Center"
Name="TextToImageButton" />
</Grid>
<ContentPresenter x:Name="PageContentDialog" />
</Grid>
</Page>

12
StabilityMatrix/TextToImagePage.xaml.cs
Unescape View File

@ -1,4 +1,6 @@
using System.Windows.Controls;
using System.Windows;
using System.Windows.Controls;
using StabilityMatrix.Services;
using StabilityMatrix.ViewModels;
using Wpf.Ui.Controls.AutoSuggestBoxControl;
@ -8,10 +10,11 @@ public sealed partial class TextToImagePage : Page
{
private TextToImageViewModel ViewModel => (TextToImageViewModel) DataContext;
public TextToImagePage(TextToImageViewModel viewModel)
public TextToImagePage(TextToImageViewModel viewModel, PageContentDialogService pageContentDialogService)
{
InitializeComponent();
DataContext = viewModel;
pageContentDialogService.SetContentPresenter(PageContentDialog);
}
private void PositivePromptBox_OnQuerySubmitted(AutoSuggestBox sender, AutoSuggestBoxQuerySubmittedEventArgs args)
@ -49,4 +52,9 @@ public sealed partial class TextToImagePage : Page
ViewModel.NegativePromptText = fullText;
}
}
private async void TextToImagePage_OnLoaded(object sender, RoutedEventArgs e)
{
await ViewModel.OnLoaded();
}
}

79
StabilityMatrix/ViewModels/TextToImageViewModel.cs
Unescape View File

@ -9,6 +9,8 @@ using Microsoft.Extensions.Logging;
using StabilityMatrix.Api;
using StabilityMatrix.Helper;
using StabilityMatrix.Models.Api;
using StabilityMatrix.Services;
using Wpf.Ui.Contracts;
namespace StabilityMatrix.ViewModels;
@ -16,11 +18,16 @@ public partial class TextToImageViewModel : ObservableObject
{
private readonly ILogger<TextToImageViewModel> logger;
private readonly IA3WebApi a3WebApi;
private readonly IDialogErrorHandler dialogErrorHandler;
private readonly PageContentDialogService pageContentDialogService;
private AsyncDispatcherTimer? progressQueryTimer;
[ObservableProperty]
private bool isGenerating;
[ObservableProperty]
private bool connectionFailed;
[ObservableProperty]
[NotifyPropertyChangedFor(nameof(ProgressRingVisibility))]
[NotifyPropertyChangedFor(nameof(ImagePreviewVisibility))]
@ -48,14 +55,66 @@ public partial class TextToImageViewModel : ObservableObject
public Visibility ProgressBarVisibility => ProgressValue > 0 ? Visibility.Visible : Visibility.Collapsed;
public TextToImageViewModel(IA3WebApi a3WebApi, ILogger<TextToImageViewModel> logger)
public TextToImageViewModel(IA3WebApi a3WebApi, ILogger<TextToImageViewModel> logger, IDialogErrorHandler dialogErrorHandler, PageContentDialogService pageContentDialogService)
{
this.logger = logger;
this.a3WebApi = a3WebApi;
this.dialogErrorHandler = dialogErrorHandler;
this.pageContentDialogService = pageContentDialogService;
positivePromptText = "Positive";
negativePromptText = "Negative";
generationSteps = 10;
}
public async Task OnLoaded()
{
if (ConnectionFailed)
{
await PromptRetryConnection();
}
else
{
await CheckConnection();
}
}
// Checks connection, if unsuccessful, shows a content dialog to retry
private async Task CheckConnection()
{
try
{
await a3WebApi.GetPing();
ConnectionFailed = false;
}
catch (Exception e)
{
// On error, show a content dialog to retry
ConnectionFailed = true;
logger.LogWarning("Ping response failed: {EMessage}", e.Message);
var dialog = pageContentDialogService.CreateDialog();
dialog.Title = "Connection failed";
dialog.Content = "Please check the server is running with the --api launch option enabled.";
dialog.CloseButtonText = "Retry";
dialog.IsPrimaryButtonEnabled = false;
dialog.IsSecondaryButtonEnabled = false;
await dialog.ShowAsync();
// Retry
await CheckConnection();
}
}
private async Task PromptRetryConnection()
{
var dialog = pageContentDialogService.CreateDialog();
dialog.Title = "Connection failed";
dialog.Content = "Please check the server is running with the --api launch option enabled.";
dialog.CloseButtonText = "Retry";
dialog.IsPrimaryButtonEnabled = false;
dialog.IsSecondaryButtonEnabled = false;
await dialog.ShowAsync();
// Retry
await CheckConnection();
}
private void StartProgressTracking(TimeSpan? interval = null)
{
@ -78,7 +137,15 @@ public partial class TextToImageViewModel : ObservableObject
private async Task OnProgressTrackingTick()
{
var request = new ProgressRequest();
var response = await a3WebApi.GetProgress(request);
var task = a3WebApi.GetProgress(request);
var responseResult = await dialogErrorHandler.TryAsync(task, "Failed to get progress");
if (!responseResult.IsSuccessful || responseResult.Result == null)
{
StopProgressTracking();
return;
}
var response = responseResult.Result;
var progress = response.Progress;
logger.LogInformation("Image Progress: {ResponseProgress}, ETA: {ResponseEtaRelative} s", response.Progress, response.EtaRelative);
if (Math.Abs(progress - 1.0) < 0.01)
@ -133,11 +200,13 @@ public partial class TextToImageViewModel : ObservableObject
// Progress track while waiting for response
StartProgressTracking();
var response = await task;
var response = await dialogErrorHandler.TryAsync(task, "Failed to get a response from the server");
StopProgressTracking();
if (!response.IsSuccessful || response.Result == null) return;
// Decode base64 image
var result = response.Images[0];
var result = response.Result.Images[0];
var bitmap = Base64ToBitmap(result);
ImagePreview = bitmap;

Write Preview
Loading…
Cancel
Save