skrift 0.1.0a11__tar.gz → 0.1.0a13__tar.gz

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

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

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

@@ -1,6 +1,6 @@
 [project]
 name = "skrift"
-version = "0.1.0a11"
+version = "0.1.0a13"
 description = "A lightweight async Python CMS for crafting modern websites"
 readme = "README.md"
 requires-python = ">=3.13"

{skrift-0.1.0a11 → skrift-0.1.0a13}/skrift/asgi.py

@@ -416,6 +416,7 @@ def create_app() -> Litestar:
         httponly=True,
         secure=not settings.debug,
         samesite="lax",
+        domain=settings.session.cookie_domain,
     )
 
     # Template configuration

{skrift-0.1.0a11 → skrift-0.1.0a13}/skrift/config.py

@@ -133,6 +133,12 @@ class DummyProviderConfig(BaseModel):
 ProviderConfig = OAuthProviderConfig | DummyProviderConfig
 
 
+class SessionConfig(BaseModel):
+    """Session cookie configuration."""
+
+    cookie_domain: str | None = None  # None = exact host only
+
+
 class AuthConfig(BaseModel):
     """Authentication configuration."""
 
@@ -177,6 +183,9 @@ class Settings(BaseSettings):
     # Auth config (loaded from app.yaml)
     auth: AuthConfig = AuthConfig()
 
+    # Session config (loaded from app.yaml)
+    session: SessionConfig = SessionConfig()
+
 
 def clear_settings_cache() -> None:
     """Clear the settings cache to force reload."""
@@ -220,28 +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 updates:
-        return base_settings.model_copy(update=updates)
+    if "session" in app_config:
+        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)