blurry-cli 0.14.0__tar.gz → 0.16.0__tar.gz

{blurry_cli-0.14.0 → blurry_cli-0.16.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.3
 Name: blurry-cli
-Version: 0.14.0
+Version: 0.16.0
 Summary: A Mistune-based static site generator for Python
 License: MIT
 Keywords: static-site-generator,seo,pagespeed
@@ -26,13 +26,13 @@ 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.49)
+Requires-Dist: jinjax (>=0.48,<0.58)
 Requires-Dist: livereload (>=2.7.1,<3.0.0)
 Requires-Dist: mistune (>=3.1.0,<4.0.0)
 Requires-Dist: pydantic (>=2.10.5,<3.0.0)
-Requires-Dist: rich (>=13.9.4,<14.0.0)
+Requires-Dist: rich (>=13.9.4,<15.0.0)
 Requires-Dist: selectolax (>=0.3.27,<0.4.0)
-Requires-Dist: typer (>=0.15.1,<0.16.0)
+Requires-Dist: typer (>=0.15.1,<0.17.0)
 Project-URL: Repository, https://github.com/blurry-dev/blurry
 Description-Content-Type: text/markdown
 

{blurry_cli-0.14.0 → blurry_cli-0.16.0}/blurry/__init__.py

@@ -20,6 +20,7 @@ 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
+from blurry.commands.version import print_blurry_version
 from blurry.constants import ENV_VAR_PREFIX
 from blurry.file_processors import process_non_markdown_file
 from blurry.file_processors import write_html_file
@@ -29,7 +30,7 @@ from blurry.runserver_handlers import handle_changed_markdown_files
 from blurry.runserver_handlers import rebuild_markdown_files
 from blurry.settings import get_build_directory
 from blurry.settings import get_content_directory
-from blurry.settings import SETTINGS
+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
@@ -38,7 +39,7 @@ from blurry.templates import get_jinja_env
 warning_console = Console(stderr=True, style="bold yellow")
 
 
-app = AsyncTyper()
+app = AsyncTyper(no_args_is_help=True)
 
 
 @app.command(name="clean")
@@ -51,16 +52,21 @@ def init_command(name: str | None = None, domain: str | None = None):
     initialize_new_project(name, domain)
 
 
+@app.command(name="version")
+def version_command():
+    print_blurry_version()
+
+
 @app.async_command()
 async def build(release=True, clean: bool = False):
     """Generates HTML content from Markdown files."""
     start = datetime.now()
 
     if release:
+        update_settings()
         print_blurry_name()
         print_plugin_table()
 
-    update_settings()
     build_directory = get_build_directory()
 
     if clean:
@@ -159,7 +165,7 @@ def runserver():
     print_blurry_name()
     print_plugin_table()
 
-    update_settings()
+    SETTINGS = get_settings()
     os.environ.setdefault(f"{ENV_VAR_PREFIX}BUILD_MODE", "dev")
 
     SETTINGS["RUNSERVER"] = True

blurry_cli-0.16.0/blurry/commands/version.py

@@ -0,0 +1,9 @@
+import importlib.metadata
+from rich import print
+
+
+def print_blurry_version():
+    """Prints the current Blurry version."""
+    version = importlib.metadata.version("blurry-cli")
+
+    print(f"v{version}")

{blurry_cli-0.14.0 → blurry_cli-0.16.0}/blurry/file_processors/__init__.py

@@ -17,7 +17,7 @@ from blurry.plugins import discovered_html_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 SETTINGS
+from blurry.settings import get_settings
 from blurry.types import MarkdownFileData
 from blurry.types import TemplateContext
 from blurry.utils import content_path_to_url
@@ -56,6 +56,7 @@ def process_non_markdown_file(
 
 
 def process_jinja_file(filepath: Path, jinja_env: Environment, file_data_by_directory):
+    SETTINGS = get_settings()
     build_directory = get_build_directory()
     content_directory = get_content_directory()
     template = jinja_env.get_template(str(filepath.relative_to(content_directory)))
@@ -87,6 +88,7 @@ def write_html_file(
     release: bool,
     jinja_env: Environment,
 ):
+    SETTINGS = get_settings()
     extra_context: TemplateContext = {}
     # Gather data from other files in this directory if this is an index file
     file_data_list = file_data_by_directory[filepath.parent]

{blurry_cli-0.14.0 → blurry_cli-0.16.0}/blurry/images.py

@@ -6,12 +6,11 @@ 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
+from blurry.settings import get_settings
 
 
 def get_target_image_widths():
-    update_settings()
+    SETTINGS = get_settings()
     IMAGE_WIDTHS = SETTINGS["IMAGE_WIDTHS"]
     MAXIMUM_IMAGE_WIDTH = int(SETTINGS["MAXIMUM_IMAGE_WIDTH"])
     THUMBNAIL_WIDTH = int(SETTINGS["THUMBNAIL_WIDTH"])
@@ -32,6 +31,7 @@ def add_image_width_to_path(image_path: Path, width: int) -> Path:
 
 
 def convert_image_to_avif(image_path: Path, target_path: Path | None = None):
+    SETTINGS = get_settings()
     AVIF_COMPRESSION_QUALITY = SETTINGS["AVIF_COMPRESSION_QUALITY"]
     image_suffix = image_path.suffix
     avif_filepath = str(target_path or image_path).replace(image_suffix, ".avif")
@@ -78,9 +78,9 @@ async def generate_images_for_srcset(image_path: Path):
             resized_original_image_type_future = executor.submit(
                 clone_and_resize_image, image_path, target_width, new_filepath_in_build
             )
-            resize_future_to_filepath[
-                resized_original_image_type_future
-            ] = new_filepath_in_build
+            resize_future_to_filepath[resized_original_image_type_future] = (
+                new_filepath_in_build
+            )
 
         # Create AVIF versions of resized images as they're ready
         for future in concurrent.futures.as_completed(resize_future_to_filepath):

{blurry_cli-0.14.0 → blurry_cli-0.16.0}/blurry/markdown/__init__.py

@@ -25,7 +25,7 @@ from blurry.images import get_widths_for_image_width
 from blurry.plugins import discovered_markdown_plugins
 from blurry.plugins.jinja_plugins.filters import slugify
 from blurry.settings import get_content_directory
-from blurry.settings import SETTINGS
+from blurry.settings import get_settings
 from blurry.types import is_str
 from blurry.utils import content_path_to_url
 from blurry.utils import convert_relative_path_in_markdown_file_to_pathname
@@ -36,6 +36,8 @@ from blurry.utils import resolve_relative_path_in_markdown
 # https://schema.org/ImageObject
 ImageObject: TypeAlias = dict
 
+SETTINGS = get_settings()
+
 
 class BlurryRenderer(mistune.HTMLRenderer):
     """Renderer that converts relative content URLs to build URLs."""
@@ -105,7 +107,7 @@ class BlurryRenderer(mistune.HTMLRenderer):
         return (
             f"<figure>"
             f"<picture>{source_tag}<img {attributes_str}></picture>"
-            f'<figcaption>{attributes["alt"]}</figcaption>'
+            f"<figcaption>{attributes['alt']}</figcaption>"
             f"</figure>"
         )
 

{blurry_cli-0.14.0 → blurry_cli-0.16.0}/blurry/schema_validation/__init__.py

@@ -5,7 +5,7 @@ from pydantic import ValidationError
 from rich.console import Console
 
 from blurry.schema_validation import models
-from blurry.settings import SETTINGS
+from blurry.settings import get_settings
 
 
 def validate_front_matter_as_schema(
@@ -15,6 +15,7 @@ def validate_front_matter_as_schema(
     Validates schema data using partial Schema.org types based on Google's support for them:
     https://developers.google.com/search/docs/appearance/structured-data/search-gallery
     """
+    SETTINGS = get_settings()
     schematype = schema_variables["@type"]
 
     if mapped_schematype_ := SETTINGS["TEMPLATE_SCHEMA_TYPES"].get(schematype):

{blurry_cli-0.14.0 → blurry_cli-0.16.0}/blurry/settings.py

@@ -48,7 +48,7 @@ SETTINGS: Settings = {
 }
 
 
-def update_settings():
+def update_settings() -> Settings:
     try:
         blurry_config = tomllib.load(open(SETTINGS_FILENAME, "rb"))
         user_settings = blurry_config["blurry"]
@@ -64,6 +64,23 @@ def update_settings():
         settings_key = key[setting_name_start_index:]
         SETTINGS[settings_key] = value
 
+    return SETTINGS
+
+
+class SettingsCache(TypedDict):
+    settings: Settings | None
+
+
+settings_cache: SettingsCache = {"settings": None}
+
+
+def get_settings() -> Settings:
+    if cached_settings := settings_cache.get("settings"):
+        return cached_settings
+    settings = update_settings()
+    settings_cache["settings"] = settings
+    return settings
+
 
 def get_build_directory():
     is_dev_build = environ.get(f"{ENV_VAR_PREFIX}BUILD_MODE") == "dev"

{blurry_cli-0.14.0 → blurry_cli-0.16.0}/blurry/templates.py

@@ -7,13 +7,14 @@ from blurry.plugins import discovered_jinja_extensions
 from blurry.plugins import discovered_jinja_filter_plugins
 from blurry.settings import get_content_directory
 from blurry.settings import get_templates_directory
-from blurry.settings import SETTINGS
+from blurry.settings import get_settings
 
 
 def get_jinja_env() -> Environment:
     """
     Returns a Jinja environment complete with JinjaX and any installed Jinja extensions and filters.
     """
+    SETTINGS = get_settings()
     templates_directory = get_templates_directory()
     content_directory = get_content_directory()
     jinja_env = Environment(

{blurry_cli-0.14.0 → blurry_cli-0.16.0}/blurry/utils.py

@@ -2,10 +2,11 @@ from pathlib import Path
 
 from blurry.settings import get_build_directory
 from blurry.settings import get_content_directory
-from blurry.settings import SETTINGS
+from blurry.settings import get_settings
 
 
 def get_domain_with_scheme():
+    SETTINGS = get_settings()
     if SETTINGS.get("RUNSERVER"):
         host = SETTINGS["DEV_HOST"]
         port = SETTINGS["DEV_PORT"]

{blurry_cli-0.14.0 → blurry_cli-0.16.0}/pyproject.toml

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "blurry-cli"
-version = "0.14.0"
+version = "0.16.0"
 description = "A Mistune-based static site generator for Python"
 authors = ["John Franey <franey@duck.com>"]
 license = "MIT"
@@ -30,25 +30,28 @@ ffmpeg-python = "^0.2.0"
 livereload = "^2.7.1"
 mistune = "^3.1.0"
 python = "^3.11"
-rich = "^13.9.4"
+rich = ">=13.9.4,<15.0.0"
 selectolax = "^0.3.27"
-typer = "^0.15.1"
+typer = ">=0.15.1,<0.17.0"
 htmlmin2 = "^0.1.13"
 dpath = "^2.2.0"
 jinja2-simple-tags = "^0.6.1"
-jinjax = "^0.48"
+jinjax = ">=0.48,<0.58"
 pydantic = "^2.10.5"
 
 [tool.poetry.scripts]
 blurry = 'blurry:main'
 
+[tool.poetry.group.dev]
+optional = true
+
 [tool.poetry.group.dev.dependencies]
-black = "^24.10.0"
-nox = "^2024.10.9"
+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"
-ruff = ">=0.8.6,<0.10.0"
+ruff = ">=0.8.6,<0.12.0"
 pytest-watcher = "^0.4.3"
 
 [build-system]