Merge pull request #3217 from AayushSabharwal/as/mtkmodel-variables

fix: `@mtkmodel` no longer makes `@variables` callable

Author: ChrisRackauckas

Project.toml

@@ -143,7 +143,7 @@ StochasticDiffEq = "6.72.1"
 StochasticDelayDiffEq = "1.8.1"
 SymbolicIndexingInterface = "0.3.36"
 SymbolicUtils = "3.7"
-Symbolics = "6.19"
+Symbolics = "6.22"
 URIs = "1"
 UnPack = "0.1, 1.0"
 Unitful = "1.1"

src/systems/model_parsing.jl

@@ -497,7 +497,7 @@ function generate_var!(dict, a, b, varclass, mod;
     vd isa Vector && (vd = first(vd))
     vd[a] = Dict{Symbol, Any}()
     var = if indices === nothing
-        Symbolics.variable(a, T = SymbolicUtils.FnType{Tuple{Any}, type})(iv)
+        first(@variables $a(iv)::type)
     else
         vd[a][:size] = Tuple(lastindex.(indices))
         first(@variables $a(iv)[indices...]::type)

test/model_parsing.jl

@@ -1,4 +1,4 @@
-using ModelingToolkit, Test
+using ModelingToolkit, Symbolics, Test
 using ModelingToolkit: get_connector_type, get_defaults, get_gui_metadata,
                        get_systems, get_ps, getdefault, getname, readable_code,
                        scalarize, symtype, VariableDescription, RegularConnector,
@@ -990,3 +990,22 @@ struct CustomStruct end
     @named sys = MyModel(p = CustomStruct())
     @test ModelingToolkit.defaults(sys)[@nonamespace sys.p] == CustomStruct()
 end
+
+@testset "Variables are not callable symbolics" begin
+    @mtkmodel Example begin
+        @variables begin
+            x(t)
+            y(t)
+        end
+        @equations begin
+            x ~ y
+        end
+    end
+    @named ex = Example()
+    vars = Symbolics.get_variables(only(equations(ex)))
+    @test length(vars) == 2
+    for u in Symbolics.unwrap.(unknowns(ex))
+        @test !Symbolics.hasmetadata(u, Symbolics.CallWithParent)
+        @test any(isequal(u), vars)
+    end
+end