haiway 0.10.0__py3-none-any.whl → 0.10.10__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/state/attributes.py

@@ -509,7 +509,10 @@ def _resolve_type_typeddict(
             self_annotation=resolved_attribute,
             recursion_guard=recursion_guard,
         ).update_required(key in annotation.__required_keys__)
-    resolved_attribute.extra = attributes
+    resolved_attribute.extra = {
+        "attributes": attributes,
+        "required": annotation.__required_keys__,
+    }
     return resolved_attribute
 
 

haiway/state/validation.py

@@ -86,6 +86,12 @@ class AttributeValidator[Type]:
         assert self.validation is not MISSING  # nosec: B101
         return self.validation(value)  # pyright: ignore[reportCallIssue, reportUnknownVariableType]
 
+    def __str__(self) -> str:
+        return f"Validator[{self.annotation}]"
+
+    def __repr__(self) -> str:
+        return f"Validator[{self.annotation}]"
+
 
 def _prepare_validator_of_any(
     annotation: AttributeAnnotation,
@@ -391,11 +397,12 @@ def _prepare_validator_of_typed_dict(
             case _:
                 raise TypeError(f"'{value}' is not matching expected type of 'str'")
 
+    formatted_type: str = str(annotation)
     values_validators: dict[str, AttributeValidation[Any]] = {
         key: AttributeValidator.of(element, recursion_guard=recursion_guard)
-        for key, element in annotation.extra.items()
+        for key, element in annotation.extra["attributes"].items()
     }
-    formatted_type: str = str(annotation)
+    required_values: Set[str] = annotation.extra["required"]
 
     def validator(
         value: Any,
@@ -406,8 +413,10 @@ def _prepare_validator_of_typed_dict(
                 validated: MutableMapping[str, Any] = {}
                 for key, validator in values_validators.items():
                     element: Any = elements.get(key, MISSING)
-                    if element is not MISSING:
-                        validated[key_validator(key)] = validator(element)
+                    if element is MISSING and key not in required_values:
+                        continue  # skip missing and not required
+
+                    validated[key_validator(key)] = validator(element)
 
                 # TODO: make sure dict is not mutable with MappingProxyType?
                 return validated

{haiway-0.10.0.dist-info → haiway-0.10.10.dist-info}/METADATA

@@ -1,7 +1,9 @@
-Metadata-Version: 2.2
+Metadata-Version: 2.4
 Name: haiway
-Version: 0.10.0
+Version: 0.10.10
 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.0.dist-info → haiway-0.10.10.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,17 +12,17 @@ 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
 haiway/helpers/tracing.py,sha256=eQpkIoGSB51jRF8RcLaihvHX3VzJIRdyRxTx3I14Pzg,3346
 haiway/state/__init__.py,sha256=emTuwGFn7HyjyTJ_ass69J5jQIA7_WHO4teZz_dR05Y,355
-haiway/state/attributes.py,sha256=iQ7TJHnT3hlcYwKcxchXE56zU8WbOTJZhsVn_HocXBc,22903
+haiway/state/attributes.py,sha256=0gJbgOKiH79RNM9IW66NNWSWM29037yGTTpoln6vPvU,22984
 haiway/state/path.py,sha256=4vh-fYQv8_xRWjS0ErMQslKDWRI6-KVECAr8JhYk0UY,17503
 haiway/state/requirement.py,sha256=3iQqzp5Q7w6y5uClamJGH7S5Hib9pciuTAV27PP5lS8,6161
 haiway/state/structure.py,sha256=bSIj0S_HG-F1Z5GxSlY6VpGtrtiwG82-AIL_PL1lRLo,12465
-haiway/state/validation.py,sha256=hbvzPVBD36AD_B5u9ER4A11vjaXR9LJLD8G2k8IE-AI,13492
+haiway/state/validation.py,sha256=r0EMIs-nvoXsmSA74oGu6Lrbw8lkzmseaY82_-E8ous,13814
 haiway/types/__init__.py,sha256=-j4uDN6ix3GBXLBqXC-k_QOJSDlO6zvNCxDej8vVzek,342
 haiway/types/default.py,sha256=IVQsNzDnfukL3-XlScYv2PgTcJ1x_BNP9i5UlS5oEbg,2179
 haiway/types/frozen.py,sha256=CZhFCXnWAKEhuWSfILxA8smfdpMd5Ku694ycfLh98R8,76
@@ -36,8 +36,7 @@ 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.0.dist-info/LICENSE,sha256=GehQEW_I1pkmxkkj3NEa7rCTQKYBn7vTPabpDYJlRuo,1063
-haiway-0.10.0.dist-info/METADATA,sha256=6fSYOr9NesJPftFBAIfoOGH_OsX5cIqCy8DY4N4qswM,3895
-haiway-0.10.0.dist-info/WHEEL,sha256=In9FTNxeP60KnTkGw7wk6mJPYd_dQSjEZmXdBdMCI-8,91
-haiway-0.10.0.dist-info/top_level.txt,sha256=_LdXVLzUzgkvAGQnQJj5kQfoFhpPW6EF4Kj9NapniLg,7
-haiway-0.10.0.dist-info/RECORD,,
+haiway-0.10.10.dist-info/METADATA,sha256=PhcebR048J2VPSVrFIQOnQSEIvQpwolFKMmRuOGTWAg,3858
+haiway-0.10.10.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
+haiway-0.10.10.dist-info/licenses/LICENSE,sha256=GehQEW_I1pkmxkkj3NEa7rCTQKYBn7vTPabpDYJlRuo,1063
+haiway-0.10.10.dist-info/RECORD,,

{haiway-0.10.0.dist-info → haiway-0.10.10.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.0.dist-info/top_level.txt

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