updating to use the new cppyy patch of func_overloads_types

Author: siliataider

bindings/pyroot/pythonizations/python/ROOT/_pythonization/_rdf_pyz.py

@@ -269,30 +269,37 @@ def get_column_types(rdf, cols):
     types = [rdf.GetColumnType(col) for col in cols]
     return types
 
-def get_overload_based_on_args(signatures, types):
+def get_overload_based_on_args(overload_types, types):
     """
     Gets the C++ overloads for a function based on the provided signatures and types.
     """
-    if not isinstance(signatures, list) or not all(isinstance(sig, str) for sig in signatures):
-        raise TypeError("Function signatures must be a list of strings.")
+    if not isinstance(overload_types, dict):
+        raise TypeError("Overload types must be a dictionary.")
 
     if not isinstance(types, list) or not all(isinstance(t, str) for t in types):
         raise TypeError("Types must be a list of strings.")
 
-    if len(signatures) == 1:
+    if len(overload_types) == 1:
         # If there is only one signature, return it directly
-        return signatures[0]
+        return next(iter(overload_types))
 
-    for sig in signatures:
-        args_str = sig[sig.index('(') + 1:sig.rindex(')')]
+    for full_sig, info in overload_types.items():
+        input_types = info.get('input_types', ())
 
-        if not args_str and not types:
-            return sig
+        if len(input_types) != len(types):
+            continue
 
-        args = [arg.strip() for arg in args_str.split(',') if arg.strip()]
+        match = True
+        for expected, actual in zip(input_types, types):
+            # Loose match: require actual to appear somewhere in expected (e.g. "int" in "const int&")
+            if actual not in expected:
+                match = False
+                break
 
-        if len(args) == len(types):
-            return sig
+        if match:
+            return full_sig
+
+    raise ValueError(f"No matching overload found for types: {types} in signatures: {overload_types.keys()}. Please check the function overloads.")
 
 def _get_cpp_signature(func, rdf, cols):
     """
@@ -306,12 +313,9 @@ def _get_cpp_signature(func, rdf, cols):
     if not isinstance(func, cppyy._backend.CPPOverload):
         raise TypeError(f"Expected a cppyy callable, got {type(func).__name__}")
 
-    get_overloads = func.__overload__
-    if not get_overloads:
-        raise ValueError(f"Function {func} has no `__overload__` method, cannot deduce signature.")
-
-    signatures = [remove_fn_name_from_signature(sig) for sig in get_overloads()]
-    return get_overload_based_on_args(signatures, get_column_types(rdf, cols))
+    overload_types = func.func_overloads_types
+    matched_overload = get_overload_based_on_args(overload_types, get_column_types(rdf, cols))
+    return remove_fn_name_from_signature(matched_overload)
 
 def _to_std_function(func, rdf, cols):
     """