skrift 0.1.0a12__py3-none-any.whl → 0.1.0a14__py3-none-any.whl

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/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/lib/__init__.py

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

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/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.dist-info → skrift-0.1.0a14.dist-info}/METADATA

@@ -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.dist-info → skrift-0.1.0a14.dist-info}/RECORD

@@ -1,9 +1,9 @@
 skrift/__init__.py,sha256=eXE5PFVkJpH5XsV_ZlrTIeFPUPrmcHYAj4GpRS3R5PY,29
 skrift/__main__.py,sha256=wt6JZL9nBhKU36vdyurhOEtWy7w3C9zohyy24PLcKho,164
 skrift/alembic.ini,sha256=mYguI6CbMCTyfHctsGiTyf9Z5gv21FdeI3qtfgOHO3A,1815
-skrift/asgi.py,sha256=qtP0aq9C6-bIZgbXiwJeF_3dY8O0cM2U_5hkajKMjBc,23032
+skrift/asgi.py,sha256=7uPvgsGMpZJyPOjIGxL9QlXTRLWh9uRAhcg-RdBS1c8,23355
 skrift/cli.py,sha256=aT-7pXvOuuZC-Eypx1h-xCiqaBKhIFjSqd5Ky_dHna0,4214
-skrift/config.py,sha256=O37SnnYkqTme-iMicMs2k4aD7Fv0wt7v3E_7fsiF40Y,7772
+skrift/config.py,sha256=ZDOrYgp6gC6fE1nEZgrAOouoykhRo2NZo5U1-WLdDSc,7862
 skrift/admin/__init__.py,sha256=x81Cj_ilVmv6slaMl16HHyT_AgrnLxKEWkS0RPa4V9s,289
 skrift/admin/controller.py,sha256=5ZDypvKHXLNDESsKNsdsH2E3Si5OqlpzttFl7Ot8aF0,15651
 skrift/admin/navigation.py,sha256=VwttFoIUIJy5rONKIkJd5w4CNkUpeK22_OfLGHecN34,3382
@@ -35,8 +35,9 @@ skrift/db/services/__init__.py,sha256=qAC24IPOYg6AampUWonmLeajljQRMwUw0lgXksQG6N
 skrift/db/services/oauth_service.py,sha256=1065tYGvrSer0X28GblibrSz2BjwVjl3tndXk1plthE,5208
 skrift/db/services/page_service.py,sha256=cXJ-urV7LjUDoVsT1P52f6wcOsur3T-pvqKkGG4xlvI,5246
 skrift/db/services/setting_service.py,sha256=eqFxukn8QFrDHQbaBILOLjP1nr34JPIPFT_NnhmeaTY,5613
-skrift/lib/__init__.py,sha256=PL66bS4_-90zJDMsQSnzqkkxwkO_3aLcYl9l9cDrE2Y,65
+skrift/lib/__init__.py,sha256=Ew53SFcJcoohNF_FEDoDXsrks9cKZQonoaJAWyjXWMs,132
 skrift/lib/exceptions.py,sha256=p8ceLIQCc7agCwW6-mhBDAuMAMxZDcf9TDLC6PfztU4,5803
+skrift/lib/markdown.py,sha256=fPLUIAsmFXC64Os2RngQG7P2xRKBd1RO8fh7b5_gV1U,950
 skrift/lib/template.py,sha256=4_urkRfvth75yNeQ5TyGTHvkvs3vVef7TcwZx0k285k,4226
 skrift/setup/__init__.py,sha256=3VjFPMES5y0M5cQ9R4C1xazqiEPEDqTPjX9-3rBMXnA,478
 skrift/setup/config_writer.py,sha256=YFH3FVjXN7Rum2fzGVPAQRkjdc9b0bHECDqMKYiEkhg,6347
@@ -50,7 +51,7 @@ skrift/templates/error-404.html,sha256=sJrDaF3Or3Nyki8mxo3wBxLLzgy4wkB9p9wdS8pRA
 skrift/templates/error-500.html,sha256=MR0wJ1JKLqdmdvsoJbQnZxLkxDPE59LrlbtVPKLM8-A,401
 skrift/templates/error.html,sha256=tg45Hj0wNc9QiZKBVVQ2WsqDiAkByXZnuehTdJPclXc,415
 skrift/templates/index.html,sha256=lzZlnoZ2luY__OtRVa61mpQIgcopAbkKa2rS9XRfRlI,172
-skrift/templates/page.html,sha256=kY1j7TH6dFnvWnYwBEGCIEvardjLhnFMnM3NbAnKszQ,759
+skrift/templates/page.html,sha256=aSTypibx86SzIhO7GTff8XXVrW8D-XbHNaTo_UT31oc,770
 skrift/templates/admin/admin.html,sha256=8sErpGKedl7Hf_CMeu53bUEHptH1FqdBX9LT3z-1HcU,454
 skrift/templates/admin/base.html,sha256=JX1MPw9XTY8jCT2M6iHUwEj8NPNOdZPca2cDUEs9kfQ,659
 skrift/templates/admin/pages/edit.html,sha256=s-uZ4BYG7BdnWYTBSS1mr5aFL8XfT8h-KNiSIraWmHw,1322
@@ -68,7 +69,7 @@ skrift/templates/setup/configuring.html,sha256=2KHW9h2BrJgL_kO5IizbAYs4pnFLyRf76
 skrift/templates/setup/database.html,sha256=gU4-315-QraHa2Eq4Fh3b55QpOM2CkJzh27_Yz13frA,5495
 skrift/templates/setup/restart.html,sha256=GHg31F_e2uLFhWUzJoalk0Y0oYLqsFWyZXWKX3mblbY,1355
 skrift/templates/setup/site.html,sha256=PSOH-q1-ZBl47iSW9-Ad6lEfJn_fzdGD3Pk4vb3xgK4,1680
-skrift-0.1.0a12.dist-info/METADATA,sha256=Vqc35fHrSYSsEgJSZ1r46xjHr-mlE4YyEz_1H5RFutQ,6436
-skrift-0.1.0a12.dist-info/WHEEL,sha256=WLgqFyCfm_KASv4WHyYy0P3pM_m7J5L9k2skdKLirC8,87
-skrift-0.1.0a12.dist-info/entry_points.txt,sha256=uquZ5Mumqr0xwYTpTcNiJtFSITGfF6_QCCy2DZJSZig,42
-skrift-0.1.0a12.dist-info/RECORD,,
+skrift-0.1.0a14.dist-info/METADATA,sha256=unD0pS4u31RZprH6rOeGVZJ_zA565aw7wTFxXzG91Go,6511
+skrift-0.1.0a14.dist-info/WHEEL,sha256=WLgqFyCfm_KASv4WHyYy0P3pM_m7J5L9k2skdKLirC8,87
+skrift-0.1.0a14.dist-info/entry_points.txt,sha256=uquZ5Mumqr0xwYTpTcNiJtFSITGfF6_QCCy2DZJSZig,42
+skrift-0.1.0a14.dist-info/RECORD,,