plain 0.34.1__py3-none-any.whl → 0.36.0__py3-none-any.whl

plain/assets/views.py

@@ -254,7 +254,7 @@ class AssetView(View):
 
         if not range_header.startswith("bytes="):
             return Response(
-                status=416, headers=[("Content-Range", f"bytes */{file_size}")]
+                status_code=416, headers=[("Content-Range", f"bytes */{file_size}")]
             )
 
         range_values = range_header.split("=")[1].split("-")
@@ -263,7 +263,7 @@ class AssetView(View):
 
         if start >= file_size:
             return Response(
-                status=416, headers=[("Content-Range", f"bytes */{file_size}")]
+                status_code=416, headers=[("Content-Range", f"bytes */{file_size}")]
             )
 
         end = min(end, file_size - 1)
@@ -272,7 +272,7 @@ class AssetView(View):
             f.seek(start)
             content = f.read(end - start + 1)
 
-        response = StreamingResponse(BytesIO(content), status=206)
+        response = StreamingResponse(BytesIO(content), status_code=206)
         response.headers = self.update_headers(response.headers, path)
         response.headers["Content-Range"] = f"bytes {start}-{end}/{file_size}"
         response.headers["Content-Length"] = str(end - start + 1)

plain/cli/build.py

@@ -0,0 +1,107 @@
+import shutil
+import subprocess
+import sys
+import tomllib
+from importlib.metadata import entry_points
+from pathlib import Path
+
+import click
+
+import plain.runtime
+from plain.assets.compile import compile_assets, get_compiled_path
+
+
+@click.command()
+@click.option(
+    "--keep-original/--no-keep-original",
+    "keep_original",
+    is_flag=True,
+    default=False,
+    help="Keep the original assets",
+)
+@click.option(
+    "--fingerprint/--no-fingerprint",
+    "fingerprint",
+    is_flag=True,
+    default=True,
+    help="Fingerprint the assets",
+)
+@click.option(
+    "--compress/--no-compress",
+    "compress",
+    is_flag=True,
+    default=True,
+    help="Compress the assets",
+)
+def build(keep_original, fingerprint, compress):
+    """Pre-deployment build step (compile assets, css, js, etc.)"""
+
+    if not keep_original and not fingerprint:
+        click.secho(
+            "You must either keep the original assets or fingerprint them.",
+            fg="red",
+            err=True,
+        )
+        sys.exit(1)
+
+    # Run user-defined build commands first
+    pyproject_path = plain.runtime.APP_PATH.parent / "pyproject.toml"
+    if pyproject_path.exists():
+        with pyproject_path.open("rb") as f:
+            pyproject = tomllib.load(f)
+
+        for name, data in (
+            pyproject.get("tool", {})
+            .get("plain", {})
+            .get("build", {})
+            .get("run", {})
+            .items()
+        ):
+            click.secho(f"Running {name} from pyproject.toml", bold=True)
+            result = subprocess.run(data["cmd"], shell=True)
+            print()
+            if result.returncode:
+                click.secho(f"Error in {name} (exit {result.returncode})", fg="red")
+                sys.exit(result.returncode)
+
+    # Then run installed package build steps (like tailwind, typically should run last...)
+    for entry_point in entry_points(group="plain.build"):
+        click.secho(f"Running {entry_point.name}", bold=True)
+        result = entry_point.load()()
+        print()
+
+    # Compile our assets
+    target_dir = get_compiled_path()
+    click.secho(f"Compiling assets to {target_dir}", bold=True)
+    if target_dir.exists():
+        click.secho("(clearing previously compiled assets)")
+        shutil.rmtree(target_dir)
+    target_dir.mkdir(parents=True, exist_ok=True)
+
+    total_files = 0
+    total_compiled = 0
+
+    for url_path, resolved_url_path, compiled_paths in compile_assets(
+        target_dir=target_dir,
+        keep_original=keep_original,
+        fingerprint=fingerprint,
+        compress=compress,
+    ):
+        if url_path == resolved_url_path:
+            click.secho(url_path, bold=True)
+        else:
+            click.secho(url_path, bold=True, nl=False)
+            click.secho(" → ", fg="yellow", nl=False)
+            click.echo(resolved_url_path)
+
+        print("\n".join(f"  {Path(p).relative_to(Path.cwd())}" for p in compiled_paths))
+
+        total_files += 1
+        total_compiled += len(compiled_paths)
+
+    click.secho(
+        f"\nCompiled {total_files} assets into {total_compiled} files", fg="green"
+    )
+
+    # TODO could do a jinja pre-compile here too?
+    # environment.compile_templates() but it needs a target, ignore_errors=False