some fixes

Author: strengejacke

R/methods_marginaleffects.R

@@ -109,9 +109,9 @@ model_parameters.predictions <- function(model,
   insight::check_if_installed("marginaleffects")
 
   # Bayesian models have posterior draws as attribute
-  is_bayes <- !is.null(suppressWarnings(marginaleffects::get_draws(model, "PxD")))
+  is_bayesian <- !is.null(suppressWarnings(marginaleffects::get_draws(model, "PxD")))
 
-  if (is_bayes) {
+  if (is_bayesian) {
     # Bayesian
     out <- suppressWarnings(bayestestR::describe_posterior(
       model,
@@ -137,10 +137,11 @@ model_parameters.predictions <- function(model,
   out$rowid <- out$Type <- out$rowid_dedup <- NULL
 
   # find at-variables
-  at_variables <- attributes(model)$newdata_at
-  if (is.null(at_variables)) {
-    at_variables <- attributes(model)$by
-  }
+  at_variables <- c(
+    marginaleffects::components(model, "variable_names_datagrid"),
+    marginaleffects::components(model, "variable_names_by"),
+    marginaleffects::components(model, "variable_names_by_hypothesis")
+  )
 
   # find cofficient name - differs for Bayesian models
   coef_name <- intersect(c("Predicted", "Coefficient"), colnames(out))[1]
@@ -153,7 +154,7 @@ model_parameters.predictions <- function(model,
   }
 
   # extract response, remove from data frame
-  reg_model <- attributes(model)$model
+  reg_model <- marginaleffects::components(model, "model")
   if (!is.null(reg_model) && insight::is_model(reg_model)) {
     resp <- insight::find_response(reg_model)
     # check if response could be extracted