Add attribute paths

miquido · Dec 9, 2024 · 5149d38 · 5149d38
1 parent d171290
commit 5149d38
Show file tree

Hide file tree

Showing 10 changed files with 1,031 additions and 19 deletions.
diff --git a/constraints b/constraints
@@ -2,7 +2,7 @@
 #    uv --no-cache pip compile pyproject.toml -o constraints --all-extras
 bandit==1.8.0
     # via haiway (pyproject.toml)
-coverage==7.6.8
+coverage==7.6.9
     # via pytest-cov
 iniconfig==2.0.0
     # via pytest

diff --git a/pyproject.toml b/pyproject.toml
@@ -5,7 +5,7 @@ build-backend = "setuptools.build_meta"
 [project]
 name = "haiway"
 description = "Framework for dependency injection and state management within structured concurrency model."
-version = "0.6.2"
+version = "0.6.3"
 readme = "README.md"
 maintainers = [
   { name = "Kacper Kaliński", email = "[email protected]" },

diff --git a/src/haiway/__init__.py b/src/haiway/__init__.py
@@ -17,7 +17,7 @@
     traced,
     wrap_async,
 )
-from haiway.state import State
+from haiway.state import AttributePath, AttributeRequirement, State
 from haiway.types import (
     MISSING,
     Missing,
@@ -46,6 +46,8 @@
     "MISSING",
     "ArgumentsTrace",
     "AsyncQueue",
+    "AttributePath",
+    "AttributeRequirement",
     "Disposable",
     "Disposables",
     "Missing",

diff --git a/src/haiway/state/__init__.py b/src/haiway/state/__init__.py
@@ -1,8 +1,12 @@
 from haiway.state.attributes import AttributeAnnotation, attribute_annotations
+from haiway.state.path import AttributePath
+from haiway.state.requirement import AttributeRequirement
 from haiway.state.structure import State
 
 __all__ = [
     "AttributeAnnotation",
+    "AttributePath",
+    "AttributeRequirement",
     "State",
     "attribute_annotations",
 ]
diff --git a/src/haiway/state/attributes.py b/src/haiway/state/attributes.py
@@ -19,6 +19,7 @@
 __all__ = [
     "AttributeAnnotation",
     "attribute_annotations",
+    "resolve_attribute_annotation",
 ]
 
 
@@ -68,7 +69,7 @@ def attribute_annotations(
         if ((get_origin(annotation) or annotation) is ClassVar) or key.startswith("_"):
             continue
 
-        attributes[key] = _resolve_attribute_annotation(
+        attributes[key] = resolve_attribute_annotation(
             annotation,
             self_annotation=self_annotation,
             type_parameters=type_parameters,
@@ -80,7 +81,7 @@ def attribute_annotations(
     return attributes
 
 
-def _resolve_attribute_annotation(  # noqa: C901, PLR0911, PLR0912, PLR0913
+def resolve_attribute_annotation(  # noqa: C901, PLR0911, PLR0912, PLR0913
     annotation: Any,
     /,
     self_annotation: AttributeAnnotation | None,
@@ -100,7 +101,7 @@ def _resolve_attribute_annotation(  # noqa: C901, PLR0911, PLR0912, PLR0913
 
         # forward reference through string
         case str() as forward_ref:
-            return _resolve_attribute_annotation(
+            return resolve_attribute_annotation(
                 ForwardRef(forward_ref, module=module)._evaluate(
                     globalns=None,
                     localns=localns,
@@ -115,7 +116,7 @@ def _resolve_attribute_annotation(  # noqa: C901, PLR0911, PLR0912, PLR0913
 
         # forward reference directly
         case typing.ForwardRef() as reference:
-            return _resolve_attribute_annotation(
+            return resolve_attribute_annotation(
                 reference._evaluate(
                     globalns=None,
                     localns=localns,
@@ -137,7 +138,7 @@ def _resolve_attribute_annotation(  # noqa: C901, PLR0911, PLR0912, PLR0913
                         origin=TypeAliasType,
                         arguments=[],
                     )
-                    resolved: AttributeAnnotation = _resolve_attribute_annotation(
+                    resolved: AttributeAnnotation = resolve_attribute_annotation(
                         alias.__value__,
                         self_annotation=None,
                         type_parameters=type_parameters,
@@ -169,7 +170,7 @@ def _resolve_attribute_annotation(  # noqa: C901, PLR0911, PLR0912, PLR0913
                             return AttributeAnnotation(
                                 origin=parametrized,
                                 arguments=[
-                                    _resolve_attribute_annotation(
+                                    resolve_attribute_annotation(
                                         argument,
                                         self_annotation=self_annotation,
                                         type_parameters=type_parameters,
@@ -193,7 +194,7 @@ def _resolve_attribute_annotation(  # noqa: C901, PLR0911, PLR0912, PLR0913
                     return AttributeAnnotation(
                         origin=origin,
                         arguments=[
-                            _resolve_attribute_annotation(
+                            resolve_attribute_annotation(
                                 argument,
                                 self_annotation=self_annotation,
                                 type_parameters=type_parameters,
@@ -211,7 +212,7 @@ def _resolve_attribute_annotation(  # noqa: C901, PLR0911, PLR0912, PLR0913
                 origin=TypeAliasType,
                 arguments=[],
             )
-            resolved: AttributeAnnotation = _resolve_attribute_annotation(
+            resolved: AttributeAnnotation = resolve_attribute_annotation(
                 alias.__value__,
                 self_annotation=None,
                 type_parameters=type_parameters,
@@ -225,7 +226,7 @@ def _resolve_attribute_annotation(  # noqa: C901, PLR0911, PLR0912, PLR0913
 
         # type parameter
         case typing.TypeVar():
-            return _resolve_attribute_annotation(
+            return resolve_attribute_annotation(
                 # try to resolve it from current parameters if able
                 type_parameters.get(
                     annotation.__name__,
@@ -270,7 +271,7 @@ def _resolve_attribute_annotation(  # noqa: C901, PLR0911, PLR0912, PLR0913
                 arguments=[
                     recursion_guard.get(
                         argument,
-                        _resolve_attribute_annotation(
+                        resolve_attribute_annotation(
                             argument,
                             self_annotation=self_annotation,
                             type_parameters=type_parameters,
@@ -287,7 +288,7 @@ def _resolve_attribute_annotation(  # noqa: C901, PLR0911, PLR0912, PLR0913
             return AttributeAnnotation(
                 origin=typing.Callable,
                 arguments=[
-                    _resolve_attribute_annotation(
+                    resolve_attribute_annotation(
                         argument,
                         self_annotation=self_annotation,
                         type_parameters=type_parameters,
@@ -314,7 +315,7 @@ def _resolve_attribute_annotation(  # noqa: C901, PLR0911, PLR0912, PLR0913
 
         # unwrap from irrelevant type wrappers
         case typing.Annotated | typing.Final | typing.Required | typing.NotRequired:
-            return _resolve_attribute_annotation(
+            return resolve_attribute_annotation(
                 get_args(annotation)[0],
                 self_annotation=self_annotation,
                 type_parameters=type_parameters,
@@ -327,7 +328,7 @@ def _resolve_attribute_annotation(  # noqa: C901, PLR0911, PLR0912, PLR0913
             return AttributeAnnotation(
                 origin=UnionType,  # pyright: ignore[reportArgumentType]
                 arguments=[
-                    _resolve_attribute_annotation(
+                    resolve_attribute_annotation(
                         get_args(annotation)[0],
                         self_annotation=self_annotation,
                         type_parameters=type_parameters,
@@ -352,7 +353,7 @@ def _resolve_attribute_annotation(  # noqa: C901, PLR0911, PLR0912, PLR0913
             return AttributeAnnotation(
                 origin=other,
                 arguments=[
-                    _resolve_attribute_annotation(
+                    resolve_attribute_annotation(
                         argument,
                         self_annotation=self_annotation,
                         type_parameters=type_parameters,