Fixing defects with setters

Author: dkincaid

R/utils.R

@@ -7,7 +7,8 @@
 #' 
 #' @export
 nlp_set_input_cols <- function(jobj, input_cols) {
-  newobj <- sparklyr:::ml_set_param(jobj, "inputCols", input_col)
+  input_cols <- forge::cast_string_list(input_cols)
+  newobj <- sparklyr:::ml_set_param(jobj, "inputCols", input_cols)
   return(newobj)
   #invoke(spark_jobj(jobj), "setInputCols", cast_string_list(input_cols))
 }
@@ -21,6 +22,7 @@ nlp_set_input_cols <- function(jobj, input_cols) {
 #' 
 #' @export
 nlp_set_output_col <- function(jobj, output_col) {
+  output_col <- forge::cast_string(output_col)
   newobj <- sparklyr:::ml_set_param(jobj, "outputCol", output_col)
   return(newobj)
 #  invoke(spark_jobj(jobj), "setOutputCol", cast_string(output_col))

tests/testthat/helper-initialize.R

@@ -15,7 +15,7 @@ test_classifier_text <- data.frame(description = c("The cats are laying in front
 # helper functions from sparklyr tests
 # https://github.com/rstudio/sparklyr/blob/master/tests/testthat/helper-initialize.R
 testthat_spark_connection <- function() {
-  version <- Sys.getenv("SPARK_VERSION", unset = "3.1.1")
+  version <- Sys.getenv("SPARK_VERSION", unset = "3.1.2")
 
   spark_installed <- sparklyr::spark_installed_versions()
   if (nrow(spark_installed[spark_installed$spark == version, ]) == 0) {

tests/testthat/testthat-medical-ner.R

@@ -101,6 +101,7 @@ test_that("medical_ner param setting", {
 # })
 
 test_that("nlp_medical_ner pretrained", {
+  print(nlp_version())
   model <- nlp_medical_ner_pretrained(sc, input_cols = c("sentence", "token", "embeddings"),
                                       output_col = "ner",
                                       name = "ner_clinical", lang = "en", remote_loc = "clinical/models")

tests/testthat/testthat-utils.R

@@ -36,6 +36,22 @@ test_that("nlp_set_param", {
   expect_equal(newvalue, 0.8)
 })
 
+test_that("nlp_set_input_cols", {
+  model <- nlp_sentence_detector_dl_pretrained(sc, input_cols = c("document"), output_col = "sentence")
+  
+  model <- nlp_set_input_cols(model, c("new_document"))
+  newvalue <- ml_param(model, "input_cols")
+  expect_equal(newvalue, list("new_document"))
+})
+
+test_that("nlp_set_output_cols", {
+  model <- nlp_sentence_detector_dl_pretrained(sc, input_cols = c("document"), output_col = "sentence")
+  
+  model <- nlp_set_output_col(model, list("new_sentence"))
+  newvalue <- ml_param(model, "output_col")
+  expect_equal(newvalue, "new_sentence")
+})
+
 test_that("nlp_conll_read_dataset", {
   conll_data <- nlp_conll_read_dataset(sc, here::here("tests", "testthat", "data", "eng.testa.conll"))
   expect_true("text" %in% colnames(conll_data))