python-introspect 0.2.3__tar.gz → 0.2.5__tar.gz

{python_introspect-0.2.3/src/python_introspect.egg-info → python_introspect-0.2.5}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: python-introspect
-Version: 0.2.3
+Version: 0.2.5
 Summary: Pure Python introspection toolkit for function signatures, dataclasses, and type hints
 Author-email: Tristan Simas <tristan.simas@mail.mcgill.ca>
 License: MIT
@@ -15,6 +15,7 @@ Classifier: Programming Language :: Python :: 3
 Classifier: Programming Language :: Python :: 3.10
 Classifier: Programming Language :: Python :: 3.11
 Classifier: Programming Language :: Python :: 3.12
+Classifier: Programming Language :: Python :: 3.13
 Classifier: Topic :: Software Development :: Libraries :: Python Modules
 Classifier: Topic :: Utilities
 Requires-Python: >=3.10

{python_introspect-0.2.3 → python_introspect-0.2.5}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "python-introspect"
-version = "0.2.3"
+version = "0.2.5"
 description = "Pure Python introspection toolkit for function signatures, dataclasses, and type hints"
 readme = "README.md"
 requires-python = ">=3.10"
@@ -21,6 +21,7 @@ classifiers = [
     "Programming Language :: Python :: 3.10",
     "Programming Language :: Python :: 3.11",
     "Programming Language :: Python :: 3.12",
+    "Programming Language :: Python :: 3.13",
     "Topic :: Software Development :: Libraries :: Python Modules",
     "Topic :: Utilities",
 ]

{python_introspect-0.2.3 → python_introspect-0.2.5}/src/python_introspect/__init__.py

@@ -9,7 +9,7 @@ Extensibility:
     type resolution for framework-specific types (lazy configs, proxies, etc.)
 """
 
-__version__ = "0.2.3"
+__version__ = "0.2.5"
 
 from .signature_analyzer import (
     SignatureAnalyzer,

{python_introspect-0.2.3 → python_introspect-0.2.5}/src/python_introspect/annotation_types.py

@@ -5,7 +5,15 @@ from __future__ import annotations
 import sys
 import types
 from enum import Enum
-from typing import Annotated, Literal, Union, get_args, get_origin, get_type_hints
+from typing import (
+    Annotated,
+    ForwardRef,
+    Literal,
+    Union,
+    get_args,
+    get_origin,
+    get_type_hints,
+)
 
 
 def resolved_class_annotations(owner: type) -> dict[str, object]:
@@ -13,6 +21,9 @@ def resolved_class_annotations(owner: type) -> dict[str, object]:
 
     Python 3.10 leaves strings inside PEP 585 aliases unresolved. Complete
     those declarations without interpreting Literal values or Annotated metadata.
+    A recursive alias such as ``V = int | list["V"]`` names itself; the inner
+    reference is left as a ``ForwardRef``, the form ``get_type_hints`` produces
+    for it on Python 3.11 and later.
     """
     annotations = get_type_hints(owner, include_extras=True)
     unresolved = set(annotations)
@@ -29,20 +40,34 @@ def resolved_class_annotations(owner: type) -> dict[str, object]:
     return annotations
 
 
-def _resolve_nested_type_strings(annotation: object, globalns: dict, localns: dict) -> object:
+def _resolve_nested_type_strings(
+    annotation: object,
+    globalns: dict,
+    localns: dict,
+    expanding: frozenset[str] = frozenset(),
+) -> object:
     if isinstance(annotation, str):
-        return _resolve_nested_type_strings(eval(annotation, globalns, localns), globalns, localns)
+        if annotation in expanding:
+            return ForwardRef(annotation)
+        return _resolve_nested_type_strings(
+            eval(annotation, globalns, localns), globalns, localns, expanding | {annotation}
+        )
     if isinstance(annotation, list):
-        resolved = [_resolve_nested_type_strings(member, globalns, localns) for member in annotation]
+        resolved = [
+            _resolve_nested_type_strings(member, globalns, localns, expanding)
+            for member in annotation
+        ]
         return annotation if all(a is b for a, b in zip(resolved, annotation)) else resolved
     origin = get_origin(annotation)
     members = get_args(annotation)
     if not members or origin is Literal:
         return annotation
     if origin is Annotated:
-        base = _resolve_nested_type_strings(members[0], globalns, localns)
+        base = _resolve_nested_type_strings(members[0], globalns, localns, expanding)
         return annotation if base is members[0] else Annotated[(base, *members[1:])]
-    resolved = tuple(_resolve_nested_type_strings(member, globalns, localns) for member in members)
+    resolved = tuple(
+        _resolve_nested_type_strings(member, globalns, localns, expanding) for member in members
+    )
     if all(member is original for member, original in zip(resolved, members)):
         return annotation
     if isinstance(annotation, types.GenericAlias):

{python_introspect-0.2.3 → python_introspect-0.2.5}/src/python_introspect/signature_analyzer.py

@@ -771,6 +771,26 @@ class CallableAnalysisContext:
         )
 
 
+def _class_node_for_qualname(tree: ast.AST, qualname: str) -> Optional[ast.ClassDef]:
+    """Return the class statement whose qualified name is ``qualname``.
+
+    Function bodies contribute ``<locals>`` exactly as ``__qualname__`` does.
+    """
+    pending = [(node, ()) for node in reversed(getattr(tree, 'body', ()))]
+    while pending:
+        node, scope = pending.pop()
+        if isinstance(node, ast.ClassDef):
+            node_scope = (*scope, node.name)
+            if '.'.join(node_scope) == qualname:
+                return node
+        elif isinstance(node, (ast.FunctionDef, ast.AsyncFunctionDef)):
+            node_scope = (*scope, node.name, '<locals>')
+        else:
+            node_scope = scope
+        pending.extend((child, node_scope) for child in reversed(list(ast.iter_child_nodes(node))))
+    return None
+
+
 class ClassSourceDeclaration(NamedTuple):
     """Immutable located class source and its source-only documentation views."""
 
@@ -1196,20 +1216,13 @@ class SignatureAnalyzer:
     def _qualified_class_source(source: str, qualname: str) -> Optional[ClassSourceDeclaration]:
         """Use Python's qualified class/decorator locator on current source content."""
         tree = SignatureAnalyzer._module_source_tree(source)
-        finder = inspect._ClassFinder(qualname)
-        try:
-            finder.visit(tree)
-        except inspect.ClassFoundException as found:
-            lines = source.splitlines(keepends=True)
-            first_line = found.args[0] + 1
-            block = ''.join(inspect.getblock(lines[found.args[0]:]))
-            class_node = next(
-                node for node in ast.walk(tree)
-                if isinstance(node, ast.ClassDef)
-                and min([node.lineno, *(decorator.lineno for decorator in node.decorator_list)]) == first_line
-            )
-            return ClassSourceDeclaration.from_block(block, class_node, first_line)
-        return None
+        class_node = _class_node_for_qualname(tree, qualname)
+        if class_node is None:
+            return None
+        first_line = min([class_node.lineno, *(decorator.lineno for decorator in class_node.decorator_list)])
+        lines = source.splitlines(keepends=True)
+        block = ''.join(inspect.getblock(lines[first_line - 1:]))
+        return ClassSourceDeclaration.from_block(block, class_node, first_line)
 
     @staticmethod
     def _extract_inline_field_docs(dataclass_type: type) -> Dict[str, str]:

{python_introspect-0.2.3 → python_introspect-0.2.5/src/python_introspect.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: python-introspect
-Version: 0.2.3
+Version: 0.2.5
 Summary: Pure Python introspection toolkit for function signatures, dataclasses, and type hints
 Author-email: Tristan Simas <tristan.simas@mail.mcgill.ca>
 License: MIT
@@ -15,6 +15,7 @@ Classifier: Programming Language :: Python :: 3
 Classifier: Programming Language :: Python :: 3.10
 Classifier: Programming Language :: Python :: 3.11
 Classifier: Programming Language :: Python :: 3.12
+Classifier: Programming Language :: Python :: 3.13
 Classifier: Topic :: Software Development :: Libraries :: Python Modules
 Classifier: Topic :: Utilities
 Requires-Python: >=3.10

{python_introspect-0.2.3 → python_introspect-0.2.5}/tests/test_dataclass_projection.py

@@ -1,7 +1,7 @@
 from dataclasses import asdict, dataclass, field
 from enum import Enum
 from typing import Annotated, Literal
-from collections.abc import Sequence
+from collections.abc import Mapping, Sequence
 
 import pytest
 
@@ -297,3 +297,37 @@ def test_inherited_nested_types_use_the_declaring_module_namespace(monkeypatch):
     )
     result = dataclass_from_mapping(child_module.Child, {"children": [{"name": "child"}]})
     assert isinstance(result.children[0], base_module.Leaf)
+
+
+WireValue = (
+    str
+    | int
+    | float
+    | bool
+    | None
+    | list["WireValue"]
+    | tuple["WireValue", ...]
+    | dict[str, "WireValue"]
+)
+
+
+@dataclass(frozen=True)
+class WireEnvelope:
+    sequence: int
+    event: Mapping[str, WireValue] | None
+
+
+def test_recursive_type_alias_decodes_nested_values() -> None:
+    # Python 3.10 keeps "WireValue" as a string inside the PEP 585 aliases;
+    # resolving it must stop where the alias names itself.
+    payload = {
+        "sequence": 1,
+        "event": {
+            "phase": "compile",
+            "percent": 50.0,
+            "context": {"axes": ["A01"], "details": [{"ready": True, "error": None}]},
+        },
+    }
+    result = dataclass_from_mapping(WireEnvelope, payload)
+    assert result == WireEnvelope(1, payload["event"])
+    validate_annotated_dataclass(result)