skrift 0.1.0a4__tar.gz → 0.1.0a6__tar.gz

{skrift-0.1.0a4 → skrift-0.1.0a6}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: skrift
-Version: 0.1.0a4
+Version: 0.1.0a6
 Summary: A lightweight async Python CMS for crafting modern websites
 Requires-Python: >=3.13
 Requires-Dist: advanced-alchemy>=0.26.0

{skrift-0.1.0a4 → skrift-0.1.0a6}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "skrift"
-version = "0.1.0a4"
+version = "0.1.0a6"
 description = "A lightweight async Python CMS for crafting modern websites"
 readme = "README.md"
 requires-python = ">=3.13"
@@ -20,8 +20,7 @@ dependencies = [
 ]
 
 [project.scripts]
-skrift = "skrift.__main__:main"
-skrift-db = "skrift.cli:db"
+skrift = "skrift.cli:cli"
 
 [tool.uv]
 package = true

skrift-0.1.0a6/skrift/__main__.py

@@ -0,0 +1,12 @@
+"""Entry point for the skrift package."""
+
+from skrift.cli import cli
+
+
+def main():
+    """Run the Skrift CLI."""
+    cli()
+
+
+if __name__ == "__main__":
+    main()

{skrift-0.1.0a4 → skrift-0.1.0a6}/skrift/asgi.py

@@ -10,6 +10,7 @@ The application uses a dispatcher architecture:
 import asyncio
 import hashlib
 import importlib
+import os
 from datetime import datetime
 from pathlib import Path
 
@@ -309,9 +310,11 @@ def create_app() -> Litestar:
     )
 
     # Template configuration
+    # 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=template_dir,
+        directory=[working_dir_templates, template_dir],
         engine=JinjaTemplateEngine,
         engine_callback=lambda engine: engine.engine.globals.update({
             "now": datetime.now,
@@ -322,10 +325,11 @@ def create_app() -> Litestar:
         }),
     )
 
-    # Static files
+    # Static files - working directory first for user overrides, then package directory
+    working_dir_static = Path(os.getcwd()) / "static"
     static_files_router = create_static_files_router(
         path="/static",
-        directories=[Path(__file__).parent / "static"],
+        directories=[working_dir_static, Path(__file__).parent / "static"],
     )
 
     from skrift.auth import sync_roles_to_database
@@ -381,9 +385,11 @@ def create_setup_app() -> Litestar:
     )
 
     # Template configuration
+    # 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=template_dir,
+        directory=[working_dir_templates, template_dir],
         engine=JinjaTemplateEngine,
         engine_callback=lambda engine: engine.engine.globals.update({
             "now": datetime.now,
@@ -394,10 +400,11 @@ def create_setup_app() -> Litestar:
         }),
     )
 
-    # Static files
+    # Static files - working directory first for user overrides, then package directory
+    working_dir_static = Path(os.getcwd()) / "static"
     static_files_router = create_static_files_router(
         path="/static",
-        directories=[Path(__file__).parent / "static"],
+        directories=[working_dir_static, Path(__file__).parent / "static"],
     )
 
     # Import controllers

skrift-0.1.0a6/skrift/cli.py

@@ -0,0 +1,143 @@
+"""CLI commands for Skrift."""
+
+import base64
+import os
+import re
+import secrets
+import sys
+from pathlib import Path
+
+import click
+
+
+@click.group()
+@click.version_option(package_name="skrift")
+def cli():
+    """Skrift - A lightweight async Python CMS."""
+    pass
+
+
+@cli.command()
+@click.option("--host", default="127.0.0.1", help="Host to bind to")
+@click.option("--port", default=8080, type=int, help="Port to bind to")
+@click.option("--reload", is_flag=True, help="Enable auto-reload for development")
+@click.option("--workers", default=1, type=int, help="Number of worker processes")
+@click.option(
+    "--log-level",
+    default="info",
+    type=click.Choice(["debug", "info", "warning", "error"]),
+    help="Logging level",
+)
+def serve(host, port, reload, workers, log_level):
+    """Run the Skrift server."""
+    import uvicorn
+
+    uvicorn.run(
+        "skrift.asgi:app",
+        host=host,
+        port=port,
+        reload=reload,
+        workers=workers if not reload else 1,
+        log_level=log_level,
+    )
+
+
+@cli.command()
+@click.option(
+    "--write",
+    type=click.Path(),
+    default=None,
+    help="Write SECRET_KEY to a .env file",
+)
+@click.option(
+    "--format",
+    "fmt",
+    default="urlsafe",
+    type=click.Choice(["urlsafe", "hex", "base64"]),
+    help="Output format for the secret key",
+)
+@click.option("--length", default=32, type=int, help="Number of random bytes")
+def secret(write, fmt, length):
+    """Generate a secure secret key."""
+    # Generate key based on format
+    if fmt == "urlsafe":
+        key = secrets.token_urlsafe(length)
+    elif fmt == "hex":
+        key = secrets.token_hex(length)
+    else:  # base64
+        key = base64.b64encode(secrets.token_bytes(length)).decode("ascii")
+
+    if write:
+        env_path = Path(write)
+        env_content = ""
+
+        # Read existing content if file exists
+        if env_path.exists():
+            env_content = env_path.read_text()
+
+        # Update or add SECRET_KEY
+        secret_key_pattern = re.compile(r"^SECRET_KEY=.*$", re.MULTILINE)
+        new_line = f"SECRET_KEY={key}"
+
+        if secret_key_pattern.search(env_content):
+            # Replace existing SECRET_KEY
+            env_content = secret_key_pattern.sub(new_line, env_content)
+        else:
+            # Add SECRET_KEY at the end
+            if env_content and not env_content.endswith("\n"):
+                env_content += "\n"
+            env_content += new_line + "\n"
+
+        env_path.write_text(env_content)
+        click.echo(f"SECRET_KEY written to {env_path}")
+    else:
+        click.echo(key)
+
+
+@cli.command(
+    context_settings=dict(
+        ignore_unknown_options=True,
+        allow_extra_args=True,
+    )
+)
+@click.pass_context
+def db(ctx):
+    """Run database migrations via Alembic.
+
+    \b
+    Examples:
+        skrift db upgrade head     # Apply all migrations
+        skrift db downgrade -1     # Rollback one migration
+        skrift db current          # Show current revision
+        skrift db history          # Show migration history
+        skrift db revision -m "description" --autogenerate  # Create new migration
+    """
+    from alembic.config import main as alembic_main
+
+    # Always run from the project root (where app.yaml and .env are)
+    # This ensures database paths like ./app.db resolve correctly
+    project_root = Path.cwd()
+    if not (project_root / "app.yaml").exists():
+        # If not in project root, try parent directory
+        project_root = Path(__file__).parent.parent
+    os.chdir(project_root)
+
+    # Find alembic.ini - check project root first, then skrift package directory
+    alembic_ini = project_root / "alembic.ini"
+    if not alembic_ini.exists():
+        skrift_dir = Path(__file__).parent
+        alembic_ini = skrift_dir / "alembic.ini"
+
+        if not alembic_ini.exists():
+            click.echo("Error: Could not find alembic.ini", err=True)
+            click.echo("Make sure you're running from the project root directory.", err=True)
+            sys.exit(1)
+
+    # Build argv for alembic: ['-c', '/path/to/alembic.ini', ...extra_args]
+    alembic_argv = ["-c", str(alembic_ini)] + ctx.args
+
+    sys.exit(alembic_main(alembic_argv))
+
+
+if __name__ == "__main__":
+    cli()

skrift-0.1.0a4/skrift/__main__.py

@@ -1,17 +0,0 @@
-"""Entry point for the skrift package."""
-
-import uvicorn
-
-
-def main():
-    """Run the Skrift development server."""
-    uvicorn.run(
-        "skrift.asgi:app",
-        host="0.0.0.0",
-        port=8080,
-        reload=True,
-    )
-
-
-if __name__ == "__main__":
-    main()

skrift-0.1.0a4/skrift/cli.py

@@ -1,54 +0,0 @@
-"""CLI commands for Skrift database management."""
-
-import sys
-from pathlib import Path
-
-
-def db() -> None:
-    """Run Alembic database migrations.
-
-    This is a thin wrapper around Alembic that sets up the correct working
-    directory and passes through all arguments.
-
-    Usage:
-        skrift-db upgrade head     # Apply all migrations
-        skrift-db downgrade -1     # Rollback one migration
-        skrift-db current          # Show current revision
-        skrift-db history          # Show migration history
-        skrift-db revision -m "description" --autogenerate  # Create new migration
-    """
-    from alembic.config import main as alembic_main
-
-    import os
-
-    # Always run from the project root (where app.yaml and .env are)
-    # This ensures database paths like ./app.db resolve correctly
-    project_root = Path.cwd()
-    if not (project_root / "app.yaml").exists():
-        # If not in project root, try parent directory
-        project_root = Path(__file__).parent.parent
-    os.chdir(project_root)
-
-    # Find alembic.ini - check project root first, then skrift package directory
-    alembic_ini = project_root / "alembic.ini"
-    if not alembic_ini.exists():
-        skrift_dir = Path(__file__).parent
-        alembic_ini = skrift_dir / "alembic.ini"
-
-        if not alembic_ini.exists():
-            print("Error: Could not find alembic.ini", file=sys.stderr)
-            print("Make sure you're running from the project root directory.", file=sys.stderr)
-            sys.exit(1)
-
-    # Build argv with config path at the beginning (before any subcommand)
-    # Original argv: ['skrift-db', 'upgrade', 'head']
-    # New argv: ['skrift-db', '-c', '/path/to/alembic.ini', 'upgrade', 'head']
-    new_argv = [sys.argv[0], "-c", str(alembic_ini)] + sys.argv[1:]
-    sys.argv = new_argv
-
-    # Pass through all CLI arguments to Alembic
-    sys.exit(alembic_main(sys.argv[1:]))
-
-
-if __name__ == "__main__":
-    db()