blurry-cli 0.6.1__tar.gz → 0.7.0__tar.gz

{blurry_cli-0.6.1 → blurry_cli-0.7.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: blurry-cli
-Version: 0.6.1
+Version: 0.7.0
 Summary: A Mistune-based static site generator for Python
 Home-page: https://github.com/blurry-dev/blurry
 License: MIT
@@ -24,9 +24,10 @@ Requires-Dist: Jinja2 (>=3.0.0,<4.0.0)
 Requires-Dist: PyLD (>=2.0.3,<3.0.0)
 Requires-Dist: Wand (>=0.6.6,<0.7.0)
 Requires-Dist: ffmpeg-python (>=0.2.0,<0.3.0)
-Requires-Dist: htmlmin (>=0.1.12,<0.2.0)
+Requires-Dist: htmlmin2 (>=0.1.13,<0.2.0)
 Requires-Dist: livereload (>=2.6.3,<3.0.0)
 Requires-Dist: mistune (>=3.0.0rc5,<4.0.0)
+Requires-Dist: pydantic2-schemaorg (>=0.1.1,<0.2.0)
 Requires-Dist: rich (>=13.3.3,<14.0.0)
 Requires-Dist: selectolax (>=0.3.6,<0.4.0)
 Requires-Dist: toml (>=0.10.2,<0.11.0)

{blurry_cli-0.6.1 → blurry_cli-0.7.0}/blurry/__init__.py

@@ -1,13 +1,12 @@
 import asyncio
 import dataclasses
 import json
+import mimetypes
 import os
 import shutil
 from collections.abc import Coroutine
 from copy import deepcopy
 from datetime import datetime
-from mimetypes import guess_type
-from mimetypes import types_map
 from pathlib import Path
 from typing import Any
 
@@ -16,6 +15,7 @@ from jinja2 import FileSystemLoader
 from jinja2 import select_autoescape
 from livereload import Server
 from rich import print
+from rich.console import Console
 
 from blurry.async_typer import AsyncTyper
 from blurry.cli import print_blurry_name
@@ -26,6 +26,7 @@ from blurry.markdown import convert_markdown_file_to_html
 from blurry.open_graph import open_graph_meta_tags
 from blurry.plugins import discovered_html_plugins
 from blurry.plugins import discovered_jinja_filter_plugins
+from blurry.schema_validation import validate_front_matter_as_schema
 from blurry.settings import get_build_directory
 from blurry.settings import get_content_directory
 from blurry.settings import get_templates_directory
@@ -47,6 +48,8 @@ def json_converter_with_dates(item: Any) -> None | str:
         return item.strftime("%Y-%M-%D")
 
 
+warning_console = Console(stderr=True, style="bold yellow")
+
 print_blurry_name()
 print_plugin_table()
 
@@ -80,7 +83,7 @@ def get_jinja_env():
 
 async def process_non_markdown_file(filepath: Path):
     CONTENT_DIR = get_content_directory()
-    mimetype, _ = guess_type(filepath, strict=False)
+    mimetype, _ = mimetypes.guess_type(filepath, strict=False)
     relative_filepath = filepath.relative_to(CONTENT_DIR)
     build_filepath = get_build_directory() / relative_filepath
     output_file = Path(build_filepath)
@@ -90,7 +93,11 @@ async def process_non_markdown_file(filepath: Path):
     shutil.copyfile(filepath, build_filepath)
 
     # Create srcset images
-    if mimetype in [types_map[".jpg"], types_map[".png"]]:
+    if mimetype in [
+        mimetypes.types_map[".jpg"],
+        mimetypes.types_map[".png"],
+        mimetypes.common_types[".webp"],
+    ]:
         await generate_images_for_srcset(filepath)
 
 
@@ -144,6 +151,9 @@ async def write_html_file(
         format_schema_data(schema_variables),
         default=json_converter_with_dates,
     )
+
+    validate_front_matter_as_schema(file_data.path, front_matter, warning_console)
+
     schema_type_tag = f'<script type="application/ld+json">{schema_data}</script>'
 
     template_context = {
@@ -233,8 +243,10 @@ async def build(release=True):
     print(f"Blurring {len(markdown_tasks)} Markdown files from: {content_dir_relative}")
 
     await asyncio.gather(*markdown_tasks)
+    loop = asyncio.new_event_loop()
+    asyncio.set_event_loop(loop)
     for non_markdown_task in non_markdown_tasks:
-        await asyncio.to_thread(lambda: asyncio.run(non_markdown_task))
+        await asyncio.to_thread(lambda: loop.run_until_complete(non_markdown_task))
 
     end = datetime.now()
 

{blurry_cli-0.6.1 → blurry_cli-0.7.0}/blurry/images.py

@@ -6,18 +6,21 @@ from wand.image import Image
 from blurry.settings import get_build_directory
 from blurry.settings import get_content_directory
 from blurry.settings import SETTINGS
+from blurry.settings import update_settings
 
-AVIF_COMPRESSION_QUALITY = SETTINGS["AVIF_COMPRESSION_QUALITY"]
-IMAGE_WIDTHS = SETTINGS["IMAGE_WIDTHS"]
-MAXIMUM_IMAGE_WIDTH = int(SETTINGS["MAXIMUM_IMAGE_WIDTH"])
-THUMBNAIL_WIDTH = int(SETTINGS["THUMBNAIL_WIDTH"])
 
-TARGET_IMAGE_WIDTHS = [w for w in IMAGE_WIDTHS if w < MAXIMUM_IMAGE_WIDTH]
-TARGET_IMAGE_WIDTHS.append(MAXIMUM_IMAGE_WIDTH)
-if THUMBNAIL_WIDTH not in TARGET_IMAGE_WIDTHS:
-    TARGET_IMAGE_WIDTHS.append(THUMBNAIL_WIDTH)
+def get_target_image_widths():
+    update_settings()
+    IMAGE_WIDTHS = SETTINGS["IMAGE_WIDTHS"]
+    MAXIMUM_IMAGE_WIDTH = int(SETTINGS["MAXIMUM_IMAGE_WIDTH"])
+    THUMBNAIL_WIDTH = int(SETTINGS["THUMBNAIL_WIDTH"])
 
-TARGET_IMAGE_WIDTHS.sort()
+    TARGET_IMAGE_WIDTHS = [w for w in IMAGE_WIDTHS if w < MAXIMUM_IMAGE_WIDTH]
+    TARGET_IMAGE_WIDTHS.append(MAXIMUM_IMAGE_WIDTH)
+    if THUMBNAIL_WIDTH not in TARGET_IMAGE_WIDTHS:
+        TARGET_IMAGE_WIDTHS.append(THUMBNAIL_WIDTH)
+
+    return sorted(TARGET_IMAGE_WIDTHS)
 
 
 def add_image_width_to_path(image_path: Path, width: int) -> Path:
@@ -28,9 +31,8 @@ def add_image_width_to_path(image_path: Path, width: int) -> Path:
 
 
 async def convert_image_to_avif(image_path: Path, target_path: Path | None = None):
+    AVIF_COMPRESSION_QUALITY = SETTINGS["AVIF_COMPRESSION_QUALITY"]
     image_suffix = image_path.suffix
-    if image_suffix in [".webp", ".gif"]:
-        return
     avif_filepath = str(target_path or image_path).replace(image_suffix, ".avif")
     if Path(avif_filepath).exists():
         return
@@ -43,8 +45,7 @@ async def convert_image_to_avif(image_path: Path, target_path: Path | None = Non
 async def generate_images_for_srcset(image_path: Path):
     BUILD_DIR = get_build_directory()
     CONTENT_DIR = get_content_directory()
-    if image_path.suffix in [".webp", ".gif"]:
-        return
+
     with Image(filename=str(image_path)) as img:
         width = img.width
         # Convert original image
@@ -69,8 +70,9 @@ async def generate_images_for_srcset(image_path: Path):
 
 
 def get_widths_for_image_width(image_width: int) -> list[int]:
-    widths = [tw for tw in TARGET_IMAGE_WIDTHS if tw < image_width]
-    if image_width < TARGET_IMAGE_WIDTHS[-1]:
+    target_image_widths = get_target_image_widths()
+    widths = [tw for tw in target_image_widths if tw < image_width]
+    if image_width < target_image_widths[-1]:
         widths.append(image_width)
     return widths
 

{blurry_cli-0.6.1 → blurry_cli-0.7.0}/blurry/markdown/__init__.py

@@ -74,22 +74,20 @@ class BlurryRenderer(mistune.HTMLRenderer):
             # Tailor srcset and sizes to image width
             with Image(filename=str(absolute_path)) as img:
                 image_width = img.width
+                image_height = img.height
                 attributes["width"] = image_width
-                attributes["height"] = img.height
-
-            if extension in ["webp", "gif"]:
-                source_tag = ""
-            else:
-                image_widths = get_widths_for_image_width(image_width)
-
-                attributes["sizes"] = generate_sizes_string(image_widths)
-                attributes["srcset"] = generate_srcset_string(src, image_widths)
-                avif_srcset = generate_srcset_string(
-                    src.replace(extension, "avif"), image_widths
-                )
-                source_tag = '<source srcset="{}" sizes="{}" />'.format(
-                    avif_srcset, attributes["sizes"]
-                )
+                attributes["height"] = image_height
+
+            image_widths = get_widths_for_image_width(image_width)
+
+            attributes["sizes"] = generate_sizes_string(image_widths)
+            attributes["srcset"] = generate_srcset_string(src, 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"]
+            )
 
         attributes_str = " ".join(
             f'{name}="{value}"' for name, value in attributes.items()

blurry_cli-0.7.0/blurry/schema_validation.py

@@ -0,0 +1,61 @@
+import importlib
+from collections.abc import MutableMapping
+from pathlib import Path
+
+from pydantic.v1 import ValidationError
+from rich.console import Console
+
+from blurry.settings import SETTINGS
+from blurry.settings import update_settings
+
+
+class Config:
+    extra = "forbid"
+
+
+def validate_front_matter_as_schema(
+    path: Path, front_matter: MutableMapping, console: Console
+):
+    """
+    Validates schema data using pydantic_schemaorg, disallowing extra fields
+    """
+    update_settings()
+
+    schema_type = front_matter["@type"]
+
+    if mapped_schema_type := SETTINGS["TEMPLATE_SCHEMA_TYPES"].get(schema_type):
+        schema_type = mapped_schema_type
+
+    # Import pydantic_schemaorg model
+    try:
+        pydantic_schemaorg_model_module = importlib.import_module(
+            f"pydantic2_schemaorg.{schema_type}"
+        )
+    except ModuleNotFoundError:
+        console.print(
+            f"{path}: Could not find Schema type for {schema_type}. Skipping."
+        )
+        return
+
+    schema_model = getattr(pydantic_schemaorg_model_module, schema_type)
+
+    # Create new Pydantic model that forbids extra fields
+    class NonExtraSchemaModel(schema_model, extra="forbid"):  # type: ignore
+        pass
+
+    # Validate model and print errors
+    try:
+        non_schema_variable_prefix = SETTINGS["FRONTMATTER_NON_SCHEMA_VARIABLE_PREFIX"]
+        schema_front_matter = {
+            k: v
+            for k, v in front_matter.items()
+            if not k.startswith(non_schema_variable_prefix)
+        }
+        NonExtraSchemaModel(**schema_front_matter)
+    except ValidationError as e:
+        for error in e.errors():
+            msg = error["msg"]
+            loc = error["loc"]
+            console.print(
+                f"{path}: {schema_type} schema validation error: {msg}: {loc}"
+            )

{blurry_cli-0.6.1 → blurry_cli-0.7.0}/pyproject.toml

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "blurry-cli"
-version = "0.6.1"
+version = "0.7.0"
 description = "A Mistune-based static site generator for Python"
 authors = ["John Franey <franey@duck.com>"]
 license = "MIT"
@@ -12,6 +12,7 @@ classifiers = [
     "Operating System :: OS Independent",
     "Programming Language :: Python :: 3.10",
     "Programming Language :: Python :: 3.11",
+    "Programming Language :: Python :: 3.12",
     "Topic :: Internet :: WWW/HTTP :: Dynamic Content :: Content Management System",
     "Topic :: Internet :: WWW/HTTP :: Site Management ",
     "Topic :: Software Development :: Libraries :: Python Modules",
@@ -26,7 +27,6 @@ Jinja2 = "^3.0.0"
 PyLD = "^2.0.3"
 Wand = "^0.6.6"
 ffmpeg-python = "^0.2.0"
-htmlmin = "^0.1.12"
 livereload = "^2.6.3"
 mistune = "^3.0.0rc5"
 python = "^3.10"
@@ -34,13 +34,15 @@ rich = "^13.3.3"
 selectolax = "^0.3.6"
 toml = "^0.10.2"
 typer = "^0.6.1"
+htmlmin2 = "^0.1.13"
+pydantic2-schemaorg = "^0.1.1"
 
 [tool.poetry.scripts]
 blurry = 'blurry:main'
 
 [tool.poetry.group.dev.dependencies]
 black = "^22.10.0"
-nox = "^2023.4.22"
+nox = "^2024.03.02"
 pyright = "^1.1.311"
 pytest = "^6.2.2"
 pytest-cov = "^2.11.1"