From a7d546931a577a1649acd0ea2c749c4d4ef4d7be Mon Sep 17 00:00:00 2001
From: the-database <25811902+the-database@users.noreply.github.com>
Date: Tue, 30 Jul 2024 23:59:54 -0400
Subject: [PATCH 1/2] add grayscale detection threshold, fix NoneType bug when
 there is no matched chain

---
 .../ViewModels/MainWindowViewModel.cs         | 308 +++++++++++++++++-
 MangaJaNaiConverterGui/Views/MainWindow.axaml |  21 +-
 .../backend/src/run_upscale.py                |  42 ++-
 3 files changed, 352 insertions(+), 19 deletions(-)

diff --git a/MangaJaNaiConverterGui/ViewModels/MainWindowViewModel.cs b/MangaJaNaiConverterGui/ViewModels/MainWindowViewModel.cs
index d8d779b..c109a5e 100644
--- a/MangaJaNaiConverterGui/ViewModels/MainWindowViewModel.cs
+++ b/MangaJaNaiConverterGui/ViewModels/MainWindowViewModel.cs
@@ -73,6 +73,303 @@ public MainWindowViewModel(IPythonService? pythonService = null, IUpdateManagerS
 "0x1984",
 "0x1985",];
 
+        private static readonly string DEFAULT_WORKFLOW = """
+{
+  "$type": "MangaJaNaiConverterGui.ViewModels.UpscaleWorkflow, MangaJaNaiConverterGui",
+  "WorkflowName": "Upscale Manga (Default)",
+  "WorkflowIndex": 0,
+  "SelectedTabIndex": 0,
+  "InputFilePath": "",
+  "InputFolderPath": "",
+  "OutputFilename": "%filename%-mangajanai",
+  "OutputFolderPath": "",
+  "OverwriteExistingFiles": false,
+  "UpscaleImages": true,
+  "UpscaleArchives": true,
+  "ResizeHeightAfterUpscale": 2160,
+  "ResizeWidthAfterUpscale": 3840,
+  "WebpSelected": true,
+  "AvifSelected": false,
+  "PngSelected": false,
+  "JpegSelected": false,
+  "UseLosslessCompression": false,
+  "LossyCompressionQuality": 80,
+  "ShowLossySettings": true,
+  "ModeScaleSelected": true,
+  "UpscaleScaleFactor": 4,
+  "ModeWidthSelected": false,
+  "ModeHeightSelected": false,
+  "ModeFitToDisplaySelected": false,
+  "DisplayDevice": "Kobo Elipsa 2E (2023)",
+  "DisplayDeviceWidth": 1404,
+  "DisplayDeviceHeight": 1872,
+  "DisplayPortraitSelected": true,
+  "ShowAdvancedSettings": false,
+  "GrayscaleDetectionThreshold": 12,
+  "Chains": {
+    "$type": "Avalonia.Collections.AvaloniaList`1[[MangaJaNaiConverterGui.ViewModels.UpscaleChain, MangaJaNaiConverterGui]], Avalonia.Base",
+    "$values": [
+      {
+        "$type": "MangaJaNaiConverterGui.ViewModels.UpscaleChain, MangaJaNaiConverterGui",
+        "ChainNumber": "1",
+        "MinResolution": "0x0",
+        "MaxResolution": "0x0",
+        "IsGrayscale": false,
+        "IsColor": true,
+        "MinScaleFactor": 0,
+        "MaxScaleFactor": 2,
+        "ModelFilePath": "2x_IllustrationJaNai_V1_ESRGAN_120k.pth",
+        "ModelTileSize": "Auto (Estimate)",
+        "AutoAdjustLevels": false,
+        "ResizeHeightBeforeUpscale": 0,
+        "ResizeWidthBeforeUpscale": 0,
+        "ResizeFactorBeforeUpscale": 100.0
+      },
+      {
+        "$type": "MangaJaNaiConverterGui.ViewModels.UpscaleChain, MangaJaNaiConverterGui",
+        "ChainNumber": "2",
+        "MinResolution": "0x0",
+        "MaxResolution": "0x0",
+        "IsGrayscale": false,
+        "IsColor": true,
+        "MinScaleFactor": 2,
+        "MaxScaleFactor": 0,
+        "ModelFilePath": "4x_IllustrationJaNai_V1_ESRGAN_135k.pth",
+        "ModelTileSize": "Auto (Estimate)",
+        "AutoAdjustLevels": false,
+        "ResizeHeightBeforeUpscale": 0,
+        "ResizeWidthBeforeUpscale": 0,
+        "ResizeFactorBeforeUpscale": 100.0
+      },
+      {
+        "$type": "MangaJaNaiConverterGui.ViewModels.UpscaleChain, MangaJaNaiConverterGui",
+        "ChainNumber": "3",
+        "MinResolution": "0x0",
+        "MaxResolution": "0x1250",
+        "IsGrayscale": true,
+        "IsColor": false,
+        "MinScaleFactor": 0,
+        "MaxScaleFactor": 2,
+        "ModelFilePath": "2x_MangaJaNai_1200p_V1_ESRGAN_70k.pth",
+        "ModelTileSize": "Auto (Estimate)",
+        "AutoAdjustLevels": true,
+        "ResizeHeightBeforeUpscale": 0,
+        "ResizeWidthBeforeUpscale": 0,
+        "ResizeFactorBeforeUpscale": 100.0
+      },
+      {
+        "$type": "MangaJaNaiConverterGui.ViewModels.UpscaleChain, MangaJaNaiConverterGui",
+        "ChainNumber": "4",
+        "MinResolution": "0x0",
+        "MaxResolution": "0x1250",
+        "IsGrayscale": true,
+        "IsColor": false,
+        "MinScaleFactor": 2,
+        "MaxScaleFactor": 0,
+        "ModelFilePath": "4x_MangaJaNai_1200p_V1_ESRGAN_70k.pth",
+        "ModelTileSize": "Auto (Estimate)",
+        "AutoAdjustLevels": true,
+        "ResizeHeightBeforeUpscale": 0,
+        "ResizeWidthBeforeUpscale": 0,
+        "ResizeFactorBeforeUpscale": 100.0
+      },
+      {
+        "$type": "MangaJaNaiConverterGui.ViewModels.UpscaleChain, MangaJaNaiConverterGui",
+        "ChainNumber": "5",
+        "MinResolution": "0x1251",
+        "MaxResolution": "0x1350",
+        "IsGrayscale": true,
+        "IsColor": false,
+        "MinScaleFactor": 0,
+        "MaxScaleFactor": 2,
+        "ModelFilePath": "2x_MangaJaNai_1300p_V1_ESRGAN_75k.pth",
+        "ModelTileSize": "Auto (Estimate)",
+        "AutoAdjustLevels": true,
+        "ResizeHeightBeforeUpscale": 0,
+        "ResizeWidthBeforeUpscale": 0,
+        "ResizeFactorBeforeUpscale": 100.0
+      },
+      {
+        "$type": "MangaJaNaiConverterGui.ViewModels.UpscaleChain, MangaJaNaiConverterGui",
+        "ChainNumber": "6",
+        "MinResolution": "0x1251",
+        "MaxResolution": "0x1350",
+        "IsGrayscale": true,
+        "IsColor": false,
+        "MinScaleFactor": 2,
+        "MaxScaleFactor": 0,
+        "ModelFilePath": "4x_MangaJaNai_1300p_V1_ESRGAN_75k.pth",
+        "ModelTileSize": "Auto (Estimate)",
+        "AutoAdjustLevels": true,
+        "ResizeHeightBeforeUpscale": 0,
+        "ResizeWidthBeforeUpscale": 0,
+        "ResizeFactorBeforeUpscale": 100.0
+      },
+      {
+        "$type": "MangaJaNaiConverterGui.ViewModels.UpscaleChain, MangaJaNaiConverterGui",
+        "ChainNumber": "7",
+        "MinResolution": "0x1351",
+        "MaxResolution": "0x1450",
+        "IsGrayscale": true,
+        "IsColor": false,
+        "MinScaleFactor": 0,
+        "MaxScaleFactor": 2,
+        "ModelFilePath": "2x_MangaJaNai_1400p_V1_ESRGAN_70k.pth",
+        "ModelTileSize": "Auto (Estimate)",
+        "AutoAdjustLevels": true,
+        "ResizeHeightBeforeUpscale": 0,
+        "ResizeWidthBeforeUpscale": 0,
+        "ResizeFactorBeforeUpscale": 100.0
+      },
+      {
+        "$type": "MangaJaNaiConverterGui.ViewModels.UpscaleChain, MangaJaNaiConverterGui",
+        "ChainNumber": "8",
+        "MinResolution": "0x1351",
+        "MaxResolution": "0x1450",
+        "IsGrayscale": true,
+        "IsColor": false,
+        "MinScaleFactor": 2,
+        "MaxScaleFactor": 0,
+        "ModelFilePath": "4x_MangaJaNai_1400p_V1_ESRGAN_105k.pth",
+        "ModelTileSize": "Auto (Estimate)",
+        "AutoAdjustLevels": true,
+        "ResizeHeightBeforeUpscale": 0,
+        "ResizeWidthBeforeUpscale": 0,
+        "ResizeFactorBeforeUpscale": 100.0
+      },
+      {
+        "$type": "MangaJaNaiConverterGui.ViewModels.UpscaleChain, MangaJaNaiConverterGui",
+        "ChainNumber": "9",
+        "MinResolution": "0x1451",
+        "MaxResolution": "0x1550",
+        "IsGrayscale": true,
+        "IsColor": false,
+        "MinScaleFactor": 0,
+        "MaxScaleFactor": 2,
+        "ModelFilePath": "2x_MangaJaNai_1500p_V1_ESRGAN_90k.pth",
+        "ModelTileSize": "Auto (Estimate)",
+        "AutoAdjustLevels": true,
+        "ResizeHeightBeforeUpscale": 0,
+        "ResizeWidthBeforeUpscale": 0,
+        "ResizeFactorBeforeUpscale": 100.0
+      },
+      {
+        "$type": "MangaJaNaiConverterGui.ViewModels.UpscaleChain, MangaJaNaiConverterGui",
+        "ChainNumber": "10",
+        "MinResolution": "0x1451",
+        "MaxResolution": "0x1550",
+        "IsGrayscale": true,
+        "IsColor": false,
+        "MinScaleFactor": 2,
+        "MaxScaleFactor": 0,
+        "ModelFilePath": "4x_MangaJaNai_1500p_V1_ESRGAN_105k.pth",
+        "ModelTileSize": "Auto (Estimate)",
+        "AutoAdjustLevels": true,
+        "ResizeHeightBeforeUpscale": 0,
+        "ResizeWidthBeforeUpscale": 0,
+        "ResizeFactorBeforeUpscale": 100.0
+      },
+      {
+        "$type": "MangaJaNaiConverterGui.ViewModels.UpscaleChain, MangaJaNaiConverterGui",
+        "ChainNumber": "11",
+        "MinResolution": "0x1551",
+        "MaxResolution": "0x1760",
+        "IsGrayscale": true,
+        "IsColor": false,
+        "MinScaleFactor": 0,
+        "MaxScaleFactor": 2,
+        "ModelFilePath": "2x_MangaJaNai_1600p_V1_ESRGAN_90k.pth",
+        "ModelTileSize": "Auto (Estimate)",
+        "AutoAdjustLevels": true,
+        "ResizeHeightBeforeUpscale": 0,
+        "ResizeWidthBeforeUpscale": 0,
+        "ResizeFactorBeforeUpscale": 100.0
+      },
+      {
+        "$type": "MangaJaNaiConverterGui.ViewModels.UpscaleChain, MangaJaNaiConverterGui",
+        "ChainNumber": "12",
+        "MinResolution": "0x1551",
+        "MaxResolution": "0x1760",
+        "IsGrayscale": true,
+        "IsColor": false,
+        "MinScaleFactor": 2,
+        "MaxScaleFactor": 0,
+        "ModelFilePath": "4x_MangaJaNai_1600p_V1_ESRGAN_70k.pth",
+        "ModelTileSize": "Auto (Estimate)",
+        "AutoAdjustLevels": true,
+        "ResizeHeightBeforeUpscale": 0,
+        "ResizeWidthBeforeUpscale": 0,
+        "ResizeFactorBeforeUpscale": 100.0
+      },
+      {
+        "$type": "MangaJaNaiConverterGui.ViewModels.UpscaleChain, MangaJaNaiConverterGui",
+        "ChainNumber": "13",
+        "MinResolution": "0x1761",
+        "MaxResolution": "0x1984",
+        "IsGrayscale": true,
+        "IsColor": false,
+        "MinScaleFactor": 0,
+        "MaxScaleFactor": 2,
+        "ModelFilePath": "2x_MangaJaNai_1920p_V1_ESRGAN_70k.pth",
+        "ModelTileSize": "Auto (Estimate)",
+        "AutoAdjustLevels": true,
+        "ResizeHeightBeforeUpscale": 0,
+        "ResizeWidthBeforeUpscale": 0,
+        "ResizeFactorBeforeUpscale": 100.0
+      },
+      {
+        "$type": "MangaJaNaiConverterGui.ViewModels.UpscaleChain, MangaJaNaiConverterGui",
+        "ChainNumber": "14",
+        "MinResolution": "0x1761",
+        "MaxResolution": "0x1984",
+        "IsGrayscale": true,
+        "IsColor": false,
+        "MinScaleFactor": 2,
+        "MaxScaleFactor": 0,
+        "ModelFilePath": "4x_MangaJaNai_1920p_V1_ESRGAN_105k.pth",
+        "ModelTileSize": "Auto (Estimate)",
+        "AutoAdjustLevels": true,
+        "ResizeHeightBeforeUpscale": 0,
+        "ResizeWidthBeforeUpscale": 0,
+        "ResizeFactorBeforeUpscale": 100.0
+      },
+      {
+        "$type": "MangaJaNaiConverterGui.ViewModels.UpscaleChain, MangaJaNaiConverterGui",
+        "ChainNumber": "15",
+        "MinResolution": "0x1985",
+        "MaxResolution": "0x0",
+        "IsGrayscale": true,
+        "IsColor": false,
+        "MinScaleFactor": 0,
+        "MaxScaleFactor": 2,
+        "ModelFilePath": "2x_MangaJaNai_2048p_V1_ESRGAN_95k.pth",
+        "ModelTileSize": "Auto (Estimate)",
+        "AutoAdjustLevels": true,
+        "ResizeHeightBeforeUpscale": 0,
+        "ResizeWidthBeforeUpscale": 0,
+        "ResizeFactorBeforeUpscale": 100.0
+      },
+      {
+        "$type": "MangaJaNaiConverterGui.ViewModels.UpscaleChain, MangaJaNaiConverterGui",
+        "ChainNumber": "16",
+        "MinResolution": "0x1985",
+        "MaxResolution": "0x0",
+        "IsGrayscale": true,
+        "IsColor": false,
+        "MinScaleFactor": 2,
+        "MaxScaleFactor": 0,
+        "ModelFilePath": "4x_MangaJaNai_2048p_V1_ESRGAN_70k.pth",
+        "ModelTileSize": "Auto (Estimate)",
+        "AutoAdjustLevels": true,
+        "ResizeHeightBeforeUpscale": 0,
+        "ResizeWidthBeforeUpscale": 0,
+        "ResizeFactorBeforeUpscale": 100.0
+      }
+    ]
+  }
+}
+""";
+
         public string[] CommonResolutions
         {
             get => _commonResolutions;
@@ -1152,8 +1449,7 @@ public void ResetCurrentWorkflow()
         {
             if (CurrentWorkflow != null)
             {
-                var lines = JsonConvert.SerializeObject(Workflows[0], NewtonsoftJsonSuspensionDriver.Settings);
-                var workflow = JsonConvert.DeserializeObject<UpscaleWorkflow>(lines, NewtonsoftJsonSuspensionDriver.Settings);
+                var workflow = JsonConvert.DeserializeObject<UpscaleWorkflow>(DEFAULT_WORKFLOW, NewtonsoftJsonSuspensionDriver.Settings);
                 var workflowIndex = CurrentWorkflow.WorkflowIndex;
                 var workflowName = $"Custom Workflow {workflowIndex}";
 
@@ -1744,6 +2040,14 @@ public bool ShowAdvancedSettings
             set => this.RaiseAndSetIfChanged(ref _showAdvancedSettings, value);
         }
 
+        private int _grayscaleDetectionThreshold = 12;
+        [DataMember]
+        public int GrayscaleDetectionThreshold
+        {
+            get => _grayscaleDetectionThreshold;
+            set => this.RaiseAndSetIfChanged(ref _grayscaleDetectionThreshold, value);
+        }
+
         private AvaloniaList<UpscaleChain> _chains;
         [DataMember]
         public AvaloniaList<UpscaleChain> Chains
diff --git a/MangaJaNaiConverterGui/Views/MainWindow.axaml b/MangaJaNaiConverterGui/Views/MainWindow.axaml
index 8e79e81..b1a46b1 100644
--- a/MangaJaNaiConverterGui/Views/MainWindow.axaml
+++ b/MangaJaNaiConverterGui/Views/MainWindow.axaml
@@ -190,12 +190,12 @@
           <!-- Main Form -->
           <StackPanel Margin="20">
             <Grid>
-              <StackPanel Orientation="Horizontal" Margin="0,10,0,10" IsVisible="{Binding !CurrentWorkflow.IsDefaultWorkflow}" Grid.Column="0">
+              <StackPanel Orientation="Horizontal" Margin="0,10,0,10" Grid.Column="0">
                 <TextBlock Margin="0,0,5,0" VerticalAlignment="Center">Workflow Name</TextBlock>
                 <TextBox Width="500" Margin="0,0,5,0" Text="{Binding CurrentWorkflow.WorkflowName}"/>
               </StackPanel>
 
-              <StackPanel Grid.Column="1" HorizontalAlignment="Right" VerticalAlignment="Top" IsVisible="{Binding !CurrentWorkflow.IsDefaultWorkflow}">
+              <StackPanel Grid.Column="1" HorizontalAlignment="Right" VerticalAlignment="Top">
                 <StackPanel Margin="0,10,0,0" Orientation="Horizontal" HorizontalAlignment="Right">
 
                   <Button Margin="10,0,10,0" Click="ImportCurrentWorkflowButtonClick">
@@ -433,11 +433,20 @@
                 <TextBlock Margin="0,0,5,0" FontWeight="Bold" Text="Advanced Settings"/>
                 <materialIcons:MaterialIcon Kind="QuestionMarkCircle" Opacity="0.5" VerticalAlignment="Center" />
               </StackPanel>
-              <TextBlock FontSize="12" Foreground="Gray" Margin="0,10,0,10" IsVisible="{Binding CurrentWorkflow.IsDefaultWorkflow}">
-                Advanced settings are locked for the default workflow, and are displayed below for reference only. Select any custom workflow to modify the advanced settings for that workflow.
-              </TextBlock>
 
-              <Border Classes="border" IsEnabled="{Binding !CurrentWorkflow.IsDefaultWorkflow}">
+              <Border Classes="border">
+                <StackPanel>
+                  <StackPanel Orientation="Horizontal" Margin="10,10,0,0">
+                    <TextBlock Margin="0,0,5,0" Text="Grayscale Detection Threshold" VerticalAlignment="Center" />
+                    <Slider VerticalAlignment="Center" Value="{Binding CurrentWorkflow.GrayscaleDetectionThreshold}" Minimum="0" Maximum="24" Width="500" TickFrequency="1" IsSnapToTickEnabled="True" />
+                    <TextBlock VerticalAlignment="Center" Width="40" Margin="10,10,0,10" Text="{Binding CurrentWorkflow.GrayscaleDetectionThreshold}" HorizontalAlignment="Center"/>
+                    <TextBlock Width="650" TextWrapping="WrapWithOverflow" Foreground="Gray" FontSize="12" VerticalAlignment="Center" Margin="20,0,0,0">The threshold for which an image is considered grayscale. The default value of 12 considers images with slight color as grayscale, because some grayscale images have slight color due to artifacts. Set the threshold to 0 to consider only strictly grayscale images as grayscale, and increase the threshold to consider images with more color as grayscale.</TextBlock>
+                  </StackPanel>
+
+                </StackPanel>
+              </Border>
+
+              <Border Classes="border">
                 <StackPanel>
                   <ItemsControl ItemsSource="{Binding CurrentWorkflow.Chains}">
                     <ItemsControl.ItemTemplate>
diff --git a/MangaJaNaiConverterGui/backend/src/run_upscale.py b/MangaJaNaiConverterGui/backend/src/run_upscale.py
index caee1e4..209d151 100644
--- a/MangaJaNaiConverterGui/backend/src/run_upscale.py
+++ b/MangaJaNaiConverterGui/backend/src/run_upscale.py
@@ -299,7 +299,7 @@ def _pil_to_cv2(im: ImageType) -> np.ndarray:
     return img
 
 
-def cv_image_is_grayscale(image: np.ndarray) -> bool:
+def cv_image_is_grayscale(image: np.ndarray, user_threshold: float) -> bool:
     _, _, c = get_h_w_c(image)
 
     if c == 1:
@@ -307,7 +307,7 @@ def cv_image_is_grayscale(image: np.ndarray) -> bool:
 
     b, g, r = cv2.split(image[:, :, :3])
 
-    ignore_threshold = 12
+    ignore_threshold = user_threshold
 
     # getting differences between (b,g), (r,g), (b,r) channel pixels
     r_g = cv2.subtract(cv2.absdiff(r, g), ignore_threshold)  # type: ignore
@@ -332,7 +332,7 @@ def cv_image_is_grayscale(image: np.ndarray) -> bool:
     # finding ratio of diff_sum with respect to size of image without pure black and pure white pixels
     ratio = diff_sum / size_without_black_and_white
 
-    return ratio < 1
+    return ratio <= user_threshold / 12
 
 
 def get_chain_for_image(
@@ -341,7 +341,8 @@ def get_chain_for_image(
     target_width: int,
     target_height: int,
     chains: list[dict[str, Any]],
-) -> tuple[dict[str, Any], bool, int, int] | tuple[None, None, None, None]:
+    grayscale_detection_threshold: int
+) -> tuple[dict[str, Any], bool, int, int] | tuple[None, None, int, int]:
     original_height, original_width, _ = get_h_w_c(image)
 
     if target_width != 0 and target_height != 0:
@@ -355,16 +356,16 @@ def get_chain_for_image(
 
     assert target_scale is not None
 
-    is_grayscale = cv_image_is_grayscale(image)
+    is_grayscale = cv_image_is_grayscale(image, grayscale_detection_threshold)
 
     for chain in chains:
         if should_chain_activate_for_image(
             original_width, original_height, is_grayscale, target_scale, chain
         ):
-            print("Matched Chain:", chain)
+            print("Matched Chain:", chain, flush=True)
             return chain, is_grayscale, original_width, original_height
 
-    return None, None, None, None
+    return None, None, original_width, original_height
 
 
 def should_chain_activate_for_image(
@@ -647,6 +648,7 @@ def preprocess_worker_archive(
     target_height: int,
     chains: list[dict[str, Any]],
     loaded_models: dict[str, ModelDescriptor],
+    grayscale_detection_threshold: int,
 ) -> None:
     """
     given a zip or rar path, read images out of the archive, apply auto levels, add the image to upscale queue
@@ -663,6 +665,7 @@ def preprocess_worker_archive(
                 target_height,
                 chains,
                 loaded_models,
+                grayscale_detection_threshold,
             )
     elif input_archive_path.endswith(RAR_EXTENSIONS):
         with rarfile.RarFile(input_archive_path, "r") as input_rar:
@@ -675,6 +678,7 @@ def preprocess_worker_archive(
                 target_height,
                 chains,
                 loaded_models,
+                grayscale_detection_threshold,
             )
 
 
@@ -687,6 +691,7 @@ def preprocess_worker_archive_file(
     target_height: int,
     chains: list[dict[str, Any]],
     loaded_models: dict[str, ModelDescriptor],
+    grayscale_detection_threshold: int,
 ) -> None:
     """
     given an input zip or rar archive, read images out of the archive, apply auto levels, add the image to upscale queue
@@ -716,7 +721,7 @@ def preprocess_worker_archive_file(
 
                 chain, is_grayscale, original_width, original_height = (
                     get_chain_for_image(
-                        image, target_scale, target_width, target_height, chains
+                        image, target_scale, target_width, target_height, chains, grayscale_detection_threshold
                     )
                 )
                 model = None
@@ -785,7 +790,6 @@ def preprocess_worker_archive_file(
                     image = normalize(image)
 
                 # image = np.ascontiguousarray(image)
-
                 upscale_queue.put(
                     (
                         image,
@@ -828,6 +832,7 @@ def preprocess_worker_folder(
     target_height: int,
     chains: list[dict[str, Any]],
     loaded_models: dict[str, ModelDescriptor],
+    grayscale_detection_threshold: int,
 ) -> None:
     """
     given a folder path, recursively iterate the folder
@@ -868,7 +873,7 @@ def preprocess_worker_folder(
 
                     chain, is_grayscale, original_width, original_height = (
                         get_chain_for_image(
-                            image, target_scale, target_width, target_height, chains
+                            image, target_scale, target_width, target_height, chains, grayscale_detection_threshold
                         )
                     )
                     model = None
@@ -977,6 +982,7 @@ def preprocess_worker_folder(
                         target_height,
                         chains,
                         loaded_models,
+                        grayscale_detection_threshold
                     )  # TODO custom output extension
     upscale_queue.put(UPSCALE_SENTINEL)
     # print("preprocess_worker_folder exiting")
@@ -992,6 +998,7 @@ def preprocess_worker_image(
     target_height: int,
     chains: list[dict[str, Any]],
     loaded_models: dict[str, ModelDescriptor],
+    grayscale_detection_threshold: int,
 ) -> None:
     """
     given an image path, apply auto levels and add to upscale queue
@@ -1006,7 +1013,7 @@ def preprocess_worker_image(
         image = _read_image_from_path(input_image_path)
 
         chain, is_grayscale, original_width, original_height = get_chain_for_image(
-            image, target_scale, target_width, target_height, chains
+            image, target_scale, target_width, target_height, chains, grayscale_detection_threshold
         )
         model = None
         tile_size_str = ""
@@ -1253,6 +1260,7 @@ def upscale_archive_file(
     target_height: int,
     chains: list[dict[str, Any]],
     loaded_models: dict[str, ModelDescriptor],
+    grayscale_detection_threshold: int,
 ) -> None:
     # TODO accept multiple paths to reuse simple queues?
 
@@ -1271,6 +1279,7 @@ def upscale_archive_file(
             target_height,
             chains,
             loaded_models,
+            grayscale_detection_threshold,
         ),
     )
     preprocess_process.start()
@@ -1315,6 +1324,7 @@ def upscale_image_file(
     target_height: int,
     chains: list[dict[str, Any]],
     loaded_models: dict[str, ModelDescriptor],
+    grayscale_detection_threshold: int,
 ) -> None:
     upscale_queue = Queue(maxsize=1)
     postprocess_queue = Queue(maxsize=1)
@@ -1332,6 +1342,7 @@ def upscale_image_file(
             target_height,
             chains,
             loaded_models,
+            grayscale_detection_threshold
         ),
     )
     preprocess_process.start()
@@ -1377,6 +1388,7 @@ def upscale_file(
     target_height: int,
     chains: list[dict[str, Any]],
     loaded_models: dict[str, ModelDescriptor],
+    grayscale_detection_threshold: int,
 ) -> None:
     input_file_base = Path(input_file_path).stem
 
@@ -1404,6 +1416,7 @@ def upscale_file(
             target_height,
             chains,
             loaded_models,
+            grayscale_detection_threshold,
         )
 
     elif input_file_path.lower().endswith(IMAGE_EXTENSIONS):
@@ -1431,6 +1444,7 @@ def upscale_file(
             target_height,
             chains,
             loaded_models,
+            grayscale_detection_threshold
         )
 
 
@@ -1449,6 +1463,7 @@ def upscale_folder(
     target_height: int,
     chains: list[dict[str, Any]],
     loaded_models: dict[str, ModelDescriptor],
+    grayscale_detection_threshold: int,
 ) -> None:
     # print("upscale_folder: entering")
 
@@ -1475,6 +1490,7 @@ def upscale_folder(
             target_height,
             chains,
             loaded_models,
+            grayscale_detection_threshold
         ),
     )
     preprocess_process.start()
@@ -1596,6 +1612,8 @@ def get_dot20_icc_profile() -> ImageCmsProfile:
     target_width = 0
     target_height = 0
 
+    grayscale_detection_threshold = workflow["GrayscaleDetectionThreshold"]
+
     if workflow["ModeScaleSelected"]:
         target_scale = workflow["UpscaleScaleFactor"]
     elif workflow["ModeWidthSelected"]:
@@ -1622,6 +1640,7 @@ def get_dot20_icc_profile() -> ImageCmsProfile:
             target_height,
             workflow["Chains"]["$values"],
             loaded_models,
+            grayscale_detection_threshold
         )
     elif workflow["SelectedTabIndex"] == 0:
         upscale_file(
@@ -1637,6 +1656,7 @@ def get_dot20_icc_profile() -> ImageCmsProfile:
             target_height,
             workflow["Chains"]["$values"],
             loaded_models,
+            grayscale_detection_threshold
         )
 
     # # Record the end time

From 0f0dec4bc22d5ad9d4691c0c5cdc7318ee93d183 Mon Sep 17 00:00:00 2001
From: the-database <25811902+the-database@users.noreply.github.com>
Date: Wed, 31 Jul 2024 00:01:13 -0400
Subject: [PATCH 2/2] ruff format

---
 .../backend/src/run_upscale.py                | 35 +++++++++++++------
 1 file changed, 25 insertions(+), 10 deletions(-)

diff --git a/MangaJaNaiConverterGui/backend/src/run_upscale.py b/MangaJaNaiConverterGui/backend/src/run_upscale.py
index 209d151..a9a84a1 100644
--- a/MangaJaNaiConverterGui/backend/src/run_upscale.py
+++ b/MangaJaNaiConverterGui/backend/src/run_upscale.py
@@ -341,7 +341,7 @@ def get_chain_for_image(
     target_width: int,
     target_height: int,
     chains: list[dict[str, Any]],
-    grayscale_detection_threshold: int
+    grayscale_detection_threshold: int,
 ) -> tuple[dict[str, Any], bool, int, int] | tuple[None, None, int, int]:
     original_height, original_width, _ = get_h_w_c(image)
 
@@ -721,7 +721,12 @@ def preprocess_worker_archive_file(
 
                 chain, is_grayscale, original_width, original_height = (
                     get_chain_for_image(
-                        image, target_scale, target_width, target_height, chains, grayscale_detection_threshold
+                        image,
+                        target_scale,
+                        target_width,
+                        target_height,
+                        chains,
+                        grayscale_detection_threshold,
                     )
                 )
                 model = None
@@ -873,7 +878,12 @@ def preprocess_worker_folder(
 
                     chain, is_grayscale, original_width, original_height = (
                         get_chain_for_image(
-                            image, target_scale, target_width, target_height, chains, grayscale_detection_threshold
+                            image,
+                            target_scale,
+                            target_width,
+                            target_height,
+                            chains,
+                            grayscale_detection_threshold,
                         )
                     )
                     model = None
@@ -982,7 +992,7 @@ def preprocess_worker_folder(
                         target_height,
                         chains,
                         loaded_models,
-                        grayscale_detection_threshold
+                        grayscale_detection_threshold,
                     )  # TODO custom output extension
     upscale_queue.put(UPSCALE_SENTINEL)
     # print("preprocess_worker_folder exiting")
@@ -1013,7 +1023,12 @@ def preprocess_worker_image(
         image = _read_image_from_path(input_image_path)
 
         chain, is_grayscale, original_width, original_height = get_chain_for_image(
-            image, target_scale, target_width, target_height, chains, grayscale_detection_threshold
+            image,
+            target_scale,
+            target_width,
+            target_height,
+            chains,
+            grayscale_detection_threshold,
         )
         model = None
         tile_size_str = ""
@@ -1342,7 +1357,7 @@ def upscale_image_file(
             target_height,
             chains,
             loaded_models,
-            grayscale_detection_threshold
+            grayscale_detection_threshold,
         ),
     )
     preprocess_process.start()
@@ -1444,7 +1459,7 @@ def upscale_file(
             target_height,
             chains,
             loaded_models,
-            grayscale_detection_threshold
+            grayscale_detection_threshold,
         )
 
 
@@ -1490,7 +1505,7 @@ def upscale_folder(
             target_height,
             chains,
             loaded_models,
-            grayscale_detection_threshold
+            grayscale_detection_threshold,
         ),
     )
     preprocess_process.start()
@@ -1640,7 +1655,7 @@ def get_dot20_icc_profile() -> ImageCmsProfile:
             target_height,
             workflow["Chains"]["$values"],
             loaded_models,
-            grayscale_detection_threshold
+            grayscale_detection_threshold,
         )
     elif workflow["SelectedTabIndex"] == 0:
         upscale_file(
@@ -1656,7 +1671,7 @@ def get_dot20_icc_profile() -> ImageCmsProfile:
             target_height,
             workflow["Chains"]["$values"],
             loaded_models,
-            grayscale_detection_threshold
+            grayscale_detection_threshold,
         )
 
     # # Record the end time