afterpython 0.3.13__tar.gz → 0.3.14__tar.gz

{afterpython-0.3.13 → afterpython-0.3.14}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: afterpython
-Version: 0.3.13
+Version: 0.3.14
 Summary: CLI tool to streamline Python package maintenance and generate a dedicated project website
 Keywords: package-maintenance,project-website,static-site-generator,developer-tools,documentation,cli-tool,ci/cd,mystmd,semantic-release,python-packaging
 Author: Stephen Yau

{afterpython-0.3.13 → afterpython-0.3.14}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "afterpython"
-version = "0.3.13"
+version = "0.3.14"
 description = "CLI tool to streamline Python package maintenance and generate a dedicated project website"
 license = "Apache-2.0"
 authors = [

{afterpython-0.3.13 → afterpython-0.3.14}/src/afterpython/builders/content_json.py

@@ -37,19 +37,23 @@ def standardize_data(content_type: tContentType, content: dict) -> dict:
     is_featured = content["slug"] == featured_post or content["location"].endswith(
         featured_post
     )
+    # `frontmatter.get(key, default)` only falls back when the key is missing —
+    # but YAML parses `thumbnail:` (empty value) as None, which then propagates
+    # into convert_paths() and crashes the string concatenation. Coerce here
+    # so downstream sees "" / [] consistently.
     return {
         "version": content["version"],
         "slug": content["slug"],
         "location": content["location"],
         "featured": is_featured,
         # frontmatter fields
-        "title": frontmatter.get("title", ""),
-        "description": frontmatter.get("description", ""),
-        "tags": frontmatter.get("tags", []),
-        "date": frontmatter.get("date", ""),
-        "thumbnail": frontmatter.get("thumbnail", ""),
-        "thumbnailOptimized": frontmatter.get("thumbnailOptimized", ""),
-        "authors": frontmatter.get("authors", []),
+        "title": frontmatter.get("title") or "",
+        "description": frontmatter.get("description") or "",
+        "tags": frontmatter.get("tags") or [],
+        "date": frontmatter.get("date") or "",
+        "thumbnail": frontmatter.get("thumbnail") or "",
+        "thumbnailOptimized": frontmatter.get("thumbnailOptimized") or "",
+        "authors": frontmatter.get("authors") or [],
     }
 
 
@@ -63,11 +67,15 @@ def convert_paths(content_type: tContentType, output_file: Path):
 
     for item in content:
         if not item.get("thumbnailOptimized"):
-            item["thumbnailOptimized"] = item["thumbnail"]
-        item["thumbnail"] = f"/{content_type}/build" + item["thumbnail"]
-        item["thumbnailOptimized"] = (
-            f"/{content_type}/build" + item["thumbnailOptimized"]
-        )
+            item["thumbnailOptimized"] = item.get("thumbnail") or ""
+        # Skip path prefixing when there's no thumbnail — prepending to "" would
+        # produce a bogus "/blog/build" URL that 404s in the frontend.
+        if item.get("thumbnail"):
+            item["thumbnail"] = f"/{content_type}/build" + item["thumbnail"]
+        if item.get("thumbnailOptimized"):
+            item["thumbnailOptimized"] = (
+                f"/{content_type}/build" + item["thumbnailOptimized"]
+            )
 
     with open(output_file, "w", encoding="utf-8") as f:
         json.dump(content, f, indent=2, ensure_ascii=False)

{afterpython-0.3.13 → afterpython-0.3.14}/src/afterpython/cli/commands/dev.py

@@ -5,7 +5,12 @@ from typing import TYPE_CHECKING
 if TYPE_CHECKING:
     from afterpython._typing import NodeEnv
 
+import contextlib
+import os
+import queue
+import signal
 import subprocess
+import threading
 import time
 
 import click
@@ -16,6 +21,76 @@ from afterpython.const import CONTENT_TYPES
 from afterpython.utils import find_available_port, find_node_env
 
 
+def _stream_process_output(
+    proc: subprocess.Popen,
+    output_queue: queue.Queue[str | None],
+    ready_event: threading.Event,
+):
+    """Forward process output to the terminal and queue startup lines."""
+    if proc.stdout is None:
+        if not ready_event.is_set():
+            output_queue.put(None)
+        return
+
+    for line in proc.stdout:
+        click.echo(line, nl=False)
+        if not ready_event.is_set():
+            output_queue.put(line)
+
+    if not ready_event.is_set():
+        output_queue.put(None)
+
+
+def _wait_for_myst_server(
+    proc: subprocess.Popen,
+    content_type: str,
+    port: int,
+    output_queue: queue.Queue[str | None],
+    ready_event: threading.Event,
+    timeout: int = 300,
+):
+    """Wait until MyST reports that its dev server has started."""
+    deadline = time.monotonic() + timeout
+    ready_markers = (
+        f"Server started on port {port}",
+        f"http://localhost:{port}",
+        f"http://127.0.0.1:{port}",
+    )
+
+    try:
+        while time.monotonic() < deadline:
+            returncode = proc.poll()
+            if returncode is not None and output_queue.empty():
+                if returncode == 0:
+                    click.echo(
+                        f"MyST {content_type} server exited before becoming ready"
+                    )
+                    return
+                raise Exit(returncode)
+
+            try:
+                line = output_queue.get(timeout=0.5)
+            except queue.Empty:
+                continue
+
+            if line is None:
+                returncode = proc.poll()
+                if returncode not in (None, 0):
+                    raise Exit(returncode)
+                click.echo(f"MyST {content_type} server exited before becoming ready")
+                return
+
+            if any(marker in line for marker in ready_markers):
+                click.echo(f"MyST {content_type} server is ready")
+                return
+
+        raise click.ClickException(
+            f"Timed out waiting for MyST {content_type} server on port {port}"
+        )
+    finally:
+        ready_event.set()
+
+
 @click.command(
     add_help_option=False,  # disable click's --help option so that ap dev --help can work
     context_settings=dict(
@@ -116,15 +191,26 @@ def dev(
     paths = ctx.obj["paths"]
 
     def cleanup_processes():
-        """Clean up all MyST server processes"""
+        """Clean up all MyST server processes.
+
+        Each spawned 'ap {content_type}' is its own session leader (start_new_session=True
+        below), so its grandchild `myst start` shares the same process group. proc.terminate()
+        would only SIGTERM the outer Python wrapper — which is blocked in subprocess.run and
+        doesn't forward the signal — leaving myst orphaned. Signal the whole group instead.
+        """
         click.echo("\nShutting down MyST servers...")
         for proc in myst_processes:
             try:
-                proc.terminate()
+                pgid = os.getpgid(proc.pid)
+            except ProcessLookupError:
+                continue
+            try:
+                os.killpg(pgid, signal.SIGTERM)
                 proc.wait(timeout=5)
             except subprocess.TimeoutExpired:
-                proc.kill()
-            except Exception:
+                with contextlib.suppress(ProcessLookupError):
+                    os.killpg(pgid, signal.SIGKILL)
+            except ProcessLookupError:
                 pass
 
     # Determine which content types to run
@@ -175,6 +261,8 @@ def dev(
                         f"PUBLIC_{content_type.upper()}_URL=http://localhost:{myst_port}\n"
                     )
 
+                output_queue: queue.Queue[str | None] = queue.Queue()
+                ready_event = threading.Event()
                 myst_process = subprocess.Popen(
                     [
                         "ap",
@@ -184,15 +272,23 @@ def dev(
                         *(["--execute"] if execute else []),
                         *ctx.args,
                     ],
-                    # stdout=subprocess.DEVNULL,  # Suppress output (optional)
-                    # stderr=subprocess.DEVNULL,  # Suppress errors (optional)
+                    # New session so cleanup_processes can SIGTERM the whole group and
+                    # take the grandchild `myst start` down with the wrapper.
+                    start_new_session=True,
+                    stdout=subprocess.PIPE,
+                    stderr=subprocess.STDOUT,
+                    text=True,
+                    bufsize=1,
                 )
                 myst_processes.append(myst_process)
-
-                # NOTE: MyST internally uses additional ports beyond the one specified by --port.
-                # Without this delay, multiple MyST servers may attempt to bind to the same internal port,
-                # causing "address already in use" errors.
-                time.sleep(3)
+                threading.Thread(
+                    target=_stream_process_output,
+                    args=(myst_process, output_queue, ready_event),
+                    daemon=True,
+                ).start()
+                _wait_for_myst_server(
+                    myst_process, content_type, myst_port, output_queue, ready_event
+                )
 
         postbuild(dev_build=True)
 
@@ -208,7 +304,7 @@ def dev(
             click.echo(
                 "Skipping website dev server (--no-website flag). Run 'pnpm dev' manually in afterpython/_website/ with your custom options."
             )
-            if enabled_content_types:
+            if myst_processes:
                 # Keep the process running to maintain MyST servers
                 click.echo("Press Ctrl+C to stop MyST servers...")
                 while True:

{afterpython-0.3.13 → afterpython-0.3.14}/src/afterpython/cli/commands/sync.py

@@ -1,4 +1,5 @@
 from datetime import datetime
+from pathlib import PurePosixPath
 
 import click
 from pyproject_metadata import StandardMetadata
@@ -8,6 +9,13 @@ import afterpython as ap
 from afterpython.utils import convert_author_name_to_id, normalize_static_path
 
 
+def _myst_favicon_path(path: str) -> str:
+    """Convert a website favicon path to MyST's required .ico favicon path."""
+    if not path:
+        return ""
+    return str(PurePosixPath(path).with_suffix(".ico"))
+
+
 def _sync_authors_yml(authors: list[tuple[str, str | None]]):
     """Sync authors.yml with authors in pyproject.toml"""
     from afterpython._io.yaml import read_yaml
@@ -58,10 +66,7 @@ def sync():
         website_favicon = normalize_static_path(
             str(_from_tomlkit(afterpython.get("website", {})).get("favicon", ""))
         )
-        if website_favicon and not website_favicon.lower().endswith(".ico"):
-            raise ValueError(
-                f"Invalid favicon '{website_favicon}': mystmd only supports .ico files."
-            )
+        myst_favicon = _myst_favicon_path(website_favicon)
         website_logo = normalize_static_path(
             str(_from_tomlkit(afterpython.get("website", {})).get("logo", ""))
         )
@@ -133,7 +138,7 @@ def sync():
             "site": {
                 "title": title,
                 "options": {
-                    "favicon": "../static" + website_favicon if website_favicon else "",
+                    "favicon": "../static" + myst_favicon if myst_favicon else "",
                     "logo": "../static" + website_logo if website_logo else "",
                     "logo_dark": "../static" + website_logo_dark
                     if website_logo_dark