haiway 0.22.0__py3-none-any.whl → 0.23.0__py3-none-any.whl

haiway/context/access.py

@@ -539,6 +539,8 @@ class ctx:
     def check_state[StateType: State](
         state: type[StateType],
         /,
+        *,
+        instantiate_defaults: bool = False,
     ) -> bool:
         """
         Check if state object is available in the current context.
@@ -551,12 +553,18 @@ class ctx:
         state: type[StateType]
             The type of state to check
 
+        instantiate_defaults: bool = False
+            Control if default value should be instantiated during check.
+
         Returns
         -------
         bool
             True if state is available, otherwise False.
         """
-        return StateContext.check_state(state)
+        return StateContext.check_state(
+            state,
+            instantiate_defaults=instantiate_defaults,
+        )
 
     @staticmethod
     def state[StateType: State](

haiway/context/disposables.py

@@ -12,7 +12,7 @@ from itertools import chain
 from types import TracebackType
 from typing import Any, final
 
-from haiway.context.state import ScopeState, StateContext
+from haiway.context.state import StateContext
 from haiway.state import State
 from haiway.utils.mimic import mimic_function
 
@@ -195,19 +195,25 @@ class Disposables:
                 return multiple
 
     async def prepare(self) -> Iterable[State]:
+        """
+        Enter all contained disposables asynchronously.
+
+        Enters all disposables in parallel and collects any State objects they return.
+        """
         assert self._loop is None  # nosec: B101
         object.__setattr__(
             self,
             "_loop",
             get_running_loop(),
         )
-        return [
-            *chain.from_iterable(
+
+        return tuple(
+            chain.from_iterable(
                 await gather(
                     *[self._setup(disposable) for disposable in self._disposables],
                 )
             )
-        ]
+        )
 
     async def __aenter__(self) -> None:
         """
@@ -218,7 +224,7 @@ class Disposables:
         """
 
         assert self._state_context is None, "Context reentrance is not allowed"  # nosec: B101
-        state_context = StateContext(state=ScopeState(await self.prepare()))
+        state_context = StateContext.updated(await self.prepare())
         state_context.__enter__()
         object.__setattr__(
             self,
@@ -252,6 +258,26 @@ class Disposables:
         exc_val: BaseException | None = None,
         exc_tb: TracebackType | None = None,
     ) -> None:
+        """
+        Exit all contained disposables asynchronously.
+
+        Properly disposes of all resources by calling their __aexit__ methods in parallel.
+        If multiple disposables raise exceptions, they are collected into a BaseExceptionGroup.
+
+        Parameters
+        ----------
+        exc_type: type[BaseException] | None
+            The type of exception that caused the context to be exited
+        exc_val: BaseException | None
+            The exception that caused the context to be exited
+        exc_tb: TracebackType | None
+            The traceback for the exception that caused the context to be exited
+
+        Raises
+        ------
+        BaseExceptionGroup
+            If multiple disposables raise exceptions during exit
+        """
         assert self._loop is not None  # nosec: B101
         results: list[bool | BaseException | None]
 
@@ -306,6 +332,7 @@ class Disposables:
 
         Properly disposes of all resources by calling their __aexit__ methods in parallel.
         If multiple disposables raise exceptions, they are collected into a BaseExceptionGroup.
+        Additionally, produced state context will be also exited resetting state to previous.
 
         Parameters
         ----------

haiway/context/observability.py

@@ -403,7 +403,7 @@ def _logger_observability(
             f"[{trace_id_hex}] {scope.unique_name} Recorded attributes: {format_str(attributes)}",
         )
 
-    def scope_entering[Metric: State](
+    def scope_entering(
         scope: ScopeIdentifier,
         /,
     ) -> None:
@@ -412,7 +412,7 @@ def _logger_observability(
             f"[{trace_id_hex}] {scope.unique_name} Entering scope: {scope.label}",
         )
 
-    def scope_exiting[Metric: State](
+    def scope_exiting(
         scope: ScopeIdentifier,
         /,
         *,

haiway/context/state.py

@@ -37,6 +37,7 @@ class ScopeState:
             "_state",
             {type(element): element for element in state},
         )
+        assert all(issubclass(key, State) for key in self._state.keys())  # nosec: B101
         self._lock: Lock
         object.__setattr__(
             self,
@@ -67,6 +68,8 @@ class ScopeState:
         self,
         state: type[StateType],
         /,
+        *,
+        instantiate_defaults: bool = False,
     ) -> bool:
         """
         Check state object availability by its type.
@@ -79,6 +82,9 @@ class ScopeState:
         state: type[StateType]
             The type of state to check
 
+        instantiate_defaults: bool = False
+            Control if default value should be instantiated during check.
+
         Returns
         -------
         bool
@@ -87,7 +93,7 @@ class ScopeState:
         if state in self._state:
             return True
 
-        else:
+        elif instantiate_defaults:
             with self._lock:
                 if state in self._state:
                     return True
@@ -100,6 +106,9 @@ class ScopeState:
                 except BaseException:
                     return False  # unavailable, we don't care the exception
 
+        else:
+            return False
+
     def state[StateType: State](
         self,
         state: type[StateType],
@@ -201,6 +210,7 @@ class StateContext:
         cls,
         state: type[StateType],
         /,
+        instantiate_defaults: bool = False,
     ) -> bool:
         """
         Check if state object is available in the current context.
@@ -212,13 +222,19 @@ class StateContext:
         state: type[StateType]
             The type of state to check
 
+        instantiate_defaults: bool = False
+            Control if default value should be instantiated during check.
+
         Returns
         -------
         bool
             True if state is available, otherwise False.
         """
         try:
-            return cls._context.get().check_state(state)
+            return cls._context.get().check_state(
+                state,
+                instantiate_defaults=instantiate_defaults,
+            )
 
         except LookupError:
             return False  # no context no state

haiway/helpers/__init__.py

@@ -5,7 +5,7 @@ from haiway.helpers.files import File, FileAccess
 from haiway.helpers.observability import LoggerObservability
 from haiway.helpers.retries import retry
 from haiway.helpers.throttling import throttle
-from haiway.helpers.timeouted import timeout
+from haiway.helpers.timeouting import timeout
 from haiway.helpers.tracing import traced
 
 __all__ = (

haiway/helpers/observability.py

@@ -6,7 +6,6 @@ from uuid import UUID, uuid4
 
 from haiway.context import Observability, ObservabilityLevel, ScopeIdentifier
 from haiway.context.observability import ObservabilityAttribute
-from haiway.state import State
 from haiway.utils.formatting import format_str
 
 __all__ = ("LoggerObservability",)
@@ -232,7 +231,7 @@ def LoggerObservability(  # noqa: C901, PLR0915
             f"[{trace_id_hex}] {scope.unique_name} {attributes_str}",
         )
 
-    def scope_entering[Metric: State](
+    def scope_entering(
         scope: ScopeIdentifier,
         /,
     ) -> None:
@@ -255,7 +254,7 @@ def LoggerObservability(  # noqa: C901, PLR0915
             f"[{trace_id_hex}] {scope.unique_name} Entering scope: {scope.label}",
         )
 
-    def scope_exiting[Metric: State](
+    def scope_exiting(
         scope: ScopeIdentifier,
         /,
         *,

haiway/opentelemetry/observability.py

@@ -1,5 +1,5 @@
 import os
-from collections.abc import Mapping
+from collections.abc import Mapping, Sequence
 from typing import Any, ClassVar, Self, cast, final
 from uuid import UUID
 
@@ -26,12 +26,16 @@ from opentelemetry.sdk.metrics.export import ConsoleMetricExporter, PeriodicExpo
 from opentelemetry.sdk.resources import Resource
 from opentelemetry.sdk.trace import TracerProvider
 from opentelemetry.sdk.trace.export import BatchSpanProcessor, ConsoleSpanExporter, SpanExporter
-from opentelemetry.trace import Span, StatusCode, Tracer
-from opentelemetry.trace.span import SpanContext
-
-from haiway.context import Observability, ObservabilityLevel, ScopeIdentifier
-from haiway.context.observability import ObservabilityAttribute
-from haiway.state import State
+from opentelemetry.sdk.trace.id_generator import RandomIdGenerator
+from opentelemetry.trace import Link, Span, SpanContext, StatusCode, TraceFlags, Tracer
+
+from haiway.context import (
+    Observability,
+    ObservabilityAttribute,
+    ObservabilityLevel,
+    ScopeIdentifier,
+    ctx,
+)
 from haiway.types import MISSING
 
 __all__ = ("OpenTelemetry",)
@@ -437,6 +441,8 @@ class OpenTelemetry:
     def observability(  # noqa: C901, PLR0915
         cls,
         level: ObservabilityLevel = ObservabilityLevel.INFO,
+        *,
+        external_trace_id: str | None = None,
     ) -> Observability:
         """
         Create an Observability implementation using OpenTelemetry.
@@ -449,6 +455,9 @@ class OpenTelemetry:
         ----------
         level : ObservabilityLevel, default=ObservabilityLevel.INFO
             The minimum observability level to record
+        external_trace_id : str | None, optional
+            External trace ID for distributed tracing context propagation.
+            If provided, the root span will be linked to this external trace.
 
         Returns
         -------
@@ -645,7 +654,7 @@ class OpenTelemetry:
 
             scopes[scope.scope_id].record_attributes(attributes)
 
-        def scope_entering[Metric: State](
+        def scope_entering(
             scope: ScopeIdentifier,
             /,
         ) -> None:
@@ -678,17 +687,44 @@ class OpenTelemetry:
             scope_store: ScopeStore
             if root_scope is None:
                 meter = metrics.get_meter(scope.label)
-                context: Context = Context(
-                    **get_current(),
-                    # trace_id=scope.trace_id,
-                    # span_id=scope.scope_id,
-                )
+                context: Context = get_current()
+
+                # Handle distributed tracing with external trace ID
+                links: Sequence[Link] | None = None
+                if external_trace_id is not None:
+                    # Convert external trace ID to OpenTelemetry trace ID format
+                    try:
+                        # Generate a proper span ID for the external trace link
+                        id_generator = RandomIdGenerator()
+
+                        # Create a link to the external trace
+                        links = (
+                            Link(
+                                SpanContext(
+                                    (  # Assume external_trace_id is a hex string, convert to int
+                                        int(external_trace_id, 16)
+                                        if isinstance(external_trace_id, str)
+                                        else int(external_trace_id)
+                                    ),
+                                    id_generator.generate_span_id(),  # Generate proper span ID
+                                    True,  # is_remote=True
+                                    TraceFlags.SAMPLED,  # pyright: ignore[reportArgumentType]
+                                )
+                            ),
+                        )
+
+                    except (ValueError, TypeError):
+                        ctx.log_warning(
+                            "Failed to convert external trace ID to OpenTelemetry format"
+                        )
+
                 scope_store = ScopeStore(
                     scope,
                     context=context,
                     span=tracer.start_span(
                         name=scope.label,
                         context=context,
+                        links=links,
                     ),
                     meter=meter,
                     logger=get_logger(scope.label),
@@ -711,7 +747,7 @@ class OpenTelemetry:
 
             scopes[scope.scope_id] = scope_store
 
-        def scope_exiting[Metric: State](
+        def scope_exiting(
             scope: ScopeIdentifier,
             /,
             *,

haiway/state/structure.py

@@ -729,12 +729,22 @@ class State(metaclass=StateMeta):
         )
 
     def __hash__(self) -> int:
-        return hash(
-            (
-                self.__class__,
-                *tuple(getattr(self, key, MISSING) for key in sorted(self.__ATTRIBUTES__.keys())),
-            )
-        )
+        hash_values: list[int] = []
+        for key in self.__ATTRIBUTES__.keys():
+            value: Any = getattr(self, key, MISSING)
+
+            # Skip MISSING values to ensure consistent hashing
+            if value is MISSING:
+                continue
+
+            # Convert to hashable representation
+            try:
+                hash_values.append(hash(value))
+
+            except TypeError:
+                continue  # skip unhashable
+
+        return hash((self.__class__, tuple(hash_values)))
 
     def __setattr__(
         self,

haiway/utils/__init__.py

@@ -9,7 +9,6 @@ from haiway.utils.env import (
     load_env,
 )
 from haiway.utils.formatting import format_str
-from haiway.utils.freezing import freeze
 from haiway.utils.logs import setup_logging
 from haiway.utils.mimic import mimic_function
 from haiway.utils.noop import async_noop, noop
@@ -27,7 +26,6 @@ __all__ = (
     "async_always",
     "async_noop",
     "format_str",
-    "freeze",
     "getenv_base64",
     "getenv_bool",
     "getenv_float",

{haiway-0.22.0.dist-info → haiway-0.23.0.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: haiway
-Version: 0.22.0
+Version: 0.23.0
 Summary: Framework for dependency injection and state management within structured concurrency model.
 Project-URL: Homepage, https://miquido.com
 Project-URL: Repository, https://github.com/miquido/haiway.git

{haiway-0.22.0.dist-info → haiway-0.23.0.dist-info}/RECORD

@@ -1,46 +1,45 @@
 haiway/__init__.py,sha256=FiOAMHHawyGk9FfZU-1UflT8nmwu9J0CrG2QwrJGccw,1917
 haiway/py.typed,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 haiway/context/__init__.py,sha256=1N_SvdPkTfIZDZybm3y0rY2dGrDLWTm0ryzUz2XD4f8,1174
-haiway/context/access.py,sha256=j5wC0kluFEb1NpTsUG7fgFVklfeNCqb0dygK1VIdLuo,25485
-haiway/context/disposables.py,sha256=yRABVbUJIMP6r5oqO-Yl4y20ulhlDuQ2lLnI25QCltg,10495
+haiway/context/access.py,sha256=QCabyZtqqJjGTgAod1ZC3Fz3IfPsyurLo_i68RnCm4Q,25736
+haiway/context/disposables.py,sha256=AP9eZ0BPHJZfjrrfrjSzr4jONMKkR6YmhjOfnBp37so,11504
 haiway/context/identifier.py,sha256=dCCwLneXJzH__ZWFlGRUHvoCmbT4lM0QVbyokYIbUHg,5255
-haiway/context/observability.py,sha256=gLKbMPNvt5ozrfyc4TGahN8A_dFFtyCjUIMZu9_wZHA,23722
-haiway/context/state.py,sha256=Ni6NUbRYKmgi7HhvosrVH62IzfalLDUH7VYRwpUiQ78,11426
+haiway/context/observability.py,sha256=E-TDqqJ_EnHkFTspEjyA61O0iIbEev15YUn5d3yHhvU,23692
+haiway/context/state.py,sha256=Codc_F5Ngsk4x80nkNuwpvXpZ-mht3joOgcgJ7vKpVg,12000
 haiway/context/tasks.py,sha256=pScFgeiyrXSJRDFZiYbBLi3k_DHkSlhB8rgAnYtgyrU,4925
 haiway/context/types.py,sha256=VDWXJySihfvSSPzY09PaGk6j5S9HgmAUboBGCZ8o_4k,766
-haiway/helpers/__init__.py,sha256=uEJATJOiqRWeOPMjrGdn_CmWvwrlUQ1gmrau4XsBgUk,720
+haiway/helpers/__init__.py,sha256=PTWpavAveEB2V9Au1QuaRZwh3Rkb1bQSNvo_mxuGqlE,721
 haiway/helpers/asynchrony.py,sha256=Ddj8UdXhVczAbAC-rLpyhWa4RJ_W2Eolo45Veorq7_4,5362
 haiway/helpers/caching.py,sha256=BqgcUGQSAmXsuLi5V8EwlZzuGyutHOn1V4k7BHsGKeg,14347
 haiway/helpers/concurrent.py,sha256=xGMcan_tiETAHQs1YFmgYpA4YMFo6rIbFKvNeMlRFG8,2551
 haiway/helpers/files.py,sha256=L6vXd8gdgWx5jPL8azloU8IGoFq2xnxjMc4ufz-gdl4,11650
-haiway/helpers/observability.py,sha256=3G0eRE1WYTGRujS0mxzYbLR4MlKnoYllE8cu2Eb_23w,11073
+haiway/helpers/observability.py,sha256=jCJzOPJ5E3RKJsbbGRR1O-mZydaHNIGkIpppOH7nFBA,11012
 haiway/helpers/retries.py,sha256=52LA85HejTiSmCmTMAA9c8oUqD_VnhbTn1b3kwlU52c,9032
 haiway/helpers/throttling.py,sha256=KBWUSHdKVMC5_nRMmmoPNwfp-3AcerQ6OczJa9gNLM0,5796
-haiway/helpers/timeouted.py,sha256=GQ8-btb36f0Jq7TnorAPYXyKScNmf0nxHXCYxqGl-o8,3949
+haiway/helpers/timeouting.py,sha256=GQ8-btb36f0Jq7TnorAPYXyKScNmf0nxHXCYxqGl-o8,3949
 haiway/helpers/tracing.py,sha256=NHipA5UlngwFcAaKhXg1jTuJ-ti6AqSNxE7u7-92vWo,5409
 haiway/opentelemetry/__init__.py,sha256=TV-1C14mDAtcHhFZ29ActFQdrGH6x5KuGV9w-JlKYJg,91
-haiway/opentelemetry/observability.py,sha256=5fsHsFgjcxUcA0hIOM18lVvVdYSRO91ER52PticyzyU,25734
+haiway/opentelemetry/observability.py,sha256=akGAPX6_958BxCfzlLnoDJHPtEvztdMnfMA1oiJL48Y,27370
 haiway/state/__init__.py,sha256=AaMqlMhO4zKS_XNevy3A7BHh5PxmguA-Sk_FnaNDY1Q,355
 haiway/state/attributes.py,sha256=sububiFP23aBB8RGk6OvTUp7BEY6S0kER_uHC09yins,26733
 haiway/state/path.py,sha256=bv5MI3HmUyku78k0Sz5lc7Q_Bay53iom1l3AL5KZs-4,32143
 haiway/state/requirement.py,sha256=zNTx7s8FiMZKu9EV3T6f1SOJpR4SC9X5hhL--PVWPCY,15641
-haiway/state/structure.py,sha256=XzPDCrFUSy-PKVzI9G6TqechRW3nXSbTK7f_AhxCzq4,23481
+haiway/state/structure.py,sha256=CTf1l0TyKA7vkVDqA9RMdxaOVNSHwQduN2jb6H015hg,23798
 haiway/state/validation.py,sha256=eDOZKRrfd-dmdbqoHcLacdCVKmVCEpwt239EG6ljNF8,23557
 haiway/types/__init__.py,sha256=jFr5kf36SvVGdgngvik6_HzG8YNa3NVsdDDSqxVuGm4,281
 haiway/types/default.py,sha256=59chcOaoGqI2to08RamCCLluimfYbJp5xbYl3fWaLrM,4153
 haiway/types/missing.py,sha256=OfiyYUnzTk3arKWu8S6ORCEYGvcRu_mdL4j1ExdSvgI,4256
-haiway/utils/__init__.py,sha256=HOylRgBEa0uNxEuPBupaJ28l4wEQiy98cGJi2Gtirr4,972
+haiway/utils/__init__.py,sha256=Zs4mJnoRL_4ssGSZqvCFuhllxMDww_8-McsI2xB0mug,917
 haiway/utils/always.py,sha256=dd6jDQ1j4DpJjTKO1J2Tv5xS8X1LnMC4kQ0D7DtKUvw,1230
 haiway/utils/collections.py,sha256=gF5tC1EaEzBfPpXrHqR0mZh8e4pRwEPSVactvfN-30M,4737
 haiway/utils/env.py,sha256=Z0uHJDFegvgzy-gM-f0uPMha9_1ldUglrD5SKNJsvYE,9445
 haiway/utils/formatting.py,sha256=jgSIGalGUBZVo2ziiNC5Y7vBYbAEwPugOiwEOrNFTcI,4039
-haiway/utils/freezing.py,sha256=HJH0SOgPCreb9o0wPeaMPMxhS9JDuzzey6UsKhuvUJU,1292
 haiway/utils/logs.py,sha256=NuwoqKQnMNi1FMIA91cVFnAPefUFeg3UIT50IOl3sJk,1571
 haiway/utils/mimic.py,sha256=xaZiUKp096QFfdSw7cNIKEWt2UIS7vf880KF54gny38,1831
 haiway/utils/noop.py,sha256=U8ocfoCgt-pY0owJDPtrRrj53cabeIXH9qCKWMQnoRk,1336
 haiway/utils/queue.py,sha256=6v2u3pA6A44IuCCTOjmCt3yLyOcm7PCRnrIGo25j-1o,6402
 haiway/utils/stream.py,sha256=lXaeveTY0-AYG5xVzcQYaiC6SUD5fUtHoMXiQcrQAAM,5723
-haiway-0.22.0.dist-info/METADATA,sha256=6__3ZCA0Klv8j7coosQhvQY9GWNqyVlUKSIRbh1f7Jw,4919
-haiway-0.22.0.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
-haiway-0.22.0.dist-info/licenses/LICENSE,sha256=3phcpHVNBP8jsi77gOO0E7rgKeDeu99Pi7DSnK9YHoQ,1069
-haiway-0.22.0.dist-info/RECORD,,
+haiway-0.23.0.dist-info/METADATA,sha256=TAlSBtVIn8VCcK_qsmQ9how4K-ULVga-lP04ZS9M1AQ,4919
+haiway-0.23.0.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
+haiway-0.23.0.dist-info/licenses/LICENSE,sha256=3phcpHVNBP8jsi77gOO0E7rgKeDeu99Pi7DSnK9YHoQ,1069
+haiway-0.23.0.dist-info/RECORD,,

haiway/utils/freezing.py

@@ -1,46 +0,0 @@
-from typing import Any
-
-__all__ = ("freeze",)
-
-
-def freeze(
-    instance: object,
-    /,
-) -> None:
-    """
-    Make an object instance immutable by preventing attribute modification.
-
-    This function modifies the given object to prevent further changes to its attributes.
-    It replaces the object's __setattr__ and __delattr__ methods with ones that raise
-    exceptions, effectively making the object immutable after this function is called.
-
-    Parameters
-    ----------
-    instance : object
-        The object instance to make immutable
-
-    Returns
-    -------
-    None
-        The object is modified in-place
-
-    Notes
-    -----
-    - This only affects direct attribute assignments and deletions
-    - Mutable objects contained within the instance can still be modified internally
-    - The object's class remains unchanged, only the specific instance is affected
-    """
-
-    def frozen_set(
-        __name: str,
-        __value: Any,
-    ) -> None:
-        raise RuntimeError(f"{instance.__class__.__qualname__} is frozen and can't be modified")
-
-    def frozen_del(
-        __name: str,
-    ) -> None:
-        raise RuntimeError(f"{instance.__class__.__qualname__} is frozen and can't be modified")
-
-    instance.__delattr__ = frozen_del
-    instance.__setattr__ = frozen_set