missing kwarg not handled correctly (#617)

* kwargs should also be added to the missings

* added test

* bump patch version

* Fix turing tests (#618)

* fix turing tests

* fix missing imports

---------

Co-authored-by: Hong Ge <[email protected]>

Author: torfjelde

Project.toml

@@ -1,6 +1,6 @@
 name = "DynamicPPL"
 uuid = "366bfd00-2699-11ea-058f-f148b4cae6d8"
-version = "0.27.1"
+version = "0.27.2"
 
 [deps]
 ADTypes = "47edcb42-4c32-4615-8424-f2b9edc5f35b"

src/model.jl

@@ -67,11 +67,16 @@ model with different arguments.
 @generated function Model(
     f::F,
     args::NamedTuple{argnames,Targs},
-    defaults::NamedTuple,
+    defaults::NamedTuple{kwargnames,Tkwargs},
     context::AbstractContext=DefaultContext(),
-) where {F,argnames,Targs}
-    missings = Tuple(name for (name, typ) in zip(argnames, Targs.types) if typ <: Missing)
-    return :(Model{$missings}(f, args, defaults, context))
+) where {F,argnames,Targs,kwargnames,Tkwargs}
+    missing_args = Tuple(
+        name for (name, typ) in zip(argnames, Targs.types) if typ <: Missing
+    )
+    missing_kwargs = Tuple(
+        name for (name, typ) in zip(kwargnames, Tkwargs.types) if typ <: Missing
+    )
+    return :(Model{$(missing_args..., missing_kwargs...)}(f, args, defaults, context))
 end
 
 function Model(f, args::NamedTuple, context::AbstractContext=DefaultContext(); kwargs...)

test/model.jl

@@ -243,6 +243,11 @@ is_typed_varinfo(varinfo::DynamicPPL.SimpleVarInfo{<:NamedTuple}) = true
         @test length(test_defaults(missing, 2)()) == 2
     end
 
+    @testset "missing kwarg" begin
+        @model test_missing_kwarg(; x=missing) = x ~ Normal(0, 1)
+        @test :x in keys(rand(test_missing_kwarg()))
+    end
+
     @testset "extract priors" begin
         @testset "$(model.f)" for model in DynamicPPL.TestUtils.DEMO_MODELS
             priors = extract_priors(model)

test/turing/Project.toml

@@ -1,6 +1,8 @@
 [deps]
+Distributions = "31c24e10-a181-5473-b8eb-7969acd0382f"
 DynamicPPL = "366bfd00-2699-11ea-058f-f148b4cae6d8"
 LinearAlgebra = "37e2e46d-f89d-539d-b4ee-838fcccc9c8e"
+MCMCChains = "c7f686f2-ff18-58e9-bc7b-31028e88f75d"
 Random = "9a3f8284-a2c9-5f02-9a11-845980a1fd5c"
 ReverseDiff = "37e2e3b7-166d-5795-8a7a-e32c996b4267"
 Test = "8dfed614-e22c-5e08-85e1-65c5234f0b40"
@@ -9,5 +11,5 @@ Turing = "fce5fe82-541a-59a6-adf8-730c64b5f9a0"
 [compat]
 DynamicPPL = "0.24, 0.25, 0.26, 0.27"
 ReverseDiff = "1.15"
-Turing = "0.31, 0.32, 0.33"
+Turing = "0.33"
 julia = "1.7"

test/turing/runtests.jl

@@ -14,6 +14,8 @@ Random.seed!(100)
 include(joinpath(pathof(DynamicPPL), "..", "..", "test", "test_util.jl"))
 include(joinpath(pathof(Turing), "..", "..", "test", "test_utils", "numerical_tests.jl"))
 
+using .NumericalTests: check_numerical
+
 @testset "Turing" begin
     include("compiler.jl")
     include("loglikelihoods.jl")