Register conversion rules in owning modules

Author: cjdoris

src/Convert/Convert.jl

@@ -21,7 +21,6 @@ import ..PythonCall:
     pyconvert
 
 export pyconvert_isunconverted,
-    pyconvert_add_rule_high_priority,
     pyconvert_result,
     pyconvert_result,
     pyconvert_tryconvert,
@@ -40,6 +39,7 @@ function __init__()
     init_ctypes()
     init_numpy()
     init_pandas()
+    init_pyconvert_canonical()
 end
 
 end

src/Convert/numpy.jl

@@ -99,6 +99,7 @@ const NUMPY_SIMPLE_TYPES = [
 
 function init_numpy()
     # simple numeric scalar types
+    priority = 1
     for (t, T) in NUMPY_SIMPLE_TYPES
         isbool = occursin("bool", t)
         isint = occursin("int", t) || isbool
@@ -142,27 +143,27 @@ function init_numpy()
         pyconvert_rule_timedelta64)
     pyconvert_add_rule("numpy:timedelta64", Missing, Missing, pyconvert_rule_timedelta64)
     pyconvert_add_rule("numpy:timedelta64", Nothing, Nothing, pyconvert_rule_timedelta64)
-end
-
-function init_numpy_high_priority()
     for (t, T) in NUMPY_SIMPLE_TYPES
         pyconvert_add_rule_high_priority(
             "numpy:$t",
             T,
             Any,
             pyconvert_rule_numpysimplevalue{T,true}(),
+            priority,
         )
     end
     pyconvert_add_rule_high_priority(
         "numpy:datetime64",
         DateTime64,
         Any,
         pyconvert_rule_datetime64,
+        priority,
     )
     pyconvert_add_rule_high_priority(
         "numpy:timedelta64",
         TimeDelta64,
         Any,
         pyconvert_rule_timedelta64,
+        priority,
     )
 end

src/Convert/pandas.jl

@@ -2,9 +2,12 @@ pyconvert_rule_pandas_na(::Type{Nothing}, x::Py) = pyconvert_return(nothing)
 pyconvert_rule_pandas_na(::Type{Missing}, x::Py) = pyconvert_return(missing)
 
 function init_pandas()
-    pyconvert_add_rule("pandas.api.typing:NAType",
+    pyconvert_add_rule_high_priority(
+        "pandas.api.typing:NAType",
         Missing,
         Any,
-        pyconvert_rule_pandas_na)
+        pyconvert_rule_pandas_na,
+        0,
+    )
     pyconvert_add_rule("pandas.api.typing:NAType", Nothing, Nothing, pyconvert_rule_pandas_na)
 end

src/Convert/pyconvert.jl

@@ -63,6 +63,7 @@ function pyconvert_add_rule_high_priority(
     type::Type,
     scope::Type,
     func::Function,
+    priority::Int,
 )
     @nospecialize type scope func
     type <: scope || throw(
@@ -75,7 +76,7 @@ function pyconvert_add_rule_high_priority(
             type,
             scope,
             func,
-            typemax(Int) - length(PYCONVERT_RULES),
+            typemax(Int) ÷ 2 + priority * (typemax(Int) ÷ 16) - length(PYCONVERT_RULES),
         ),
     )
     empty!.(values(PYCONVERT_RULES_CACHE))
@@ -400,50 +401,69 @@ function init_pyconvert()
 end
 
 function init_pyconvert_canonical()
-    pyconvert_add_rule("types:NoneType", Nothing, Any, pyconvert_rule_none)
-    pyconvert_add_rule("builtins:bool", Bool, Any, pyconvert_rule_bool)
-    pyconvert_add_rule("builtins:float", Float64, Any, pyconvert_rule_float)
-    pyconvert_add_rule(
+    priority = 0
+    pyconvert_add_rule_high_priority("types:NoneType", Nothing, Any, pyconvert_rule_none, priority)
+    pyconvert_add_rule_high_priority("builtins:bool", Bool, Any, pyconvert_rule_bool, priority)
+    pyconvert_add_rule_high_priority("builtins:float", Float64, Any, pyconvert_rule_float, priority)
+    pyconvert_add_rule_high_priority(
         "builtins:complex",
         Complex{Float64},
         Any,
         pyconvert_rule_complex,
+        priority,
     )
-    pyconvert_add_rule(
+    pyconvert_add_rule_high_priority("numbers:Integral", Integer, Any, pyconvert_rule_int, priority)
+    pyconvert_add_rule_high_priority(
         "numbers:Rational",
         Rational{<:Integer},
         Any,
         pyconvert_rule_fraction,
+        priority,
     )
-    pyconvert_add_rule("numbers:Integral", Integer, Any, pyconvert_rule_int)
-    pyconvert_add_rule("builtins:str", String, Any, pyconvert_rule_str)
-    pyconvert_add_rule(
+    pyconvert_add_rule_high_priority("builtins:str", String, Any, pyconvert_rule_str, priority)
+    pyconvert_add_rule_high_priority(
         "builtins:bytes",
         Base.CodeUnits{UInt8,String},
         Any,
         pyconvert_rule_bytes,
+        priority,
     )
-    pyconvert_add_rule(
+    pyconvert_add_rule_high_priority(
         "builtins:range",
         StepRange{<:Integer,<:Integer},
         Any,
         pyconvert_rule_range,
+        priority,
     )
-    pyconvert_add_rule("builtins:tuple", NamedTuple, Any, pyconvert_rule_iterable)
-    pyconvert_add_rule("builtins:tuple", Tuple, Any, pyconvert_rule_iterable)
-    pyconvert_add_rule("datetime:datetime", DateTime, Any, pyconvert_rule_datetime)
-    pyconvert_add_rule("datetime:date", Date, Any, pyconvert_rule_date)
-    pyconvert_add_rule("datetime:time", Time, Any, pyconvert_rule_time)
-    pyconvert_add_rule(
+    pyconvert_add_rule_high_priority(
+        "builtins:tuple",
+        NamedTuple,
+        Any,
+        pyconvert_rule_iterable,
+        priority,
+    )
+    pyconvert_add_rule_high_priority("builtins:tuple", Tuple, Any, pyconvert_rule_iterable, priority)
+    pyconvert_add_rule_high_priority(
+        "datetime:datetime",
+        DateTime,
+        Any,
+        pyconvert_rule_datetime,
+        priority,
+    )
+    pyconvert_add_rule_high_priority("datetime:date", Date, Any, pyconvert_rule_date, priority)
+    pyconvert_add_rule_high_priority("datetime:time", Time, Any, pyconvert_rule_time, priority)
+    pyconvert_add_rule_high_priority(
         "datetime:timedelta",
         Microsecond,
         Any,
         pyconvert_rule_timedelta,
+        priority,
     )
-    pyconvert_add_rule(
+    pyconvert_add_rule_high_priority(
         "builtins:BaseException",
         PyException,
         Any,
         pyconvert_rule_exception,
+        priority,
     )
 end

src/JlWrap/base.jl

@@ -23,11 +23,15 @@ pyjlvalue(x) = @autopy x _pyjl_getvalue(x_)
 function init_base()
     setptr!(pyjlbasetype, incref(Cjl.PyJuliaBase_Type[]))
     pyjuliacallmodule.JlBase = pyjlbasetype
+    Convert.pyconvert_add_rule_high_priority(
+        "juliacall:JlBase",
+        Any,
+        Any,
+        pyconvert_rule_jlvalue,
+        2,
+    )
 end
 
-init_base_rule_high_priority() =
-    Convert.pyconvert_add_rule_high_priority("juliacall:JlBase", Any, Any, pyconvert_rule_jlvalue)
-
 pyconvert_rule_jlvalue(::Type{T}, x::Py) where {T} =
     pyconvert_tryconvert(T, _pyjl_getvalue(x))
 

src/PythonCall.jl

@@ -27,11 +27,4 @@ for k in [
 ]
     @eval using .JlWrap: $k
 end
-function __init__()
-    JlWrap.init_base_rule_high_priority()
-    Wrap.init_wrap_rules_high_priority()
-    Convert.init_numpy_high_priority()
-    Convert.init_pyconvert_canonical()
-end
-
 end

src/Wrap/Wrap.jl

@@ -32,28 +32,55 @@ include("PyTable.jl")
 include("PyPandasDataFrame.jl")
 
 function __init__()
-    pyconvert_add_rule("collections.abc:Sequence",
+    priority = 0
+    Convert.pyconvert_add_rule_high_priority(
+        "collections.abc:Sequence",
         PyList,
         Any,
-        pyconvert_rule_sequence)
-    pyconvert_add_rule("collections.abc:Set", PySet, Any, pyconvert_rule_set)
-    pyconvert_add_rule("collections.abc:Mapping", PyDict, Any, pyconvert_rule_mapping)
-    pyconvert_add_rule("collections.abc:Iterable",
+        pyconvert_rule_sequence,
+        priority,
+    )
+    Convert.pyconvert_add_rule_high_priority(
+        "collections.abc:Set",
+        PySet,
+        Any,
+        pyconvert_rule_set,
+        priority,
+    )
+    Convert.pyconvert_add_rule_high_priority(
+        "collections.abc:Mapping",
+        PyDict,
+        Any,
+        pyconvert_rule_mapping,
+        priority,
+    )
+    Convert.pyconvert_add_rule_high_priority(
+        "collections.abc:Iterable",
         PyIterable,
         Any,
-        pyconvert_rule_iterable)
-    pyconvert_add_rule("io:IOBase", PyIO, Any, pyconvert_rule_io)
-    pyconvert_add_rule(
+        pyconvert_rule_iterable,
+        priority,
+    )
+    Convert.pyconvert_add_rule_high_priority(
+        "io:IOBase",
+        PyIO,
+        Any,
+        pyconvert_rule_io,
+        priority,
+    )
+    Convert.pyconvert_add_rule_high_priority(
         "pandas:DataFrame",
         PyPandasDataFrame,
         Any,
         pyconvert_rule_pandasdataframe,
+        priority,
     )
-    pyconvert_add_rule(
+    Convert.pyconvert_add_rule_high_priority(
         "pandas.api.extensions:ExtensionArray",
         PyList,
         Any,
         pyconvert_rule_sequence,
+        priority,
     )
 
     pyconvert_add_rule("<arraystruct>", Array, AbstractArray, pyconvert_rule_array)
@@ -64,13 +91,22 @@ function __init__()
     pyconvert_add_rule("<arrayinterface>", AbstractArray, AbstractArray, pyconvert_rule_array)
     pyconvert_add_rule("<array>", AbstractArray, AbstractArray, pyconvert_rule_array)
     pyconvert_add_rule("<buffer>", AbstractArray, AbstractArray, pyconvert_rule_array)
-end
-
-function init_wrap_rules_high_priority()
-    pyconvert_add_rule_high_priority("<arraystruct>", PyArray, Any, pyconvert_rule_array_nocopy)
-    pyconvert_add_rule_high_priority("<arrayinterface>", PyArray, Any, pyconvert_rule_array_nocopy)
-    pyconvert_add_rule_high_priority("<array>", PyArray, Any, pyconvert_rule_array_nocopy)
-    pyconvert_add_rule_high_priority("<buffer>", PyArray, Any, pyconvert_rule_array_nocopy)
+    Convert.pyconvert_add_rule_high_priority(
+        "<arraystruct>",
+        PyArray,
+        Any,
+        pyconvert_rule_array_nocopy,
+        1,
+    )
+    Convert.pyconvert_add_rule_high_priority(
+        "<arrayinterface>",
+        PyArray,
+        Any,
+        pyconvert_rule_array_nocopy,
+        1,
+    )
+    Convert.pyconvert_add_rule_high_priority("<array>", PyArray, Any, pyconvert_rule_array_nocopy, 1)
+    Convert.pyconvert_add_rule_high_priority("<buffer>", PyArray, Any, pyconvert_rule_array_nocopy, 1)
 end
 
 end