Keep all loaded models with their path in the .loaded_models environm…

…ent so that users of the function udpipe don't need to care about loading models efficiently

NEWS.md

@@ -4,7 +4,7 @@
 - Added txt_tagsequence
 - Added 1 general function called udpipe which does annotation of data in TIF format.
 - Add option in udpipe_download_model to download the model only it does not exist on disk
-- Last loaded model is put into an environment
+- Loaded model are put into an environment such that users of the function udpipe do not need to care about loading
 
 # CHANGES IN udpipe VERSION 0.6.1
 

R/pkg.R

@@ -7,5 +7,4 @@
 NULL
 
 
-.current_model <- new.env()
-.current_model$udpipe_model <- structure(list(file = character(0), model = NULL), class = "udpipe_model")
+.loaded_models <- new.env()

R/udpipe_models.R

@@ -181,6 +181,6 @@ udpipe_load_model <- function(file) {
   out <- structure(
     list(file = file, model = ptr), 
     class = "udpipe_model")
-  .current_model$udpipe_model <- out
+  .loaded_models[[out$file]] <- out
   out 
 }

R/udpipe_parse.R

@@ -337,6 +337,7 @@ read_connlu <- function(x, is_udpipe_annotation = FALSE, ...){
 #'             object = ud_dutch)
 #'        
 #' ## You can also directly pass on the language in the call to udpipe
+#' x <- udpipe("Dit werkt ook.", object = "dutch-lassysmall")
 #' x <- udpipe(txt, object = "dutch-lassysmall")
 #' x <- udpipe(data.frame(doc_id = names(txt), text = txt, stringsAsFactors = FALSE), 
 #'             object = "dutch-lassysmall")
@@ -347,33 +348,40 @@ udpipe <- function(x, object, ...) {
 }
 
 getmodel <- function(object, ...){
+  ## It already a loaded udpipe model
   if(inherits(object, "udpipe_model")){
     return(object)
   }
-  ## Load the model if it is a file and if it was not the last model which was loaded
-  already_loaded_model <- .current_model$udpipe_model
+  ## It's a data.frame returned by udpipe_download_model
+  ## Load the model, but only if it was not the already loaded
   if(is.data.frame(object) && nrow(object) == 1 && "file_model" %in% colnames(object)){
-    if(identical(already_loaded_model$file, object$file_model)){
-      return(already_loaded_model)
+    if(object$file_model %in% names(.loaded_models)){
+      return(getmodel(.loaded_models[[object$file_model]]))
     }else{
       return(udpipe_load_model(object))  
     }
   }
+  ## It's just the path to the udpipe model
   if(file.exists(object)){
-    if(identical(already_loaded_model$file, object)){
-      return(already_loaded_model)
+    if(object %in% names(.loaded_models)){
+      return(getmodel(.loaded_models[[object]]))
     }else{
       return(udpipe_load_model(object))
     }
   }
+  ## It's the language
   ## Download if needed, and check again if it is the same model which was already loaded
   getmodel(udpipe_download_model(object, overwrite = FALSE, ...))
 }
 
 #' @export
 udpipe.character <- function(x, object, ...){
   udmodel <- getmodel(object, ...)
-  x <- udpipe_annotate(udmodel, x = x, doc_id = names(x), ...)
+  if(length(names(x)) == 0){
+    x <- udpipe_annotate(udmodel, x = x, ...)  
+  }else{
+    x <- udpipe_annotate(udmodel, x = x, doc_id = names(x), ...)
+  }
   x <- as.data.frame(x, detailed = TRUE)
   x
 }