skrift 0.1.0a12__tar.gz → 0.1.0a14__tar.gz

{skrift-0.1.0a12 → skrift-0.1.0a14}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: skrift
-Version: 0.1.0a12
+Version: 0.1.0a14
 Summary: A lightweight async Python CMS for crafting modern websites
 Requires-Python: >=3.13
 Requires-Dist: advanced-alchemy>=0.26.0
@@ -9,6 +9,8 @@ Requires-Dist: alembic>=1.14.0
 Requires-Dist: asyncpg>=0.30.0
 Requires-Dist: httpx>=0.28.0
 Requires-Dist: litestar[cryptography,jinja,standard]>=2.14.0
+Requires-Dist: markdown-it-py>=3.0.0
+Requires-Dist: mdit-py-plugins>=0.4.0
 Requires-Dist: pydantic-settings>=2.7.0
 Requires-Dist: python-dotenv>=1.0.0
 Requires-Dist: pyyaml>=6.0.0

{skrift-0.1.0a12 → skrift-0.1.0a14}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "skrift"
-version = "0.1.0a12"
+version = "0.1.0a14"
 description = "A lightweight async Python CMS for crafting modern websites"
 readme = "README.md"
 requires-python = ">=3.13"
@@ -17,6 +17,8 @@ dependencies = [
     "uvicorn>=0.34.0",
     "pyyaml>=6.0.0",
     "ruamel.yaml>=0.18.0",
+    "markdown-it-py>=3.0.0",
+    "mdit-py-plugins>=0.4.0",
 ]
 
 [project.scripts]

{skrift-0.1.0a12 → skrift-0.1.0a14}/skrift/asgi.py

@@ -44,6 +44,7 @@ from skrift.db.services.setting_service import (
     SETUP_COMPLETED_AT_KEY,
 )
 from skrift.lib.exceptions import http_exception_handler, internal_server_error_handler
+from skrift.lib.markdown import render_markdown
 
 
 def load_controllers() -> list:
@@ -423,16 +424,20 @@ def create_app() -> Litestar:
     # Search working directory first for user overrides, then package directory
     working_dir_templates = Path(os.getcwd()) / "templates"
     template_dir = Path(__file__).parent / "templates"
-    template_config = TemplateConfig(
-        directory=[working_dir_templates, template_dir],
-        engine=JinjaTemplateEngine,
-        engine_callback=lambda engine: engine.engine.globals.update({
+    def configure_template_engine(engine):
+        engine.engine.globals.update({
             "now": datetime.now,
             "site_name": get_cached_site_name,
             "site_tagline": get_cached_site_tagline,
             "site_copyright_holder": get_cached_site_copyright_holder,
             "site_copyright_start_year": get_cached_site_copyright_start_year,
-        }),
+        })
+        engine.engine.filters.update({"markdown": render_markdown})
+
+    template_config = TemplateConfig(
+        directory=[working_dir_templates, template_dir],
+        engine=JinjaTemplateEngine,
+        engine_callback=configure_template_engine,
     )
 
     # Static files - working directory first for user overrides, then package directory
@@ -498,16 +503,21 @@ def create_setup_app() -> Litestar:
     # Search working directory first for user overrides, then package directory
     working_dir_templates = Path(os.getcwd()) / "templates"
     template_dir = Path(__file__).parent / "templates"
-    template_config = TemplateConfig(
-        directory=[working_dir_templates, template_dir],
-        engine=JinjaTemplateEngine,
-        engine_callback=lambda engine: engine.engine.globals.update({
+
+    def configure_setup_template_engine(engine):
+        engine.engine.globals.update({
             "now": datetime.now,
             "site_name": lambda: "Skrift",
             "site_tagline": lambda: "Setup",
             "site_copyright_holder": lambda: "",
             "site_copyright_start_year": lambda: None,
-        }),
+        })
+        engine.engine.filters.update({"markdown": render_markdown})
+
+    template_config = TemplateConfig(
+        directory=[working_dir_templates, template_dir],
+        engine=JinjaTemplateEngine,
+        engine_callback=configure_setup_template_engine,
     )
 
     # Static files - working directory first for user overrides, then package directory

{skrift-0.1.0a12 → skrift-0.1.0a14}/skrift/config.py

@@ -229,31 +229,28 @@ def is_config_valid() -> tuple[bool, str | None]:
 @lru_cache
 def get_settings() -> Settings:
     """Load settings from .env and app.yaml."""
-    # First create base settings from .env
-    base_settings = Settings()
-
     # Load app.yaml config
     try:
         app_config = load_app_config()
     except FileNotFoundError:
-        return base_settings
+        return Settings()
     except ValueError:
         # Missing environment variables - return base settings
-        return base_settings
+        return Settings()
 
-    # Merge YAML config with settings
-    updates = {}
+    # Build nested configs from YAML - pass directly to Settings to avoid
+    # model_copy issues with nested BaseModel instances in Pydantic v2
+    kwargs = {}
 
     if "db" in app_config:
-        updates["db"] = DatabaseConfig(**app_config["db"])
+        kwargs["db"] = DatabaseConfig(**app_config["db"])
 
     if "auth" in app_config:
-        updates["auth"] = AuthConfig(**app_config["auth"])
+        kwargs["auth"] = AuthConfig(**app_config["auth"])
 
     if "session" in app_config:
-        updates["session"] = SessionConfig(**app_config["session"])
-
-    if updates:
-        return base_settings.model_copy(update=updates)
+        kwargs["session"] = SessionConfig(**app_config["session"])
 
-    return base_settings
+    # Create Settings with YAML nested configs
+    # BaseSettings will still load debug/secret_key from env, but kwargs take precedence
+    return Settings(**kwargs)

skrift-0.1.0a14/skrift/lib/__init__.py

@@ -0,0 +1,4 @@
+from skrift.lib.markdown import render_markdown
+from skrift.lib.template import Template
+
+__all__ = ["Template", "render_markdown"]

skrift-0.1.0a14/skrift/lib/markdown.py

@@ -0,0 +1,37 @@
+"""Markdown rendering utilities for page content."""
+
+from markdown_it import MarkdownIt
+from mdit_py_plugins.footnote import footnote_plugin
+
+
+def create_markdown_renderer() -> MarkdownIt:
+    """Create a configured markdown renderer with standard plugins."""
+    md = MarkdownIt("commonmark", {"typographer": True})
+    md.enable("table")
+    footnote_plugin(md)
+    return md
+
+
+_renderer: MarkdownIt | None = None
+
+
+def get_renderer() -> MarkdownIt:
+    """Get the singleton markdown renderer, creating it if needed."""
+    global _renderer
+    if _renderer is None:
+        _renderer = create_markdown_renderer()
+    return _renderer
+
+
+def render_markdown(content: str) -> str:
+    """Render markdown content to HTML.
+
+    Args:
+        content: Markdown text to render.
+
+    Returns:
+        Rendered HTML string. Returns empty string for empty/None input.
+    """
+    if not content:
+        return ""
+    return get_renderer().render(content)

{skrift-0.1.0a12 → skrift-0.1.0a14}/skrift/templates/page.html

@@ -14,7 +14,7 @@
     </header>
 
     <div class="page-content">
-        {{ page.content | safe }}
+        {{ page.content | markdown | safe }}
     </div>
 
     {% if not page.is_published %}

skrift-0.1.0a12/skrift/lib/__init__.py

@@ -1,3 +0,0 @@
-from skrift.lib.template import Template
-
-__all__ = ["Template"]