servicekit 3.0.0__tar.gz → 3.1.0__tar.gz

{servicekit-3.0.0 → servicekit-3.1.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.3
 Name: servicekit
-Version: 3.0.0
+Version: 3.1.0
 Summary: Async SQLAlchemy framework with FastAPI integration - reusable foundation for building data services
 Keywords: fastapi,sqlalchemy,async,database,rest-api,crud,framework
 Author: Morten Hansen

{servicekit-3.0.0 → servicekit-3.1.0}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "servicekit"
-version = "3.0.0"
+version = "3.1.0"
 description = "Async SQLAlchemy framework with FastAPI integration - reusable foundation for building data services"
 readme = "README.md"
 requires-python = ">=3.13,<3.14"
@@ -84,6 +84,7 @@ select = [
     "F",
     "I",
     "D",
+    "S",
 ]
 ignore = [
     "D203",
@@ -97,7 +98,15 @@ known-third-party = ["alembic"]
 convention = "google"
 
 [tool.ruff.lint.per-file-ignores]
-"tests/**/*.py" = ["D"]
+"tests/**/*.py" = [
+    "D",
+    "S101",
+    "S104",
+    "S105",
+    "S108",
+    "S603",
+    "S607",
+]
 "**/__init__.py" = ["D104"]
 "src/**/*.py" = [
     "D102",

{servicekit-3.0.0 → servicekit-3.1.0}/pyproject.toml.orig

@@ -1,6 +1,6 @@
 [project]
 name = "servicekit"
-version = "3.0.0"
+version = "3.1.0"
 description = "Async SQLAlchemy framework with FastAPI integration - reusable foundation for building data services"
 readme = "README.md"
 authors = [{ name = "Morten Hansen", email = "morten@dhis2.org" }]
@@ -73,7 +73,7 @@ line-length = 120
 
 [tool.ruff.lint]
 fixable = ["ALL"]
-select = ["E", "W", "F", "I", "D"]
+select = ["E", "W", "F", "I", "D", "S"]
 ignore = ["D203", "D213"]
 
 [tool.ruff.lint.isort]
@@ -83,7 +83,7 @@ known-third-party = ["alembic"]
 convention = "google"
 
 [tool.ruff.lint.per-file-ignores]
-"tests/**/*.py" = ["D"]
+"tests/**/*.py" = ["D", "S101", "S104", "S105", "S108", "S603", "S607"]
 "**/__init__.py" = ["D104"]
 "src/**/*.py" = ["D102", "D105", "D107"]
 "examples/**/*.py" = []

{servicekit-3.0.0 → servicekit-3.1.0}/src/servicekit/api/monitoring.py

@@ -56,7 +56,8 @@ def setup_monitoring(
     # Auto-instrument SQLAlchemy - only once globally
     if not _sqlalchemy_instrumented:
         try:
-            SQLAlchemyInstrumentor().instrument()
+            # The instrumentor's declared range lags SQLAlchemy releases (0.66b1 stops below 2.1) and works on 2.1.
+            SQLAlchemyInstrumentor().instrument(skip_dep_check=True)
             _sqlalchemy_instrumented = True
         except RuntimeError:
             # Already instrumented

{servicekit-3.0.0 → servicekit-3.1.0}/src/servicekit/api/registration.py

@@ -6,7 +6,7 @@ import socket
 from dataclasses import dataclass
 from typing import Any
 
-import httpx
+import httpx2 as httpx
 from pydantic import BaseModel, ConfigDict, SerializeAsAny
 
 from servicekit.logging import get_logger

{servicekit-3.0.0 → servicekit-3.1.0}/src/servicekit/api/service_builder.py

@@ -39,7 +39,7 @@ type DependencyOverride = Callable[..., object]
 type LifespanFactory = Callable[[FastAPI], AsyncContextManager[None]]
 
 # Header the readiness probe sends and expects echoed back, so it only accepts its own app
-_READINESS_TOKEN_HEADER = "x-servicekit-readiness-token"
+_READINESS_TOKEN_HEADER = "x-servicekit-readiness-token"  # noqa: S105
 _DEFAULT_LOCAL_PORT = 8000
 
 
@@ -998,7 +998,7 @@ async def _wait_until_ready(
     timeout: float = 30.0,
 ) -> int | None:
     """Poll the candidate local ports until this app serves requests, returning the ready port or None."""
-    import httpx
+    import httpx2 as httpx
 
     path = health_path or "/"
     check_kind = "health" if health_path else "tcp"
@@ -1010,7 +1010,7 @@ async def _wait_until_ready(
             try:
                 async with httpx.AsyncClient() as client:
                     response = await client.get(f"http://127.0.0.1:{port}{path}", headers=headers, timeout=2.0)
-            except Exception:
+            except httpx.TransportError:
                 continue
             # Something else listening on a candidate port (e.g. the orchestrator itself) is not us
             if response.headers.get(_READINESS_TOKEN_HEADER) != token:

{servicekit-3.0.0 → servicekit-3.1.0}/src/servicekit/database.py

@@ -211,8 +211,9 @@ class SqliteDatabase(Database):
             try:
                 async with self.engine.begin() as conn:
                     await conn.exec_driver_sql("PRAGMA wal_checkpoint(TRUNCATE);")
-            except Exception:
-                pass  # Don't fail dispose on checkpoint error
+            except Exception as e:
+                # Don't fail dispose on checkpoint error
+                get_logger(__name__).warning("database.wal_checkpoint_failed", error=str(e))
         await super().dispose()