Merge branch 'vnext'

Author: 13xforever

Clients/CirrusCiClient/CirrusCiClient.csproj

@@ -12,6 +12,6 @@
     <PackageReference Include="Microsoft.Extensions.Caching.Memory" Version="10.0.10" />
     <PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="10.0.10" />
     <PackageReference Include="Microsoft.Extensions.Http" Version="10.0.10" />
-    <PackageReference Include="StrawberryShake.Server" Version="16.5.0" />
+    <PackageReference Include="StrawberryShake.Server" Version="16.5.1" />
   </ItemGroup>
 </Project>

CompatBot/EventHandlers/MediaScreenshotMonitor.cs

@@ -100,7 +100,7 @@ await ContentFilter.PerformFilterActions(
                     if (previousItem.hit.Actions.HasFlag(FilterAction.RemoveContent))
                         RemovedMessages.Set(msg.Id, true, MessageCachedTime);
                 }
-                else if (await OcrProvider.GetTextAsync(imgUrl, ocrTask.Rotation, Config.Cts.Token).ConfigureAwait(false) is ({ Length: > 0 } result, var confidence))
+                else if (await OcrProvider.GetTextAsync(imgUrl, ocrTask.Rotation, Config.Cts.Token).ConfigureAwait(false) is ({Length: >0} result, var confidence))
                 {
                     var cnt = true;
                     var duplicates = new HashSet<string>();

CompatBot/Ocr/Backend/Tesseract.cs

@@ -8,8 +8,8 @@ namespace CompatBot.Ocr.Backend;
 
 internal class Tesseract: BackendBase
 {
-    private TesseractEngine engine;
-    private static readonly SemaphoreSlim limiter = new(1, 1);
+    private TesseractEngine engine = null!;
+    private static readonly SemaphoreSlim Limiter = new(1, 1);
 
     public override string Name => "tesseract";
 
@@ -28,34 +28,14 @@ public override async Task<bool> InitializeAsync(CancellationToken cancellationT
             return false;
         }
 
-        var engModelPath = Path.Combine(ModelCachePath, "eng.traineddata");
-        if (!File.Exists(engModelPath))
-        {
-            try
-            {
-                using var client = HttpClientFactory.Create(new CompressionMessageHandler());
-                // existing repos: tessdata_fast, tessdata, tessdata_best
-                const string uri = "https://github.com/tesseract-ocr/tessdata_best/raw/refs/heads/main/eng.traineddata";
-                await using var response = await client.GetStreamAsync(uri, cancellationToken).ConfigureAwait(false);
-                await using var file = File.Open(engModelPath, new FileStreamOptions
-                {
-                    Mode = FileMode.Create,
-                    Access = FileAccess.Write,
-                    Share = FileShare.None,
-                    Options = FileOptions.Asynchronous | FileOptions.SequentialScan,
-                });
-                await response.CopyToAsync(file, cancellationToken).ConfigureAwait(false);
-            }
-            catch (Exception e)
-            {
-                Config.Log.Error(e, "Failed to download model data");
-                return false;
-            }
-        }
+        var modelsAvailable = await EnsureModelIsCached("eng", cancellationToken).ConfigureAwait(false)
+                              && await EnsureModelIsCached("rus", cancellationToken).ConfigureAwait(false);
+        if (!modelsAvailable)
+            return false;
 
         try
         {
-            engine = new(ModelCachePath, "eng", EngineMode.Default);
+            engine = new(ModelCachePath, "eng+rus", EngineMode.Default);
         }
         catch (Exception e)
         {
@@ -84,15 +64,15 @@ public override async Task<bool> InitializeAsync(CancellationToken cancellationT
                 img.Dispose();
                 img = img2;
             }
-            await limiter.WaitAsync(Config.Cts.Token).ConfigureAwait(false);
+            await Limiter.WaitAsync(Config.Cts.Token).ConfigureAwait(false);
             try
             {
                 using var page = engine.Process(img);
                 return (page.GetText() ?? "", page.GetMeanConfidence());
             }
             finally
             {
-                limiter.Release();
+                Limiter.Release();
             }
         }
         finally
@@ -107,6 +87,35 @@ public override void Dispose()
         engine.Dispose();
     }
 
+    private async ValueTask<bool> EnsureModelIsCached(string lang, CancellationToken cancellationToken)
+    {
+        var modelPath = Path.Combine(ModelCachePath, $"{lang}.traineddata");
+        if (File.Exists(modelPath))
+            return true;
+        
+        try
+        {
+            using var client = HttpClientFactory.Create(new CompressionMessageHandler());
+            // existing repos: tessdata_fast, tessdata, tessdata_best
+            var uri = $"https://github.com/tesseract-ocr/tessdata_best/raw/refs/heads/main/{lang}.traineddata";
+            await using var response = await client.GetStreamAsync(uri, cancellationToken).ConfigureAwait(false);
+            await using var file = File.Open(modelPath, new FileStreamOptions
+            {
+                Mode = FileMode.Create,
+                Access = FileAccess.Write,
+                Share = FileShare.None,
+                Options = FileOptions.Asynchronous | FileOptions.SequentialScan,
+            });
+            await response.CopyToAsync(file, cancellationToken).ConfigureAwait(false);
+        }
+        catch (Exception e)
+        {
+            Config.Log.Error(e, $"Failed to download model data for language {lang}");
+            return false;
+        }
+        return true;
+    }
+
     private enum RotationDirection
     {
         Clockwise = 1,