Refactor SearchClient & P/C model

Decimation · Decimation · commit 628681c54645 · 2025-01-01T13:29:52.000-06:00
diff --git a/SmartImage.Lib/Images/Uni/UniImage.cs b/SmartImage.Lib/Images/Uni/UniImage.cs
@@ -23,7 +23,7 @@
 using SixLabors.ImageSharp.Processing;
 using SmartImage.Lib.Results.Data;
 
-#pragma warning disable CS0168 // Variable is declared but never used
+// #pragma warning disable CS0168 // Variable is declared but never used
 
 namespace SmartImage.Lib.Images.Uni;
 #nullable disable
diff --git a/SmartImage.Lib/Results/Data/ISimilarity.cs b/SmartImage.Lib/Results/Data/ISimilarity.cs
@@ -3,7 +3,7 @@
 
 namespace SmartImage.Lib.Results.Data;
 
-#pragma warning disable CS0168
+// #pragma warning disable CS0168
 public interface ISimilarity
 {
 
diff --git a/SmartImage.Lib/SearchClient.cs b/SmartImage.Lib/SearchClient.cs
@@ -1,4 +1,5 @@
-﻿global using CMN = System.Runtime.CompilerServices.CallerMemberNameAttribute;
+﻿global using EC = System.Runtime.CompilerServices.EnumeratorCancellationAttribute;
+global using CMN = System.Runtime.CompilerServices.CallerMemberNameAttribute;
 global using JI = System.Text.Json.Serialization.JsonIgnoreAttribute;
 global using ICBN = JetBrains.Annotations.ItemCanBeNullAttribute;
 global using INN = JetBrains.Annotations.ItemNotNullAttribute;
@@ -34,6 +35,7 @@
 using SmartImage.Lib.Results.Data;
 using static System.Runtime.InteropServices.JavaScript.JSType;
 using SmartImage.Lib.Utilities.Diagnostics;
+using Kantan.Monad;
 
 namespace SmartImage.Lib;
 
@@ -62,12 +64,13 @@ public SearchClient(SearchConfig cfg)
 
 	}
 
-	static SearchClient()
-	{ }
+	static SearchClient() { }
 
 	[ModuleInitializer]
 	public static void Init()
 	{
+		Trace.AutoFlush = true;
+		Debug.AutoFlush = true;
 		s_logger.LogInformation("Init");
 
 
@@ -99,23 +102,27 @@ public void OpenChannel()
 	{
 		var ok = ResultChannel?.Writer.TryComplete(new ChannelClosedException("Reopened channel"));
 
-		if (ok.HasValue && ok.Value) { }
+		if (ok.HasValue && ok.Value) {
+			// ...
+		}
 
 		ResultChannel = Channel.CreateUnbounded<SearchResult>(new UnboundedChannelOptions()
 		{
 			SingleWriter = true,
+
 		});
 	}
 
+#if OLD
 	/// <summary>
 	/// Runs a search of <paramref name="query"/>.
 	/// </summary>
 	/// <param name="query">Search query</param>
 	/// <param name="scheduler"></param>
 	/// <param name="token">Cancellation token passed to <see cref="WebSearchEngine{T}.GetResultAsync(SmartImage.Lib.SearchQuery,System.Threading.CancellationToken)"/></param>
-	public async Task<SearchResult[]> RunSearchAsync(SearchQuery query,
-	                                                 TaskScheduler scheduler = default,
-	                                                 CancellationToken token = default)
+	public async Task<SearchResult[]> RunSearchAsync1(SearchQuery query,
+	                                                  TaskScheduler scheduler = default,
+	                                                  CancellationToken token = default)
 	{
 		scheduler ??= TaskScheduler.Default;
 
@@ -140,12 +147,12 @@ public async Task<SearchResult[]> RunSearchAsync(SearchQuery query,
 
 		Debug.WriteLine($"Config: {Config} | {Engines.QuickJoin()}");
 
-		List<Task<SearchResult>> tasks = GetSearchTasks(query, scheduler, token).ToList();
+		var tasks = GetSearchTasks(query, scheduler, token);
 
-		var results = new SearchResult[tasks.Count];
-		int i       = 0;
+		// var results = new SearchResult[tasks.Count];
+		int i = 0;
 
-		while (tasks.Count > 0) {
+		/*while (tasks.Count > 0) {
 			if (token.IsCancellationRequested) {
 
 				Debugger.Break();
@@ -164,6 +171,19 @@ public async Task<SearchResult[]> RunSearchAsync(SearchQuery query,
 
 			results[i] = result;
 			i++;
+		}*/
+
+
+		await foreach (var task in Task.WhenEach(tasks).WithCancellation(token)) {
+			if (token.IsCancellationRequested) {
+
+				Debugger.Break();
+				s_logger.LogWarning("Cancellation requested");
+				CompleteSearchAsync();
+			}
+
+			var result = await task;
+			ProcessResult(result);
 		}
 
 		CompleteSearchAsync();
@@ -191,8 +211,60 @@ public async Task<SearchResult[]> RunSearchAsync(SearchQuery query,
 
 		return results;
 	}
+#endif
+
+	public async IAsyncEnumerable<SearchResult> RunSearchAsync(SearchQuery query,
+	                                                           TaskScheduler scheduler = default,
+	                                                           [EC] CancellationToken token = default)
+	{
+		await RunSearchAsync2(query, ResultChannel.Writer, token);
+
+		await foreach (var result in ResultChannel.Reader.ReadAllAsync(token)) {
+			yield return result;
+		}
+	}
+
+
+	/// <summary>
+	/// Runs a search of <paramref name="query"/>.
+	/// </summary>
+	public async ValueTask<bool> RunSearchAsync2(SearchQuery query,
+	                                             ChannelWriter<SearchResult> cw,
+	                                             CancellationToken token = default)
+	{
+		if (!query.IsUploaded) {
+			throw new SmartImageException($"{query} was not uploaded");
+		}
+
+		var tasks = Engines.Select(e =>
+		{
+			var task = e.GetResultAsync(query, token);
+			return task;
+		});
+
+		await foreach (var task in Task.WhenEach(tasks).WithCancellation(token)) {
+
+			var result = await task;
+
+			if (task.IsFaulted || task.IsCanceled) {
+				Trace.WriteLine($"{task} faulted or was canceled");
+			}
+
+			if (cw.TryWrite(result)) {
+				//
+			}
+
+			if (Config.PriorityEngines.HasFlag(result.Engine.EngineOption)) {
+				var url = Config.OpenRaw ? result.RawUrl : result.GetBestResult()?.Url;
+
+				OpenResult(url);
+			}
+		}
+
+		return default;
+	}
 
-	public static SearchResultItem GetBest(SearchResult[] results)
+	public static SearchResultItem GetBest(IEnumerable<SearchResult> results)
 	{
 		var ordered = results.Select(x => x.GetBestResult())
 			.Where(x => x != null)
@@ -259,16 +331,10 @@ public IEnumerable<Task<SearchResult>> GetSearchTasks(SearchQuery query, TaskSch
 	{
 		var tasks = Engines.Select(e =>
 		{
-			try {
+			/*try {
 				Debug.WriteLine($"Starting {e} for {query}");
 
-				Task<SearchResult> res = e.GetResultAsync(query, token: token)
-					.ContinueWith((r) =>
-					{
-						ProcessResult(r.Result);
-						return r.Result;
 
-					}, token, TaskContinuationOptions.None, scheduler);
 
 				return res;
 			}
@@ -279,7 +345,19 @@ public IEnumerable<Task<SearchResult>> GetSearchTasks(SearchQuery query, TaskSch
 				// return  Task.FromException(exception);
 			}
 
-			return default;
+			return default;*/
+
+			/*Task<SearchResult> res = e.GetResultAsync(query, token: token)
+				.ContinueWith((r) =>
+				{
+					ProcessResult(r.Result);
+					return r.Result;
+
+				}, token, TaskContinuationOptions.None, scheduler)*/
+			;
+
+			Task<SearchResult> res = e.GetResultAsync(query, token: token);
+			return res;
 		});
 
 		return tasks;
@@ -306,7 +384,7 @@ public async ValueTask LoadEnginesAsync(CancellationToken token = default)
 		}
 
 		if (Config.FlareSolverr && !FlareSolverrClient.Value.IsInitialized) {
-			
+
 
 			var ok = FlareSolverrClient.Value.Configure(Config.FlareSolverrApiUrl);
 
@@ -360,4 +438,4 @@ public void Dispose()
 		ResultChannel?.Writer.Complete();
 	}
 
-}
+}
diff --git a/SmartImage.Lib/SearchServer.cs b/SmartImage.Lib/SearchServer.cs
@@ -81,7 +81,11 @@ private async Task<object> HandleRequestAsync(HttpListenerRequest request, HttpL
 
 			var url = await sq.UploadAsync();
 
-			var results = await Client.RunSearchAsync(sq);
+			var results1 =  Client.RunSearchAsync(sq);
+
+			await foreach (var v in results1) {
+				
+			}
 
 			var best = SearchClient.GetBest(results);
 
diff --git a/SmartImage.Lib/SmartImage.Lib.csproj b/SmartImage.Lib/SmartImage.Lib.csproj
@@ -11,7 +11,7 @@
     <PublishTrimmed>True</PublishTrimmed>
     <!-- <PublishSingleFile>true</PublishSingleFile> -->
     <PublishSingleFile Condition="'$(Configuration)' == 'Release|AnyCPU'">true</PublishSingleFile>
-    <NoWarn>AD0001;IDE0290;CS0168</NoWarn>
+    <NoWarn>AD0001;IDE0290</NoWarn>
   </PropertyGroup>
   <PropertyGroup>
     <SatelliteResourceLanguages>en-US;en</SatelliteResourceLanguages>
diff --git a/SmartImage.UI/MainWindow.Handlers.cs b/SmartImage.UI/MainWindow.Handlers.cs
@@ -893,4 +893,10 @@ private void HashItem_OnClick(object sender, RoutedEventArgs e)
 		e.Handled = true;
 	}
 
+	private void Tb_ProgFolder_OnMouseDoubleClick(object sender, MouseButtonEventArgs e)
+	{
+		FileSystem.Open(BaseOSIntegration.ExecutableDirectory);
+		e.Handled=true;
+	}
+
 }
diff --git a/SmartImage.UI/MainWindow.xaml b/SmartImage.UI/MainWindow.xaml
@@ -771,6 +771,17 @@
                     <ProgressBar x:Name="Pb_Preview" Grid.Column="1" HorizontalAlignment="Right" Height="10"
                                  Margin="0,105,174,0" Grid.Row="1" VerticalAlignment="Top" Width="320"
                                  Value="{Binding CurrentResult.PreviewProgress}" />
+                    <Label x:Name="Lb_SelPrevUrl" Content="Preview" HorizontalAlignment="Left" Margin="4,31,0,0"
+                           VerticalAlignment="Top" Height="26" Foreground="White"
+                           Background="{DynamicResource {x:Static SystemColors.ControlDarkDarkBrushKey}}" Width="55"
+                           HorizontalContentAlignment="Center"
+                           Grid.Row="1" FontWeight="Bold" />
+                    <TextBox x:Name="Tb_SelPrevUrl" HorizontalAlignment="Left" Margin="64,34,0,0"
+                             VerticalAlignment="Top" Width="434" IsReadOnly="True" Height="20" Foreground="White"
+                             Background="Black"
+                             Text="{Binding CurrentResult.Result.Thumbnail, Converter={StaticResource urlConverter}, ElementName=Wnd_Main, Mode=OneWay, UpdateSourceTrigger=PropertyChanged}"
+                             ToolTip="Preview image URL"
+                             Grid.Row="1" MouseDoubleClick="Tb_SelPrevUrl_MouseDoubleClick" />
 
                     <Label x:Name="Lb_SelMainUrl" Content="Item" HorizontalAlignment="Left" Margin="4,59,0,0"
                            VerticalAlignment="Top" Height="26" Foreground="White"
@@ -817,20 +828,6 @@
                              ToolTip="Preview image dimensions"
                              Grid.Row="1" />
 
-                    <Label x:Name="Lb_SelPrevUrl" Content="Preview" HorizontalAlignment="Left" Margin="4,31,0,0"
-                           VerticalAlignment="Top" Height="26" Foreground="White"
-                           Background="{DynamicResource {x:Static SystemColors.ControlDarkDarkBrushKey}}" Width="55"
-                           HorizontalContentAlignment="Center"
-                           Grid.Row="1" FontWeight="Bold" />
-
-                    <TextBox x:Name="Tb_SelPrevUrl" HorizontalAlignment="Left" Margin="64,34,0,0"
-                             VerticalAlignment="Top" Width="434" IsReadOnly="True" Height="20" Foreground="White"
-                             Background="Black"
-                             Text="{Binding CurrentResult.Result.Thumbnail, Converter={StaticResource urlConverter}, ElementName=Wnd_Main, Mode=OneWay, 
-                        UpdateSourceTrigger=PropertyChanged}"
-                             ToolTip="Preview image URL"
-                             Grid.Row="1" MouseDoubleClick="Tb_SelPrevUrl_MouseDoubleClick" />
-
                 </Grid>
             </TabItem>
             <TabItem x:Name="Ti_Config" HorizontalAlignment="Center" Height="20" Header="Config"
@@ -918,12 +915,34 @@
             <TabItem x:Name="Ti_Info" HorizontalAlignment="Center" Height="20" Header="Info" VerticalAlignment="Center"
                      Width="54">
                 <Grid Background="{DynamicResource Black1}">
-                    <Label x:Name="Lb_Version" Content="Current version" HorizontalAlignment="Left" Margin="10,21,0,0"
+                    <Label x:Name="Lb_Version" Content="Current version" HorizontalAlignment="Left" Margin="8,11,0,0"
+                           VerticalAlignment="Top" Height="26" Foreground="White"
+                           Background="{DynamicResource {x:Static SystemColors.ControlDarkDarkBrushKey}}" Width="100"
+                           HorizontalContentAlignment="Center" FontWeight="Bold" />
+                    <TextBox x:Name="Tb_Version" HorizontalAlignment="Left" Margin="113,14,0,0"
+                             VerticalAlignment="Top" Width="130" IsReadOnly="True" Height="20" Foreground="White"
+                             Background="Black" />
+
+                    <Label x:Name="Lb_Version2" Content="Latest version" HorizontalAlignment="Left" Margin="8,42,0,0"
+                           VerticalAlignment="Top" Height="26" Foreground="White"
+                           Background="{DynamicResource {x:Static SystemColors.ControlDarkDarkBrushKey}}" Width="100"
+                           HorizontalContentAlignment="Center" FontWeight="Bold" />
+
+                    <TextBox x:Name="Tb_Version2" HorizontalAlignment="Left" Margin="113,45,0,0"
+                             VerticalAlignment="Top" Width="130" IsReadOnly="True" Height="20" Foreground="White"
+                             Background="Black" />
+                    <Label x:Name="Lb_ProgFolder" Content="Program folder" HorizontalAlignment="Left" Margin="8,78,0,0"
+                           VerticalAlignment="Top" Height="26" Foreground="White"
+                           Background="{DynamicResource {x:Static SystemColors.ControlDarkDarkBrushKey}}" Width="100"
+                           HorizontalContentAlignment="Center" FontWeight="Bold" />
+                    <TextBox x:Name="Tb_ProgFolder" HorizontalAlignment="Left" Margin="113,81,0,0"
+                             VerticalAlignment="Top" Width="500" IsReadOnly="True" Height="20" Foreground="White"
+                             Background="Black" MouseDoubleClick="Tb_ProgFolder_OnMouseDoubleClick" TextWrapping="WrapWithOverflow"/>
+
+                    <!--<Label x:Name="Lb_Version" Content="Current version" HorizontalAlignment="Left" Margin="10,21,0,0"
                            VerticalAlignment="Top" Foreground="White" FontWeight="Bold" />
                     <TextBlock x:Name="Tb_Version" HorizontalAlignment="Left" Margin="112,26,0,0" TextWrapping="Wrap"
-                               VerticalAlignment="Top" Foreground="White" Width="115" />
-                    <Button x:Name="Btn_OpenFolder" Content="Open program folder" HorizontalAlignment="Left"
-                            Margin="10,162,0,0" VerticalAlignment="Top" Click="Btn_OpenFolder_Click" />
+                               VerticalAlignment="Top" Foreground="White" Width="115" />-->
                     <ListView x:Name="Lv_Logs" ItemsSource="{Binding Logs}"
                               Foreground="White"
                               Background="{DynamicResource Black2}"
@@ -935,12 +954,17 @@
                             </GridView>
                         </ListView.View>
                     </ListView>
-                    <Label x:Name="Lb_Version2" Content="Latest version" HorizontalAlignment="Left" Margin="10,52,0,0"
+
+                    <!--<Label x:Name="Lb_Version2" Content="Latest version" HorizontalAlignment="Left" Margin="10,52,0,0"
                            VerticalAlignment="Top" Foreground="White" FontWeight="Bold" />
                     <TextBlock x:Name="Tb_Version2" HorizontalAlignment="Left" Margin="103,57,0,0" TextWrapping="Wrap"
-                               VerticalAlignment="Top" Foreground="White" Width="124" />
+                               VerticalAlignment="Top" Foreground="White" Width="124" />-->
+
                     <Button x:Name="Btn_OpenWiki" Content="Open wiki" HorizontalAlignment="Left" Margin="10,132,0,0"
                             VerticalAlignment="Top" Width="70" Click="Btn_OpenWiki_Click" />
+                    <Button x:Name="Btn_StackTrace" Content="Generate stack trace" HorizontalAlignment="Left"
+                            Margin="95,132,0,0"
+                            VerticalAlignment="Top" Width="120" Click="Btn_OpenWiki_Click" />
                 </Grid>
             </TabItem>
         </TabControl>
diff --git a/SmartImage.UI/MainWindow.xaml.cs b/SmartImage.UI/MainWindow.xaml.cs

Original file line number	Diff line number	Diff line change
`@@ -3,7 +3,7 @@`
`3`	`3`
`4`	`4`	`namespace SmartImage.Lib.Results.Data;`
`5`	`5`
`6`		`-#pragma warning disable CS0168`
	`6`	`+// #pragma warning disable CS0168`
`7`	`7`	`public interface ISimilarity`
`8`	`8`	`{`
`9`	`9`
Original file line number	Diff line number	Diff line change
`@@ -893,4 +893,10 @@ private void HashItem_OnClick(object sender, RoutedEventArgs e)`
`893`	`893`	`e.Handled = true;`
`894`	`894`	`}`
`895`	`895`
	`896`	`+ private void Tb_ProgFolder_OnMouseDoubleClick(object sender, MouseButtonEventArgs e)`
	`897`	`+ {`
	`898`	`+ FileSystem.Open(BaseOSIntegration.ExecutableDirectory);`
	`899`	`+ e.Handled=true;`
	`900`	`+ }`
	`901`	`+`
`896`	`902`	`}`