add make dashboard, drop use_aws... envvir

Author: dsweber2

Makefile

@@ -10,3 +10,6 @@ run-nohup:
 
 sync:
 	Rscript sync.R
+
+dashboard:
+	Rscript dashboard.R

README.md

@@ -21,8 +21,12 @@ AWS_S3_PREFIX=2023/exploration
 # Pull from the bucket
 make sync
 
+# Run only the dashboard, to display results run on other machines
+make dashboard
+
 # Run the pipeline wrapper run.R.
 make run
+
 ```
 
 -   `EPIDATR_USE_CACHE` controls whether `epidatr` functions use the cache.

dashboard.R

@@ -0,0 +1,53 @@
+tar_project <- Sys.getenv("TAR_PROJECT", "covid_hosp_explore")
+external_scores_path <- Sys.getenv("EXTERNAL_SCORES_PATH", "")
+debug_mode <- as.logical(Sys.getenv("DEBUG_MODE", TRUE))
+use_shiny <- as.logical(Sys.getenv("USE_SHINY", FALSE))
+use_aws_s3_only <- as.logical(Sys.getenv("USE_AWS_S3_ONLY", FALSE))
+aws_s3_prefix <- Sys.getenv("AWS_S3_PREFIX", "exploration")
+aws_s3_prefix <- paste0(aws_s3_prefix, "/", tar_project)
+suppressPackageStartupMessages({
+  library(targets)
+  library(shiny)
+})
+# Prevent functions defined in /R dir from being loaded unnecessarily
+options(shiny.autoload.r = FALSE)
+
+forecaster_options <- unique(tar_read(forecaster_params_grid)[["parent_id"]])
+# Map forecaster names to score files
+forecaster_options <- setNames(
+  # File names
+  paste0("score_", gsub(" ", ".", forecaster_options)),
+  # Display names
+  forecaster_options
+)
+
+# Add ensembles
+ensemble_options <- unique(tar_read(ensemble_forecasters)[["parent_id"]])
+ensemble_options <- setNames(
+  # File names
+  paste0("ensemble_score_", ensemble_options),
+  # Display names
+  paste0("ensemble.", ensemble_options)
+)
+
+external_options <- unique(tar_read(external_names))
+EXTERNAL_PREFIX <- "[external] "
+if (!is.null(external_options) && length(external_options) > 0) {
+  external_options <- setNames(
+    # File names
+    # Get names of all branches of `external_scores` target by index. The way these
+    # were specified, `external_names` provides the order of the branches.
+    tar_branch_names(external_scores, seq_along(external_options)),
+    # Display names
+    paste0(
+      EXTERNAL_PREFIX,
+      gsub(" forecaster", "", gsub("_", " ", external_options, fixed = TRUE), fixed = TRUE)
+    )
+  )
+} else {
+  external_options <- character(0)
+}
+
+forecaster_options <- c(ensemble_options, forecaster_options, external_options)
+
+runApp(here::here("app.R"), port = 3838)

run.R

@@ -33,7 +33,6 @@ tar_project <- Sys.getenv("TAR_PROJECT", "covid_hosp_explore")
 external_scores_path <- Sys.getenv("EXTERNAL_SCORES_PATH", "")
 debug_mode <- as.logical(Sys.getenv("DEBUG_MODE", TRUE))
 use_shiny <- as.logical(Sys.getenv("USE_SHINY", FALSE))
-use_aws_s3 <- as.logical(Sys.getenv("USE_AWS_S3", FALSE))
 aws_s3_prefix <- Sys.getenv("AWS_S3_PREFIX", "exploration")
 aws_s3_prefix <- paste0(aws_s3_prefix, "/", tar_project)
 cli::cli_inform(
@@ -65,50 +64,7 @@ if (debug_mode) {
 } else {
   tar_make()
 }
-# tar_make_clustermq(workers = 2) # nolint
-# tar_make_future(workers = 2) # nolint
 
 if (use_shiny) {
-  # Prevent functions defined in /R dir from being loaded unnecessarily
-  options(shiny.autoload.r = FALSE)
-
-  forecaster_options <- unique(tar_read(forecaster_params_grid)[["parent_id"]])
-  # Map forecaster names to score files
-  forecaster_options <- setNames(
-    # File names
-    paste0("score_", gsub(" ", ".", forecaster_options)),
-    # Display names
-    forecaster_options
-  )
-
-  # Add ensembles
-  ensemble_options <- unique(tar_read(ensemble_forecasters)[["parent_id"]])
-  ensemble_options <- setNames(
-    # File names
-    paste0("ensemble_score_", ensemble_options),
-    # Display names
-    paste0("ensemble.", ensemble_options)
-  )
-
-  external_options <- unique(tar_read(external_names))
-  EXTERNAL_PREFIX <- "[external] "
-  if (!is.null(external_options) && length(external_options) > 0) {
-    external_options <- setNames(
-      # File names
-      # Get names of all branches of `external_scores` target by index. The way these
-      # were specified, `external_names` provides the order of the branches.
-      tar_branch_names(external_scores, seq_along(external_options)),
-      # Display names
-      paste0(
-        EXTERNAL_PREFIX,
-        gsub(" forecaster", "", gsub("_", " ", external_options, fixed = TRUE), fixed = TRUE)
-      )
-    )
-  } else {
-    external_options <- character(0)
-  }
-
-  forecaster_options <- c(ensemble_options, forecaster_options, external_options)
-
-  runApp(here::here("app.R"), port = 3838)
+  source("dashboard.R")
 }

sync.R

@@ -1,8 +1,3 @@
 library(targets)
 library(shiny)
-use_aws_s3 <- as.logical(Sys.getenv("USE_AWS_S3", FALSE))
-if (use_aws_s3) {
-  epieval::manage_S3_forecast_cache()
-} else {
-  cli::cli_inform("Syncing turned off")
-}
+epieval::manage_S3_forecast_cache()