Merge pull request #250 from robotpy/draft-remove-pydantic

Remove pydantic and switch to dataclasses/validobj

Author: virtuald

pyproject.toml

@@ -28,7 +28,7 @@ dependencies = [
     "setuptools >= 45",
     "setuptools_scm >= 6.2, < 8",
     "sphinxify >= 0.7.3",
-    "pydantic >= 1.7.0, < 2, != 1.10.20",
+    "validobj ~= 1.2",
     "cxxheaderparser[pcpp] ~= 1.4.1",
     "tomli",
     "tomli_w",

robotpy_build/autowrap/context.py

@@ -494,7 +494,7 @@ class TemplateInstanceContext:
     full_cpp_name_identifier: str
     binder_typename: str
 
-    params: typing.List[str]
+    params: typing.List[typing.Union[int, str]]
 
     header_name: str
 

robotpy_build/autowrap/cxxparser.py

@@ -115,13 +115,13 @@ def _gen_int_types():
 
 
 _rvp_map = {
-    ReturnValuePolicy.TAKE_OWNERSHIP: "py::return_value_policy::take_ownership",
-    ReturnValuePolicy.COPY: "py::return_value_policy::copy",
-    ReturnValuePolicy.MOVE: "py::return_value_policy::move",
-    ReturnValuePolicy.REFERENCE: "py::return_value_policy::reference",
-    ReturnValuePolicy.REFERENCE_INTERNAL: "py::return_value_policy::reference_internal",
-    ReturnValuePolicy.AUTOMATIC: "",
-    ReturnValuePolicy.AUTOMATIC_REFERENCE: "py::return_value_policy::automatic_reference",
+    ReturnValuePolicy.take_ownership: "py::return_value_policy::take_ownership",
+    ReturnValuePolicy.copy: "py::return_value_policy::copy",
+    ReturnValuePolicy.move: "py::return_value_policy::move",
+    ReturnValuePolicy.reference: "py::return_value_policy::reference",
+    ReturnValuePolicy.reference_internal: "py::return_value_policy::reference_internal",
+    ReturnValuePolicy.automatic: "",
+    ReturnValuePolicy.automatic_reference: "py::return_value_policy::automatic_reference",
 }
 
 # fmt: off
@@ -938,7 +938,7 @@ def _on_class_field(
         else:
             py_name = prop_name
 
-        if propdata.access == PropAccess.AUTOMATIC:
+        if propdata.access == PropAccess.auto:
             # const variables can't be written
             if f.constexpr or getattr(f.type, "const", False):
                 prop_readonly = True
@@ -949,7 +949,7 @@ def _on_class_field(
             else:
                 prop_readonly = _is_prop_readonly(f.type)
         else:
-            prop_readonly = propdata.access == PropAccess.READONLY
+            prop_readonly = propdata.access == PropAccess.readonly
 
         doc = self._process_doc(f.doxygen, propdata)
 
@@ -2038,7 +2038,8 @@ def parse_header(
                 break
 
         for param in tmpl_data.params:
-            visitor._add_user_type_caster(param)
+            if isinstance(param, str):
+                visitor._add_user_type_caster(param)
 
     # User typealias additions
     visitor._extract_typealias(user_cfg.typealias, hctx.user_typealias, set())

robotpy_build/autowrap/generator_data.py

@@ -6,6 +6,7 @@
     AutowrapConfigYaml,
     PropData,
     FunctionData,
+    OverloadData,
 )
 from .context import OverloadTracker
 
@@ -40,6 +41,23 @@ class ClsReportData:
     functions: FnMissingData = dataclasses.field(default_factory=dict)
 
 
+def _merge_overload(data: FunctionData, overload: OverloadData) -> FunctionData:
+    # merge overload information
+    # - create a dictionary that contains things that haven't changed
+    changes = {"overloads": {}}
+    for f in dataclasses.fields(OverloadData):
+        v = getattr(overload, f.name)
+        if f.default_factory is not dataclasses.MISSING:
+            default = f.default_factory()
+        else:
+            default = f.default
+
+        if v != default:
+            changes[f.name] = v
+
+    return dataclasses.replace(data, **changes)
+
+
 class GeneratorData:
     """
     Used by the hooks to retrieve user-specified generation data, and
@@ -141,11 +159,7 @@ def get_function_data(
             overload = data.overloads.get(signature)
             missing = overload is None
             if not missing and overload:
-                # merge overload information
-                data = data.dict(exclude_unset=True)
-                del data["overloads"]
-                data.update(overload.dict(exclude_unset=True))
-                data = FunctionData(**data)
+                data = _merge_overload(data, overload)
             report_data.overloads[signature] = is_private or not missing
 
         report_data.tracker.add_overload()

robotpy_build/autowrap/render_tmpl_inst.py

@@ -10,7 +10,7 @@ def render_template_inst_cpp(
     r = RenderBuffer()
     render_class_prologue(r, hctx)
 
-    tmpl_params = ", ".join(tmpl_data.params)
+    tmpl_params = ", ".join(str(p) for p in tmpl_data.params)
 
     r.write_trim(
         f"""