From e9ab854b39deabedaa7fa2ae0024bda9059be05c Mon Sep 17 00:00:00 2001 From: Florian Berding Date: Fri, 19 Jan 2024 09:48:24 +0100 Subject: [PATCH] Fix global variables --- DESCRIPTION | 1 + NAMESPACE | 4 +++ R/aif_gui.R | 57 +++++++++++++++++++++++------------------- R/install_and_config.R | 3 +-- R/onLoad.R | 2 ++ 5 files changed, 39 insertions(+), 28 deletions(-) diff --git a/DESCRIPTION b/DESCRIPTION index 7e89410..6f21c9a 100644 --- a/DESCRIPTION +++ b/DESCRIPTION @@ -51,6 +51,7 @@ Imports: Rcpp (>= 1.0.10), reshape2, reticulate (>= 1.34.0), + rlang, smotefamily, stringr, stringi, diff --git a/NAMESPACE b/NAMESPACE index 48ad6f6..c65ef2d 100644 --- a/NAMESPACE +++ b/NAMESPACE @@ -55,6 +55,7 @@ importFrom(readxl,read_xlsx) importFrom(reticulate,conda_create) importFrom(reticulate,py_install) importFrom(reticulate,py_module_available) +importFrom(rlang,.data) importFrom(shinyjs,html) importFrom(shinyjs,useShinyjs) importFrom(stats,na.omit) @@ -66,6 +67,9 @@ importFrom(stringr,str_length) importFrom(stringr,str_remove_all) importFrom(stringr,str_replace_all) importFrom(utils,compareVersion) +importFrom(utils,packageVersion) importFrom(utils,read.csv) +importFrom(utils,read.csv2) importFrom(utils,write.csv) +importFrom(utils,write.csv2) useDynLib(aifeducation, .registration = TRUE) diff --git a/R/aif_gui.R b/R/aif_gui.R index 378743d..5ad37bb 100644 --- a/R/aif_gui.R +++ b/R/aif_gui.R @@ -21,6 +21,11 @@ #'@importFrom stringi stri_split_regex #'@importFrom stringi stri_trans_tolower #'@importFrom stringr str_extract_all +#'@importFrom utils packageVersion +#'@importFrom utils read.csv2 +#'@importFrom utils write.csv2 +#'@importFrom rlang .data +#' #' #'@export start_aifeducation_studio<-function(){ @@ -841,7 +846,7 @@ start_aifeducation_studio<-function(){ for(i in 1:nrow(r_packages_table)){ r_packages_table[i,1]<-r_packages_names[[i]] - r_packages_table[i,2]<-as.character(packageVersion(r_packages_names[[i]])) + r_packages_table[i,2]<-as.character(utils::packageVersion(r_packages_names[[i]])) } colnames(r_packages_table)=c("Package","Version") @@ -2313,7 +2318,7 @@ start_aifeducation_studio<-function(){ model=try(load_ai_model(model_dir = model_path, ml_framework=input$config_ml_framework), silent = TRUE) - if(("try-error"%in%class(model))==FALSE){ + if(is(model,class2 = "try-error")==FALSE){ if("TextEmbeddingModel"%in%class(model)){ if(utils::compareVersion(as.character(model$get_package_versions()$aifeducation),"0.3.1")>=0){ closeSweetAlert() @@ -2544,7 +2549,7 @@ start_aifeducation_studio<-function(){ n_solutions=input$lm_n_fillments_for_fill_mask), silent = TRUE) - if(class(solutions)!="try-error"){ + if(is(solutions,class2 = "try-error")==FALSE){ updateNumericInput(inputId = "lm_select_mask_for_fill_mask", max=length(solutions)) @@ -2812,7 +2817,7 @@ start_aifeducation_studio<-function(){ type="info") model=try(load_ai_model(model_dir = lm_interface_for_documentation_path(), ml_framework=input$config_ml_framework),silent = TRUE) - if(("try-error"%in%class(model))==FALSE){ + if(is(model,class2 = "try-error")==FALSE){ if("TextEmbeddingModel"%in%class(model)){ if(utils::compareVersion(as.character(model$get_package_versions()$aifeducation),"0.3.1")>=0){ closeSweetAlert() @@ -3187,7 +3192,7 @@ start_aifeducation_studio<-function(){ type="info") if(extension=="csv"|extension=="txt"){ target_data=try(as.data.frame( - read.csv2(file = file_path, + utils::read.csv2(file = file_path, header = TRUE)),silent = TRUE) } else if(extension=="xlsx"){ target_data=try( @@ -3524,7 +3529,7 @@ start_aifeducation_studio<-function(){ classifier<-try(load_ai_model(model_dir = model_path, ml_framework=input$config_ml_framework), silent = TRUE) - if(("try-error"%in%class(classifier))==FALSE){ + if(is(classifier,class2 = "try-error")==FALSE){ if("TextEmbeddingClassifierNeuralNet"%in%class(classifier)){ if(utils::compareVersion(as.character(classifier$get_package_versions()$r_package_versions$aifeducation),"0.3.1")>=0){ closeSweetAlert() @@ -4105,37 +4110,37 @@ start_aifeducation_studio<-function(){ } plot<-ggplot2::ggplot(data=plot_data)+ - ggplot2::geom_line(ggplot2::aes(x=epoch,y=train_mean,color="train"))+ - ggplot2::geom_line(ggplot2::aes(x=epoch,y=validation_mean,color="validation")) + ggplot2::geom_line(ggplot2::aes(x=epoch,y=.data$train_mean,color="train"))+ + ggplot2::geom_line(ggplot2::aes(x=epoch,y=.data$validation_mean,color="validation")) if(input$tec_performance_training_min_max==TRUE){ plot<-plot+ - ggplot2::geom_line(ggplot2::aes(x=epoch,y=train_min,color="train"))+ - ggplot2::geom_line(ggplot2::aes(x=epoch,y=train_max,color="train"))+ - ggplot2::geom_ribbon(ggplot2::aes(x=epoch, - ymin=train_min, - ymax=train_max), + ggplot2::geom_line(ggplot2::aes(x=epoch,y=.data$train_min,color="train"))+ + ggplot2::geom_line(ggplot2::aes(x=epoch,y=.data$train_max,color="train"))+ + ggplot2::geom_ribbon(ggplot2::aes(x=.data$epoch, + ymin=.data$train_min, + ymax=.data$train_max), alpha=0.25, fill="red")+ - ggplot2::geom_line(ggplot2::aes(x=epoch,y=validation_min,color="validation"))+ - ggplot2::geom_line(ggplot2::aes(x=epoch,y=validation_max,color="validation"))+ - ggplot2::geom_ribbon(ggplot2::aes(x=epoch, - ymin=validation_min, - ymax=validation_max), + ggplot2::geom_line(ggplot2::aes(x=epoch,y=.data$validation_min,color="validation"))+ + ggplot2::geom_line(ggplot2::aes(x=epoch,y=.data$validation_max,color="validation"))+ + ggplot2::geom_ribbon(ggplot2::aes(x=.data$epoch, + ymin=.data$validation_min, + ymax=.data$validation_max), alpha=0.25, fill="blue") } if("test_mean"%in%colnames(plot_data)){ plot=plot+ - ggplot2::geom_line(ggplot2::aes(x=epoch,y=test_mean,color="test")) + ggplot2::geom_line(ggplot2::aes(x=.data$epoch,y=.data$test_mean,color="test")) if(input$tec_performance_training_min_max==TRUE){ plot=plot+ - ggplot2::geom_line(ggplot2::aes(x=epoch,y=test_min,color="test"))+ + ggplot2::geom_line(ggplot2::aes(x=.data$epoch,y=.data$test_min,color="test"))+ - ggplot2::geom_line(ggplot2::aes(x=epoch,y=test_max,color="test"))+ - ggplot2::geom_ribbon(ggplot2::aes(x=epoch, - ymin=test_min, - ymax=test_max), + ggplot2::geom_line(ggplot2::aes(x=.data$epoch,y=.data$test_max,color="test"))+ + ggplot2::geom_ribbon(ggplot2::aes(x=.data$epoch, + ymin=.data$test_min, + ymax=.data$test_max), alpha=0.25, fill="darkgreen") } @@ -4314,7 +4319,7 @@ start_aifeducation_studio<-function(){ file = paste0(save_path_root,".rda")) } if(input$tec_pred_save_as_csv==TRUE){ - write.csv2(predictions, + utils::write.csv2(predictions, file = paste0(save_path_root,".csv")) } removeModal() @@ -4340,7 +4345,7 @@ start_aifeducation_studio<-function(){ classifier=try(load_ai_model(model_dir = tec_interface_for_documentation_path(), ml_framework=input$config_ml_framework), silent = TRUE) - if(("try-error"%in%class(classifier))==FALSE){ + if(is(classifier,class2 = "try-error")==FALSE){ if("TextEmbeddingClassifierNeuralNet"%in%class(classifier)){ if(utils::compareVersion(as.character(classifier$get_package_versions()$r_package_versions$aifeducation),"0.3.1")>=0){ closeSweetAlert() diff --git a/R/install_and_config.R b/R/install_and_config.R index c27ac59..7740acd 100644 --- a/R/install_and_config.R +++ b/R/install_and_config.R @@ -125,8 +125,7 @@ install_py_modules<-function(envname="aifeducation", #'In all other cases it returns \code{FALSE} #'@family Installation and Configuration #'@export -check_aif_py_modules<-function(trace=TRUE, - check="all"){ +check_aif_py_modules<-function(trace=TRUE, check="all"){ if(!(check%in%c("all","pytorch","tensorflow"))){ stop("check must be all, pytorch or tensorflow.") } diff --git a/R/onLoad.R b/R/onLoad.R index d01947c..bed0d10 100644 --- a/R/onLoad.R +++ b/R/onLoad.R @@ -10,6 +10,8 @@ os<-NULL keras<-NULL accelerate<-NULL safetensors<-NULL +py_update_aifeducation_progress_bar_epochs<-NULL +py_update_aifeducation_progress_bar_steps<-NULL aifeducation_config<-NULL