httpware 0.8.3__tar.gz → 0.8.5__tar.gz

{httpware-0.8.3 → httpware-0.8.5}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: httpware
-Version: 0.8.3
+Version: 0.8.5
 Summary: Resilience-first async HTTP client framework for Python
 Keywords: http,async,client,resilience,retry,circuit-breaker,middleware,httpx,pydantic
 Author: Artur Shiriev

{httpware-0.8.3 → httpware-0.8.5}/pyproject.toml

@@ -26,7 +26,7 @@ classifiers = [
     "Topic :: Internet :: WWW/HTTP",
     "Framework :: AsyncIO",
 ]
-version = "0.8.3"
+version = "0.8.5"
 dependencies = [
     "httpx2>=2.0.0,<3.0",
 ]

httpware-0.8.5/src/httpware/_internal/import_checker.py

@@ -0,0 +1,26 @@
+"""Detect optional extras without importing them. Used by adapter modules to gate hard imports."""
+
+from importlib.metadata import PackageNotFoundError, distribution
+from importlib.util import find_spec
+
+
+def _is_distribution_installed(name: str) -> bool:
+    """Probe the package registry for a distribution by name. No sys.modules side effects."""
+    try:
+        distribution(name)
+    except PackageNotFoundError:
+        return False
+    return True
+
+
+is_msgspec_installed = find_spec("msgspec") is not None
+is_pydantic_installed = find_spec("pydantic") is not None
+# opentelemetry/ is a PEP 420 namespace package — instrumentation packages create the
+# directory even without opentelemetry-api. find_spec("opentelemetry") therefore returns
+# non-None regardless of whether the api package is present, and
+# find_spec("opentelemetry.trace") populates sys.modules with the namespace parent as a
+# CPython side-effect, breaking the isolation guarantee.
+# importlib.metadata.distribution probes the package registry instead: it returns the
+# distribution when opentelemetry-api is installed and raises PackageNotFoundError when
+# it is absent, with no sys.modules side effects.
+is_otel_installed = _is_distribution_installed("opentelemetry-api")

{httpware-0.8.3 → httpware-0.8.5}/src/httpware/_internal/observability.py

@@ -29,7 +29,9 @@ def _emit_event(
        ``trace.get_current_span().add_event(event_name, attributes=attributes)``.
        When no tracer is active, ``get_current_span()`` returns a ``NonRecordingSpan``
        whose ``add_event`` is a documented no-op — so the call is unconditional
-       behind the install gate.
+       behind the install gate. If the install gate is wrong (the namespace exists
+       but the api package is missing or broken), the lazy import raises
+       ``ImportError``; we degrade silently to log-only emission.
 
     The lazy ``from opentelemetry import trace`` inside the if-block preserves
     the optional-extras isolation invariant: ``import httpware`` must not pull
@@ -37,6 +39,10 @@ def _emit_event(
     """
     logger.log(level, message, extra=attributes)
     if import_checker.is_otel_installed:
-        from opentelemetry import trace  # noqa: PLC0415 — lazy by design (optional-extras isolation)
-
+        try:
+            from opentelemetry import trace  # noqa: PLC0415 — lazy by design (optional-extras isolation)
+        except ImportError:
+            # opentelemetry namespace exists but the api package is broken or missing —
+            # degrade to log-only emission. The structured log record above has already fired.
+            return
         trace.get_current_span().add_event(event_name, attributes=attributes)

{httpware-0.8.3 → httpware-0.8.5}/src/httpware/decoders/pydantic.py

@@ -1,19 +1,20 @@
 """PydanticDecoder — module-level cached TypeAdapter adapter for ResponseDecoder.
 
-Requires the `pydantic` extra: `pip install httpware[pydantic]`. Importing this
-module without the extra works (the `pydantic` import is guarded by a
-`find_spec` check), but instantiating the decoder raises `ImportError` with the
+Requires the `pydantic` extra: `pip install httpware[pydantic]`. The optional-extras
+gate is enforced upstream — `client.py:_default_pydantic_decoder()` raises
+ImportError when pydantic is absent, so this module is never imported in that
+path. Tests simulating "pydantic not installed" patch
+`import_checker.is_pydantic_installed=False` at runtime, after this module is
+already loaded; `PydanticDecoder.__init__` then raises ImportError with the
 install hint.
 """
 
 import functools
 from typing import TypeVar
 
-from httpware._internal import import_checker
-
+from pydantic import TypeAdapter
 
-if import_checker.is_pydantic_installed:
-    from pydantic import TypeAdapter
+from httpware._internal import import_checker
 
 
 MISSING_DEPENDENCY_MESSAGE = (

{httpware-0.8.3 → httpware-0.8.5}/src/httpware/middleware/chain.py

@@ -5,16 +5,14 @@ from collections.abc import Awaitable, Callable, Sequence
 
 import httpx2
 
-
-if typing.TYPE_CHECKING:
-    from httpware.middleware import AsyncMiddleware, Middleware
+from httpware.middleware import AsyncMiddleware, Middleware
 
 
 _AsyncNext: typing.TypeAlias = Callable[[httpx2.Request], Awaitable[httpx2.Response]]
 _Next: typing.TypeAlias = Callable[[httpx2.Request], httpx2.Response]
 
 
-def compose_async(middleware: "Sequence[AsyncMiddleware]", terminal: _AsyncNext) -> _AsyncNext:
+def compose_async(middleware: Sequence[AsyncMiddleware], terminal: _AsyncNext) -> _AsyncNext:
     """Fold `middleware` into a single callable around `terminal`.
 
     The first middleware in the sequence is the outermost wrapper.
@@ -25,14 +23,14 @@ def compose_async(middleware: "Sequence[AsyncMiddleware]", terminal: _AsyncNext)
     return dispatch
 
 
-def _wrap(layer: "AsyncMiddleware", inner: _AsyncNext) -> _AsyncNext:
+def _wrap(layer: AsyncMiddleware, inner: _AsyncNext) -> _AsyncNext:
     async def call(request: httpx2.Request) -> httpx2.Response:
         return await layer(request, inner)
 
     return call
 
 
-def compose(middleware: "Sequence[Middleware]", terminal: _Next) -> _Next:
+def compose(middleware: Sequence[Middleware], terminal: _Next) -> _Next:
     """Fold sync `middleware` into a single callable around sync `terminal`.
 
     The first middleware in the sequence is the outermost wrapper.
@@ -43,7 +41,7 @@ def compose(middleware: "Sequence[Middleware]", terminal: _Next) -> _Next:
     return dispatch
 
 
-def _wrap_sync(layer: "Middleware", inner: _Next) -> _Next:
+def _wrap_sync(layer: Middleware, inner: _Next) -> _Next:
     def call(request: httpx2.Request) -> httpx2.Response:
         return layer(request, inner)
 

httpware-0.8.3/src/httpware/_internal/import_checker.py

@@ -1,8 +0,0 @@
-"""Detect optional extras without importing them. Used by adapter modules to gate hard imports."""
-
-from importlib.util import find_spec
-
-
-is_msgspec_installed = find_spec("msgspec") is not None
-is_pydantic_installed = find_spec("pydantic") is not None
-is_otel_installed = find_spec("opentelemetry") is not None