Change some arg names

mapped_downscale.py

@@ -235,54 +235,54 @@ def str2bool(value) -> bool:
         raise argparse.ArgumentTypeError("Boolean value expected.")
 
 
-def mapped_downscale(*, control_path: str, input_path: str, output_up_path: Optional[str], output_down_path: Optional[str], sample_radius: Optional[int], downsampler: Image.Resampling, trim_cropped_edges: bool) -> None:
+def mapped_downscale(*, control_path: str, input_path: str, output_downscaled_path: Optional[str], output_quantized_path: Optional[str], sample_radius: Optional[int], downsampler: Image.Resampling, trim_cropped_edges: bool) -> None:
     """
     Downsample and rescale an image.
-    
+ 
     :param control_path: Path to the control image.
     :param input_path: Path to the input image.
-    :param output_up_path: Path to save the output image, upscaled to the original size.
-    :param output_down_path: Path to save the output image, kept at the downsampled size.
+    :param output_downscaled_path: Path to save the output downscaled image.
+    :param output_quantized_path: Path to save the output quantized image (downscaled and then upscaled to the original size).
     :param sample_radius: Radius for sampling (Manhattan distance).
     :param downsampler: Downsampler to use.
     :param trim_cropped_edges: Drop mapped checker grid elements that are cropped in the control image.
     """
+    if not output_downscaled_path and not output_quantized_path:
+        raise ValueError("At least one of output_up and output_down must be specified.")
+ 
     control_image = Image.open(control_path).convert("1")
     input_image = Image.open(input_path)
     if control_image.size != input_image.size:
         raise ValueError("Control image and input image must have the same dimensions.")
-    
-    output_image: Optional[ImageRef] = None
-    down_image: Optional[ImageRef] = None
-    
-    if not output_up_path and not output_down_path:
-        raise ValueError("At least one of output_up and output_down must be specified.")
-    
-    if output_up_path:
-        output_image = ImageRef(Image.new("RGB", input_image.size))
+
+    downscaled_image: Optional[ImageRef] = None
+    quantized_image: Optional[ImageRef] = None
+ 
+    if output_quantized_path:
+        quantized_image = ImageRef(Image.new("RGB", input_image.size))
 
     extracted_boxes = extract_boxes(control_image)
-    
-    if output_down_path:
-        down_image = ImageRef(Image.new("RGB", extracted_boxes.down_dimensions()))
-        
+ 
+    if output_downscaled_path:
+        downscaled_image = ImageRef(Image.new("RGB", extracted_boxes.down_dimensions()))
+
     boxes = extracted_boxes.boxes()
-    downsample_all(input_image=input_image, output_image=output_image, down_image=down_image, boxes=boxes, sample_radius=sample_radius, downsampler=downsampler, trim_cropped_edges=trim_cropped_edges)
-    
-    if output_image:
-        assert output_up_path
-        output_image.ref.save(output_up_path)
-    if down_image:
-        assert output_down_path
-        down_image.ref.save(output_down_path)
+    downsample_all(input_image=input_image, output_image=quantized_image, down_image=downscaled_image, boxes=boxes, sample_radius=sample_radius, downsampler=downsampler, trim_cropped_edges=trim_cropped_edges)
+ 
+    if quantized_image:
+        assert output_quantized_path
+        quantized_image.ref.save(output_quantized_path)
+    if downscaled_image:
+        assert output_downscaled_path
+        downscaled_image.ref.save(output_downscaled_path)
 
 
 def main(cli_args: List[str]) -> None:
     parser = argparse.ArgumentParser(description="Downsample and rescale image.")
     parser.add_argument("--control", required=True, help="Path to control image.")
     parser.add_argument("--input", required=True, help="Path to input image.")
-    parser.add_argument("--output-up", help="Path to save the output image, upscaled to the original size.")
-    parser.add_argument("--output-down", help="Path to save the output image, kept at the downsampled size.")
+    parser.add_argument("--output-downscaled", help="Path to save the output downscaled image.")
+    parser.add_argument("--output-quantized", help="Path to save the output quantized image (downscaled and then upscaled to the original size).")
     parser.add_argument("--sample-radius", type=int, default=None, help="Radius for sampling (Manhattan distance).")
     parser.add_argument("--downsampler", choices=["box", "bilinear", "bicubic", "hamming", "lanczos"], default="box", help="Downsampler to use.")
     parser.add_argument("--trim-cropped-edges", type=str2bool, default=False, help="Drop mapped checker grid elements that are cropped in the control image.")
@@ -293,8 +293,8 @@ def main(cli_args: List[str]) -> None:
     mapped_downscale(
         control_path=args.control,
         input_path=args.input,
-        output_up_path=args.output_up,
-        output_down_path=args.output_down,
+        output_downscaled_path=args.output_downscaled,
+        output_quantized_path=args.output_quantized,
         sample_radius=args.sample_radius,
         downsampler=downsampler,
         trim_cropped_edges=args.trim_cropped_edges