refactor: Remove explicit use of InvalidExpr

Author: sizmailov

pybind11_stubgen/__init__.py

@@ -48,7 +48,7 @@
     RemoveSelfAnnotation,
     ReplaceReadWritePropertyWithField,
     RewritePybind11EnumValueRepr,
-    WrapInvalidExpressionInAnnotated,
+    WrapInvalidExpressions,
 )
 from pybind11_stubgen.parser.mixins.parse import (
     BaseParser,
@@ -252,7 +252,7 @@ def stub_parser_from_args(args: CLIArgs) -> IParser:
     if args.print_invalid_expressions_as_is:
         wrap_invalid_expressions = []
     else:
-        wrap_invalid_expressions = [WrapInvalidExpressionInAnnotated]
+        wrap_invalid_expressions = [WrapInvalidExpressions]
 
     class Parser(
         *error_handlers_top,  # type: ignore[misc]
@@ -268,7 +268,6 @@ class Parser(
         FixMissingEnumMembersAnnotation,
         OverridePrintSafeValues,
         *numpy_fixes,  # type: ignore[misc]
-        *wrap_invalid_expressions,
         FixNumpyDtype,
         FixNumpyArrayFlags,
         FixCurrentModulePrefixInTypeNames,
@@ -283,6 +282,7 @@ class Parser(
         FixRedundantMethodsFromBuiltinObject,
         RemoveSelfAnnotation,
         FixPybind11EnumStrDoc,
+        *wrap_invalid_expressions,
         ExtractSignaturesFromPybind11Docstrings,
         ParserDispatchMixin,
         BaseParser,

pybind11_stubgen/parser/mixins/fix.py

@@ -36,7 +36,7 @@
     TypeVar_,
     Value,
 )
-from pybind11_stubgen.typing_ext import DynamicSize, FixedSize, InvalidExpr
+from pybind11_stubgen.typing_ext import DynamicSize, FixedSize
 
 logger = getLogger("pybind11_stubgen")
 
@@ -867,24 +867,20 @@ def handle_class_member(
         return result
 
 
-class WrapInvalidExpressionInAnnotated(IParser):
+class WrapInvalidExpressions(IParser):
     def parse_annotation_str(
         self, annotation_str: str
     ) -> ResolvedType | InvalidExpression | Value:
         result = super().parse_annotation_str(annotation_str)
         if not isinstance(result, InvalidExpression):
             return result
 
-        self.handle_type(InvalidExpr)
         substitute_t = ResolvedType(self.handle_type(Any))
         return ResolvedType(
             QualifiedName.from_str("typing.Annotated"),
             parameters=[
                 substitute_t,
-                Value(
-                    repr=repr(InvalidExpr(expr=annotation_str.strip())),
-                    is_print_safe=True,
-                ),
+                result,
             ],
         )
 

pybind11_stubgen/typing_ext.py

@@ -1,5 +1,7 @@
 from __future__ import annotations
 
+from typing import Any
+
 
 class FixedSize:
     def __init__(self, *dim: int):
@@ -25,13 +27,8 @@ def __repr__(self):
         )
 
 
-class InvalidExpr:
-    def __init__(self, expr: str):
-        self.expr = expr
-
-    def __repr__(self):
-        return (
-            f"{self.__module__}."
-            f"{self.__class__.__qualname__}"
-            f"({repr(self.expr)})"
-        )
+def InvalidExpr(expr: str) -> Any:
+    raise RuntimeError(
+        "The method exists only for annotation purposes in stub files. "
+        "Should never not be used at runtime"
+    )

tests/stubs/python-3.12/pybind11-master/numpy-array-wrap-with-annotated/demo/_bindings/flawed_bindings.pyi

@@ -2,8 +2,6 @@ from __future__ import annotations
 
 import typing
 
-import pybind11_stubgen.typing_ext
-
 __all__ = [
     "Enum",
     "Unbound",
@@ -20,24 +18,8 @@ class Enum:
 class Unbound:
     pass
 
-def accept_unbound_enum(
-    arg0: typing.Annotated[
-        typing.Any,
-        pybind11_stubgen.typing_ext.InvalidExpr("(anonymous namespace)::Enum"),
-    ]
-) -> int: ...
+def accept_unbound_enum(arg0: typing.Annotated[typing.Any, ...]) -> int: ...
 def accept_unbound_enum_defaulted(x: Enum = ...) -> int: ...
-def accept_unbound_type(
-    arg0: tuple[
-        typing.Annotated[
-            typing.Any,
-            pybind11_stubgen.typing_ext.InvalidExpr("(anonymous namespace)::Unbound"),
-        ],
-        int,
-    ]
-) -> int: ...
+def accept_unbound_type(arg0: tuple[typing.Annotated[typing.Any, ...], int]) -> int: ...
 def accept_unbound_type_defaulted(x: Unbound = ...) -> int: ...
-def get_unbound_type() -> typing.Annotated[
-    typing.Any,
-    pybind11_stubgen.typing_ext.InvalidExpr("(anonymous namespace)::Unbound"),
-]: ...
+def get_unbound_type() -> typing.Annotated[typing.Any, ...]: ...