haiway 0.10.16__py3-none-any.whl → 0.11.0__py3-none-any.whl

haiway/__init__.py

@@ -9,7 +9,9 @@ from haiway.context import (
     MetricsScopeExiting,
     MissingContext,
     MissingState,
+    ScopeContext,
     ScopeIdentifier,
+    StateContext,
     ctx,
 )
 from haiway.helpers import (
@@ -78,8 +80,10 @@ __all__ = [
     "MissingContext",
     "MissingState",
     "ResultTrace",
+    "ScopeContext",
     "ScopeIdentifier",
     "State",
+    "StateContext",
     "always",
     "as_dict",
     "as_list",

haiway/context/__init__.py

@@ -1,4 +1,4 @@
-from haiway.context.access import ctx
+from haiway.context.access import ScopeContext, ctx
 from haiway.context.disposables import Disposable, Disposables
 from haiway.context.identifier import ScopeIdentifier
 from haiway.context.metrics import (
@@ -9,6 +9,7 @@ from haiway.context.metrics import (
     MetricsScopeEntering,
     MetricsScopeExiting,
 )
+from haiway.context.state import StateContext
 from haiway.context.types import MissingContext, MissingState
 
 __all__ = [
@@ -22,6 +23,8 @@ __all__ = [
     "MetricsScopeExiting",
     "MissingContext",
     "MissingState",
+    "ScopeContext",
     "ScopeIdentifier",
+    "StateContext",
     "ctx",
 ]

haiway/context/access.py

@@ -1,4 +1,9 @@
-from asyncio import CancelledError, Task, current_task, iscoroutinefunction
+from asyncio import (
+    CancelledError,
+    Task,
+    current_task,
+    iscoroutinefunction,
+)
 from collections.abc import (
     AsyncGenerator,
     AsyncIterator,

haiway/state/path.py

@@ -6,7 +6,7 @@ from collections import abc as collections_abc
 from collections import deque
 from collections.abc import Callable, Mapping, Sequence
 from copy import copy
-from typing import Any, final, get_args, get_origin, overload
+from typing import Any, TypeAliasType, final, get_args, get_origin, overload
 
 from haiway.types import MISSING, Missing, not_missing
 
@@ -48,8 +48,8 @@ class PropertyAttributePathComponent(AttributePathComponent):
         attribute: type[Attribute],
         name: str,
     ) -> None:
-        root_origin: Any = get_origin(root) or root
-        attribute_origin: Any = get_origin(attribute) or attribute
+        root_origin: Any = _unaliased_origin(root)
+        attribute_origin: Any = _unaliased_origin(attribute)
 
         def access(
             subject: Root,
@@ -144,8 +144,8 @@ class SequenceItemAttributePathComponent(AttributePathComponent):
         attribute: type[Attribute],
         index: int,
     ) -> None:
-        root_origin: Any = get_origin(root) or root
-        attribute_origin: Any = get_origin(attribute) or attribute
+        root_origin: Any = _unaliased_origin(root)
+        attribute_origin: Any = _unaliased_origin(attribute)
 
         def access(
             subject: Root,
@@ -218,8 +218,8 @@ class MappingItemAttributePathComponent(AttributePathComponent):
         attribute: type[Attribute],
         key: str | int,
     ) -> None:
-        root_origin: Any = get_origin(root) or root
-        attribute_origin: Any = get_origin(attribute) or attribute
+        root_origin: Any = _unaliased_origin(root)
+        attribute_origin: Any = _unaliased_origin(attribute)
 
         def access(
             subject: Root,
@@ -373,9 +373,9 @@ class AttributePath[Root, Attribute]:
         self,
         key: str | int,
     ) -> Any:
-        match get_origin(self.__attribute__) or self.__attribute__:
+        match _unaliased_origin(self.__attribute__):
             case collections_abc.Mapping | typing.Mapping | builtins.dict:
-                match get_args(self.__attribute__):
+                match get_args(_unaliased(self.__attribute__)):
                     case (builtins.str | builtins.int, element_annotation):
                         return AttributePath[Root, Any](
                             self.__root__,
@@ -403,7 +403,7 @@ class AttributePath[Root, Attribute]:
                         self.__attribute__.__name__,
                     )
 
-                match get_args(self.__attribute__):
+                match get_args(_unaliased(self.__attribute__)):
                     case (element_annotation, builtins.Ellipsis | types.EllipsisType):
                         return AttributePath[Root, Any](
                             self.__root__,
@@ -439,7 +439,7 @@ class AttributePath[Root, Attribute]:
                         self.__attribute__.__name__,
                     )
 
-                match get_args(self.__attribute__):
+                match get_args(_unaliased(self.__attribute__)):
                     case (element_annotation,):
                         return AttributePath[Root, Any](
                             self.__root__,
@@ -484,13 +484,13 @@ class AttributePath[Root, Attribute]:
         /,
         updated: Attribute | Missing = MISSING,
     ) -> Root | Attribute:
-        assert isinstance(root, get_origin(self.__root__) or self.__root__), (  # nosec: B101
+        assert isinstance(root, _unaliased_origin(self.__root__)), (  # nosec: B101
             f"AttributePath '{self.__repr__()}' used on unexpected root of "
             f"'{type(root).__name__}' instead of '{self.__root__.__name__}'"
         )
 
         if not_missing(updated):
-            assert isinstance(updated, get_origin(self.__attribute__) or self.__attribute__), (  # nosec: B101
+            assert isinstance(updated, _unaliased_origin(self.__attribute__)), (  # nosec: B101
                 f"AttributePath '{self.__repr__()}' assigning to unexpected value of "
                 f"'{type(updated).__name__}' instead of '{self.__attribute__.__name__}'"
             )
@@ -516,9 +516,27 @@ class AttributePath[Root, Attribute]:
             for component in self.__components__:
                 resolved = component.access(resolved)
 
-            assert isinstance(resolved, get_origin(self.__attribute__) or self.__attribute__), (  # nosec: B101
+            assert isinstance(resolved, _unaliased_origin(self.__attribute__)), (  # nosec: B101
                 f"AttributePath '{self.__repr__()}' pointing to unexpected value of "
                 f"'{type(resolved).__name__}' instead of '{self.__attribute__.__name__}'"
             )
 
             return resolved
+
+
+def _unaliased_origin(base: type[Any]) -> type[Any]:
+    match base:
+        case TypeAliasType() as aliased:
+            return get_origin(aliased.__value__) or aliased.__value__
+
+        case concrete:
+            return get_origin(concrete) or concrete
+
+
+def _unaliased(base: type[Any]) -> type[Any]:
+    match base:
+        case TypeAliasType() as aliased:
+            return aliased.__value__
+
+        case concrete:
+            return concrete

haiway/utils/queue.py

@@ -23,9 +23,6 @@ class AsyncQueue[Element](AsyncIterator[Element]):
         self._waiting: Future[Element] | None = None
         self._finish_reason: BaseException | None = None
 
-    def __del__(self) -> None:
-        self.finish()
-
     @property
     def is_finished(self) -> bool:
         return self._finish_reason is not None
@@ -34,7 +31,6 @@ class AsyncQueue[Element](AsyncIterator[Element]):
         self,
         element: Element,
         /,
-        *elements: Element,
     ) -> None:
         if self.is_finished:
             raise RuntimeError("AsyncQueue is already finished")
@@ -45,8 +41,6 @@ class AsyncQueue[Element](AsyncIterator[Element]):
         else:
             self._queue.append(element)
 
-        self._queue.extend(elements)
-
     def finish(
         self,
         exception: BaseException | None = None,
@@ -57,7 +51,17 @@ class AsyncQueue[Element](AsyncIterator[Element]):
         self._finish_reason = exception or StopAsyncIteration()
 
         if self._waiting is not None and not self._waiting.done():
-            self._waiting.set_exception(self._finish_reason)
+            # checking loop only on finish as the rest of operations
+            # should always have a valid loop in a typical environment
+            # and we are not supporting multithreading yet
+            if get_running_loop() is not self._loop:
+                self._loop.call_soon_threadsafe(
+                    self._waiting.set_exception,
+                    self._finish_reason,
+                )
+
+            else:
+                self._waiting.set_exception(self._finish_reason)
 
     def cancel(self) -> None:
         self.finish(exception=CancelledError())

{haiway-0.10.16.dist-info → haiway-0.11.0.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: haiway
-Version: 0.10.16
+Version: 0.11.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.10.16.dist-info → haiway-0.11.0.dist-info}/RECORD

@@ -1,7 +1,7 @@
-haiway/__init__.py,sha256=IEUCyFYKT5IPHnkiUvDVZHdJeHqCaBnG8FhPD20Zgo8,1929
+haiway/__init__.py,sha256=PYMHx7JZwwSsALewho7v6EgIb5MUwYgZEWrVH-OhVx0,2005
 haiway/py.typed,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-haiway/context/__init__.py,sha256=eRvuhifx7xCd-_6desgk55idzNpD5S5sprmCfGb3_9M,662
-haiway/context/access.py,sha256=Fc2NfoIV2zWE5qPnNgSitK1dy-PME-rJJfUPhoNwJzY,17125
+haiway/context/__init__.py,sha256=feqd0eJnGQwh4B8BZXpS0fQRE-DqoFCFOHipF1jOY8A,762
+haiway/context/access.py,sha256=KeAgxGf78TufqEUSwvw2LPY2aPE00z6xo3hvQ8L6QO4,17146
 haiway/context/disposables.py,sha256=DZjnMp-wMfF-em2Wjhbm1MvXubNpuzFBT70BQNIxC7M,2019
 haiway/context/identifier.py,sha256=Fyb6OHx5FPaSLLRK249HUEr_KlBSG5F-eW01Oxg_Ke8,2570
 haiway/context/logging.py,sha256=ptwgENuyw-WFgokVsYx9OXZGhJENuO_wgfVjcBryUKM,4251
@@ -19,7 +19,7 @@ haiway/helpers/timeouted.py,sha256=1xU09hQnFdj6p48BwZl5xUvtIr3zC0ZUXehkdrduCjs,3
 haiway/helpers/tracing.py,sha256=VDOAhdVELaYs92HxHreEo_ZV8b7e6ZQs10lTNn8xOtQ,3383
 haiway/state/__init__.py,sha256=emTuwGFn7HyjyTJ_ass69J5jQIA7_WHO4teZz_dR05Y,355
 haiway/state/attributes.py,sha256=plCcYGE5LVU1Nvo0GHkhThqFG96uLR3tFsisQyK1jK0,23122
-haiway/state/path.py,sha256=4vh-fYQv8_xRWjS0ErMQslKDWRI6-KVECAr8JhYk0UY,17503
+haiway/state/path.py,sha256=p-ZVSDU02qAUDln12SDc1pGWzhZ88-1zYEBC0hqceXM,17930
 haiway/state/requirement.py,sha256=3iQqzp5Q7w6y5uClamJGH7S5Hib9pciuTAV27PP5lS8,6161
 haiway/state/structure.py,sha256=bSIj0S_HG-F1Z5GxSlY6VpGtrtiwG82-AIL_PL1lRLo,12465
 haiway/state/validation.py,sha256=r0EMIs-nvoXsmSA74oGu6Lrbw8lkzmseaY82_-E8ous,13814
@@ -35,8 +35,8 @@ 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.16.dist-info/METADATA,sha256=j02RHfNVzjysuMNaLot1JxcgYIWyqLfSJf2iInhHjyU,3858
-haiway-0.10.16.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
-haiway-0.10.16.dist-info/licenses/LICENSE,sha256=GehQEW_I1pkmxkkj3NEa7rCTQKYBn7vTPabpDYJlRuo,1063
-haiway-0.10.16.dist-info/RECORD,,
+haiway/utils/queue.py,sha256=jmz5b4cDvdXpuFnAfrNsGB5wXx4ThCgLHbFlH54o8UY,2657
+haiway-0.11.0.dist-info/METADATA,sha256=HWxQi7lFsvowR9D-wF-zNBHnIfMVq0i5Jlze3BAbVEo,3857
+haiway-0.11.0.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
+haiway-0.11.0.dist-info/licenses/LICENSE,sha256=GehQEW_I1pkmxkkj3NEa7rCTQKYBn7vTPabpDYJlRuo,1063
+haiway-0.11.0.dist-info/RECORD,,