fix

R/get_marginalcontrasts.R

@@ -27,17 +27,17 @@ get_marginalcontrasts <- function(model,
     contrast <- "auto"
   }
 
-  # Guess arguments
+	# check whether contrasts should be made for numerics or categorical
+	model_data <- insight::get_data(model, source = "mf", verbose = FALSE)
+	on_the_fly_factors <- attributes(model_data)$factors
+
+	# Guess arguments
   my_args <- .guess_marginaleffects_arguments(model, by, contrast, verbose = verbose, ...)
 
   # sanitize comparison argument, to ensure compatibility between different
   # marginaleffects versions - newer versions don't accept a string argument,
   # only formulas (older versions don't accept formulas)
-  my_args <- .get_marginaleffects_hypothesis_argument(comparison, my_args, ...)
-
-  # check whether contrasts should be made for numerics or categorical
-  model_data <- insight::get_data(model, source = "mf", verbose = FALSE)
-  on_the_fly_factors <- attributes(model_data)$factors
+  my_args <- .get_marginaleffects_hypothesis_argument(comparison, my_args, model_data, ...)
 
   # extract first focal term
   first_focal <- my_args$contrast[1]
@@ -115,11 +115,16 @@ get_marginalcontrasts <- function(model,
 
 # make "comparison" argument compatible -----------------------------------
 
-.get_marginaleffects_hypothesis_argument <- function(comparison, my_args, ...) {
+.get_marginaleffects_hypothesis_argument <- function(comparison, my_args, model_data = NULL, ...) {
   # init
   comparison_slopes <- NULL
   original_by <- my_args$by
 
+  # make sure "by" is a valid column name, and no filter-directive, like "Species='setosa'".
+  if (!is.null(my_args$by) && grepl("[^0-9A-Za-z\\.]", my_args$by)) {
+    my_args$by <- NULL
+  }
+
   # convert comparison and by into a formula
   if (!is.null(comparison)) {
     # if we have a formula as comparison, we convert it into strings in order to

R/get_marginaltrends.R

@@ -17,8 +17,7 @@ get_marginaltrends <- function(model,
   dots <- list(...)
 
   # Guess arguments
-  trend <- .guess_marginaltrends_arguments(model, trend, by, verbose, ...)
-
+  trend <- .guess_marginaltrends_arguments(model, trend, verbose, ...)
 
   # First step: create a data grid --------------------------------------------
   # ---------------------------------------------------------------------------
@@ -93,7 +92,6 @@ get_marginaltrends <- function(model,
 #' @keywords internal
 .guess_marginaltrends_arguments <- function(model,
                                             trend = NULL,
-                                            by = NULL,
                                             verbose = TRUE,
                                             ...) {
   # Gather info