Merge pull request #251 from JBGruber/master

make spacy_download_langmodel work with multiple models (#249)
quanteda · May 18, 2024 · 6df75a7 · 6df75a7
2 parents 1ce5458 + d1b3dc3
commit 6df75a7
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 3 deletions.
diff --git a/DESCRIPTION b/DESCRIPTION
@@ -1,7 +1,7 @@
 Package: spacyr
 Type: Package
 Title: Wrapper to the 'spaCy' 'NLP' Library
-Version: 1.3.0
+Version: 1.3.1
 Authors@R: c(
     person("Kenneth", "Benoit", email = "[email protected]", role = c("cre", "aut", "cph"), comment = c(ORCID = "0000-0002-0797-564X")), 
     person("Akitaka", "Matsuo", email = "[email protected]", role = "aut", comment = c(ORCID = "0000-0002-3323-6330")),

diff --git a/NEWS.md b/NEWS.md
@@ -1,3 +1,7 @@
+# spacyr v1.3.1
+
+* Fixed a bug in `spacy_download_langmodel()` that prevented installing multiple models in one function call (#249)
+
 # spacyr v1.3
 
 * Overhauled the `spacy_install()` and `spacy_uninstall()` functions to provide a more modern and robust installation procedure.

diff --git a/R/spacy_langmodel_functions.R b/R/spacy_langmodel_functions.R
@@ -20,12 +20,14 @@
 spacy_download_langmodel <- function(lang_models = "en_core_web_sm",
                                      force = FALSE) {
 
-  if (!force & py_check_installed(lang_models)) {
+  if (!force & all(py_check_installed(lang_models))) {
     warning("Skipping installation. Use `force` to force installation or update.")
     return(invisible(NULL))
+  } else if (!force & any(py_check_installed(lang_models))) {
+    warning("Skipping installation of one or more models. Use `force` to force installation or update.")
+    lang_models <- lang_models[!py_check_installed(lang_models)]
   }
 
-
   bin <- Sys.getenv("RETICULATE_PYTHON", unset = reticulate::virtualenv_python(
     Sys.getenv("SPACY_PYTHON", unset = "r-spacyr")
   ))