adapt to revised target contract

Author: ablaom

src/learners/regression.jl

@@ -50,6 +50,8 @@ function LearnAPI.obs(::Ridge, data)
     names = Tables.columnnames(table) |> collect
     RidgeFitObs(Tables.matrix(table)', names, y)
 end
+
+# for involutivity:
 LearnAPI.obs(::Ridge, data::RidgeFitObs) = data
 
 # for observations:
@@ -82,9 +84,10 @@ LearnAPI.fit(learner::Ridge, data; kwargs...) =
     fit(learner, obs(learner, data); kwargs...)
 
 # extracting stuff from training data:
-LearnAPI.target(::Ridge, data) = last(data)
 LearnAPI.target(::Ridge, observations::RidgeFitObs) = observations.y
 LearnAPI.features(::Ridge, observations::RidgeFitObs) = observations.A
+LearnAPI.target(learner::Ridge, data) =
+    LearnAPI.target(learner, obs(learner, data))
 
 # observations for consumption by `predict`:
 LearnAPI.obs(::RidgeFitted, X) = Tables.matrix(X)'
@@ -130,7 +133,7 @@ LearnAPI.fit(learner::Ridge, X, y; kwargs...) =
     fit(learner, (X, y); kwargs...)
 
 
-# # VARIATION OF RIDGE REGRESSION THAT USES FALLBACK OF LearnAPI.obs
+# # VARIATION OF RIDGE REGRESSION WITHOUT DATA FRONT END
 
 # no docstring here - that goes with the constructor
 struct BabyRidge
@@ -169,9 +172,6 @@ function LearnAPI.fit(learner::BabyRidge, data; verbosity=1)
 
 end
 
-# extracting stuff from training data:
-LearnAPI.target(::BabyRidge, data) = last(data)
-
 LearnAPI.learner(model::BabyRidgeFitted) = model.learner
 
 LearnAPI.predict(model::BabyRidgeFitted, ::Point, Xnew) =

src/logging.jl

@@ -93,6 +93,11 @@ const OBS = """
 
     Attempting to call `observations = obs(learner, data)`.
 
+  """
+const FEATURES0 = """
+
+    Attempting to call `LearnAPI.features(learner, data)`.
+
   """
 const FEATURES = """
 
@@ -249,28 +254,23 @@ const TRANSFORM_ON_SELECTIONS2 = """
     `verbosity=1` for further explanation of `model3` and `X3`.
 
   """
-const TARGET = """
+const TARGET0 = """
 
-    Attempting to call `LearnAPI.target(learner, observations)` (fallback returns
-    `nothing`).
+    Attempting to call `LearnAPI.target(learner, data)` (fallback returns
+    `last(data)`).
 
   """
-const TARGET_IN_FUNCTIONS = """
-
-    Checking that `:(LearnAPI.target)` is included in `LearnAPI.functions(learner)`.
-
-  """
-const TARGET_NOT_IN_FUNCTIONS = """
+const TARGET = """
 
-    Checking that `:(LearnAPI.target)` is excluded from `LearnAPI.functions(learner)`, as
-    `LearnAPI.target` has not been overloaded.
+    Attempting to call `LearnAPI.target(learner, observations)` (fallback returns
+    `last(observations)`).
 
   """
 const TARGET_SELECTIONS = """
 
-    Checking that all observations can be extracted from `LearnAPI.target(learner,
-    observations)` using the data interface declared by
-    `LearnAPI.data_interface(learner)`.
+    Checking that all observations can be extracted from `LearnAPI.target(learner, data)`
+    using the data interface declared by `LearnAPI.data_interface(learner)`. Doing the
+    same with `data` replaced with `observations`.
 
   """
 const WEIGHTS = """

src/testapi.jl

@@ -68,7 +68,7 @@ If `LearnAPI.is_static(learner) == false`, then:
   `transform` are called with no data. Otherwise, they are called with `X`.
 
 If instead `LearnAPI.is_static(learner) == true`, then `fit` and its cousins are called
-without any data, and `dataset` is passed directly to `fit` and/or `transform`.
+without any data, and `dataset` is passed directly to `predict` and/or `transform`.
 
 """
 macro testapi(learner, data...)
@@ -197,8 +197,15 @@ macro testapi(learner, data...)
                 obs(learner, data)
             end
 
-            X = @logged_testset $FEATURES verbosity begin
-                LearnAPI.features(learner, observations)
+            X = if _is_static
+                data
+            else
+                @logged_testset $FEATURES0 verbosity begin
+                    LearnAPI.features(learner, data)
+                end
+                @logged_testset $FEATURES verbosity begin
+                    LearnAPI.features(learner, observations)
+                end
             end
 
             if !(isnothing(X))
@@ -437,24 +444,24 @@ macro testapi(learner, data...)
 
             # target
 
-            _y = @logged_testset $TARGET verbosity begin
-                LearnAPI.target(learner, observations)
-            end
-
-            if !(isnothing(_y))
-                @logged_testset $TARGET_IN_FUNCTIONS verbosity begin
-                    Test.@test :(LearnAPI.target) in _functions
+            if :(LearnAPI.target) in _functions
+                _y = @logged_testset $TARGET0 verbosity begin
+                    LearnAPI.target(learner, data)
+                end
+                @logged_testset $TARGET verbosity begin
+                    LearnAPI.target(learner, observations)
                 end
-                y = @logged_testset $TARGET_SELECTIONS verbosity begin
+                @logged_testset $TARGET_SELECTIONS verbosity begin
                     LearnTestAPI.learner_get(
                         learner,
                         data,
                         data->LearnAPI.target(learner, data),
                     )
-                end
-            else
-                @logged_testset $TARGET_NOT_IN_FUNCTIONS verbosity begin
-                    Test.@test !(:(LearnAPI.target) in _functions)
+                    LearnTestAPI.learner_get(
+                        learner,
+                        observations,
+                        data->LearnAPI.target(learner, data),
+                    )
                 end
             end
 
@@ -645,19 +652,19 @@ macro testapi(learner, data...)
                 Test.@test _human_name isa String
             end
 
-            @logged_testset $FIT_SCITYPE verbosity begin
-                S = LearnAPI.fit_scitype(learner)
-                if S == Union{}
-                    push!(missing_traits, :(LearnAPI.fit_scitype))
-                else
+            S = LearnAPI.fit_scitype(learner)
+            if S == Union{}
+                push!(missing_traits, :(LearnAPI.fit_scitype))
+            else
+                @logged_testset $FIT_SCITYPE verbosity begin
                     Test.@test ScientificTypes.scitype(data) <: S
                 end
             end
 
             S = LearnAPI.target_observation_scitype(learner)
             testable = :(LearnAPI.target) in _functions &&
                _data_interface in (LearnAPI.RandomAccess(), LearnAPI.FiniteIterable())
-            if S == Any
+            if S == Any && (LearnAPI.target) in _functions
                 push!(missing_traits, :(LearnAPI.target_observation_scitype))
             elseif testable
                 @logged_testset $TARGET_OBSERVATION_SCITYPE verbosity begin

src/tools.jl

@@ -83,8 +83,7 @@ end
 *Private method.*
 
 Extract from `LearnAPI.obs(learner, data)`, after applying `apply`, all observations,
-using the data access API specified by `LearnAPI.data_interface(learner)`. Used to test
-that the output of `data` indeed implements the specified interface.
+using the data access API specified by `LearnAPI.data_interface(learner)`.
 
 """
 learner_get(learner, data, apply=identity) =
@@ -97,8 +96,7 @@ learner_get(learner, data, apply=identity) =
 
 Extract from `LearnAPI.obs(model, data)`, after applying `apply`, all observations, using
 the data access API specified by `LearnAPI.data_interface(learner)`, where `learner =
-LearnAPI.learner(model)`. Used to test that the output of `data` indeed implements the
-specified interface.
+LearnAPI.learner(model)`.
 
 """
 model_get(model, data, apply =identity) =

test/learners/dimension_reduction.jl

@@ -11,7 +11,7 @@ U, Vt = r.U, r.Vt
 X = U*diagm([1, 2, 3, 0.01, 0.01])*Vt
 
 learner = LearnTestAPI.TruncatedSVD(codim=2)
-@testapi learner X verbosity=1
+@testapi learner X verbosity=0
 
 @testset "extra test for truncated SVD" begin
     model = @test_logs(