cuneus 0.2.5__tar.gz → 0.2.6__tar.gz

cuneus-0.2.6/Makefile

@@ -0,0 +1,68 @@
+BASE_DIR		:= $(shell git rev-parse --show-toplevel 2>/dev/null || pwd)
+PROG_NAME		:= $(shell basename $(BASE_DIR))
+PYPROJECT		:= $(shell find . -name 'pyproject.toml')
+SHELL			:= /bin/bash
+UV_LOCK			:= uv.lock
+UV				?= uv
+VENV			:= .venv
+MARKER			:= $(VENV)/.installed
+
+################################################################
+#%
+#% Usage:
+#%   make <command>
+#%
+#% Getting Started:
+#%   make setup
+#%
+#% Run the tests locally:
+#%   make test
+#%
+#% Available Commands:
+help: ## Help is on the way
+	@echo " Tools for building, running, and testing $(PROG_NAME)"
+	@grep '^#%' $(MAKEFILE_LIST) | sed -e 's/#%//'
+	@grep '^[a-zA-Z]' $(MAKEFILE_LIST) | awk -F ':.*?## ' 'NF==2 {printf "   %-20s%s\n", $$1, $$2}' | sort
+
+# export env vars in order to be used in commands
+export PYTHONPATH ?= ./
+
+# uv creates the venv automatically, but this tracks if sync has been run
+$(MARKER): $(PYPROJECT) $(UV_LOCK)
+	$(UV) sync --all-extras
+	touch $(MARKER)
+
+.PHONY: install
+setup: $(MARKER) ## Install dependencies for the project
+
+.PHONY: update
+update: ## Update and lock dependencies
+	$(UV) lock
+	$(UV) sync
+	touch $(MARKER)
+
+.PHONY: clean
+clean: ## Remove virtual environment
+	rm -rf $(VENV)
+
+.PHONY: deps
+deps: $(MARKER) ## Run any dependencies for local dev and test
+	@echo "Starting deps..."
+
+.PHONY: dev
+dev: deps ## Run the application in dev mode
+	$(UV) run cuneus dev
+
+.PHONY: prod
+prod: deps ## Run the application in prod mode
+	$(UV) run cuneus prod
+
+.PHONY: test
+test: deps ## Run pytests
+	$(UV) run pytest
+
+.PHONY: test-failed
+test-failed: deps ## Re-Run pytest on tests that failed
+	$(UV) run pytest --lf
+
+

{cuneus-0.2.5 → cuneus-0.2.6}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: cuneus
-Version: 0.2.5
+Version: 0.2.6
 Summary: ASGI application wrapper
 Project-URL: Homepage, https://github.com/rmyers/cuneus
 Project-URL: Documentation, https://github.com/rmyers/cuneus#readme

{cuneus-0.2.5 → cuneus-0.2.6}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "cuneus"
-version = "0.2.5"
+version = "0.2.6"
 description = "ASGI application wrapper"
 readme = "README.md"
 authors = [{ name = "Robert Myers", email = "robert@julython.org" }]

{cuneus-0.2.5 → cuneus-0.2.6}/src/cuneus/cli.py

@@ -63,6 +63,8 @@ def dev(host: str, port: int) -> None:
         host=host,
         port=port,
         reload=True,
+        log_config=None,
+        server_header=False,
     )
 
 
@@ -81,6 +83,8 @@ def prod(host: str, port: int, workers: int) -> None:
         host=host,
         port=port,
         workers=workers,
+        log_config=None,
+        server_header=False,
     )
 
 

{cuneus-0.2.5 → cuneus-0.2.6}/src/cuneus/core/application.py

@@ -11,6 +11,7 @@ from contextlib import AsyncExitStack, asynccontextmanager
 from typing import Any, AsyncIterator, Callable
 
 import click
+import structlog
 import svcs
 from fastapi import FastAPI
 from starlette.middleware import Middleware
@@ -21,6 +22,7 @@ from .logging import LoggingExtension
 from .extensions import Extension, HasCLI, HasMiddleware
 from ..ext.health import HealthExtension
 
+logger = structlog.stdlib.get_logger("cuneus")
 
 type ExtensionInput = Extension | Callable[..., Extension]
 
@@ -128,8 +130,10 @@ def build_app(
 
     for ext in all_extensions:
         if isinstance(ext, HasMiddleware):
+            logger.debug(f"Loading middleware from {ext.__class__.__name__}")
             middleware.extend(ext.middleware())
         if isinstance(ext, HasCLI):
+            logger.debug(f"Adding cli commands from {ext.__class__.__name__}")
             ext.register_cli(app_cli)
 
     app = FastAPI(lifespan=lifespan, middleware=middleware, **fastapi_kwargs)

{cuneus-0.2.5 → cuneus-0.2.6}/src/cuneus/core/logging.py

@@ -20,6 +20,58 @@ from starlette.types import ASGIApp, Scope, Send, Receive
 from .extensions import BaseExtension
 from .settings import Settings
 
+logger = structlog.stdlib.get_logger("cuneus")
+
+
+def configure_structlog(settings: Settings | None = None) -> None:
+    log_settings = settings or Settings()
+
+    # Shared processors
+    shared_processors: list[structlog.types.Processor] = [
+        structlog.contextvars.merge_contextvars,
+        structlog.stdlib.add_log_level,
+        structlog.stdlib.add_logger_name,
+        structlog.stdlib.PositionalArgumentsFormatter(),
+        structlog.processors.TimeStamper(fmt="iso", utc=True),
+        structlog.processors.StackInfoRenderer(),
+        structlog.processors.UnicodeDecoder(),
+    ]
+
+    renderer: structlog.types.Processor = structlog.dev.ConsoleRenderer(colors=True)
+    if log_settings.log_json:
+        renderer = structlog.processors.JSONRenderer()
+
+    # Configure structlog
+    structlog.configure(
+        processors=shared_processors
+        + [
+            structlog.stdlib.ProcessorFormatter.wrap_for_formatter,
+        ],
+        logger_factory=structlog.stdlib.LoggerFactory(),
+        cache_logger_on_first_use=True,
+    )
+
+    # Create formatter for stdlib
+    formatter = structlog.stdlib.ProcessorFormatter(
+        foreign_pre_chain=shared_processors,
+        processors=[
+            structlog.stdlib.ProcessorFormatter.remove_processors_meta,
+            renderer,
+        ],
+    )
+
+    # Configure root logger
+    handler = logging.StreamHandler()
+    handler.setFormatter(formatter)
+
+    root_logger = logging.getLogger()
+    root_logger.handlers.clear()
+    root_logger.addHandler(handler)
+    root_logger.setLevel(log_settings.log_level.upper())
+
+    # Quiet noisy loggers
+    logging.getLogger("uvicorn.access").setLevel(logging.WARNING)
+
 
 class LoggingExtension(BaseExtension):
     """
@@ -40,56 +92,7 @@ class LoggingExtension(BaseExtension):
 
     def __init__(self, settings: Settings | None = None) -> None:
         self.settings = settings or Settings()
-        self._configure_structlog()
-
-    def _configure_structlog(self) -> None:
-        settings = self.settings
-
-        # Shared processors
-        shared_processors: list[structlog.types.Processor] = [
-            structlog.contextvars.merge_contextvars,
-            structlog.stdlib.add_log_level,
-            structlog.stdlib.add_logger_name,
-            structlog.stdlib.PositionalArgumentsFormatter(),
-            structlog.processors.TimeStamper(fmt="iso"),
-            structlog.processors.StackInfoRenderer(),
-            structlog.processors.UnicodeDecoder(),
-        ]
-
-        renderer: structlog.types.Processor = structlog.dev.ConsoleRenderer(colors=True)
-        if settings.log_json:
-            renderer = structlog.processors.JSONRenderer()
-
-        # Configure structlog
-        structlog.configure(
-            processors=shared_processors
-            + [
-                structlog.stdlib.ProcessorFormatter.wrap_for_formatter,
-            ],
-            logger_factory=structlog.stdlib.LoggerFactory(),
-            cache_logger_on_first_use=True,
-        )
-
-        # Create formatter for stdlib
-        formatter = structlog.stdlib.ProcessorFormatter(
-            foreign_pre_chain=shared_processors,
-            processors=[
-                structlog.stdlib.ProcessorFormatter.remove_processors_meta,
-                renderer,
-            ],
-        )
-
-        # Configure root logger
-        handler = logging.StreamHandler()
-        handler.setFormatter(formatter)
-
-        root_logger = logging.getLogger()
-        root_logger.handlers.clear()
-        root_logger.addHandler(handler)
-        root_logger.setLevel(settings.log_level.upper())
-
-        # Quiet noisy loggers
-        logging.getLogger("uvicorn.access").setLevel(logging.WARNING)
+        configure_structlog(settings)
 
     async def startup(self, registry: svcs.Registry, app: FastAPI) -> dict[str, Any]:
         # app.add_middleware(RequestLoggingMiddleware)
@@ -120,18 +123,24 @@ class LoggingMiddleware(BaseHTTPMiddleware):
     async def dispatch(
         self, request: Request, call_next: Callable[..., Awaitable[Response]]
     ) -> Response:
+        path = request.url.path
+        # Exclude health routes as these are just noise
+        # TODO(rmyers): make this configurable
+        if path.startswith("/health"):
+            return await call_next(request)
+
         request_id = request.headers.get(self.header_name) or str(uuid.uuid4())[:8]
 
         structlog.contextvars.clear_contextvars()
         structlog.contextvars.bind_contextvars(
             request_id=request_id,
             method=request.method,
-            path=request.url.path,
+            path=path,
         )
 
         request.state.request_id = request_id
 
-        log = structlog.get_logger()
+        log = structlog.stdlib.get_logger("cuneus")
         start_time = time.perf_counter()
 
         try:

{cuneus-0.2.5 → cuneus-0.2.6}/tests/test_integration.py

@@ -9,6 +9,6 @@ async def test_cuneus():
 
     with TestClient(app) as client:
         resp = client.get("/healthz")
-        assert resp.status_code == 200
+        assert resp.status_code == 201
 
         assert resp.json()["status"] == health.HealthStatus.HEALTHY

{cuneus-0.2.5 → cuneus-0.2.6}/uv.lock

@@ -249,7 +249,7 @@ toml = [
 
 [[package]]
 name = "cuneus"
-version = "0.2.4"
+version = "0.2.5"
 source = { editable = "." }
 dependencies = [
     { name = "click" },