Skip to content

Threading the call through #275

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.

Sign up for GitHub

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 16 commits into from
Dec 10, 2024
Merged

Threading the call through #275

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
16 commits
Select commit Hold shift + click to select a range
25f3aec
add call to `check_elems()`
hfrick Dec 2, 2024
1faeed0
pass call to `validate_column_names()`
hfrick Dec 2, 2024
4e990ee
pass call to `recompose()` from `mold()`
hfrick Dec 3, 2024
afc3b85
pass call to `recompose()` from `forge()`
hfrick Dec 3, 2024
47f813e
Pass call to `validate_missing_name_isnt_.outcome()`
hfrick Dec 3, 2024
d81c543
Pass call to `model_offset()` from `mold()`
hfrick Dec 3, 2024
578bc33
Pass call to `check_no_factorish_*()` from `mold()`
hfrick Dec 3, 2024
7c4328e
Pass call to `get_all_predictors()` from `mold()`
hfrick Dec 3, 2024
b63888d
Pass call to `get_all_outcomes()` from `mold()`
hfrick Dec 3, 2024
102d0d8
Pass call to `check_implicit_intercept()` from `mold()`
hfrick Dec 3, 2024
856477e
Pass call to `check_no_interactions()` from `mold()`
hfrick Dec 3, 2024
5c0a123
Pass call to and through `mold_recipe_default_clean()` from `mold()`
hfrick Dec 3, 2024
104de52
Pass call to `validate_has_known_outcome_types()`
hfrick Dec 3, 2024
e469ea5
Merged origin/main into thread-call-thru
hfrick Dec 6, 2024
a2d06f0
move back into function!
hfrick Dec 6, 2024
d800ea2
Add NEWS bullet
hfrick Dec 10, 2024
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
2 changes: 2 additions & 0 deletions NEWS.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,8 @@

* Added a new vector class called `quantile_pred()` to house predictions made from a quantile regression model (tidymodels/parsnip#1191, @dajmcdon).

* Several functions gained a `call` argument for passing the call used in errors and warnings (#275).

# hardhat 1.4.0

* Added `extract_postprocessor()` generic (#247).
Expand Down
77 changes: 48 additions & 29 deletions R/blueprint-formula-default.R
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -372,27 +372,28 @@ refresh_blueprint.default_formula_blueprint <- function(blueprint) {
#'
#' @rdname run-mold
#' @export
run_mold.default_formula_blueprint <- function(blueprint, ..., data) {
run_mold.default_formula_blueprint <- function(blueprint, ..., data, call = caller_env()) {
check_dots_empty0(...)

cleaned <- mold_formula_default_clean(blueprint = blueprint, data = data)
cleaned <- mold_formula_default_clean(blueprint = blueprint, data = data, call = call)

blueprint <- cleaned$blueprint
data <- cleaned$data

mold_formula_default_process(blueprint = blueprint, data = data)
mold_formula_default_process(blueprint = blueprint, data = data, call = call)
}

# ------------------------------------------------------------------------------
# mold - formula - clean

mold_formula_default_clean <- function(blueprint, data) {
check_data_frame_or_matrix(data)
mold_formula_default_clean <- function(blueprint, data, ..., call = caller_env()) {
check_dots_empty0(...)
check_data_frame_or_matrix(data, call = call)
data <- coerce_to_tibble(data)

# Check here, not in the constructor, because we
# put a non-intercept-containing formula back in
check_implicit_intercept(blueprint$formula, arg = "formula")
check_implicit_intercept(blueprint$formula, arg = "formula", call = call)

formula <- remove_formula_intercept(blueprint$formula, blueprint$intercept)
formula <- alter_formula_environment(formula)
Expand Down Expand Up @@ -490,10 +491,13 @@ recurse_intercept_search <- function(x,
# ------------------------------------------------------------------------------
# mold - formula - process

mold_formula_default_process <- function(blueprint, data) {
mold_formula_default_process <- function(blueprint, data, ..., call = caller_env()) {
check_dots_empty0(...)

processed <- mold_formula_default_process_predictors(
blueprint = blueprint,
data = data
data = data,
call = call
)

blueprint <- processed$blueprint
Expand All @@ -503,7 +507,8 @@ mold_formula_default_process <- function(blueprint, data) {

processed <- mold_formula_default_process_outcomes(
blueprint = blueprint,
data = data
data = data,
call = call
)

blueprint <- processed$blueprint
Expand All @@ -523,11 +528,13 @@ mold_formula_default_process <- function(blueprint, data) {
new_mold_process(predictors, outcomes, blueprint, extras)
}

mold_formula_default_process_predictors <- function(blueprint, data) {
mold_formula_default_process_predictors <- function(blueprint, data, ..., call = caller_env()) {
check_dots_empty0(...)

formula <- expand_formula_dot_notation(blueprint$formula, data)
formula <- get_predictors_formula(formula)

original_names <- get_all_predictors(formula, data)
original_names <- get_all_predictors(formula, data, call = call)
data <- data[original_names]

ptype <- extract_ptype(data)
Expand All @@ -553,14 +560,14 @@ mold_formula_default_process_predictors <- function(blueprint, data) {
if (identical(blueprint$indicators, "none")) {
factorish_names <- extract_original_factorish_names(ptype)
factorish_data <- data[factorish_names]
check_no_factorish_in_interactions(formula, factorish_names)
check_no_factorish_in_functions(formula, factorish_names)
check_no_factorish_in_interactions(formula, factorish_names, error_call = call)
check_no_factorish_in_functions(formula, factorish_names, error_call = call)
formula <- remove_factorish_from_formula(formula, factorish_names)
data <- mask_factorish_in_data(data, factorish_names)
}

framed <- model_frame(formula, data)
offset <- extract_offset(framed$terms, framed$data)
offset <- extract_offset(framed$terms, framed$data, call = call)

if (identical(blueprint$indicators, "one_hot")) {
predictors <- model_matrix_one_hot(
Expand All @@ -580,7 +587,7 @@ mold_formula_default_process_predictors <- function(blueprint, data) {

terms <- simplify_terms(framed$terms)

predictors <- recompose(predictors, composition = blueprint$composition)
predictors <- recompose(predictors, composition = blueprint$composition, call = call)

blueprint_terms <- blueprint$terms
blueprint_terms$predictors <- terms
Expand All @@ -594,18 +601,20 @@ mold_formula_default_process_predictors <- function(blueprint, data) {
)
}

mold_formula_default_process_outcomes <- function(blueprint, data) {
mold_formula_default_process_outcomes <- function(blueprint, data, ..., call = caller_env()) {
check_dots_empty0(...)

formula <- blueprint$formula

original_names <- get_all_outcomes(formula, data)
original_names <- get_all_outcomes(formula, data, call = call)
data <- data[original_names]

ptype <- extract_ptype(data)

formula <- get_outcomes_formula(formula)

# used on the `~ LHS` formula
check_no_interactions(formula)
check_no_interactions(formula, error_call = call)

framed <- model_frame(formula, data)

Expand All @@ -631,13 +640,16 @@ mold_formula_default_process_outcomes <- function(blueprint, data) {
run_forge.default_formula_blueprint <- function(blueprint,
new_data,
...,
outcomes = FALSE) {
outcomes = FALSE,
call = caller_env()
) {
check_dots_empty0(...)

cleaned <- forge_formula_default_clean(
blueprint = blueprint,
new_data = new_data,
outcomes = outcomes
outcomes = outcomes,
call = call
)

blueprint <- cleaned$blueprint
Expand All @@ -649,13 +661,15 @@ run_forge.default_formula_blueprint <- function(blueprint,
blueprint = blueprint,
predictors = predictors,
outcomes = outcomes,
extras = extras
extras = extras,
call = call
)
}

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

forge_formula_default_clean <- function(blueprint, new_data, outcomes) {
forge_formula_default_clean <- function(blueprint, new_data, outcomes, ..., call = caller_env()) {
check_dots_empty0(...)
check_data_frame_or_matrix(new_data)
new_data <- coerce_to_tibble(new_data)
check_unique_column_names(new_data)
Expand All @@ -672,7 +686,7 @@ forge_formula_default_clean <- function(blueprint, new_data, outcomes) {
function(col, levels) factor(col, levels = levels)
)

predictors <- shrink(new_data, predictors_ptype)
predictors <- shrink(new_data, predictors_ptype, call = call)

predictors <- scream(
predictors,
Expand All @@ -681,7 +695,7 @@ forge_formula_default_clean <- function(blueprint, new_data, outcomes) {
)

if (outcomes) {
outcomes <- shrink(new_data, blueprint$ptypes$outcomes)
outcomes <- shrink(new_data, blueprint$ptypes$outcomes, call = call)
# Never allow novel levels for outcomes
outcomes <- scream(outcomes, blueprint$ptypes$outcomes)
} else {
Expand All @@ -693,10 +707,13 @@ forge_formula_default_clean <- function(blueprint, new_data, outcomes) {

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

forge_formula_default_process <- function(blueprint, predictors, outcomes, extras) {
forge_formula_default_process <- function(blueprint, predictors, outcomes, extras, ..., call = caller_env()) {
check_dots_empty0(...)

processed <- forge_formula_default_process_predictors(
blueprint = blueprint,
predictors = predictors
predictors = predictors,
call = call
)

blueprint <- processed$blueprint
Expand All @@ -720,7 +737,9 @@ forge_formula_default_process <- function(blueprint, predictors, outcomes, extra
new_forge_process(predictors, outcomes, extras)
}

forge_formula_default_process_predictors <- function(blueprint, predictors) {
forge_formula_default_process_predictors <- function(blueprint, predictors, ..., call = caller_env()) {
check_dots_empty0(...)

terms <- blueprint$terms$predictors
terms <- alter_terms_environment(terms)

Expand Down Expand Up @@ -748,9 +767,9 @@ forge_formula_default_process_predictors <- function(blueprint, predictors) {
data <- unmask_factorish_in_data(data, factorish_predictors)
}

data <- recompose(data, composition = blueprint$composition)
data <- recompose(data, composition = blueprint$composition, call = call)

offset <- extract_offset(framed$terms, framed$data)
offset <- extract_offset(framed$terms, framed$data, call = call)

extras <- list(offset = offset)

Expand Down
Loading
Loading