refactor: _itypes to interfaces

ididi/__init__.py

@@ -18,16 +18,15 @@
 
 __version__ = VERSION
 
-from ._itypes import GraphConfig as GraphConfig
-from ._itypes import INode as INode
-from ._itypes import INodeConfig as INodeConfig
-from ._itypes import NodeConfig as NodeConfig
+from .interfaces import INode as INode
+from .interfaces import INodeConfig as INodeConfig
 from .api import entry as entry
 from .api import resolve as resolve
 from .graph import AsyncScope as AsyncScope
 from .graph import DependencyGraph as DependencyGraph
 from .graph import SyncScope as SyncScope
 from .node import DependentNode as DependentNode
+from .node import NodeConfig as NodeConfig
 from .node import use as use
 from .utils.typing_utils import AsyncResource as AsyncResource
 from .utils.typing_utils import Resource as Resource

ididi/_type_resolve.py

@@ -26,7 +26,7 @@
 
 from typing_extensions import ParamSpec, TypeGuard
 
-from ._itypes import AsyncClosable, Closable
+from .interfaces import AsyncClosable, Closable
 from .errors import (
     ForwardReferenceNotFoundError,
     GenericDependencyNotSupportedError,

ididi/api.py

@@ -3,7 +3,7 @@
 
 from typing_extensions import Unpack
 
-from ._itypes import IAsyncFactory, IFactory, INodeConfig, TEntryDecor
+from .interfaces import IAsyncFactory, IFactory, INodeConfig, TEntryDecor
 from .graph import DependencyGraph as DependencyGraph
 from .utils.typing_utils import P, T
 

ididi/graph.py

@@ -18,16 +18,16 @@
     TypeVar,
     Union,
     cast,
+    final,
     get_origin,
     overload,
 )
 
 from typing_extensions import Self, Unpack
 
 from ._ds import GraphNodes, GraphNodesView, ResolutionRegistry, TypeRegistry, Visitor
-from ._itypes import (
+from .interfaces import (
     INSPECT_EMPTY,
-    GraphConfig,
     GraphIgnoreConfig,
     IAnyFactory,
     IAsyncFactory,
@@ -36,7 +36,6 @@
     INode,
     INodeConfig,
     INodeFactory,
-    NodeConfig,
     TDecor,
     TEntryDecor,
 )
@@ -66,6 +65,7 @@
 from .node import (
     DependentNode,
     LazyDependent,
+    NodeConfig,
     resolve_annotated,
     resolve_inject,
     should_override,
@@ -301,6 +301,27 @@ async def __aexit__(
         self._graph.reset_context_scope(self._token)
 
 
+class GraphConfig:
+    __slots__ = ("self_inject", "ignore", "partial_resolve")
+
+    def __init__(
+        self,
+        *,
+        self_inject: bool,
+        ignore: Maybe[GraphIgnoreConfig],
+        partial_resolve: bool,
+    ):
+        self.self_inject = self_inject
+        if not is_provided(ignore):
+            ignore = tuple()
+        elif not isinstance(ignore, tuple):
+            ignore = (ignore,)
+
+        self.ignore = ignore
+        self.partial_resolve = partial_resolve
+
+
+@final
 class DependencyGraph:
     """
     ### Description:

ididi/_itypes.py → ididi/interfaces.py

@@ -14,8 +14,6 @@
 )
 
 from typing_extensions import TypeAliasType
-
-from .utils.param_utils import MISSING, Maybe, is_provided
 from .utils.typing_utils import P, R, T
 
 EMPTY_SIGNATURE = Signature()
@@ -113,52 +111,6 @@ class INodeConfig(TypedDict, total=False):
     reuse: bool
 
 
-class NodeConfig:
-    __slots__ = ("reuse", "lazy", "ignore")
-
-    ignore: NodeIgnore
-
-    def __init__(
-        self,
-        *,
-        reuse: bool = True,
-        lazy: bool = False,
-        ignore: Maybe[NodeIgnoreConfig] = MISSING,
-    ):
-        self.lazy = lazy
-
-        if not is_provided(ignore):
-            ignore = tuple()
-        elif not isinstance(ignore, tuple):
-            ignore = (ignore,)
-
-        self.ignore = ignore
-        self.reuse = reuse
-
-    def __repr__(self):
-        return f"{self.__class__.__name__}({self.reuse=}, {self.lazy=}, {self.ignore=})"
-
-
-class GraphConfig:
-    __slots__ = ("self_inject", "ignore", "partial_resolve")
-
-    def __init__(
-        self,
-        *,
-        self_inject: bool,
-        ignore: Maybe[GraphIgnoreConfig],
-        partial_resolve: bool,
-    ):
-        self.self_inject = self_inject
-        if not is_provided(ignore):
-            ignore = tuple()
-        elif not isinstance(ignore, tuple):
-            ignore = (ignore,)
-
-        self.ignore = ignore
-        self.partial_resolve = partial_resolve
-
-
 @runtime_checkable
 class Closable(Protocol):
     def close(self) -> None: ...

ididi/node.py

@@ -26,15 +26,15 @@
 
 from typing_extensions import Unpack
 
-from ._itypes import (
+from .interfaces import (
     EMPTY_SIGNATURE,
     INSPECT_EMPTY,
     INode,
     INodeAnyFactory,
     INodeConfig,
     INodeFactory,
-    NodeConfig,
     NodeIgnore,
+    NodeIgnoreConfig,
 )
 from ._type_resolve import (
     IDIDI_INJECT_RESOLVE_MARK,
@@ -63,6 +63,32 @@
 from .utils.typing_utils import P, T, get_factory_sig_from_cls
 
 
+class NodeConfig:
+    __slots__ = ("reuse", "lazy", "ignore")
+
+    ignore: NodeIgnore
+
+    def __init__(
+        self,
+        *,
+        reuse: bool = True,
+        lazy: bool = False,
+        ignore: Maybe[NodeIgnoreConfig] = MISSING,
+    ):
+        self.lazy = lazy
+
+        if not is_provided(ignore):
+            ignore = tuple()
+        elif not isinstance(ignore, tuple):
+            ignore = (ignore,)
+
+        self.ignore = ignore
+        self.reuse = reuse
+
+    def __repr__(self):
+        return f"{self.__class__.__name__}({self.reuse=}, {self.lazy=}, {self.ignore=})"
+
+
 def use(
     factory: INodeFactory[P, T],
     **iconfig: Unpack[INodeConfig],

tests/features/test_entry.py

@@ -180,7 +180,6 @@ def test_entry_reuse():
     def create_user(
         user_name: str, user_email: str, service: UserService
     ) -> UserService:
-        print("f")
         return service
 
     services = set[UserService]()