Merge pull request #25 from JuliaAI/is-wrapper-fix-again

Fix `is_wrapper`

Author: ablaom

Project.toml

@@ -1,7 +1,7 @@
 name = "FeatureSelection"
 uuid = "33837fe5-dbff-4c9e-8c2f-c5612fe2b8b6"
 authors = ["Anthony D. Blaom <[email protected]>", "Samuel Okon <[email protected]"]
-version = "0.2.1"
+version = "0.2.2"
 
 [deps]
 MLJModelInterface = "e80e1ace-859a-464e-9ed9-23947d8ae3ea"

src/FeatureSelection.jl

@@ -9,5 +9,6 @@ const MMI = MLJModelInterface
 ## Includes
 include("models/featureselector.jl")
 include("models/rfe.jl")
+include("shared.jl")
 
 end # module

src/models/featureselector.jl

@@ -87,16 +87,6 @@ MMI.metadata_model(
     load_path = "FeatureSelection.FeatureSelector"
 )
 
-## Pkg Traits
-MMI.metadata_pkg(
-    FeatureSelector,
-    package_name = "FeatureSelection",
-    package_uuid = "33837fe5-dbff-4c9e-8c2f-c5612fe2b8b6",
-    package_url = "https://github.com/JuliaAI/FeatureSelection.jl",
-    is_pure_julia = true,
-    package_license = "MIT"
-)
-
 ## Docstring
 """
 $(MMI.doc_header(FeatureSelector))

src/models/rfe.jl

@@ -453,16 +453,3 @@ end
 function MMI.training_losses(model::RFE, rfe_report)
     return MMI.training_losses(model.model, rfe_report.model_report)
 end
-
-## Pkg Traits
-MMI.metadata_pkg.(
-    (
-        DeterministicRecursiveFeatureElimination,
-        ProbabilisticRecursiveFeatureElimination,
-    ),
-    package_name       = "FeatureSelection",
-    package_uuid       = "33837fe5-dbff-4c9e-8c2f-c5612fe2b8b6",
-    package_url        = "https://github.com/JuliaAI/FeatureSelection.jl",
-    is_pure_julia      = true,
-    package_license    = "MIT"
-)

src/shared.jl

@@ -0,0 +1,16 @@
+## Pkg Traits
+
+for M in [
+    :FeatureSelector,
+    :DeterministicRecursiveFeatureElimination,
+    :ProbabilisticRecursiveFeatureElimination,
+    ]
+    quote
+        MMI.package_name(::Type{<:$M})  = "FeatureSelection"
+        MMI.package_uuid(::Type{<:$M})  = "33837fe5-dbff-4c9e-8c2f-c5612fe2b8b6"
+        MMI.package_url(::Type{<:$M})   = "https://github.com/JuliaAI/FeatureSelection.jl"
+        MMI.is_pure_julia(::Type{<:$M}) = true
+        MMI.package_license(::Type{<:$M})   = "MIT"
+    end |> eval
+end
+

test/models/rfe.jl

@@ -191,3 +191,11 @@ end
 
     @test predict(mach2, (; x1=rand(2), x2=rand(2))) == yhat
 end
+
+@testset "is_wrapper" begin
+    m = RecursiveFeatureElimination(DecisionTreeClassifier())
+    @test is_wrapper(m)
+    @test is_wrapper(typeof(m))
+end
+
+true