skrift 0.1.0a16__py3-none-any.whl → 0.1.0a17__py3-none-any.whl

skrift/asgi.py

@@ -22,6 +22,8 @@ from advanced_alchemy.extensions.litestar import (
     SQLAlchemyAsyncConfig,
     SQLAlchemyPlugin,
 )
+
+from skrift.db.session import SafeSQLAlchemyAsyncConfig
 from litestar import Litestar
 from litestar.config.compression import CompressionConfig
 from litestar.contrib.jinja import JinjaTemplateEngine
@@ -398,10 +400,11 @@ def create_app() -> Litestar:
             pool_size=settings.db.pool_size,
             max_overflow=settings.db.pool_overflow,
             pool_timeout=settings.db.pool_timeout,
+            pool_pre_ping=settings.db.pool_pre_ping,
             echo=settings.db.echo,
         )
 
-    db_config = SQLAlchemyAsyncConfig(
+    db_config = SafeSQLAlchemyAsyncConfig(
         connection_string=settings.db.url,
         metadata=Base.metadata,
         create_all=False,
@@ -564,10 +567,11 @@ def create_setup_app() -> Litestar:
                 pool_size=5,
                 max_overflow=10,
                 pool_timeout=30,
+                pool_pre_ping=True,
                 echo=False,
             )
 
-        db_config = SQLAlchemyAsyncConfig(
+        db_config = SafeSQLAlchemyAsyncConfig(
             connection_string=db_url,
             metadata=Base.metadata,
             create_all=False,

skrift/config.py

@@ -110,6 +110,7 @@ class DatabaseConfig(BaseModel):
     pool_size: int = 5
     pool_overflow: int = 10
     pool_timeout: int = 30
+    pool_pre_ping: bool = True  # Validate connections before use
     echo: bool = False
 
 

skrift/db/session.py

@@ -0,0 +1,90 @@
+"""Safe SQLAlchemy async session provider with CancelledError handling.
+
+This module provides a custom session configuration that properly handles
+connection cleanup when HTTP requests are cancelled (client disconnect, timeout).
+Without this, CancelledError can prevent session cleanup, leading to connection
+pool leaks.
+"""
+
+import asyncio
+from collections.abc import AsyncGenerator
+from typing import TYPE_CHECKING, Callable, cast
+
+from advanced_alchemy._listeners import set_async_context
+from advanced_alchemy.extensions.litestar import SQLAlchemyAsyncConfig
+from advanced_alchemy.extensions.litestar._utils import (
+    delete_aa_scope_state,
+    get_aa_scope_state,
+    set_aa_scope_state,
+)
+from sqlalchemy.ext.asyncio import AsyncSession
+
+if TYPE_CHECKING:
+    from litestar.datastructures import State
+    from litestar.types import Scope
+
+
+class SafeSQLAlchemyAsyncConfig(SQLAlchemyAsyncConfig):
+    """SQLAlchemy async config with safe session cleanup on request cancellation.
+
+    This subclass overrides `provide_session` to use an async generator that
+    catches CancelledError and ensures sessions are properly closed, preventing
+    connection pool leaks when HTTP requests are cancelled.
+
+    The standard advanced_alchemy session management relies on ASGI events
+    (http.response.body, http.disconnect) to trigger cleanup via before_send_handler.
+    However, CancelledError can prevent these events from firing, leaving sessions
+    in an unclosed state.
+
+    By using an async generator, Litestar's dependency injection system ensures
+    cleanup runs even when CancelledError is raised.
+    """
+
+    async def provide_session(
+        self,
+        state: "State",
+        scope: "Scope",
+    ) -> AsyncGenerator[AsyncSession, None]:
+        """Provide a database session with proper cleanup on cancellation.
+
+        This async generator wraps session creation to ensure that
+        CancelledError (raised when an HTTP request is cancelled) doesn't
+        prevent session cleanup, which would leak connections.
+
+        Args:
+            state: The application state
+            scope: The ASGI scope
+
+        Yields:
+            AsyncSession: The database session
+        """
+        # Check if we already have a session in scope
+        session = cast(
+            "AsyncSession | None",
+            get_aa_scope_state(scope, self.session_scope_key),
+        )
+
+        if session is None:
+            # Create a new session
+            session_maker = cast(
+                "Callable[[], AsyncSession]",
+                state[self.session_maker_app_state_key],
+            )
+            session = session_maker()
+            # Store in scope for reuse within this request
+            set_aa_scope_state(scope, self.session_scope_key, session)
+
+        set_async_context(True)
+
+        try:
+            yield session
+        except asyncio.CancelledError:
+            # Request was cancelled - ensure we clean up the session
+            # This prevents connection pool leaks
+            await session.close()
+            # Remove the session from scope state to prevent double-close
+            delete_aa_scope_state(scope, self.session_scope_key)
+            raise
+
+
+__all__ = ["SafeSQLAlchemyAsyncConfig"]

skrift/setup/config_writer.py

@@ -21,6 +21,7 @@ DEFAULT_CONFIG = {
         "pool_size": 5,
         "pool_overflow": 10,
         "pool_timeout": 30,
+        "pool_pre_ping": True,
         "echo": False,
     },
     "auth": {

skrift/setup/state.py

@@ -172,9 +172,9 @@ def run_migrations_if_needed() -> tuple[bool, str | None]:
         return True, None
 
     try:
-        # Try skrift-db first
+        # Try skrift db first (the correct command)
         result = subprocess.run(
-            ["skrift-db", "upgrade", "head"],
+            ["skrift", "db", "upgrade", "head"],
             capture_output=True,
             text=True,
             cwd=Path.cwd(),
@@ -183,7 +183,7 @@ def run_migrations_if_needed() -> tuple[bool, str | None]:
         if result.returncode == 0:
             _migrations_run = True
             return True, None
-        # If skrift-db fails, try alembic directly
+        # If skrift db fails, try alembic directly
     except (subprocess.TimeoutExpired, FileNotFoundError):
         pass
 
@@ -202,7 +202,7 @@ def run_migrations_if_needed() -> tuple[bool, str | None]:
     except subprocess.TimeoutExpired:
         return False, "Migration timed out"
     except FileNotFoundError:
-        return False, "Neither skrift-db nor alembic found"
+        return False, "skrift db command not found"
     except Exception as e:
         return False, str(e)
 

{skrift-0.1.0a16.dist-info → skrift-0.1.0a17.dist-info}/METADATA

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

{skrift-0.1.0a16.dist-info → skrift-0.1.0a17.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=7uPvgsGMpZJyPOjIGxL9QlXTRLWh9uRAhcg-RdBS1c8,23355
+skrift/asgi.py,sha256=re_DzFiLzFdSiY3TAj_UGuVedkZTIs8jx1rHb6vPvkM,23509
 skrift/cli.py,sha256=-K-uO1r8y5r8wsRGygZFyaH1DsY1s9L0XViScPBnt9s,5744
-skrift/config.py,sha256=ZDOrYgp6gC6fE1nEZgrAOouoykhRo2NZo5U1-WLdDSc,7862
+skrift/config.py,sha256=9qDy9GhGbUZWinsagfPPkeAWsapHoZmqmeYFR3CEdxQ,7928
 skrift/admin/__init__.py,sha256=x81Cj_ilVmv6slaMl16HHyT_AgrnLxKEWkS0RPa4V9s,289
 skrift/admin/controller.py,sha256=gSprerjhxqxaH2lHm8vbLuz-jslN553FpbKF7jwEm9Y,19607
 skrift/admin/navigation.py,sha256=VwttFoIUIJy5rONKIkJd5w4CNkUpeK22_OfLGHecN34,3382
@@ -34,6 +34,7 @@ skrift/controllers/sitemap.py,sha256=Yfz2ElHrkZVMhAN5ixriU5RwEFJ713rS0Uezj90Bfts
 skrift/controllers/web.py,sha256=J-kbmzwJcKfiBvNbF8yR7GHGo0jhvWzY77YstJi_pcI,2968
 skrift/db/__init__.py,sha256=uSghyDFT2K4SFiEqUzdjCGzWpS-Oy6Sd1FUappau-v0,52
 skrift/db/base.py,sha256=QJplFj9235kZdScASEpvyNHln6YW2hqbHwJEYZ3OSsc,173
+skrift/db/session.py,sha256=b2E4VeSIscPTEDBWQrketJbmUqLdWqdhqhUv7cojUkY,3237
 skrift/db/models/__init__.py,sha256=DtgYPLs8rTLNFmZ0-HzD_8uhvaGRtayZCrxpMhAo88U,413
 skrift/db/models/oauth_account.py,sha256=fzmApdtrRYeEWLl35Y7H0YtF7CWjzrpG-lknBOuYRc8,1840
 skrift/db/models/page.py,sha256=pYMWBmQ7FfDiFcyBU3xV4kbpWboimZw5TZtVDOcr73o,2068
@@ -54,11 +55,11 @@ skrift/lib/markdown.py,sha256=fPLUIAsmFXC64Os2RngQG7P2xRKBd1RO8fh7b5_gV1U,950
 skrift/lib/seo.py,sha256=3fAfXn_7Jpq_OhINpcbQznixLcJTbaD-I86_Je2SFoo,2512
 skrift/lib/template.py,sha256=4_urkRfvth75yNeQ5TyGTHvkvs3vVef7TcwZx0k285k,4226
 skrift/setup/__init__.py,sha256=3VjFPMES5y0M5cQ9R4C1xazqiEPEDqTPjX9-3rBMXnA,478
-skrift/setup/config_writer.py,sha256=YFH3FVjXN7Rum2fzGVPAQRkjdc9b0bHECDqMKYiEkhg,6347
+skrift/setup/config_writer.py,sha256=2yXwJ5TRcRnQAiRL2i0cyJ3KYnJJ-QUNUsCuSOCR7M0,6378
 skrift/setup/controller.py,sha256=v0Ey8T7ptJ5A3vOqQ1TUAXH1bQwA0288J5uyUWMihsw,34250
 skrift/setup/middleware.py,sha256=Nai8ZG2vHldngmAhq7kWzAwKRNcP5tHKhJHa5dCh404,2941
 skrift/setup/providers.py,sha256=0BFKB6168NcmtXxFF6ofHgEDMQD2FbXkexsqrARVtDI,7967
-skrift/setup/state.py,sha256=RMe9LtIjzDoOm9u-Nk5-KAnr_JBiQIjWDpTP9E30ezc,9304
+skrift/setup/state.py,sha256=3RJzdtRY-ZtTWsb9aLTw43lEvgnanXMAEhK7QQmaAU0,9321
 skrift/static/css/style.css,sha256=6in8KjmwythfQV9pGt-uSCJCoHG1OijrdDOOad7oYBk,22978
 skrift/templates/base.html,sha256=s6gylukPyBvb9StgNz8MRZr4h3QT3C8GTMiwOu23nC0,4421
 skrift/templates/error-404.html,sha256=sJrDaF3Or3Nyki8mxo3wBxLLzgy4wkB9p9wdS8pRA6k,409
@@ -84,7 +85,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.0a16.dist-info/METADATA,sha256=aS6GVqS-9stFAZ_wRa86gOZHVfr21BRUTi91wae8Vqo,7267
-skrift-0.1.0a16.dist-info/WHEEL,sha256=WLgqFyCfm_KASv4WHyYy0P3pM_m7J5L9k2skdKLirC8,87
-skrift-0.1.0a16.dist-info/entry_points.txt,sha256=uquZ5Mumqr0xwYTpTcNiJtFSITGfF6_QCCy2DZJSZig,42
-skrift-0.1.0a16.dist-info/RECORD,,
+skrift-0.1.0a17.dist-info/METADATA,sha256=TElTCDYHVD_CoTOzfB9htMyL2UfBHX2qYs28IIp3zt4,7267
+skrift-0.1.0a17.dist-info/WHEEL,sha256=WLgqFyCfm_KASv4WHyYy0P3pM_m7J5L9k2skdKLirC8,87
+skrift-0.1.0a17.dist-info/entry_points.txt,sha256=uquZ5Mumqr0xwYTpTcNiJtFSITGfF6_QCCy2DZJSZig,42
+skrift-0.1.0a17.dist-info/RECORD,,