cuneus 0.2.11__tar.gz → 0.2.13__tar.gz

{cuneus-0.2.11 → cuneus-0.2.13}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: cuneus
-Version: 0.2.11
+Version: 0.2.13
 Summary: ASGI application wrapper
 Project-URL: Homepage, https://github.com/rmyers/cuneus
 Project-URL: Documentation, https://github.com/rmyers/cuneus#readme
@@ -32,6 +32,7 @@ Requires-Dist: httpx>=0.27; extra == 'dev'
 Requires-Dist: mypy>=1.8; extra == 'dev'
 Requires-Dist: opentelemetry-api; extra == 'dev'
 Requires-Dist: opentelemetry-instrumentation; extra == 'dev'
+Requires-Dist: opentelemetry-instrumentation-fastapi; extra == 'dev'
 Requires-Dist: opentelemetry-sdk; extra == 'dev'
 Requires-Dist: pytest-asyncio>=0.23; extra == 'dev'
 Requires-Dist: pytest-cov>=4.0; extra == 'dev'

{cuneus-0.2.11 → cuneus-0.2.13}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "cuneus"
-version = "0.2.11"
+version = "0.2.13"
 description = "ASGI application wrapper"
 readme = "README.md"
 authors = [{ name = "Robert Myers", email = "robert@julython.org" }]
@@ -25,6 +25,7 @@ dev = [
     "opentelemetry-sdk",
     "opentelemetry-api",
     "opentelemetry-instrumentation",
+    "opentelemetry-instrumentation-fastapi",
     "pytest>=8.0",
     "pytest-asyncio>=0.23",
     "pytest-cov>=4.0",

{cuneus-0.2.11 → cuneus-0.2.13}/src/cuneus/core/application.py

@@ -16,7 +16,14 @@ from starlette.middleware import Middleware
 from .settings import Settings
 from .exceptions import ExceptionExtension
 from .logging import LoggingExtension
-from .extensions import Extension, HasCLI, HasExceptionHandler, HasMiddleware, HasRoutes
+from .extensions import (
+    Extension,
+    HasCLI,
+    HasExceptionHandler,
+    HasMiddleware,
+    HasPostAppHook,
+    HasRoutes,
+)
 from ..ext.health import HealthExtension
 from ..ext.server import ServerExtension
 
@@ -88,6 +95,10 @@ def build_app(
 
     settings = settings or Settings()
 
+    # Grab defaults for a few FastAPI args:
+    debug: bool = fastapi_kwargs.pop("debug", settings.debug)
+    version: str = fastapi_kwargs.pop("version", settings.version)
+
     all_inputs = (*DEFAULTS, *extensions) if include_defaults else extensions
 
     all_extensions = [_instantiate_extension(ext, settings) for ext in all_inputs]
@@ -125,11 +136,20 @@ def build_app(
             logger.debug(f"Adding cli commands from {ext_name}")
             ext.register_cli(app_cli)
 
-    app = FastAPI(lifespan=lifespan, middleware=middleware, **fastapi_kwargs)
+    app = FastAPI(
+        debug=debug,
+        version=version,
+        lifespan=lifespan,
+        middleware=middleware,
+        **fastapi_kwargs,
+    )
 
     # Preform post app initialization extension customization
     for ext in all_extensions:
         ext_name = ext.__class__.__name__
+        if isinstance(ext, HasPostAppHook):
+            logger.debug(f"Running post app hook from {ext_name}")
+            ext.post_app_hook(app)
         if isinstance(ext, HasExceptionHandler):
             logger.debug(f"Loading exception handlers from {ext_name}")
             ext.add_exception_handler(app)

{cuneus-0.2.11 → cuneus-0.2.13}/src/cuneus/core/exceptions.py

@@ -158,9 +158,12 @@ class ExceptionExtension(BaseExtension):
 
     def add_exception_handler(self, app: FastAPI) -> None:
         app.add_exception_handler(AppException, self._handle_app_exception)  # type: ignore[arg-type]
-        app.add_exception_handler(Exception, self._handle_unexpected_exception)
+        if self.settings.handle_unknown_errors:  # pragma: no branch
+            app.add_exception_handler(Exception, self._handle_unexpected_exception)
 
-    def _handle_app_exception(self, request: Request, exc: AppException) -> JSONResponse:
+    def _handle_app_exception(
+        self, request: Request, exc: AppException
+    ) -> JSONResponse:
         if exc.status_code >= 500 and self.settings.log_server_errors:
             log.exception("server_error", error_code=exc.error_code)
         else:
@@ -178,7 +181,9 @@ class ExceptionExtension(BaseExtension):
             headers=headers,
         )
 
-    def _handle_unexpected_exception(self, request: Request, exc: Exception) -> JSONResponse:
+    def _handle_unexpected_exception(
+        self, request: Request, exc: Exception
+    ) -> JSONResponse:
         log.exception("unexpected_error", exc_info=exc)
         response: dict[str, Any] = {
             "error": {

{cuneus-0.2.11 → cuneus-0.2.13}/src/cuneus/core/extensions.py

@@ -74,6 +74,13 @@ class HasRoutes(Protocol):
     def add_routes(self, app: FastAPI) -> None: ...  # pragma: no cover
 
 
+@runtime_checkable
+class HasPostAppHook(Protocol):
+    """Extension that modifies app after creation."""
+
+    def post_app_hook(self, app: FastAPI) -> None: ...  # pragma: no cover
+
+
 class BaseExtension:
     """
     Base class for extensions with explicit startup/shutdown hooks.

{cuneus-0.2.11 → cuneus-0.2.13}/src/cuneus/core/settings.py

@@ -50,14 +50,17 @@ class Settings(CuneusBaseSettings):
     app_name: str = "app"
     app_module: str = "app.main:app"
     cli_module: str = "app.main:cli"
+
+    # FastAPI settings
     debug: bool = False
-    version: str | None = None
+    version: str = "0.1.0"
 
     # logging
     log_level: str = "INFO"
     log_json: bool = False
     log_server_errors: bool = True
     request_id_header: str = "X-Request-ID"
+    handle_unknown_errors: bool = True
 
     # health
     health_enabled: bool = True

{cuneus-0.2.11 → cuneus-0.2.13}/src/cuneus/ext/otel.py

@@ -103,7 +103,8 @@ class OTelExtension(BaseExtension, HasMiddleware):
         excluded_paths: Paths to exclude from tracing
     """
 
-    _tracer_provider: TracerProvider
+    _tracer_provider: TracerProvider | None = None
+    _meter_provider: MeterProvider | None = None
 
     def __init__(
         self,
@@ -117,7 +118,7 @@ class OTelExtension(BaseExtension, HasMiddleware):
 
     async def startup(self, registry: svcs.Registry, app: FastAPI) -> dict[str, Any]:
         if not self.settings.enabled:
-            logger.info("OpenTelemetry disabled")
+            logger.debug("OpenTelemetry disabled")
             return {}
 
         resource = Resource.create(
@@ -146,20 +147,17 @@ class OTelExtension(BaseExtension, HasMiddleware):
                 self._tracer_provider.get_tracer(self.settings.service_name),
             )
 
-            self._setup_auto_instrumentation()
-
             logger.info(
                 "OpenTelemetry tracing started",
-                extra={
-                    "service": self.settings.service_name,
-                    "exporters": len(self._span_exporters),
-                },
+                service=self.settings.service_name,
+                num_exporters=len(self._span_exporters),
             )
 
         if self.settings.metrics_enabled:
             meter_provider = MeterProvider(resource=resource)
             metrics.set_meter_provider(meter_provider)
-            registry.register_value(MeterProvider, meter_provider)
+            self._meter_provider = meter_provider
+            registry.register_value(MeterProvider, self._meter_provider)
 
         return {"tracer_provider": self._tracer_provider}
 
@@ -179,14 +177,9 @@ class OTelExtension(BaseExtension, HasMiddleware):
             )
         ]
 
-    def _setup_auto_instrumentation(self) -> None:
+    def post_app_hook(self, app: FastAPI) -> None:
         """Setup auto-instrumentation based on settings."""
         instrumentors = [
-            (
-                self.settings.instrument_fastapi,
-                "opentelemetry.instrumentation.fastapi",
-                "FastAPIInstrumentor",
-            ),
             (
                 self.settings.instrument_sqlalchemy,
                 "opentelemetry.instrumentation.sqlalchemy",
@@ -208,6 +201,13 @@ class OTelExtension(BaseExtension, HasMiddleware):
             if enabled:
                 self._try_instrument(module, class_name)
 
+        if self.settings.instrument_fastapi:
+            from opentelemetry.instrumentation.fastapi import FastAPIInstrumentor
+
+            inst = FastAPIInstrumentor()
+            inst.instrument_app(app)
+            logger.debug("FastAPIInstrumentor auto-instrumentation enabled")
+
     def _try_instrument(self, module: str, class_name: str) -> None:
         try:
             mod = importlib.import_module(module)

{cuneus-0.2.11 → cuneus-0.2.13}/uv.lock

@@ -87,6 +87,15 @@ wheels = [
     { url = "https://files.pythonhosted.org/packages/2f/f5/c36551e93acba41a59939ae6a0fb77ddb3f2e8e8caa716410c65f7341f72/asgi_lifespan-2.1.0-py3-none-any.whl", hash = "sha256:ed840706680e28428c01e14afb3875d7d76d3206f3d5b2f2294e059b5c23804f", size = 10895, upload-time = "2023-03-28T17:35:47.772Z" },
 ]
 
+[[package]]
+name = "asgiref"
+version = "3.11.1"
+source = { registry = "https://pypi.org/simple" }
+sdist = { url = "https://files.pythonhosted.org/packages/63/40/f03da1264ae8f7cfdbf9146542e5e7e8100a4c66ab48e791df9a03d3f6c0/asgiref-3.11.1.tar.gz", hash = "sha256:5f184dc43b7e763efe848065441eac62229c9f7b0475f41f80e207a114eda4ce", size = 38550, upload-time = "2026-02-03T13:30:14.33Z" }
+wheels = [
+    { url = "https://files.pythonhosted.org/packages/5c/0a/a72d10ed65068e115044937873362e6e32fab1b7dce0046aeb224682c989/asgiref-3.11.1-py3-none-any.whl", hash = "sha256:e8667a091e69529631969fd45dc268fa79b99c92c5fcdda727757e52146ec133", size = 24345, upload-time = "2026-02-03T13:30:13.039Z" },
+]
+
 [[package]]
 name = "async-timeout"
 version = "5.0.1"
@@ -412,7 +421,7 @@ toml = [
 
 [[package]]
 name = "cuneus"
-version = "0.2.10"
+version = "0.2.13"
 source = { editable = "." }
 dependencies = [
     { name = "click" },
@@ -445,6 +454,7 @@ dev = [
     { name = "mypy" },
     { name = "opentelemetry-api" },
     { name = "opentelemetry-instrumentation" },
+    { name = "opentelemetry-instrumentation-fastapi" },
     { name = "opentelemetry-sdk" },
     { name = "pytest" },
     { name = "pytest-asyncio" },
@@ -472,6 +482,7 @@ requires-dist = [
     { name = "mypy", marker = "extra == 'dev'", specifier = ">=1.8" },
     { name = "opentelemetry-api", marker = "extra == 'dev'" },
     { name = "opentelemetry-instrumentation", marker = "extra == 'dev'" },
+    { name = "opentelemetry-instrumentation-fastapi", marker = "extra == 'dev'" },
     { name = "opentelemetry-sdk", marker = "extra == 'dev'" },
     { name = "pydantic", specifier = ">=2.0" },
     { name = "pydantic-settings", specifier = ">=2.0" },
@@ -1032,6 +1043,38 @@ wheels = [
     { url = "https://files.pythonhosted.org/packages/77/d2/6788e83c5c86a2690101681aeef27eeb2a6bf22df52d3f263a22cee20915/opentelemetry_instrumentation-0.60b1-py3-none-any.whl", hash = "sha256:04480db952b48fb1ed0073f822f0ee26012b7be7c3eac1a3793122737c78632d", size = 33096, upload-time = "2025-12-11T13:35:33.067Z" },
 ]
 
+[[package]]
+name = "opentelemetry-instrumentation-asgi"
+version = "0.60b1"
+source = { registry = "https://pypi.org/simple" }
+dependencies = [
+    { name = "asgiref" },
+    { name = "opentelemetry-api" },
+    { name = "opentelemetry-instrumentation" },
+    { name = "opentelemetry-semantic-conventions" },
+    { name = "opentelemetry-util-http" },
+]
+sdist = { url = "https://files.pythonhosted.org/packages/77/db/851fa88db7441da82d50bd80f2de5ee55213782e25dc858e04d0c9961d60/opentelemetry_instrumentation_asgi-0.60b1.tar.gz", hash = "sha256:16bfbe595cd24cda309a957456d0fc2523f41bc7b076d1f2d7e98a1ad9876d6f", size = 26107, upload-time = "2025-12-11T13:36:47.015Z" }
+wheels = [
+    { url = "https://files.pythonhosted.org/packages/76/76/1fb94367cef64420d2171157a6b9509582873bd09a6afe08a78a8d1f59d9/opentelemetry_instrumentation_asgi-0.60b1-py3-none-any.whl", hash = "sha256:d48def2dbed10294c99cfcf41ebbd0c414d390a11773a41f472d20000fcddc25", size = 16933, upload-time = "2025-12-11T13:35:40.462Z" },
+]
+
+[[package]]
+name = "opentelemetry-instrumentation-fastapi"
+version = "0.60b1"
+source = { registry = "https://pypi.org/simple" }
+dependencies = [
+    { name = "opentelemetry-api" },
+    { name = "opentelemetry-instrumentation" },
+    { name = "opentelemetry-instrumentation-asgi" },
+    { name = "opentelemetry-semantic-conventions" },
+    { name = "opentelemetry-util-http" },
+]
+sdist = { url = "https://files.pythonhosted.org/packages/9c/e7/e7e5e50218cf488377209d85666b182fa2d4928bf52389411ceeee1b2b60/opentelemetry_instrumentation_fastapi-0.60b1.tar.gz", hash = "sha256:de608955f7ff8eecf35d056578346a5365015fd7d8623df9b1f08d1c74769c01", size = 24958, upload-time = "2025-12-11T13:36:59.35Z" }
+wheels = [
+    { url = "https://files.pythonhosted.org/packages/7d/cc/6e808328ba54662e50babdcab21138eae4250bc0fddf67d55526a615a2ca/opentelemetry_instrumentation_fastapi-0.60b1-py3-none-any.whl", hash = "sha256:af94b7a239ad1085fc3a820ecf069f67f579d7faf4c085aaa7bd9b64eafc8eaf", size = 13478, upload-time = "2025-12-11T13:36:00.811Z" },
+]
+
 [[package]]
 name = "opentelemetry-sdk"
 version = "1.39.1"
@@ -1059,6 +1102,15 @@ wheels = [
     { url = "https://files.pythonhosted.org/packages/7a/5e/5958555e09635d09b75de3c4f8b9cae7335ca545d77392ffe7331534c402/opentelemetry_semantic_conventions-0.60b1-py3-none-any.whl", hash = "sha256:9fa8c8b0c110da289809292b0591220d3a7b53c1526a23021e977d68597893fb", size = 219982, upload-time = "2025-12-11T13:32:36.955Z" },
 ]
 
+[[package]]
+name = "opentelemetry-util-http"
+version = "0.60b1"
+source = { registry = "https://pypi.org/simple" }
+sdist = { url = "https://files.pythonhosted.org/packages/50/fc/c47bb04a1d8a941a4061307e1eddfa331ed4d0ab13d8a9781e6db256940a/opentelemetry_util_http-0.60b1.tar.gz", hash = "sha256:0d97152ca8c8a41ced7172d29d3622a219317f74ae6bb3027cfbdcf22c3cc0d6", size = 11053, upload-time = "2025-12-11T13:37:25.115Z" }
+wheels = [
+    { url = "https://files.pythonhosted.org/packages/16/5c/d3f1733665f7cd582ef0842fb1d2ed0bc1fba10875160593342d22bba375/opentelemetry_util_http-0.60b1-py3-none-any.whl", hash = "sha256:66381ba28550c91bee14dcba8979ace443444af1ed609226634596b4b0faf199", size = 8947, upload-time = "2025-12-11T13:36:37.151Z" },
+]
+
 [[package]]
 name = "packaging"
 version = "25.0"