fix Julia v1.10: hasmethod(f, t)

cihga39871 · cihga39871 · commit 1c03d17ecd11 · 2024-01-04T12:35:57.000-04:00
diff --git a/Project.toml b/Project.toml
@@ -1,7 +1,7 @@
 name = "Pipelines"
 uuid = "ef544631-5c6f-4e9b-994c-12e7a4cd724c"
 authors = ["Jiacheng Chuan <jiacheng_chuan@outlook.com>"]
-version = "0.10.4"
+version = "0.10.5"
 
 [deps]
 Dates = "ade2ca70-3891-5945-98fb-dc099432e06a"
diff --git a/docs/src/changelog.md b/docs/src/changelog.md
@@ -1,5 +1,9 @@
 # Change Log
 
+## v0.10.5
+
+- Compat: Julia v1.10: `hasmethod(f, t)` in Julia v1.10 changed its behavior. It affects Program function check. Use `length(methods(f, t))` instead.
+
 ## v0.10.4
 
 - Compat: Julia v1.9: init(): change the if statement of printing Base.stdxxx was changed when initiating Pipelines.jl: now detects WindowsRawSocket.
diff --git a/src/CmdProgram.jl b/src/CmdProgram.jl
@@ -16,11 +16,11 @@ mutable struct CmdProgram <: Program
 
     function CmdProgram(name, id_file, info_before, info_after, cmd_dependencies, arg_inputs, validate_inputs, prerequisites, cmd, infer_outputs, arg_outputs, validate_outputs, wrap_up, arg_forward)
 
-        check_function_methods(validate_inputs, (Dict, ), "validate_inputs")
-        check_function_methods(prerequisites, (Dict, Dict), "prerequisites")
-        check_function_methods(infer_outputs, (Dict, ), "infer_outputs")
-        check_function_methods(validate_outputs, (Dict, ), "validate_outputs")
-        check_function_methods(wrap_up, (Dict, Dict), "wrap_up")
+        check_function_methods(validate_inputs, (Dict{String}, ), "validate_inputs")
+        check_function_methods(prerequisites, (Dict{String}, Dict{String}), "prerequisites")
+        check_function_methods(infer_outputs, (Dict{String}, ), "infer_outputs")
+        check_function_methods(validate_outputs, (Dict{String}, ), "validate_outputs")
+        check_function_methods(wrap_up, (Dict{String}, Dict{String}), "wrap_up")
 
         arg_forward = parse_arg_forward(arg_forward)
         check_arg_forward(arg_forward, arg_inputs, arg_outputs)
diff --git a/src/JuliaProgram.jl b/src/JuliaProgram.jl
@@ -16,12 +16,12 @@ mutable struct JuliaProgram <: Program
 
     function JuliaProgram(name, id_file, info_before, info_after, cmd_dependencies, arg_inputs, validate_inputs, prerequisites, main, infer_outputs, arg_outputs, validate_outputs, wrap_up, arg_forward)
 
-        check_function_methods(validate_inputs, (Dict, ), "validate_inputs")
-        check_function_methods(prerequisites, (Dict, Dict), "prerequisites")
-        check_function_methods(main, (Dict, Dict), "main")
-        check_function_methods(infer_outputs, (Dict, ), "infer_outputs")
-        check_function_methods(validate_outputs, (Dict, ), "validate_outputs")
-        check_function_methods(wrap_up, (Dict, Dict), "wrap_up")
+        check_function_methods(validate_inputs, (Dict{String}, ), "validate_inputs")
+        check_function_methods(prerequisites, (Dict{String}, Dict{String}), "prerequisites")
+        check_function_methods(main, (Dict{String}, Dict{String}), "main")
+        check_function_methods(infer_outputs, (Dict{String}, ), "infer_outputs")
+        check_function_methods(validate_outputs, (Dict{String}, ), "validate_outputs")
+        check_function_methods(wrap_up, (Dict{String}, Dict{String}), "wrap_up")
         
         arg_forward = parse_arg_forward(arg_forward)
         check_arg_forward(arg_forward, arg_inputs, arg_outputs)
@@ -143,18 +143,18 @@ function JuliaProgram(;
 )
     # inputs, input_types, default_inputs = parse_default(inputs)
     # outputs, output_types, default_outputs = parse_default(outputs)
-    arg_inputs = parse_arg(inputs)
-    arg_outputs = parse_arg(outputs)
-    inputs = String[arg.name for arg in arg_inputs]
-    outputs = String[arg.name for arg in arg_outputs]
+    arg_inputs = parse_arg(inputs)::Vector{Arg}
+    arg_outputs = parse_arg(outputs)::Vector{Arg}
+    inputs = String[arg.name for arg in arg_inputs]::Vector{String}
+    outputs = String[arg.name for arg in arg_outputs]::Vector{String}
 
     validate_inputs = quote_function(validate_inputs, inputs; mod = mod)
     infer_outputs = quote_function(infer_outputs, inputs; mod = mod)
     prerequisites = quote_function(prerequisites, inputs, outputs; mod = mod)
     validate_outputs = quote_function(validate_outputs, outputs; mod = mod)
     wrap_up = quote_function(wrap_up, inputs, outputs; mod = mod)
 
-    main = quote_function(main, inputs, outputs; specific_return = :(outputs), mod = mod)
+    main_func = quote_function(main, inputs, outputs; specific_return = :(outputs), mod = mod)
 
     JuliaProgram(
         name,
@@ -165,7 +165,7 @@ function JuliaProgram(;
         arg_inputs,
         validate_inputs,
         prerequisites,
-        main,
+        main_func,
         infer_outputs,
         arg_outputs,
         validate_outputs,
diff --git a/src/Program.jl b/src/Program.jl
@@ -31,7 +31,8 @@ end
 
 
 function check_function_methods(f::Function, t::Tuple, name = string(f))
-    if !hasmethod(f, t)
+    if length(methods(f, t)) == 0
+    # if !hasmethod(f, t)  # cannot be used in julia v1.10. Behavior changed.
         error("Program: function `$name` does not have the required method: $t. See more at the documents of `JuliaProgram` or `CmdProgram`.")
     end
 end
diff --git a/src/quote_function.jl b/src/quote_function.jl
@@ -144,12 +144,12 @@ end
 function quote_function(expr::Expr, inputs::Vector{String}; specific_return = nothing, mod::Module = @__MODULE__)
     expr = dictreplace_all!(expr, inputs, :inputs)
     if isnothing(specific_return)
-        @eval mod function(inputs)
+        @eval mod function(inputs::Dict{String})
             $expr
         end
     else
         specific_return = dictreplace_all!(specific_return, inputs, :inputs)
-        @eval mod function(inputs)
+        @eval mod function(inputs::Dict{String})
             $expr
             $specific_return
         end
@@ -159,13 +159,13 @@ function quote_function(expr::Expr, inputs::Vector{String}, outputs::Vector{Stri
     expr = dictreplace_all!(expr, inputs, :inputs)
     expr = dictreplace_all!(expr, outputs, :outputs)
     if isnothing(specific_return)
-        @eval mod function(inputs, outputs)
+        @eval mod function(inputs::Dict{String}, outputs::Dict{String})
             $expr
         end
     else
         specific_return = dictreplace_all!(specific_return, inputs, :inputs)
         specific_return = dictreplace_all!(specific_return, outputs, :outputs)
-        @eval mod function(inputs, outputs)
+        @eval mod function(inputs::Dict{String}, outputs::Dict{String})
             $expr
             $specific_return
         end
diff --git a/test/test_Arg.jl b/test/test_Arg.jl
@@ -34,7 +34,7 @@
 end
 
 @testset "Arg forward" begin
-    @test_throws ErrorException JuliaProgram(
+    @test_throws "cannot use the reserved name" JuliaProgram(
         id_file = "id_file",
         inputs = [
             "a",
@@ -45,7 +45,7 @@ end
             "c" => "<a>.<b>"
         ],
         main = quote
-            c = "$a.$b.$name.$thread"
+            c = "$a.$b.$NAME.$thread"
         end,
         arg_forward = "NAME" => "name"
     )
@@ -60,7 +60,7 @@ end
             "c" => "<a>.<b>"
         ],
         main = quote
-            c = "$a.$b.$name.$thread"
+            c = "$a.$b.$NAME.$thread"
         end,
         arg_forward = "NAME" => "name"
     )
@@ -77,7 +77,7 @@ end
             "c" => "<a>.<b>"
         ],
         main = quote
-            c = "$a.$b.$name.$thread"
+            c = "$a.$b.$NAME.$thread"
         end,
         arg_forward = ["NAME" => "name", :thread => :ncpu]
     )
@@ -93,7 +93,7 @@ end
             "c" => "<a>.<b>"
         ],
         main = quote
-            c = "$a.$b.$name.$thread"
+            c = "$a.$b.$NAME.$thread"
         end,
         arg_forward = Dict("NAME" => "name", :thread => :ncpu)
     )
