skrift 0.1.0a13__tar.gz → 0.1.0a15__tar.gz

{skrift-0.1.0a13 → skrift-0.1.0a15}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: skrift
-Version: 0.1.0a13
+Version: 0.1.0a15
 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
@@ -33,6 +35,11 @@ A modern Litestar-powered content management framework with multi-provider OAuth
 - **Dynamic Controllers**: Load controllers from `app.yaml` configuration
 - **SQLAlchemy Integration**: Async database support with SQLite/PostgreSQL
 - **Client-Side Sessions**: Encrypted cookie sessions for horizontal scalability
+- **Hook/Filter System**: WordPress-like extensibility with async support
+- **SEO Metadata**: Built-in meta descriptions, OpenGraph tags, and robots directives
+- **Content Scheduling**: Schedule pages to publish at a future date
+- **Page Revisions**: Automatic content history with restore capability
+- **Sitemap & Robots.txt**: Auto-generated with filter extensibility
 
 ## Quick Start
 
@@ -119,11 +126,17 @@ skrift/
 ├── skrift/              # Main Python package
 │   ├── asgi.py          # Application factory
 │   ├── config.py        # Settings management
-│   ├── controllers/     # Route handlers
+│   ├── controllers/     # Route handlers (auth, web, sitemap)
 │   ├── admin/           # Admin panel
 │   ├── auth/            # RBAC and guards
 │   ├── db/              # Models and services
-│   ├── lib/             # Template resolver
+│   │   ├── models/      # Page, User, Role, PageRevision
+│   │   └── services/    # page_service, revision_service
+│   ├── lib/             # Core utilities
+│   │   ├── hooks.py     # Hook/filter system
+│   │   ├── seo.py       # SEO metadata utilities
+│   │   ├── flash.py     # Enhanced flash messages
+│   │   └── template.py  # Template resolver
 │   └── setup/           # Setup wizard
 ├── templates/           # Jinja2 templates
 ├── static/              # Static assets

{skrift-0.1.0a13 → skrift-0.1.0a15}/README.md

@@ -12,6 +12,11 @@ A modern Litestar-powered content management framework with multi-provider OAuth
 - **Dynamic Controllers**: Load controllers from `app.yaml` configuration
 - **SQLAlchemy Integration**: Async database support with SQLite/PostgreSQL
 - **Client-Side Sessions**: Encrypted cookie sessions for horizontal scalability
+- **Hook/Filter System**: WordPress-like extensibility with async support
+- **SEO Metadata**: Built-in meta descriptions, OpenGraph tags, and robots directives
+- **Content Scheduling**: Schedule pages to publish at a future date
+- **Page Revisions**: Automatic content history with restore capability
+- **Sitemap & Robots.txt**: Auto-generated with filter extensibility
 
 ## Quick Start
 
@@ -98,11 +103,17 @@ skrift/
 ├── skrift/              # Main Python package
 │   ├── asgi.py          # Application factory
 │   ├── config.py        # Settings management
-│   ├── controllers/     # Route handlers
+│   ├── controllers/     # Route handlers (auth, web, sitemap)
 │   ├── admin/           # Admin panel
 │   ├── auth/            # RBAC and guards
 │   ├── db/              # Models and services
-│   ├── lib/             # Template resolver
+│   │   ├── models/      # Page, User, Role, PageRevision
+│   │   └── services/    # page_service, revision_service
+│   ├── lib/             # Core utilities
+│   │   ├── hooks.py     # Hook/filter system
+│   │   ├── seo.py       # SEO metadata utilities
+│   │   ├── flash.py     # Enhanced flash messages
+│   │   └── template.py  # Template resolver
 │   └── setup/           # Setup wizard
 ├── templates/           # Jinja2 templates
 ├── static/              # Static assets

{skrift-0.1.0a13 → skrift-0.1.0a15}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "skrift"
-version = "0.1.0a13"
+version = "0.1.0a15"
 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.0a13 → skrift-0.1.0a15}/skrift/admin/controller.py

@@ -26,8 +26,9 @@ from skrift.auth.roles import ROLE_DEFINITIONS
 from skrift.admin.navigation import build_admin_nav, ADMIN_NAV_TAG
 from skrift.db.models.user import User
 from skrift.db.models import Page
-from skrift.db.services import page_service
+from skrift.db.services import page_service, revision_service
 from skrift.db.services import setting_service
+from skrift.lib.flash import flash_success, flash_error, flash_info, get_flash_messages
 
 
 class AdminController(Controller):
@@ -74,10 +75,10 @@ class AdminController(Controller):
         if not ctx["admin_nav"]:
             raise NotAuthorizedException("No admin pages accessible")
 
-        flash = request.session.pop("flash", None)
+        flash_messages = get_flash_messages(request)
         return TemplateResponse(
             "admin/admin.html",
-            context={"flash": flash, **ctx},
+            context={"flash_messages": flash_messages, **ctx},
         )
 
     @get(
@@ -100,10 +101,10 @@ class AdminController(Controller):
         )
         users = list(result.scalars().all())
 
-        flash = request.session.pop("flash", None)
+        flash_messages = get_flash_messages(request)
         return TemplateResponse(
             "admin/users/list.html",
-            context={"flash": flash, "users": users, **ctx},
+            context={"flash_messages": flash_messages, "users": users, **ctx},
         )
 
     @get(
@@ -129,11 +130,11 @@ class AdminController(Controller):
         # Get user's current role names
         current_roles = {role.name for role in target_user.roles}
 
-        flash = request.session.pop("flash", None)
+        flash_messages = get_flash_messages(request)
         return TemplateResponse(
             "admin/users/roles.html",
             context={
-                "flash": flash,
+                "flash_messages": flash_messages,
                 "target_user": target_user,
                 "current_roles": current_roles,
                 "available_roles": ROLE_DEFINITIONS,
@@ -200,18 +201,18 @@ class AdminController(Controller):
         """List all pages with management actions."""
         ctx = await self._get_admin_context(request, db_session)
 
-        # Get all pages with their authors
+        # Get all pages with their authors, ordered by display order then created
         result = await db_session.execute(
             select(Page)
             .options(selectinload(Page.user))
-            .order_by(Page.created_at.desc())
+            .order_by(Page.order.asc(), Page.created_at.desc())
         )
         pages = list(result.scalars().all())
 
-        flash = request.session.pop("flash", None)
+        flash_messages = get_flash_messages(request)
         return TemplateResponse(
             "admin/pages/list.html",
-            context={"flash": flash, "pages": pages, **ctx},
+            context={"flash_messages": flash_messages, "pages": pages, **ctx},
         )
 
     @get(
@@ -223,10 +224,10 @@ class AdminController(Controller):
     ) -> TemplateResponse:
         """Show new page form."""
         ctx = await self._get_admin_context(request, db_session)
-        flash = request.session.pop("flash", None)
+        flash_messages = get_flash_messages(request)
         return TemplateResponse(
             "admin/pages/edit.html",
-            context={"flash": flash, "page": None, **ctx},
+            context={"flash_messages": flash_messages, "page": None, **ctx},
         )
 
     @post(
@@ -245,8 +246,20 @@ class AdminController(Controller):
         content = data.get("content", "").strip()
         is_published = data.get("is_published") == "on"
 
+        # New fields
+        order = int(data.get("order", 0) or 0)
+        publish_at_str = data.get("publish_at", "").strip()
+        publish_at = datetime.fromisoformat(publish_at_str) if publish_at_str else None
+
+        # SEO fields
+        meta_description = data.get("meta_description", "").strip() or None
+        og_title = data.get("og_title", "").strip() or None
+        og_description = data.get("og_description", "").strip() or None
+        og_image = data.get("og_image", "").strip() or None
+        meta_robots = data.get("meta_robots", "").strip() or None
+
         if not title or not slug:
-            request.session["flash"] = "Title and slug are required"
+            flash_error(request, "Title and slug are required")
             return Redirect(path="/admin/pages/new")
 
         published_at = datetime.now(UTC) if is_published else None
@@ -259,11 +272,18 @@ class AdminController(Controller):
                 content=content,
                 is_published=is_published,
                 published_at=published_at,
+                order=order,
+                publish_at=publish_at,
+                meta_description=meta_description,
+                og_title=og_title,
+                og_description=og_description,
+                og_image=og_image,
+                meta_robots=meta_robots,
             )
-            request.session["flash"] = f"Page '{title}' created successfully!"
+            flash_success(request, f"Page '{title}' created successfully!")
             return Redirect(path="/admin/pages")
         except Exception as e:
-            request.session["flash"] = f"Error creating page: {str(e)}"
+            flash_error(request, f"Error creating page: {str(e)}")
             return Redirect(path="/admin/pages/new")
 
     @get(
@@ -278,13 +298,13 @@ class AdminController(Controller):
 
         page = await page_service.get_page_by_id(db_session, page_id)
         if not page:
-            request.session["flash"] = "Page not found"
+            flash_error(request, "Page not found")
             return Redirect(path="/admin/pages")
 
-        flash = request.session.pop("flash", None)
+        flash_messages = get_flash_messages(request)
         return TemplateResponse(
             "admin/pages/edit.html",
-            context={"flash": flash, "page": page, **ctx},
+            context={"flash_messages": flash_messages, "page": page, **ctx},
         )
 
     @post(
@@ -304,13 +324,25 @@ class AdminController(Controller):
         content = data.get("content", "").strip()
         is_published = data.get("is_published") == "on"
 
+        # New fields
+        order = int(data.get("order", 0) or 0)
+        publish_at_str = data.get("publish_at", "").strip()
+        publish_at = datetime.fromisoformat(publish_at_str) if publish_at_str else None
+
+        # SEO fields
+        meta_description = data.get("meta_description", "").strip() or None
+        og_title = data.get("og_title", "").strip() or None
+        og_description = data.get("og_description", "").strip() or None
+        og_image = data.get("og_image", "").strip() or None
+        meta_robots = data.get("meta_robots", "").strip() or None
+
         if not title or not slug:
-            request.session["flash"] = "Title and slug are required"
+            flash_error(request, "Title and slug are required")
             return Redirect(path=f"/admin/pages/{page_id}/edit")
 
         page = await page_service.get_page_by_id(db_session, page_id)
         if not page:
-            request.session["flash"] = "Page not found"
+            flash_error(request, "Page not found")
             return Redirect(path="/admin/pages")
 
         published_at = page.published_at
@@ -326,11 +358,18 @@ class AdminController(Controller):
                 content=content,
                 is_published=is_published,
                 published_at=published_at,
+                order=order,
+                publish_at=publish_at,
+                meta_description=meta_description,
+                og_title=og_title,
+                og_description=og_description,
+                og_image=og_image,
+                meta_robots=meta_robots,
             )
-            request.session["flash"] = f"Page '{title}' updated successfully!"
+            flash_success(request, f"Page '{title}' updated successfully!")
             return Redirect(path="/admin/pages")
         except Exception as e:
-            request.session["flash"] = f"Error updating page: {str(e)}"
+            flash_error(request, f"Error updating page: {str(e)}")
             return Redirect(path=f"/admin/pages/{page_id}/edit")
 
     @post(
@@ -397,6 +436,55 @@ class AdminController(Controller):
         request.session["flash"] = f"'{page_title}' has been deleted"
         return Redirect(path="/admin/pages")
 
+    @get(
+        "/pages/{page_id:uuid}/revisions",
+        guards=[auth_guard, Permission("manage-pages")],
+    )
+    async def list_revisions(
+        self, request: Request, db_session: AsyncSession, page_id: UUID
+    ) -> TemplateResponse:
+        """List revisions for a page."""
+        ctx = await self._get_admin_context(request, db_session)
+
+        page = await page_service.get_page_by_id(db_session, page_id)
+        if not page:
+            flash_error(request, "Page not found")
+            return Redirect(path="/admin/pages")
+
+        revisions = await revision_service.list_revisions(db_session, page_id)
+
+        flash_messages = get_flash_messages(request)
+        return TemplateResponse(
+            "admin/pages/revisions.html",
+            context={"flash_messages": flash_messages, "page": page, "revisions": revisions, **ctx},
+        )
+
+    @post(
+        "/pages/{page_id:uuid}/revisions/{revision_id:uuid}/restore",
+        guards=[auth_guard, Permission("manage-pages")],
+    )
+    async def restore_revision(
+        self, request: Request, db_session: AsyncSession, page_id: UUID, revision_id: UUID
+    ) -> Redirect:
+        """Restore a page to a previous revision."""
+        page = await page_service.get_page_by_id(db_session, page_id)
+        if not page:
+            flash_error(request, "Page not found")
+            return Redirect(path="/admin/pages")
+
+        revision = await revision_service.get_revision(db_session, revision_id)
+        if not revision or revision.page_id != page_id:
+            flash_error(request, "Revision not found")
+            return Redirect(path=f"/admin/pages/{page_id}/revisions")
+
+        user_id = request.session.get("user_id")
+        await revision_service.restore_revision(
+            db_session, page, revision, UUID(user_id) if user_id else None
+        )
+
+        flash_success(request, f"Page restored to revision #{revision.revision_number}")
+        return Redirect(path=f"/admin/pages/{page_id}/edit")
+
     @get(
         "/settings",
         tags=[ADMIN_NAV_TAG],
@@ -410,10 +498,10 @@ class AdminController(Controller):
         ctx = await self._get_admin_context(request, db_session)
         site_settings = await setting_service.get_site_settings(db_session)
 
-        flash = request.session.pop("flash", None)
+        flash_messages = get_flash_messages(request)
         return TemplateResponse(
             "admin/settings/site.html",
-            context={"flash": flash, "settings": site_settings, **ctx},
+            context={"flash_messages": flash_messages, "settings": site_settings, **ctx},
         )
 
     @post(
@@ -448,5 +536,5 @@ class AdminController(Controller):
         # Refresh the site settings cache
         await setting_service.load_site_settings_cache(db_session)
 
-        request.session["flash"] = "Site settings saved successfully"
+        flash_success(request, "Site settings saved successfully")
         return Redirect(path="/admin/settings")

skrift-0.1.0a15/skrift/alembic/versions/20260202_add_content_scheduling.py

@@ -0,0 +1,35 @@
+"""add content scheduling
+
+Revision ID: 5e6f7g8h9i0j
+Revises: 4d5e6f7g8h9i
+Create Date: 2026-02-02 10:02:00.000000
+
+This migration adds the publish_at column for scheduled publishing.
+When set, pages with is_published=True will only be visible after this datetime.
+"""
+from typing import Sequence, Union
+
+from alembic import op
+import sqlalchemy as sa
+import advanced_alchemy.types
+
+
+# revision identifiers, used by Alembic.
+revision: str = '5e6f7g8h9i0j'
+down_revision: Union[str, None] = '4d5e6f7g8h9i'
+branch_labels: Union[str, Sequence[str], None] = None
+depends_on: Union[str, Sequence[str], None] = None
+
+
+def upgrade() -> None:
+    with op.batch_alter_table('pages') as batch_op:
+        batch_op.add_column(
+            sa.Column('publish_at', advanced_alchemy.types.datetime.DateTimeUTC(timezone=True), nullable=True)
+        )
+        batch_op.create_index('ix_pages_publish_at', ['publish_at'])
+
+
+def downgrade() -> None:
+    with op.batch_alter_table('pages') as batch_op:
+        batch_op.drop_index('ix_pages_publish_at')
+        batch_op.drop_column('publish_at')

skrift-0.1.0a15/skrift/alembic/versions/20260202_add_page_ordering.py

@@ -0,0 +1,32 @@
+"""add page ordering
+
+Revision ID: 4d5e6f7g8h9i
+Revises: 3c4d5e6f7g8h
+Create Date: 2026-02-02 10:01:00.000000
+
+This migration adds an order column to the pages table for custom ordering.
+Lower numbers appear first, default is 0.
+"""
+from typing import Sequence, Union
+
+from alembic import op
+import sqlalchemy as sa
+
+
+# revision identifiers, used by Alembic.
+revision: str = '4d5e6f7g8h9i'
+down_revision: Union[str, None] = '3c4d5e6f7g8h'
+branch_labels: Union[str, Sequence[str], None] = None
+depends_on: Union[str, Sequence[str], None] = None
+
+
+def upgrade() -> None:
+    with op.batch_alter_table('pages') as batch_op:
+        batch_op.add_column(sa.Column('order', sa.Integer(), nullable=False, server_default='0'))
+        batch_op.create_index('ix_pages_order', ['order'])
+
+
+def downgrade() -> None:
+    with op.batch_alter_table('pages') as batch_op:
+        batch_op.drop_index('ix_pages_order')
+        batch_op.drop_column('order')

skrift-0.1.0a15/skrift/alembic/versions/20260202_add_page_revisions.py

@@ -0,0 +1,46 @@
+"""add page revisions table
+
+Revision ID: 6f7g8h9i0j1k
+Revises: 5e6f7g8h9i0j
+Create Date: 2026-02-02 10:03:00.000000
+
+This migration creates the page_revisions table for tracking content history.
+Revisions are created when page content is modified, allowing restoration.
+"""
+from typing import Sequence, Union
+
+from alembic import op
+import sqlalchemy as sa
+import advanced_alchemy.types
+
+
+# revision identifiers, used by Alembic.
+revision: str = '6f7g8h9i0j1k'
+down_revision: Union[str, None] = '5e6f7g8h9i0j'
+branch_labels: Union[str, Sequence[str], None] = None
+depends_on: Union[str, Sequence[str], None] = None
+
+
+def upgrade() -> None:
+    op.create_table('page_revisions',
+        sa.Column('id', advanced_alchemy.types.guid.GUID(length=16), nullable=False),
+        sa.Column('page_id', advanced_alchemy.types.guid.GUID(length=16), nullable=False),
+        sa.Column('user_id', advanced_alchemy.types.guid.GUID(length=16), nullable=True),
+        sa.Column('revision_number', sa.Integer(), nullable=False),
+        sa.Column('title', sa.String(length=500), nullable=False),
+        sa.Column('content', sa.Text(), nullable=False),
+        sa.Column('created_at', advanced_alchemy.types.datetime.DateTimeUTC(timezone=True), nullable=False),
+        sa.Column('sa_orm_sentinel', sa.Integer(), nullable=True),
+        sa.Column('updated_at', advanced_alchemy.types.datetime.DateTimeUTC(timezone=True), nullable=False),
+        sa.ForeignKeyConstraint(['page_id'], ['pages.id'], name=op.f('fk_page_revisions_page_id_pages'), ondelete='CASCADE'),
+        sa.ForeignKeyConstraint(['user_id'], ['users.id'], name=op.f('fk_page_revisions_user_id_users'), ondelete='SET NULL'),
+        sa.PrimaryKeyConstraint('id', name=op.f('pk_page_revisions'))
+    )
+    op.create_index(op.f('ix_page_revisions_page_id'), 'page_revisions', ['page_id'], unique=False)
+    op.create_index(op.f('ix_page_revisions_user_id'), 'page_revisions', ['user_id'], unique=False)
+
+
+def downgrade() -> None:
+    op.drop_index(op.f('ix_page_revisions_user_id'), table_name='page_revisions')
+    op.drop_index(op.f('ix_page_revisions_page_id'), table_name='page_revisions')
+    op.drop_table('page_revisions')

skrift-0.1.0a15/skrift/alembic/versions/20260202_add_seo_fields.py

@@ -0,0 +1,42 @@
+"""add SEO fields to pages
+
+Revision ID: 3c4d5e6f7g8h
+Revises: 2b3c4d5e6f7g
+Create Date: 2026-02-02 10:00:00.000000
+
+This migration adds SEO metadata fields to the pages table:
+- meta_description: Meta description for search engines
+- og_title: OpenGraph title override
+- og_description: OpenGraph description override
+- og_image: OpenGraph image URL
+- meta_robots: Meta robots directive (noindex, nofollow, etc.)
+"""
+from typing import Sequence, Union
+
+from alembic import op
+import sqlalchemy as sa
+
+
+# revision identifiers, used by Alembic.
+revision: str = '3c4d5e6f7g8h'
+down_revision: Union[str, None] = '2b3c4d5e6f7g'
+branch_labels: Union[str, Sequence[str], None] = None
+depends_on: Union[str, Sequence[str], None] = None
+
+
+def upgrade() -> None:
+    with op.batch_alter_table('pages') as batch_op:
+        batch_op.add_column(sa.Column('meta_description', sa.Text(), nullable=True))
+        batch_op.add_column(sa.Column('og_title', sa.String(length=500), nullable=True))
+        batch_op.add_column(sa.Column('og_description', sa.Text(), nullable=True))
+        batch_op.add_column(sa.Column('og_image', sa.String(length=1024), nullable=True))
+        batch_op.add_column(sa.Column('meta_robots', sa.String(length=100), nullable=True))
+
+
+def downgrade() -> None:
+    with op.batch_alter_table('pages') as batch_op:
+        batch_op.drop_column('meta_robots')
+        batch_op.drop_column('og_image')
+        batch_op.drop_column('og_description')
+        batch_op.drop_column('og_title')
+        batch_op.drop_column('meta_description')

{skrift-0.1.0a13 → skrift-0.1.0a15}/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