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

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

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: skrift
-Version: 0.1.0a12
+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.0a12.dist-info → skrift-0.1.0a13.dist-info}/RECORD

@@ -3,7 +3,7 @@ skrift/__main__.py,sha256=wt6JZL9nBhKU36vdyurhOEtWy7w3C9zohyy24PLcKho,164
 skrift/alembic.ini,sha256=mYguI6CbMCTyfHctsGiTyf9Z5gv21FdeI3qtfgOHO3A,1815
 skrift/asgi.py,sha256=qtP0aq9C6-bIZgbXiwJeF_3dY8O0cM2U_5hkajKMjBc,23032
 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
@@ -68,7 +68,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.0a13.dist-info/METADATA,sha256=cNzAjQrohmMJZJv-euANW_JjoWI5Lm6KSzG0daFjT7o,6436
+skrift-0.1.0a13.dist-info/WHEEL,sha256=WLgqFyCfm_KASv4WHyYy0P3pM_m7J5L9k2skdKLirC8,87
+skrift-0.1.0a13.dist-info/entry_points.txt,sha256=uquZ5Mumqr0xwYTpTcNiJtFSITGfF6_QCCy2DZJSZig,42
+skrift-0.1.0a13.dist-info/RECORD,,