V2.

Author: huideyeren

.github/workflows/testing.yml

@@ -11,7 +11,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        python-version: ["3.10", "3.11", "3.12"]
+        python-version: ["3.10", "3.11", "3.12", "3.13"]
         poetry-version: [1.2.2]
         os: [ubuntu-latest, macos-latest, windows-latest]
     runs-on: ${{ matrix.os }}

pyproject.toml

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "anshitsu"
-version = "1.6.0"  # using poetry-dynamic-versioning
+version = "2.0.0"  # using poetry-dynamic-versioning
 description = "A tiny digital photographic utility."
 readme = "README.md"
 authors = ["Iosif Takakura <[email protected]>"]
@@ -14,7 +14,7 @@ enable = true
 style = "pep440"
 
 [tool.poetry.dependencies]
-python = "<3.13,>=3.10"
+python = "<4.0,>=3.10"
 numpy = "*"
 Pillow = "*"
 colorcorrect = "*"

src/anshitsu/cli.py

@@ -9,7 +9,7 @@
 import fire.core
 from PIL import Image, UnidentifiedImageError
 
-from anshitsu.processor import Processor
+from anshitsu.process.processor import Processor
 from anshitsu.__version__ import version as __version__
 
 
@@ -19,11 +19,19 @@ def cli(
         colorstretch: bool = False,
         grayscale: bool = False,
         invert: bool = False,
+        color: Optional[float] = None,
+        brightness: Optional[float] = None,
+        sharpness: Optional[float] = None,
+        contrast: Optional[float] = None,
         tosaka: Optional[float] = None,
         outputrgb: bool = False,
+        sepia: bool = False,
+        cyanotype: bool = False,
         noise: Optional[float] = None,
         overwrite: bool = False,
         version: bool = False,
+        line_drawing: bool = False,
+        posterize: Optional[int] = None,
 ) -> str:
     """
     Process Runnner for Command Line Interface
@@ -49,9 +57,16 @@ def cli(
         colorstretch (bool, optional): Use colorstretch algorithm. Defaults to False.
         grayscale (bool, optional): Convert to grayscale. Defaults to False.
         invert (bool, optional): Invert color. Defaults to False.
-        tosaka (Optional[float], optional): Use Tosaka mode. Defaults to None.
+        color (Optional[float], optional): Fix color balance. Defaults to None.
+        brightness (Optional[float], optional): Fix brightness. Defaults to None.
+        sharpness (Optional[float], optional): Fix sharpness. Defaults to None.
+        contrast (Optional[float], optional): Fix contrast. Defaults to None.
+        tosaka (Optional[float], optional): Convert to grayscale with fix contrast. Defaults to None.
         outputrgb (bool, optional): Outputs a monochrome image in RGB. Defaults to False.
+        cyanotype (bool, optional): Convert to RGB like cyanotype. Defaults to False.
+        sepia (bool, optional): Convert to RGB colored by sepia. Defaults to False.
         noise (Optional[float], optional): Add Gaussian noise. Defaults to None.
+        line_drawing (bool, optional): Convert to like line drawing. Defaults to False.
         version (bool, optional): Show version. Defaults to False.
 
     Raises:
@@ -121,10 +136,18 @@ def cli(
             colorautoadjust=colorautoadjust,
             colorstretch=colorstretch,
             grayscale=grayscale,
+            color=color,
+            contrast=contrast,
+            brightness=brightness,
+            sharpness=sharpness,
             invert=invert,
             tosaka=tosaka,
             outputrgb=outputrgb,
+            cyanotype=cyanotype,
+            sepia=sepia,
             noise=noise,
+            line_drawing=line_drawing,
+            posterize=posterize,
         )
         saved_image = psr.process()
         os.makedirs(os.path.join(return_path, output_dir), exist_ok=True)

src/anshitsu/process/brightness.py

@@ -0,0 +1,18 @@
+from PIL import Image, ImageEnhance
+
+def brightness(image: Image, brightness: float) -> Image:
+    """
+    brightness
+
+    Fix brightness.
+
+    Parameters:
+        image: Image
+        brightness: float
+
+    Returns:
+        Image: processed image.
+    """
+    enhancer = ImageEnhance.Brightness(image)
+    image = enhancer.enhance(brightness)
+    return image

src/anshitsu/process/color.py

@@ -0,0 +1,18 @@
+from PIL import Image, ImageEnhance
+
+def color(image: Image, color: float) -> Image:
+    """
+    contrast
+
+    Fix color balance.
+
+    Parameters:
+        image: Image
+        color: float
+
+    Returns:
+        Image: processed image.
+    """
+    enhancer = ImageEnhance.Contrast(image)
+    image = enhancer.enhance(color)
+    return image

src/anshitsu/process/color_auto_adjust.py

@@ -0,0 +1,17 @@
+from PIL import Image
+import colorcorrect.algorithm as cca
+from colorcorrect.util import to_pil, from_pil
+
+
+def color_auto_adjust(image: Image) -> Image:
+    """
+    color_auto_adjust
+
+    Use Color Auto Adjust algorithm.
+
+    Returns:
+        Image: processed image.
+    """
+    if image.mode == "L":
+        return image
+    return to_pil(cca.automatic_color_equalization(from_pil(image)))

src/anshitsu/process/color_stretch.py

@@ -0,0 +1,23 @@
+from collections import namedtuple
+from typing import Optional, Tuple
+
+from PIL import Image
+import colorcorrect.algorithm as cca
+from colorcorrect.util import to_pil, from_pil
+
+
+def color_stretch(image: Image) -> Image:
+    """
+    color_stretch
+
+    Use Color Stretch algorithm.
+
+    Parameters:
+        image: Image
+
+    Returns:
+        Image: processed image.
+    """
+    if image.mode == "L":
+        return image
+    return to_pil(cca.stretch(cca.grey_world(from_pil(image))))

src/anshitsu/process/contrast.py

@@ -0,0 +1,27 @@
+from PIL import Image, ImageEnhance
+
+def contrast(image: Image, contrast: float) -> Image:
+    """
+    contrast
+
+    Fix contrast.
+
+    Using in Tosaka mode.
+
+    Tosaka mode is a mode that expresses the preference of
+    Tosaka-senpai, a character in "Kyūkyoku Chōjin R",
+    for "photos taken with Tri-X that look like they were
+    burned onto No. 4 or No. 5 photographic paper".
+    Only use floating-point numbers when using this mode;
+    numbers around 2.4 will make it look right.
+
+    Parameters:
+        image: Image
+        contrast: float
+
+    Returns:
+        Image: processed image.
+    """
+    enhancer = ImageEnhance.Contrast(image)
+    image = enhancer.enhance(contrast)
+    return image

src/anshitsu/process/cyanotype.py

@@ -0,0 +1,14 @@
+from PIL import Image, ImageOps
+
+def cyanotype(image: Image) -> Image:
+    """
+    cyanotype
+
+    Outputs a monochrome image colored at prussian blue like cyanotype.
+
+    Returns:
+        Image: processed image.
+    """
+    if image.mode == "L":
+        image = ImageOps.colorize(image, black=(26, 68, 114), white=(255, 255, 255))
+    return image

src/anshitsu/process/grayscale.py

@@ -0,0 +1,44 @@
+from collections import namedtuple
+
+import numpy as np
+from PIL import Image
+
+
+def grayscale(image: Image) -> Image:
+    """
+    grayscale
+
+    Converts to grayscale based on the luminance in the CIE XYZ color space.
+
+    Parameters:
+        image: Image
+
+    Returns:
+        Image: processed image.
+    """
+    if image.mode == "L":
+        return image
+
+    rgb = np.array(image, dtype="float32")
+
+    gamma = 2.2
+    ColorMatrix = namedtuple("ColorMatrix", ("red", "green", "blue"))
+
+    # Coefficients for luminance in CIE XYZ color space
+    cie_xyz = ColorMatrix(0.2126, 0.7152, 0.0722)
+
+    # Inverse Gamma Correction
+    rgb_l = pow(rgb / 255.0, gamma)
+
+    # Extract RGB values
+    r, g, b = rgb_l[:, :, 0], rgb_l[:, :, 1], rgb_l[:, :, 2]
+
+    # Convert to grayscale
+    gray_l = cie_xyz.red * r + cie_xyz.green * g + cie_xyz.blue * b
+
+    # gamma correction
+    gray = pow(gray_l, 1.0 / gamma) * 255
+
+    image = Image.fromarray(gray.astype("uint8"))
+
+    return image