Merge pull request #273 from USEPA/issue_269

improve error handling for missing model spec
USEPA · Jan 15, 2024 · bffcfef · bffcfef
2 parents 1c154d8 + 913041d
commit bffcfef
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 1 deletion.
diff --git a/R/ConfigurationFunctions.R b/R/ConfigurationFunctions.R
@@ -24,6 +24,10 @@ getConfiguration <- function(configname, configtype, configpaths = NULL, pkg="us
     }
   }
   config <- configr::read.config(configpath)
+  if (typeof(config) == "logical" && config == FALSE) {
+    logging::logwarn(paste0("Configuration not found for ", configname))
+    return(NULL)
+  }
   return(config)
 }
 

diff --git a/R/InitializeModel.R b/R/InitializeModel.R
@@ -9,7 +9,7 @@ initializeModel <- function(modelname, configpaths = NULL) {
   model <- list()
   # Get model specs
   model$specs <- getConfiguration(modelname, "model", configpaths)
-  if (rlang::is_na(model$specs)) {
+  if (is.null(model$specs)) {
     stop(paste("No configuration exists for a model named", modelname))
   } else {
     # Get model crosswalk