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

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

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: blurry-cli
-Version: 0.6.2
+Version: 0.7.0
 Summary: A Mistune-based static site generator for Python
 Home-page: https://github.com/blurry-dev/blurry
 License: MIT
@@ -27,6 +27,7 @@ Requires-Dist: ffmpeg-python (>=0.2.0,<0.3.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.2 → blurry_cli-0.7.0}/blurry/__init__.py

@@ -15,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
@@ -25,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
@@ -46,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()
 
@@ -147,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 = {
@@ -236,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.2 → blurry_cli-0.7.0}/blurry/markdown/__init__.py

@@ -85,7 +85,7 @@ class BlurryRenderer(mistune.HTMLRenderer):
             avif_srcset = generate_srcset_string(
                 src.replace(extension, "avif"), image_widths
             )
-            source_tag = '<source srcset="{}" sizes="{}" />'.format(
+            source_tag = '<source srcset="{}" sizes="{}" type="image/avif" />'.format(
                 avif_srcset, attributes["sizes"]
             )
 

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.2 → blurry_cli-0.7.0}/pyproject.toml

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "blurry-cli"
-version = "0.6.2"
+version = "0.7.0"
 description = "A Mistune-based static site generator for Python"
 authors = ["John Franey <franey@duck.com>"]
 license = "MIT"
@@ -35,13 +35,14 @@ 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"