Skip to content

improve prompting about missing implementations #793

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 18 commits into from
Sep 6, 2022
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions NAMESPACE
Original file line number Diff line number Diff line change
Expand Up @@ -246,6 +246,7 @@ export(predict_time)
export(predict_time.model_fit)
export(prepare_data)
export(print_model_spec)
export(prompt_missing_implementation)
export(proportional_hazards)
export(rand_forest)
export(repair_call)
Expand All @@ -271,6 +272,8 @@ export(show_call)
export(show_engines)
export(show_fit)
export(show_model_info)
export(spec_is_loaded)
export(spec_is_possible)
export(stan_conf_int)
export(surv_reg)
export(survival_reg)
Expand Down
18 changes: 17 additions & 1 deletion R/aaa_models.R
Original file line number Diff line number Diff line change
Expand Up @@ -37,6 +37,15 @@ pred_types <-

# ------------------------------------------------------------------------------

read_model_info_table <- function() {
model_info_table <-
utils::read.delim(system.file("models.tsv", package = "parsnip"))

model_info_table
}

# ------------------------------------------------------------------------------

#' Working with the parsnip model environment
#'
#' These functions read and write to the environment where the package stores
Expand Down Expand Up @@ -220,7 +229,14 @@ check_spec_mode_engine_val <- function(cls, eng, mode) {

# Cases where the model definition is in parsnip but all of the engines
# are contained in a different package
if (nrow(model_info) == 0) {
model_info_parsnip_only <-
dplyr::inner_join(
read_model_info_table() %>% dplyr::filter(is.na(pkg)) %>% dplyr::select(-pkg),
model_info %>% dplyr::mutate(model = cls),
by = c("model", "engine", "mode")
)

if (nrow(model_info_parsnip_only) == 0) {
check_mode_with_no_engine(cls, mode)
return(invisible(NULL))
}
Expand Down
15 changes: 13 additions & 2 deletions R/arguments.R
Original file line number Diff line number Diff line change
Expand Up @@ -71,9 +71,10 @@ set_args.model_spec <- function(object, ...) {
args = object$args,
eng_args = object$eng_args,
mode = object$mode,
user_specified_mode = object$user_specified_mode,
method = NULL,
engine = object$engine,
check_missing_spec = FALSE
user_specified_engine = object$user_specified_engine
)
}

Expand All @@ -97,8 +98,18 @@ set_mode.model_spec <- function(object, mode) {
spec_modes <- rlang::env_get(get_model_env(), paste0(cls, "_modes"))
stop_incompatible_mode(spec_modes, cls = cls)
}
check_spec_mode_engine_val(cls, object$engine, mode)

# determine if the model specification could feasibly match any entry
# in the union of the parsnip model environment and model_info_table.
# if not, trigger an error based on the (possibly inferred) model spec slots.
if (!spec_is_possible(cls,
object$engine, object$user_specified_engine,
mode, user_specified_mode = TRUE)) {
check_spec_mode_engine_val(cls, object$engine, mode)
}

object$mode <- mode
object$user_specified_mode <- TRUE
object
}

Expand Down
4 changes: 3 additions & 1 deletion R/bag_mars.R
Original file line number Diff line number Diff line change
Expand Up @@ -37,8 +37,10 @@ bag_mars <-
args = args,
eng_args = NULL,
mode = mode,
user_specified_mode = !missing(mode),
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

These changes will have to propagate to the external extension packages too (e.g. model time)?

We'll also need to update the docs on tidymodels.org too (I believe).

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

engine_filter_condition and mode_filter_condition (to be renamed re: comment), where these slots are processed, anticipate model objects from external extension packages not having this slot—in those cases, we bypass the additional prompts so that those external extensions fall back to the same errors as before. Those extensions can add the slot and get the prompting introduced in this PR "for free," since these prompts look to a full join of the model environment and model_info_table.

Good thought on the tidymodels.org docs. Will follow-up with a PR there.

method = NULL,
engine = engine
engine = engine,
user_specified_engine = !missing(engine)
)
}

Expand Down
4 changes: 3 additions & 1 deletion R/bag_tree.R
Original file line number Diff line number Diff line change
Expand Up @@ -41,8 +41,10 @@ bag_tree <-
args = args,
eng_args = NULL,
mode = mode,
user_specified_mode = !missing(mode),
method = NULL,
engine = engine
engine = engine,
user_specified_engine = !missing(engine)
)
}

Expand Down
4 changes: 3 additions & 1 deletion R/bart.R
Original file line number Diff line number Diff line change
Expand Up @@ -85,8 +85,10 @@ bart <-
args = args,
eng_args = NULL,
mode = mode,
user_specified_mode = !missing(mode),
method = NULL,
engine = engine
engine = engine,
user_specified_engine = !missing(engine)
)
}

Expand Down
6 changes: 4 additions & 2 deletions R/boost_tree.R
Original file line number Diff line number Diff line change
Expand Up @@ -74,9 +74,11 @@ boost_tree <-
"boost_tree",
args,
eng_args = NULL,
mode,
mode = mode,
user_specified_mode = !missing(mode),
method = NULL,
engine = engine
engine = engine,
user_specified_engine = !missing(engine)
)
}

Expand Down
4 changes: 3 additions & 1 deletion R/c5_rules.R
Original file line number Diff line number Diff line change
Expand Up @@ -58,8 +58,10 @@ C5_rules <-
args = args,
eng_args = NULL,
mode = mode,
user_specified_mode = !missing(mode),
method = NULL,
engine = engine
engine = engine,
user_specified_engine = !missing(engine)
)
}

Expand Down
4 changes: 3 additions & 1 deletion R/cubist_rules.R
Original file line number Diff line number Diff line change
Expand Up @@ -84,8 +84,10 @@ cubist_rules <-
args = args,
eng_args = NULL,
mode = mode,
user_specified_mode = !missing(mode),
method = NULL,
engine = engine
engine = engine,
user_specified_engine = !missing(engine)
)
}

Expand Down
4 changes: 3 additions & 1 deletion R/decision_tree.R
Original file line number Diff line number Diff line change
Expand Up @@ -46,8 +46,10 @@ decision_tree <-
args = args,
eng_args = NULL,
mode = mode,
user_specified_mode = !missing(mode),
method = NULL,
engine = engine
engine = engine,
user_specified_engine = !missing(engine)
)
}

Expand Down
4 changes: 3 additions & 1 deletion R/discrim_flexible.R
Original file line number Diff line number Diff line change
Expand Up @@ -40,8 +40,10 @@ discrim_flexible <-
args = args,
eng_args = NULL,
mode = mode,
user_specified_mode = !missing(mode),
method = NULL,
engine = engine
engine = engine,
user_specified_engine = !missing(engine)
)
}

Expand Down
4 changes: 3 additions & 1 deletion R/discrim_linear.R
Original file line number Diff line number Diff line change
Expand Up @@ -42,8 +42,10 @@ discrim_linear <-
args = args,
eng_args = NULL,
mode = mode,
user_specified_mode = !missing(mode),
method = NULL,
engine = engine
engine = engine,
user_specified_engine = !missing(engine)
)
}

Expand Down
4 changes: 3 additions & 1 deletion R/discrim_quad.R
Original file line number Diff line number Diff line change
Expand Up @@ -36,8 +36,10 @@ discrim_quad <-
args = args,
eng_args = NULL,
mode = mode,
user_specified_mode = !missing(mode),
method = NULL,
engine = engine
engine = engine,
user_specified_engine = !missing(engine)
)
}

Expand Down
4 changes: 3 additions & 1 deletion R/discrim_regularized.R
Original file line number Diff line number Diff line change
Expand Up @@ -57,8 +57,10 @@ discrim_regularized <-
args = args,
eng_args = NULL,
mode = mode,
user_specified_mode = !missing(mode),
method = NULL,
engine = engine
engine = engine,
user_specified_engine = !missing(engine)
)
}

Expand Down
13 changes: 11 additions & 2 deletions R/engines.R
Original file line number Diff line number Diff line change
Expand Up @@ -116,7 +116,15 @@ set_engine.model_spec <- function(object, engine, ...) {
stop_missing_engine(mod_type)
}
object$engine <- engine
check_spec_mode_engine_val(mod_type, object$engine, object$mode)

# determine if the model specification could feasibly match any entry
# in the union of the parsnip model environment and model_info_table.
# if not, trigger an error based on the (possibly inferred) model spec slots.
if (!spec_is_possible(mod_type,
object$engine, user_specified_engine = TRUE,
object$mode, object$user_specified_mode)) {
check_spec_mode_engine_val(mod_type, object$engine, object$mode)
}

if (object$engine == "liquidSVM") {
lifecycle::deprecate_soft(
Expand All @@ -130,9 +138,10 @@ set_engine.model_spec <- function(object, engine, ...) {
args = object$args,
eng_args = enquos(...),
mode = object$mode,
user_specified_mode = object$user_specified_mode,
method = NULL,
engine = object$engine,
check_missing_spec = FALSE
user_specified_engine = TRUE
)
}

Expand Down
14 changes: 8 additions & 6 deletions R/fit.R
Original file line number Diff line number Diff line change
Expand Up @@ -120,12 +120,14 @@ fit.model_spec <-
dots <- quos(...)

if (length(possible_engines(object)) == 0) {
rlang::abort(
glue::glue(
"No engines were loaded for `{class(object)[1]}`.",
" Please load a parsnip extension package that provides one.",
" See https://www.tidymodels.org/find/parsnip/ "
)
prompt_missing_implementation(
cls = class(object)[1],
engine = object$engine,
user_specified_engine = object$user_specified_engine,
mode = object$mode,
user_specified_mode = object$user_specified_mode,
prompt = cli::cli_abort,
call = call2("fit")
)
}
if (is.null(object$engine)) {
Expand Down
8 changes: 5 additions & 3 deletions R/gen_additive_mod.R
Original file line number Diff line number Diff line change
Expand Up @@ -43,9 +43,11 @@ gen_additive_mod <- function(mode = "unknown",
"gen_additive_mod",
args = args,
eng_args = NULL,
mode = mode,
method = NULL,
engine = engine
mode = mode,
user_specified_mode = !missing(mode),
method = NULL,
engine = engine,
user_specified_engine = !missing(engine)
)

}
Expand Down
4 changes: 3 additions & 1 deletion R/linear_reg.R
Original file line number Diff line number Diff line change
Expand Up @@ -53,8 +53,10 @@ linear_reg <-
args = args,
eng_args = NULL,
mode = mode,
user_specified_mode = !missing(mode),
method = NULL,
engine = engine
engine = engine,
user_specified_engine = !missing(engine)
)
}

Expand Down
4 changes: 3 additions & 1 deletion R/logistic_reg.R
Original file line number Diff line number Diff line change
Expand Up @@ -60,8 +60,10 @@ logistic_reg <-
args = args,
eng_args = NULL,
mode = mode,
user_specified_mode = !missing(mode),
method = NULL,
engine = engine
engine = engine,
user_specified_engine = !missing(engine)
)
}

Expand Down
4 changes: 3 additions & 1 deletion R/mars.R
Original file line number Diff line number Diff line change
Expand Up @@ -44,8 +44,10 @@ mars <-
args = args,
eng_args = NULL,
mode = mode,
user_specified_mode = !missing(mode),
method = NULL,
engine = engine
engine = engine,
user_specified_engine = !missing(engine)
)
}

Expand Down
Loading