add core numbers

Author: jverzani

Project.toml

@@ -38,4 +38,4 @@ Symbolics = "0c5d862f-8b57-4792-8d23-62f2024744c7"
 SymbolicUtils = "d1185830-fcd6-423d-90d6-eec64667417b"
 
 [targets]
-test = ["Test"]
+test = ["Symbolics", "Test"]

ext/SymPyPythonCallSymbolicsExt.jl

@@ -68,15 +68,19 @@ function pyconvert_rule_sympy_function(::Type{Symbolics.Num}, x)
     if !pyisinstance(x,sp.Function)
         return PythonCall.pyconvert_unconverted()
     end
-    name = pyconvert(Symbol,x.name)
-    args = pyconvert.(Symbolics.Num,x.args)
+    nm = PythonCall.pygetattr(x, "func", nothing)
+    isnothing(nm) && return PythonCall.pyconvert_unconverted() # XXX
+    name = pyconvert(Symbol, nm)
+    args = pyconvert.(Symbolics.Num, x.args)
     func = @variables $name(..)
     return PythonCall.pyconvert_return(first(func)(args...))
 end
 
 
 function __init__()
     # added rules
+    add_pyconvert_rule(f, cls) = PythonCall.pyconvert_add_rule(cls, Symbolics.Num, f)
+
     PythonCall.pyconvert_add_rule("sympy.core.symbol:Symbol", Symbolics.Num, pyconvert_rule_sympy_symbol)
 
     PythonCall.pyconvert_add_rule("sympy.core.power:Pow", Symbolics.Num, pyconvert_rule_sympy_pow)
@@ -90,7 +94,25 @@ function __init__()
     PythonCall.pyconvert_add_rule("sympy.core.function:Derivative",Symbolics.Num, pyconvert_rule_sympy_derivative)
 
     PythonCall.pyconvert_add_rule("sympy.core.function:Function",Symbolics.Num, pyconvert_rule_sympy_function)
-end
 
+    # core numbers
+    add_pyconvert_rule("sympy.core.numbers:Pi") do T::Type{Symbolics.Num}, x
+        PythonCall.pyconvert_return(Symbolics.Num(pi))
+    end
+    add_pyconvert_rule("sympy.core.numbers:Exp1") do T::Type{Symbolics.Num}, x
+        PythonCall.pyconvert_return(Symbolics.Num(ℯ))
+    end
+    add_pyconvert_rule("sympy.core.numbers:Infinity") do T::Type{Symbolics.Num}, x
+        PythonCall.pyconvert_return(Symbolics.Num(Inf))
+    end
+    #= complex numbers and Num needs some workaround
+    add_pyconvert_rule("sympy.core.numbers:ImaginaryUnit") do T::Type{Symbolics.Num}, x
+        PythonCall.pyconvert_return(Symbolics.Num(im))
+    end
+    add_pyconvert_rule("sympy.core.numbers:ComplexInfinity") do T::Type{Symbolics.Num}, x
+        PythonCall.pyconvert_return(Symbolics.Num(Inf)) # errors: Complex(Inf,Inf)))
+    end
+    =#
+end
 
 end

test/runtests.jl

@@ -13,3 +13,7 @@ include("test-specialfuncs.jl")
 #include("test-physics.jl")
 #include("test-external-module.jl")
 include("test-latexify.jl")
+
+if VERSION >= v"1.9.0-"
+    @testset "Symbolics integration" begin include("symbolics-integration.jl") end
+end

test/symbolics-integration.jl

@@ -0,0 +1,4 @@
+using SymPyPythonCall
+using Symbolics
+
+@test isa(SymPyPythonCall.PythonCall.pyconvert(Symbolics.Num, sympy.sympify("x")), Symbolics.Num)