blurry-cli 0.18.0__tar.gz → 0.19.0__tar.gz

{blurry_cli-0.18.0 → blurry_cli-0.19.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: blurry-cli
-Version: 0.18.0
+Version: 0.19.0
 Summary: A Mistune-based static site generator for Python
 License: MIT
 License-File: LICENSE
@@ -23,14 +23,14 @@ Classifier: Topic :: Text Processing :: Markup :: HTML
 Classifier: Topic :: Text Processing :: Markup :: Markdown
 Requires-Dist: Jinja2 (>=3.1.5,<4.0.0)
 Requires-Dist: PyLD (>=2.0.4,<3.0.0)
-Requires-Dist: Wand (>=0.6.13,<0.7.0)
 Requires-Dist: dpath (>=2.2.0,<3.0.0)
 Requires-Dist: ffmpeg-python (>=0.2.0,<0.3.0)
 Requires-Dist: htmlmin2 (>=0.1.13,<0.2.0)
 Requires-Dist: jinja2-simple-tags (>=0.6.1,<0.7.0)
-Requires-Dist: jinjax (>=0.48,<0.61)
+Requires-Dist: jinjax (>=0.48,<0.62)
 Requires-Dist: livereload (>=2.7.1,<3.0.0)
 Requires-Dist: mistune (>=3.1.0,<4.0.0)
+Requires-Dist: pillow (>=12.0.0,<13.0.0)
 Requires-Dist: pydantic (>=2.10.5,<3.0.0)
 Requires-Dist: rich (>=13.9.4,<15.0.0)
 Requires-Dist: selectolax (>=0.3.27,<0.4.0)

{blurry_cli-0.18.0 → blurry_cli-0.19.0}/blurry/__init__.py

@@ -16,7 +16,7 @@ from rich.progress import TaskProgressColumn
 from rich.progress import TextColumn
 
 from blurry.async_typer import AsyncTyper
-from blurry.cli import check_avif_support, print_blurry_name
+from blurry.cli import print_blurry_name
 from blurry.cli import print_plugin_table
 from blurry.commands.clean import clean_build_directory
 from blurry.commands.init import initialize_new_project
@@ -34,6 +34,7 @@ from blurry.settings import get_settings
 from blurry.settings import update_settings
 from blurry.sitemap import write_sitemap_file
 from blurry.templates import get_jinja_env
+from blurry.utils import handle_future_result
 
 
 warning_console = Console(stderr=True, style="bold yellow")
@@ -66,7 +67,6 @@ async def build(release=True, clean: bool = False):
         update_settings()
         print_blurry_name()
         print_plugin_table()
-        check_avif_support(console=warning_console)
 
     build_directory = get_build_directory()
 
@@ -97,6 +97,12 @@ async def build(release=True, clean: bool = False):
             other_task = progress.add_task("[blue]Other")
 
             sitemap_future = executor.submit(write_sitemap_file, file_data_by_directory)
+            sitemap_future.add_done_callback(
+                lambda future: handle_future_result(
+                    future,
+                    "Could not generate sitemap",
+                )
+            )
             sitemap_future.add_done_callback(lambda _: progress.advance(other_task))
 
             for filepath in content_directory.rglob("*"):
@@ -165,7 +171,6 @@ def runserver():
     """Starts HTTP server with live reloading."""
     print_blurry_name()
     print_plugin_table()
-    check_avif_support(console=warning_console)
 
     SETTINGS = get_settings()
     os.environ.setdefault(f"{ENV_VAR_PREFIX}BUILD_MODE", "dev")

{blurry_cli-0.18.0 → blurry_cli-0.19.0}/blurry/cli.py

@@ -1,6 +1,5 @@
 from rich.console import Console
 from rich.table import Table
-import wand.version
 
 from blurry.plugins import discovered_html_plugins
 from blurry.plugins import discovered_jinja_extensions
@@ -36,11 +35,3 @@ def print_plugin_table():
     )
 
     console.print(plugin_table)
-
-
-def check_avif_support(console: Console):
-    if "AVIF" in wand.version.formats():
-        return
-    console.print(
-        "AVIF support not found. Falling back to WEBP. See https://trac.ffmpeg.org/wiki/Encode/AV1"
-    )

{blurry_cli-0.18.0 → blurry_cli-0.19.0}/blurry/file_processors/__init__.py

@@ -51,6 +51,8 @@ def process_non_markdown_file(
     if mimetype in [
         mimetypes.types_map[".jpg"],
         mimetypes.types_map[".png"],
+        mimetypes.types_map[".webp"],
+        mimetypes.types_map[".avif"],
     ]:
         asyncio.run(generate_images_for_srcset(filepath))
 

{blurry_cli-0.18.0 → blurry_cli-0.19.0}/blurry/images.py

@@ -2,14 +2,12 @@ import concurrent.futures
 from concurrent.futures import Future
 from pathlib import Path
 
-from wand.image import Image
-import wand.version
+from PIL import Image
 
 from blurry.settings import get_build_directory
 from blurry.settings import get_content_directory
 from blurry.settings import get_settings
-
-has_avif_support = "AVIF" in wand.version.formats()
+from blurry.utils import handle_future_result
 
 
 def get_target_image_widths():
@@ -33,30 +31,32 @@ def add_image_width_to_path(image_path: Path, width: int) -> Path:
     return Path(new_filename)
 
 
-def convert_image_to_avif_or_webp(image_path: Path, target_path: Path | None = None):
+def convert_image_to_avif(image_path: Path, target_path: Path | None = None):
     SETTINGS = get_settings()
     IMAGE_COMPRESSION_QUALITY = SETTINGS["IMAGE_COMPRESSION_QUALITY"]
-    image_suffix = image_path.suffix
-    new_image_format = "avif" if has_avif_support else "webp"
-    new_filepath = str(target_path or image_path).replace(
-        image_suffix, f".{new_image_format}"
-    )
+    new_filepath = (target_path or image_path).with_suffix(".avif")
     if Path(new_filepath).exists():
         return
-    with Image(filename=str(image_path)) as image:
-        image.format = new_image_format
-        image.compression_quality = IMAGE_COMPRESSION_QUALITY
-        image.save(filename=new_filepath)
+    with Image.open(image_path) as image:
+        image.save(new_filepath, quality=IMAGE_COMPRESSION_QUALITY)
 
 
-def clone_and_resize_image(
-    image_path: Path, target_width: int, resized_image_destination: Path
-):
+def clone_and_resize_image_as_avif_or_webp(image_path: Path, target_width: int):
+    resized_image_suffix = ".webp" if image_path.suffix == ".webp" else ".avif"
+    resized_image_destination = get_build_directory() / (
+        add_image_width_to_path(
+            image_path.with_suffix(resized_image_suffix), target_width
+        )
+    ).relative_to(get_content_directory())
     if resized_image_destination.exists():
         return
-    with Image(filename=str(image_path)) as image:
-        image.transform(resize=str(target_width))
-        image.save(filename=resized_image_destination)
+    with Image.open(image_path) as image:
+        width, height = image.size
+        resize_factor = target_width / width
+        resized_image = image.resize(
+            (target_width, int(height * resize_factor)), Image.Resampling.LANCZOS
+        )
+        resized_image.save(resized_image_destination)
 
 
 async def generate_images_for_srcset(image_path: Path):
@@ -66,37 +66,34 @@ async def generate_images_for_srcset(image_path: Path):
 
     build_path = BUILD_DIR / image_path.resolve().relative_to(CONTENT_DIR)
     with concurrent.futures.ThreadPoolExecutor() as executor:
-        # Convert original image
-        full_sized_image_future = executor.submit(
-            convert_image_to_avif_or_webp, image_path=image_path, target_path=build_path
-        )
-        image_futures.append(full_sized_image_future)
-
-        # Store resized image futures so AVIF/WEBP versions can be created once they're done
-        resize_future_to_filepath: dict[Future, Path] = {}
-
-        width = Image(filename=str(image_path)).width
-
-        for target_width in get_widths_for_image_width(width):
-            new_filepath = add_image_width_to_path(image_path, target_width)
-            new_filepath_in_build = BUILD_DIR / new_filepath.relative_to(CONTENT_DIR)
-
-            resized_original_image_type_future = executor.submit(
-                clone_and_resize_image, image_path, target_width, new_filepath_in_build
+        # Convert original image only if it is in an inefficient format
+        if image_path.suffix not in [".avif", ".webp"]:
+            full_sized_image_future = executor.submit(
+                convert_image_to_avif, image_path=image_path, target_path=build_path
             )
-            resize_future_to_filepath[resized_original_image_type_future] = (
-                new_filepath_in_build
+            full_sized_image_future.add_done_callback(
+                lambda future: handle_future_result(
+                    future,
+                    f"Could not convert image: {image_path.relative_to(CONTENT_DIR)}",
+                )
             )
+            image_futures.append(full_sized_image_future)
 
-        # Create AVIF/WEBP versions of resized images as they're ready
-        for future in concurrent.futures.as_completed(resize_future_to_filepath):
-            resized_image_filepath = resize_future_to_filepath[future]
+        width = Image.open(image_path).width
+
+        for target_width in get_widths_for_image_width(width):
             resized_image_future = executor.submit(
-                convert_image_to_avif_or_webp, resized_image_filepath
+                clone_and_resize_image_as_avif_or_webp, image_path, target_width
+            )
+            resized_image_future.add_done_callback(
+                lambda future: handle_future_result(
+                    future,
+                    f"Could not resize image: {image_path.relative_to(CONTENT_DIR)} to {target_width}",
+                )
             )
             image_futures.append(resized_image_future)
 
-        concurrent.futures.wait(image_futures + list(resize_future_to_filepath.keys()))
+    concurrent.futures.wait(image_futures)
 
 
 def get_widths_for_image_width(image_width: int) -> list[int]:

{blurry_cli-0.18.0 → blurry_cli-0.19.0}/blurry/markdown/__init__.py

@@ -14,7 +14,7 @@ from mistune.plugins.table import table
 from mistune.plugins.task_lists import task_lists
 from mistune.plugins.url import url
 from mistune.util import escape
-from wand.image import Image
+from PIL import Image
 
 from .front_matter import parse_front_matter
 from .renderer_functions.render_video import render_video
@@ -74,14 +74,11 @@ class BlurryRenderer(mistune.HTMLRenderer):
                 return render_video(src, absolute_path, extension, title=title)
 
             # Tailor srcset and sizes to image width
-            with Image(filename=str(absolute_path)) as img:
-                image_width = img.width
-                image_height = img.height
-                # The .animated property doesn't always detect animated .webp images
-                # and .webp is optimized enough not to benefit much from .avif
-                image_is_animated = img.animation or extension.lower() == "webp"
-                attributes["width"] = image_width
-                attributes["height"] = image_height
+            with Image.open(absolute_path) as img:
+                image_width, image_height = img.size
+                image_is_animated = getattr(img, "n_frames", 0) > 1
+                attributes["width"] = str(image_width)
+                attributes["height"] = str(image_height)
 
             if image_is_animated or extension.lower() == "svg":
                 attributes_str = " ".join(
@@ -91,25 +88,19 @@ class BlurryRenderer(mistune.HTMLRenderer):
 
             image_widths = get_widths_for_image_width(image_width)
 
-            attributes["sizes"] = generate_sizes_string(image_widths)
-            attributes["srcset"] = generate_srcset_string(src, image_widths)
+            sizes = generate_sizes_string(image_widths)
             avif_srcset = generate_srcset_string(
                 src.replace(extension, "avif"), image_widths
             )
             source_tag = '<source srcset="{}" sizes="{}" type="image/avif" />'.format(
-                avif_srcset, attributes["sizes"]
+                avif_srcset, sizes
             )
 
         attributes_str = " ".join(
             f'{name}="{value}"' for name, value in attributes.items()
         )
 
-        return (
-            f"<figure>"
-            f"<picture>{source_tag}<img {attributes_str}></picture>"
-            f"<figcaption>{attributes['alt']}</figcaption>"
-            f"</figure>"
-        )
+        return f"<figure><picture>{source_tag}<img {attributes_str}></picture></figure>"
 
     def link(self, text, url, title: str | None = None) -> str:
         CONTENT_DIR = get_content_directory()

{blurry_cli-0.18.0 → blurry_cli-0.19.0}/blurry/plugins/jinja_plugins/blurry_image_extension.py

@@ -1,11 +1,9 @@
 import mimetypes
-from pathlib import Path
 from urllib.parse import urlparse
 
 from jinja2_simple_tags import StandaloneTag
 from rich.console import Console
-from wand.exceptions import BlobError
-from wand.image import Image
+from PIL import Image
 
 from blurry.images import add_image_width_to_path
 from blurry.settings import get_build_directory
@@ -31,17 +29,16 @@ class BlurryImage(StandaloneTag):
         image_path = get_build_directory() / image_relative_pathname
 
         try:
-            with Image(filename=str(image_content_path)) as image:
-                image_width = image.width
-                image_height = image.height
-                image_mimetype = image.mimetype
-        except BlobError:
+            with Image.open(image_content_path) as image:
+                image_width, image_height = image.size
+                image_mimetype = image.get_format_mimetype()
+        except Exception:
             warning_console.print(f"Could not find image: {image_content_path}")
             return ""
 
         attributes = {
-            "width": image_width,
-            "height": image_height,
+            "width": str(image_width),
+            "height": str(image_height),
         }
         for attribute_key in kwargs:
             if attribute_key in ["width", "height"]:
@@ -49,7 +46,9 @@ class BlurryImage(StandaloneTag):
                     f"blurry_image: Received {attribute_key} in template {self.template} but this attribute is dynamic. Skipping."
                 )
                 continue
-            attributes[attribute_key] = kwargs.get(attribute_key)
+            attribute_value = kwargs.get(attribute_key)
+            if attribute_value is not None:
+                attributes[attribute_key] = attribute_value
 
         if width:
             image_path = add_image_width_to_path(image_path, width)
@@ -58,7 +57,7 @@ class BlurryImage(StandaloneTag):
             mimetypes.types_map[".jpg"],
             mimetypes.types_map[".png"],
         ]:
-            image_path = Path(str(image_path).replace(image_path.suffix, ".avif"))
+            image_path = image_path.with_suffix(".avif")
 
         attributes["src"] = build_path_to_url(image_path)
 

{blurry_cli-0.18.0 → blurry_cli-0.19.0}/blurry/utils.py

@@ -1,3 +1,4 @@
+from concurrent.futures import Future
 from pathlib import Path
 
 from blurry.settings import get_build_directory
@@ -99,3 +100,10 @@ def format_schema_data(schema_data: dict) -> dict:
     formatted_schema_data = {"@context": "https://schema.org"}
     formatted_schema_data.update(schema_data)
     return formatted_schema_data
+
+
+def handle_future_result(future: Future, message: str):
+    exception = future.exception()
+    if not exception:
+        return
+    print(message, "-", exception)

{blurry_cli-0.18.0 → blurry_cli-0.19.0}/pyproject.toml

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "blurry-cli"
-version = "0.18.0"
+version = "0.19.0"
 description = "A Mistune-based static site generator for Python"
 authors = ["John Franey <franey@duck.com>"]
 license = "MIT"
@@ -13,6 +13,7 @@ classifiers = [
     "Programming Language :: Python :: 3.11",
     "Programming Language :: Python :: 3.12",
     "Programming Language :: Python :: 3.13",
+    "Programming Language :: Python :: 3.14",
     "Topic :: Internet :: WWW/HTTP :: Dynamic Content :: Content Management System",
     "Topic :: Internet :: WWW/HTTP :: Site Management",
     "Topic :: Software Development :: Libraries :: Python Modules",
@@ -25,7 +26,6 @@ packages = [{ include = "blurry" }]
 [tool.poetry.dependencies]
 Jinja2 = "^3.1.5"
 PyLD = "^2.0.4"
-Wand = "^0.6.13"
 ffmpeg-python = "^0.2.0"
 livereload = "^2.7.1"
 mistune = "^3.1.0"
@@ -36,8 +36,9 @@ typer = ">=0.15.1,<0.17.0"
 htmlmin2 = "^0.1.13"
 dpath = "^2.2.0"
 jinja2-simple-tags = "^0.6.1"
-jinjax = ">=0.48,<0.61"
+jinjax = ">=0.48,<0.62"
 pydantic = "^2.10.5"
+pillow = "^12.0.0"
 
 [tool.poetry.scripts]
 blurry = 'blurry:main'
@@ -50,7 +51,7 @@ black = ">=24.10,<26.0"
 nox = ">=2024.10.9,<2026.0.0"
 pyright = "^1.1.391"
 pytest = "^8.3.4"
-pytest-cov = "^6.0.0"
+pytest-cov = ">=6,<8"
 ruff = ">=0.8.6,<0.15.0"
 pytest-watcher = "^0.4.3"