support xgboost 3+, add ubj models (#26)

* support xgboost 3+, add ubj models

* fix globalvariables

* bumpver

* don't skip tests on warning

Author: tanho63

.Rbuildignore

@@ -14,3 +14,4 @@
 ^codecov\.yml$
 ^\.Renviron$
 ^vignettes$
+^local$

.gitignore

@@ -5,3 +5,4 @@
 .httr-oauth
 .DS_Store
 docs
+local/

DESCRIPTION

@@ -1,9 +1,9 @@
 Package: ffopportunity
 Title: Models for Fantasy Football Expected Points
-Version: 0.1.1
+Version: 0.1.2
 Authors@R: c(
-    person("Joe", "Sydlowski", , "syd235@gmail.com", role = c("aut", "cre", "cph")),
-    person("Tan", "Ho", , "tan@tanho.ca", role = "aut", comment = c(ORCID = "0000-0001-8388-5155"))
+    person("Joe", "Sydlowski", , "syd235@gmail.com", role = c("aut", "cph")),
+    person("Tan", "Ho", , "tan@tanho.ca", role = c("aut", "cre"), comment = c(ORCID = "0000-0001-8388-5155"))
   )
 Description: Downloads expected fantasy points data from 'ffverse'
     repositories if available, and otherwise builds up expected points

NEWS.md

@@ -9,4 +9,5 @@
 * Combine variants of ep_load into one function `ep_load()` with arguments
 * Rename to ffopportunity
 * Include spikes and kneel downs to tie out to official stats with `ep_summarize()`
-* Fix YAC bug in pbp_pass data
+* Fix YAC bug in pbp_pass data
+* Update to support ubj models which should enable xgboost 3.1+ support

R/ep_predict.R

@@ -114,13 +114,14 @@ ep_predict <- function(preprocessed_pbp, version = c("latest", "v1.0.0")) {
 # automatically/prompt-for download if file not found?
 # future: add some kind of version selector (as package option?)
 #' @keywords internal
-.load_model_objs <- function(variable, version) {
+.load_model_objs <- function(variable, version, model_file_type = c(".ubj", ".xgb")) {
+  model_file_type <- match.arg(model_file_type)
 
   cache_dir <- rappdirs::user_cache_dir("ffopportunity", "ffverse")
 
   folder_path <- file.path(cache_dir,version)
 
-  model_path <- file.path(folder_path, paste0(variable,".xgb"))
+  model_path <- file.path(folder_path, paste0(variable, model_file_type))
   blueprint_path <- file.path(folder_path, paste0(variable,".rds"))
 
   stopifnot(file.exists(model_path), file.exists(blueprint_path))

R/utils.R

@@ -90,5 +90,4 @@ rds_from_url <- function(url) {
 #' @keywords internal
 is_installed <- function(pkg) requireNamespace(pkg, quietly = TRUE)
 
-utils::globalVariables("where")
-
+utils::globalVariables(c("where", "contains"))

R/utils_gh_cli.R

@@ -108,6 +108,8 @@ gh_cli_release_assets <- function(tag, ..., repo = "ffverse/ffopportunity") {
 
   out <- .cli_parse_json(cli_output = cli_output)[["assets"]]
 
+  name <- size <- downloadCount <- updatedAt <- size_string <- NULL
+
   setDT(out)
   ret <- out[,
     list(name, size, downloads = downloadCount, last_update = updatedAt, url)

tests/testthat/setup.R

@@ -12,11 +12,9 @@ if(gha_online){
       ep_cache_models(version = "v1.0.0")
       pbp_2020 <- nflreadr::load_pbp(2020)
     },
-    warning = function(e) skip <<- TRUE,
     error = function(e) skip <<- TRUE
   )
 }
 
 skippy <- function() NULL
 if (skip) skippy <- function() testthat::skip(message = "Unable to connect to GHA")
-