haiway 0.10.1__py3-none-any.whl → 0.10.11__py3-none-any.whl

haiway/context/access.py

@@ -195,6 +195,14 @@ class ScopeContext:
 
 @final
 class ctx:
+    @staticmethod
+    def trace_id() -> str:
+        """
+        Get the current context trace identifier.
+        """
+
+        return ScopeIdentifier.current_trace_id()
+
     @staticmethod
     def scope(
         label: str,

haiway/context/identifier.py

@@ -1,6 +1,6 @@
 from contextvars import ContextVar, Token
 from types import TracebackType
-from typing import Self, final
+from typing import Any, Self, final
 from uuid import uuid4
 
 __all__ = [
@@ -12,6 +12,14 @@ __all__ = [
 class ScopeIdentifier:
     _context = ContextVar[Self]("ScopeIdentifier")
 
+    @classmethod
+    def current_trace_id(cls) -> str:
+        try:
+            return ScopeIdentifier._context.get().trace_id
+
+        except LookupError as exc:
+            raise RuntimeError("Attempting to access scope identifier outside of scope") from exc
+
     @classmethod
     def scope(
         cls,
@@ -60,6 +68,15 @@ class ScopeIdentifier:
     def __str__(self) -> str:
         return self.unique_name
 
+    def __eq__(self, other: Any) -> bool:
+        if not isinstance(other, self.__class__):
+            return False
+
+        return self.scope_id == other.scope_id and self.trace_id == other.trace_id
+
+    def __hash__(self) -> int:
+        return hash(self.scope_id)
+
     def __enter__(self) -> None:
         assert not hasattr(self, "_token"), "Context reentrance is not allowed"  # nosec: B101
         self._token: Token[ScopeIdentifier] = ScopeIdentifier._context.set(self)

haiway/helpers/metrics.py

@@ -101,6 +101,7 @@ class MetricsHolder:
         )
 
     def __init__(self) -> None:
+        self.root_scope: ScopeIdentifier | None = None
         self.scopes: dict[ScopeIdentifier, MetricsScopeStore] = {}
 
     def record(
@@ -109,7 +110,9 @@ class MetricsHolder:
         /,
         metric: State,
     ) -> None:
+        assert self.root_scope is not None  # nosec: B101
         assert scope in self.scopes  # nosec: B101
+
         metric_type: type[State] = type(metric)
         metrics: dict[type[State], State] = self.scopes[scope].metrics
         if (current := metrics.get(metric_type)) and hasattr(current, "__add__"):
@@ -125,6 +128,9 @@ class MetricsHolder:
         metric: type[Metric],
         merged: bool,
     ) -> Metric | None:
+        assert self.root_scope is not None  # nosec: B101
+        assert scope in self.scopes  # nosec: B101
+
         if merged:
             return self.scopes[scope].merged(metric)
 
@@ -139,7 +145,11 @@ class MetricsHolder:
         assert scope not in self.scopes  # nosec: B101
         scope_metrics = MetricsScopeStore(scope)
         self.scopes[scope] = scope_metrics
-        if not scope.is_root:  # root scopes have no actual parent
+
+        if self.root_scope is None:
+            self.root_scope = scope
+
+        else:
             for key in self.scopes.keys():
                 if key.scope_id == scope.parent_id:
                     self.scopes[key].nested.append(scope_metrics)
@@ -182,9 +192,10 @@ class MetricsLogger:
         items_limit: int | None,
         redact_content: bool,
     ) -> None:
+        self.root_scope: ScopeIdentifier | None = None
+        self.scopes: dict[ScopeIdentifier, MetricsScopeStore] = {}
         self.items_limit: int | None = items_limit
         self.redact_content: bool = redact_content
-        self.scopes: dict[ScopeIdentifier, MetricsScopeStore] = {}
 
     def record(
         self,
@@ -192,7 +203,9 @@ class MetricsLogger:
         /,
         metric: State,
     ) -> None:
+        assert self.root_scope is not None  # nosec: B101
         assert scope in self.scopes  # nosec: B101
+
         metric_type: type[State] = type(metric)
         metrics: dict[type[State], State] = self.scopes[scope].metrics
         if (current := metrics.get(metric_type)) and hasattr(current, "__add__"):
@@ -214,6 +227,9 @@ class MetricsLogger:
         metric: type[Metric],
         merged: bool,
     ) -> Metric | None:
+        assert self.root_scope is not None  # nosec: B101
+        assert scope in self.scopes  # nosec: B101
+
         if merged:
             return self.scopes[scope].merged(metric)
 
@@ -228,7 +244,11 @@ class MetricsLogger:
         assert scope not in self.scopes  # nosec: B101
         scope_metrics = MetricsScopeStore(scope)
         self.scopes[scope] = scope_metrics
-        if not scope.is_root:  # root scopes have no actual parent
+
+        if self.root_scope is None:
+            self.root_scope = scope
+
+        else:
             for key in self.scopes.keys():
                 if key.scope_id == scope.parent_id:
                     self.scopes[key].nested.append(scope_metrics)
@@ -246,7 +266,7 @@ class MetricsLogger:
         assert scope in self.scopes  # nosec: B101
         self.scopes[scope].exited = monotonic()
 
-        if scope.is_root and self.scopes[scope].finished:
+        if scope == self.root_scope and self.scopes[scope].finished:
             if log := _tree_log(
                 self.scopes[scope],
                 list_items_limit=self.items_limit,

haiway/utils/collections.py

@@ -1,4 +1,5 @@
 from collections.abc import Mapping, Sequence, Set
+from typing import overload
 
 __all__ = [
     "as_dict",
@@ -8,24 +9,43 @@ __all__ = [
 ]
 
 
+@overload
 def as_list[T](
     collection: Sequence[T],
     /,
-) -> list[T]:
+) -> list[T]: ...
+
+
+@overload
+def as_list[T](
+    collection: Sequence[T] | None,
+    /,
+) -> list[T] | None: ...
+
+
+def as_list[T](
+    collection: Sequence[T] | None,
+    /,
+) -> list[T] | None:
     """
     Converts any given Sequence into a list.
 
     Parameters
     ----------
-    collection : Sequence[T]
+    collection : Sequence[T] | None
         The input collection to be converted.
 
     Returns
     -------
-    list[T]
-        A new list containing all elements of the input collection,
-        or the original list if it was already one.
+    list[T] | None
+        A new list containing all elements of the input collection,\
+         or the original list if it was already one.
+        None if no value was provided.
     """
+
+    if collection is None:
+        return None
+
     if isinstance(collection, list):
         return collection
 
@@ -33,24 +53,43 @@ def as_list[T](
         return list(collection)
 
 
+@overload
 def as_tuple[T](
     collection: Sequence[T],
     /,
-) -> tuple[T, ...]:
+) -> tuple[T, ...]: ...
+
+
+@overload
+def as_tuple[T](
+    collection: Sequence[T] | None,
+    /,
+) -> tuple[T, ...] | None: ...
+
+
+def as_tuple[T](
+    collection: Sequence[T] | None,
+    /,
+) -> tuple[T, ...] | None:
     """
     Converts any given Sequence into a tuple.
 
     Parameters
     ----------
-    collection : Sequence[T]
+    collection : Sequence[T] | None
         The input collection to be converted.
 
     Returns
     -------
-    tuple[T]
-        A new tuple containing all elements of the input collection,
-        or the original tuple if it was already one.
+    tuple[T] | None
+        A new tuple containing all elements of the input collection,\
+         or the original tuple if it was already one.
+        None if no value was provided.
     """
+
+    if collection is None:
+        return None
+
     if isinstance(collection, tuple):
         return collection
 
@@ -58,10 +97,24 @@ def as_tuple[T](
         return tuple(collection)
 
 
+@overload
 def as_set[T](
     collection: Set[T],
     /,
-) -> set[T]:
+) -> set[T]: ...
+
+
+@overload
+def as_set[T](
+    collection: Set[T] | None,
+    /,
+) -> set[T] | None: ...
+
+
+def as_set[T](
+    collection: Set[T] | None,
+    /,
+) -> set[T] | None:
     """
     Converts any given Set into a set.
 
@@ -73,9 +126,14 @@ def as_set[T](
     Returns
     -------
     set[T]
-        A new set containing all elements of the input collection,
-        or the original set if it was already one.
+        A new set containing all elements of the input collection,\
+         or the original set if it was already one.
+        None if no value was provided.
     """
+
+    if collection is None:
+        return None
+
     if isinstance(collection, set):
         return collection
 
@@ -83,10 +141,24 @@ def as_set[T](
         return set(collection)
 
 
+@overload
 def as_dict[K, V](
     collection: Mapping[K, V],
     /,
-) -> dict[K, V]:
+) -> dict[K, V]: ...
+
+
+@overload
+def as_dict[K, V](
+    collection: Mapping[K, V] | None,
+    /,
+) -> dict[K, V] | None: ...
+
+
+def as_dict[K, V](
+    collection: Mapping[K, V] | None,
+    /,
+) -> dict[K, V] | None:
     """
     Converts any given Mapping into a dict.
 
@@ -98,9 +170,14 @@ def as_dict[K, V](
     Returns
     -------
     dict[K, V]
-        A new dict containing all elements of the input collection,
-        or the original dict if it was already one.
+        A new dict containing all elements of the input collection,\
+         or the original dict if it was already one.
+        None if no value was provided.
     """
+
+    if collection is None:
+        return None
+
     if isinstance(collection, dict):
         return collection
 

{haiway-0.10.1.dist-info → haiway-0.10.11.dist-info}/METADATA

@@ -1,7 +1,9 @@
-Metadata-Version: 2.2
+Metadata-Version: 2.4
 Name: haiway
-Version: 0.10.1
+Version: 0.10.11
 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
 Maintainer-email: Kacper Kaliński <kacper.kalinski@miquido.com>
 License: MIT License
         
@@ -24,25 +26,22 @@ License: MIT License
         LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
         OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
         SOFTWARE.
-Project-URL: Homepage, https://miquido.com
-Project-URL: Repository, https://github.com/miquido/haiway.git
-Classifier: License :: OSI Approved :: MIT License
+License-File: LICENSE
 Classifier: Intended Audience :: Developers
+Classifier: License :: OSI Approved :: MIT License
 Classifier: Programming Language :: Python
-Classifier: Typing :: Typed
 Classifier: Topic :: Software Development
 Classifier: Topic :: Software Development :: Libraries :: Application Frameworks
+Classifier: Typing :: Typed
 Requires-Python: >=3.12
-Description-Content-Type: text/markdown
-License-File: LICENSE
 Provides-Extra: dev
-Requires-Dist: haiway; extra == "dev"
-Requires-Dist: ruff~=0.9; extra == "dev"
-Requires-Dist: pyright~=1.1; extra == "dev"
-Requires-Dist: bandit~=1.7; extra == "dev"
-Requires-Dist: pytest~=7.4; extra == "dev"
-Requires-Dist: pytest-cov~=4.1; extra == "dev"
-Requires-Dist: pytest-asyncio~=0.23; extra == "dev"
+Requires-Dist: bandit~=1.7; extra == 'dev'
+Requires-Dist: pyright~=1.1; extra == 'dev'
+Requires-Dist: pytest-asyncio~=0.23; extra == 'dev'
+Requires-Dist: pytest-cov~=4.1; extra == 'dev'
+Requires-Dist: pytest~=7.4; extra == 'dev'
+Requires-Dist: ruff~=0.9; extra == 'dev'
+Description-Content-Type: text/markdown
 
 # 🚗 haiway 🚕 🚚 🚙
 

{haiway-0.10.1.dist-info → haiway-0.10.11.dist-info}/RECORD

@@ -1,9 +1,9 @@
 haiway/__init__.py,sha256=IEUCyFYKT5IPHnkiUvDVZHdJeHqCaBnG8FhPD20Zgo8,1929
 haiway/py.typed,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 haiway/context/__init__.py,sha256=eRvuhifx7xCd-_6desgk55idzNpD5S5sprmCfGb3_9M,662
-haiway/context/access.py,sha256=RpTvs7107NoAxCgxxbp7BUThOM9gLXo_Vxv-JgDqW58,16954
+haiway/context/access.py,sha256=Fc2NfoIV2zWE5qPnNgSitK1dy-PME-rJJfUPhoNwJzY,17125
 haiway/context/disposables.py,sha256=DZjnMp-wMfF-em2Wjhbm1MvXubNpuzFBT70BQNIxC7M,2019
-haiway/context/identifier.py,sha256=f5-vZOnhKZmYj__emS51WcgsJqfD_yz6ilr3GUo9z1k,2034
+haiway/context/identifier.py,sha256=Fyb6OHx5FPaSLLRK249HUEr_KlBSG5F-eW01Oxg_Ke8,2570
 haiway/context/logging.py,sha256=ptwgENuyw-WFgokVsYx9OXZGhJENuO_wgfVjcBryUKM,4251
 haiway/context/metrics.py,sha256=Ve628X39u0rdLm0vYmVZt7aGeoEeRquR6f67vJIXClY,4213
 haiway/context/state.py,sha256=LCcFxXqDBu6prvPyPicN-ecONSNHyR56PfQ5u5jNFCU,3000
@@ -12,7 +12,7 @@ haiway/context/types.py,sha256=VvJA7wAPZ3ISpgyThVguioYUXqhHf0XkPfRd0M1ERiQ,142
 haiway/helpers/__init__.py,sha256=8XRJWNhidWuBKqRZ1Hyc2xqt7DeWLcoOs2V-oexl8VY,579
 haiway/helpers/asynchrony.py,sha256=9lo9wT3G0TyPb4vfmTnWGBvB_eN6p6nIlj46_9Ag8fQ,6022
 haiway/helpers/caching.py,sha256=Ok_WE5Whe7XqnIuLZo4rNNBFeWap-aUWX799s4b1JAQ,9536
-haiway/helpers/metrics.py,sha256=0CDDEM3QZL35Wc3GteNoAeMuLDehJX06ukxLpNediq0,12813
+haiway/helpers/metrics.py,sha256=0oFBiO-hAzihyC5jvXevNrYOoTcUGc2yGhE1A_866Mc,13314
 haiway/helpers/retries.py,sha256=gIkyUlqJLDYaxIZd3qzeqGFY9y5Gp8dgZLlZ6hs8hoc,7538
 haiway/helpers/throttling.py,sha256=zo0OwFq64si5KUwhd58cFHLmGAmYwRbFRJMbv9suhPs,3844
 haiway/helpers/timeouted.py,sha256=1xU09hQnFdj6p48BwZl5xUvtIr3zC0ZUXehkdrduCjs,3074
@@ -29,15 +29,14 @@ haiway/types/frozen.py,sha256=CZhFCXnWAKEhuWSfILxA8smfdpMd5Ku694ycfLh98R8,76
 haiway/types/missing.py,sha256=rDnyA2wxPkTbJl0L-zbo0owp7IJ04xkCIp6xD6wh8NI,1712
 haiway/utils/__init__.py,sha256=O7qmAmUktX-X_5D1L5FJMeCFEiOVrrnyYSyiycm4nyg,739
 haiway/utils/always.py,sha256=2abp8Lm9rQkrfS3rm1Iqhb-IcWyVfH1BULab3KMxgOw,1234
-haiway/utils/collections.py,sha256=_MwB4o8sCZeAjrwry8Pu9JvGlt8m7O7MqWSFFmPjJ6k,2120
+haiway/utils/collections.py,sha256=pKHZhXqTMcOth7gV6mXcC5WcSyBl70MmVIELbDSmMoA,3320
 haiway/utils/env.py,sha256=vlW21LEp8uOVNnUXpBfPtj3zKi9Kkjoemb_H5hQpYPQ,4433
 haiway/utils/freezing.py,sha256=K34ZIMzbkpgkHKH-KF73plEbXExsajNRkRTYp9nJEf4,620
 haiway/utils/logs.py,sha256=oDsc1ZdqKDjlTlctLbDcp9iX98Acr-1tdw-Pyg3DElo,1577
 haiway/utils/mimic.py,sha256=BkVjTVP2TxxC8GChPGyDV6UXVwJmiRiSWeOYZNZFHxs,1828
 haiway/utils/noop.py,sha256=qgbZlOKWY6_23Zs43OLukK2HagIQKRyR04zrFVm5rWI,344
 haiway/utils/queue.py,sha256=oQ3GXCJ-PGNtMEr6EPdgqAvYZoj8lAa7Z2drBKBEoBM,2345
-haiway-0.10.1.dist-info/LICENSE,sha256=GehQEW_I1pkmxkkj3NEa7rCTQKYBn7vTPabpDYJlRuo,1063
-haiway-0.10.1.dist-info/METADATA,sha256=0m2_QdvBq_XiPN3GiIYFIE0cXf8cVw5esT8kA6_K_5Y,3895
-haiway-0.10.1.dist-info/WHEEL,sha256=In9FTNxeP60KnTkGw7wk6mJPYd_dQSjEZmXdBdMCI-8,91
-haiway-0.10.1.dist-info/top_level.txt,sha256=_LdXVLzUzgkvAGQnQJj5kQfoFhpPW6EF4Kj9NapniLg,7
-haiway-0.10.1.dist-info/RECORD,,
+haiway-0.10.11.dist-info/METADATA,sha256=Xz9EVwzVcqiYBNaDv0QZQ4gXv3482M9eV9n82ba6kJo,3858
+haiway-0.10.11.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
+haiway-0.10.11.dist-info/licenses/LICENSE,sha256=GehQEW_I1pkmxkkj3NEa7rCTQKYBn7vTPabpDYJlRuo,1063
+haiway-0.10.11.dist-info/RECORD,,

{haiway-0.10.1.dist-info → haiway-0.10.11.dist-info}/WHEEL

@@ -1,5 +1,4 @@
 Wheel-Version: 1.0
-Generator: setuptools (75.8.0)
+Generator: hatchling 1.27.0
 Root-Is-Purelib: true
 Tag: py3-none-any
-

haiway-0.10.1.dist-info/top_level.txt

@@ -1 +0,0 @@
-haiway