split model introspection into several files

reagento · Dec 30, 2023 · dccbfed · dccbfed
1 parent 9cb1f47
commit dccbfed
Show file tree

Hide file tree

Showing 18 changed files with 654 additions and 606 deletions.
diff --git a/src/adaptix/__init__.py b/src/adaptix/__init__.py
@@ -1,7 +1,7 @@
 from adaptix._internal.definitions import DebugTrail
 
 from ._internal.common import Dumper, Loader, TypeHint
-from ._internal.model_tools.introspection import TypedDictAt38Warning
+from ._internal.model_tools.introspection.typed_dict import TypedDictAt38Warning
 from ._internal.morphing.facade.func import dump, load
 from ._internal.morphing.facade.provider import (
     as_is_dumper,

diff --git a/src/adaptix/_internal/model_tools/definitions.py b/src/adaptix/_internal/model_tools/definitions.py
@@ -2,6 +2,7 @@
 from abc import ABC, abstractmethod
 from dataclasses import dataclass, field
 from enum import Enum
+from keyword import iskeyword
 from typing import Any, Callable, FrozenSet, Generic, Hashable, Mapping, Optional, TypeVar, Union
 
 from ..common import Catchable, TypeHint, VarTuple
@@ -146,7 +147,7 @@ def create_key_accessor(key: Union[str, int], access_error: Optional[Catchable])
 
 
 def is_valid_field_id(value: str) -> bool:
-    return value.isidentifier()
+    return value.isidentifier() or iskeyword(value)
 
 
 @dataclass(frozen=True)
@@ -315,7 +316,7 @@ class OutputShape(BaseShape):
 Out = TypeVar('Out', bound=Optional[OutputShape])
 
 
-@dataclass
+@dataclass(frozen=True)
 class Shape(Generic[Inp, Out]):
     input: Inp
     output: Out