Merge branch 'main' into feat/cloud_deploy

.Rprofile

@@ -8,7 +8,6 @@ if (file.exists("renv")) {
 # Allow absolute module imports (relative to the app root).
 options(box.path = getwd())
 
-
 Sys.setenv(TRISK_INPUT_PATH = file.path("app", "data", "st_inputs"))
 Sys.setenv(TRISK_OUTPUT_PATH = file.path("app", "data", "backend_db"))
 # 'prod' or 'dev' 

app/logic/cloud_logic.R

@@ -14,6 +14,7 @@ trigger_trisk_api_computation <- function(trisk_run_params, api_endpoint) {
 
   # Define the headers, including Host
   headers <- c(
+
     `Host` = paste0("trisk-api.default.", trisk_api_service),
     `Content-Type` = "application/json"
   )

app/logic/data_load.R

@@ -1,4 +1,5 @@
 box::use(
+
   app/logic/cloud_logic[
     get_data_from_postgres
   ]

app/logic/data_write.R

@@ -26,6 +26,7 @@ append_st_results_to_backend_data <- function(
 
     # If the file exists, read the existing data, otherwise set the existing data to NULL
     if (file.exists(fpath)) {
+
       persistent_data <- arrow::read_parquet(fpath)
     } else {
       persistent_data <- NULL

app/logic/trisk_button_logic.R

@@ -71,6 +71,7 @@ trisk_generator <- function(
         max_trisk_granularity
       )
       run_id <- check_if_run_exists(trisk_run_params, backend_trisk_run_folder)
+
     } else {
       run_id <- NULL
     }

app/main.R

@@ -158,6 +158,7 @@ ui <- function(id) {
 #' @export
 server <- function(id) {
   moduleServer(id, function(input, output, session) {
+
     possible_trisk_combinations <- r2dii.climate.stress.test::get_scenario_geography_x_ald_sector(trisk_input_path)
 
     # the TRISK runs are generated In the sidebar module

app/view/crispy_equities.R

@@ -8,10 +8,10 @@ box::use(
 )
 
 box::use(
-  app/view/modules/trisk_button,
-  app/view/portfolio/portfolio_analysis,
-  app/view/modules/plots_equity_change,
-  app/view/modules/plots_trajectories,
+  app / view / modules / trisk_button,
+  app / view / portfolio / portfolio_analysis,
+  app / view / modules / plots_equity_change,
+  app / view / modules / plots_trajectories,
 )
 
 ####### UI

app/view/crispy_loans.R

@@ -7,8 +7,8 @@ box::use(
 )
 
 box::use(
-  app/view/modules/trisk_button,
-  app/view/portfolio/portfolio_analysis
+  app / view / modules / trisk_button,
+  app / view / portfolio / portfolio_analysis
 )
 
 

app/view/modules/trisk_button.R

@@ -7,11 +7,11 @@ box::use(
 )
 
 box::use(
-  app/logic/trisk_button_logic[
+  app / logic / trisk_button_logic[
     trisk_generator,
     check_if_run_exists
   ],
-  app/logic/data_load[
+  app / logic / data_load[
     load_backend_crispy_data,
     load_backend_trajectories_data
   ]
@@ -177,6 +177,7 @@ fetch_crispy_and_trajectories_data <- function(session, backend_trisk_run_folder
 
   observe({
     if (!is.null(trisk_granularity_r()) & !is.null(raw_crispy_data_r()) & !is.null(raw_trajectories_data_r())) {
+
       crispy_data_r(
         raw_crispy_data_r() |>
           stress.test.plot.report::main_load_multi_crispy_data(granularity = trisk_granularity_r())

scripts/creds.R

@@ -1,5 +0,0 @@
-Sys.setenv(ST_POSTGRES_DB = "defaultdb")
-Sys.setenv(ST_POSTGRES_HOST = "db-postgresql-st-inputs-do-user-15367886-0.c.db.ondigitalocean.com")
-Sys.setenv(ST_POSTGRES_PORT = "25060")
-Sys.setenv(ST_POSTGRES_USERNAME = "doadmin")
-Sys.setenv(ST_POSTGRES_PASSWORD = "AVNS_s2JaVyjqyVTRru4_3C4")