Merge pull request #17730 from github/redsun82/codegen-annotate

Rust: insert `CallExprBase` in the hierarchy

Author: redsun82

misc/codegen/lib/schemadefs.py

@@ -1,4 +1,8 @@
-from typing import Callable as _Callable, Dict as _Dict, ClassVar as _ClassVar
+from typing import (
+    Callable as _Callable,
+    Dict as _Dict,
+    ClassVar as _ClassVar,
+)
 from misc.codegen.lib import schema as _schema
 import inspect as _inspect
 from dataclasses import dataclass as _dataclass
@@ -271,14 +275,16 @@ def __or__(self, other: _schema.PropertyModifier):
 
 _ = _PropertyAnnotation()
 
+drop = object()
 
-def annotate(annotated_cls: type) -> _Callable[[type], _PropertyAnnotation]:
+
+def annotate(annotated_cls: type, replace_bases: _Dict[type, type] | None = None) -> _Callable[[type], _PropertyAnnotation]:
     """
-    Add or modify schema annotations after a class has been defined
-    For the moment, only docstring annotation is supported. In the future, any kind of
-    modification will be allowed.
+    Add or modify schema annotations after a class has been defined previously.
+
+    The name of the class used for annotation must be `_`.
 
-    The name of the class used for annotation must be `_`
+    `replace_bases` can be used to replace bases on the annotated class.
     """
     def decorator(cls: type) -> _PropertyAnnotation:
         if cls.__name__ != "_":
@@ -287,11 +293,15 @@ def decorator(cls: type) -> _PropertyAnnotation:
             annotated_cls.__doc__ = cls.__doc__
         for p, v in cls.__dict__.get("_pragmas", {}).items():
             _ClassPragma(p, value=v)(annotated_cls)
+        if replace_bases:
+            annotated_cls.__bases__ = tuple(replace_bases.get(b, b) for b in annotated_cls.__bases__)
         for a in dir(cls):
             if a.startswith(_schema.inheritable_pragma_prefix):
                 setattr(annotated_cls, a, getattr(cls, a))
         for p, a in cls.__annotations__.items():
-            if p in annotated_cls.__annotations__:
+            if a is drop:
+                del annotated_cls.__annotations__[p]
+            elif p in annotated_cls.__annotations__:
                 annotated_cls.__annotations__[p] |= a
             elif isinstance(a, (_PropertyAnnotation, _PropertyModifierList)):
                 raise _schema.Error(f"annotated property {p} not present in annotated class "

misc/codegen/test/test_schemaloader.py

@@ -884,6 +884,56 @@ class Something:
                 """
 
 
+def test_annotate_replace_bases():
+    @load
+    class data:
+        class Root:
+            pass
+
+        class A(Root):
+            pass
+
+        class B(Root):
+            pass
+
+        class C(B):
+            pass
+
+        class Derived(A, B):
+            pass
+
+        @defs.annotate(Derived, replace_bases={B: C})
+        class _:
+            pass
+    assert data.classes == {
+        "Root": schema.Class("Root", derived={"A", "B"}),
+        "A": schema.Class("A", bases=["Root"], derived={"Derived"}),
+        "B": schema.Class("B", bases=["Root"], derived={"C"}),
+        "C": schema.Class("C", bases=["B"], derived={"Derived"}),
+        "Derived": schema.Class("Derived", bases=["A", "C"]),
+    }
+
+
+def test_annotate_drop_field():
+    @load
+    class data:
+        class Root:
+            x: defs.int
+            y: defs.string
+            z: defs.boolean
+
+        @defs.annotate(Root)
+        class _:
+            y: defs.drop
+
+    assert data.classes == {
+        "Root": schema.Class("Root", properties=[
+            schema.SingleProperty("x", "int"),
+            schema.SingleProperty("z", "boolean"),
+        ]),
+    }
+
+
 def test_test_with_unknown_string():
     with pytest.raises(schema.Error):
         @load