Skip to content

Commit

Permalink
fixes
Browse files Browse the repository at this point in the history
  • Loading branch information
@bergalli
bergalli committed Feb 22, 2024
1 parent 073b8f9 commit ba0dff1
Show file tree
Hide file tree
Showing 3 changed files with 24 additions and 143 deletions.
3 changes: 1 addition & 2 deletions .Rprofile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,5 +10,4 @@ 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'
Sys.setenv(CRISPY_APP_ENV = "dev")

2 changes: 0 additions & 2 deletions app/logic/cloud_logic.R
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,6 @@ trigger_trisk_api_computation <- function(trisk_run_params, api_endpoint) {
# trisk_api_service <- "trisk-api-service"

Check warning on line 3 in app/logic/cloud_logic.R

View workflow job for this annotation

GitHub Actions / Run linters and tests 

file=app/logic/cloud_logic.R,line=3,col=5,[commented_code_linter] Commented code should be removed.
trisk_api_service <- Sys.getenv("TRISK_API_SERVICE")
url <- paste0("http://", trisk_api_service, ":80/compute_trisk")
# url <- "http://164.90.241.52:80/compute_trisk/"

# Define the body of the request
body <- list(
Expand All @@ -14,7 +13,6 @@ 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"
)
Expand Down
162 changes: 23 additions & 139 deletions renv.lock
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11,18 +11,18 @@
"Packages": {
"DBI": {
"Package": "DBI",
"Version": "1.2.1",
"Version": "1.2.2",
"Source": "Repository",
"Repository": "CRAN",
"Requirements": [
"R",
"methods"
],
"Hash": "9b4993e98e0e19da84c168460c032fef"
"Hash": "164809cd72e1d5160b4cb3aa57f510fe"
},
"DT": {
"Package": "DT",
"Version": "0.31",
"Version": "0.32",
"Source": "Repository",
"Repository": "CRAN",
"Requirements": [
Expand All @@ -35,7 +35,7 @@
"magrittr",
"promises"
],
"Hash": "77b5189f5272ae2b21e3ac2175ad107c"
"Hash": "0d3ab8abbb0c3e3daa47d4dc8e17bbae"
},
"MASS": {
"Package": "MASS",
Expand Down Expand Up @@ -173,37 +173,6 @@
],
"Hash": "5ea2700d21e038ace58269ecdbeb9ec0"
},
"STDataMGMT": {
"Package": "STDataMGMT",
"Version": "0.0.0.9000",
"Source": "GitHub",
"RemoteType": "github",
"RemoteHost": "api.github.com",
"RemoteUsername": "2DegreesInvesting",
"RemoteRepo": "STDataMGMT",
"RemoteRef": "master",
"RemoteSha": "d7ed2bd9b6e2debd72fac94f40879a44f5f72793",
"Requirements": [
"R",
"assertr",
"countrycode",
"crayon",
"dplyr",
"fastDummies",
"fs",
"glue",
"magrittr",
"purrr",
"readr",
"readxl",
"rlang",
"stringr",
"tibble",
"tidyr",
"zoo"
],
"Hash": "ab6b764d48b2cf632c7c94604b96d0cf"
},
"SnowballC": {
"Package": "SnowballC",
"Version": "0.7.1",
Expand Down Expand Up @@ -243,22 +212,6 @@
],
"Hash": "cad6cf7f1d5f6e906700b9d3e718c796"
},
"assertr": {
"Package": "assertr",
"Version": "3.0.1",
"Source": "Repository",
"Repository": "CRAN",
"Requirements": [
"MASS",
"R",
"dplyr",
"methods",
"rlang",
"stats",
"utils"
],
"Hash": "dd34511e88d11c95e80f8d9bb0606e79"
},
"assertthat": {
"Package": "assertthat",
"Version": "0.2.1",
Expand Down Expand Up @@ -327,14 +280,14 @@
},
"box": {
"Package": "box",
"Version": "1.1.3",
"Version": "1.2.0",
"Source": "Repository",
"Repository": "CRAN",
"Requirements": [
"R",
"tools"
],
"Hash": "ce8187a260e8e3abc2294284badc3b76"
"Hash": "d94049c1d9446b0abb413fde9e82a505"
},
"brio": {
"Package": "brio",
Expand Down Expand Up @@ -380,7 +333,7 @@
},
"callr": {
"Package": "callr",
"Version": "3.7.3",
"Version": "3.7.5",
"Source": "Repository",
"Repository": "CRAN",
"Requirements": [
Expand All @@ -389,19 +342,7 @@
"processx",
"utils"
],
"Hash": "9b2191ede20fa29828139b9900922e51"
},
"cellranger": {
"Package": "cellranger",
"Version": "1.1.0",
"Source": "Repository",
"Repository": "CRAN",
"Requirements": [
"R",
"rematch",
"tibble"
],
"Hash": "f61dbaec772ccd2e17705c1e872e9e7c"
"Hash": "9f0e4fae4963ba775a5e5c520838c87b"
},
"checkmate": {
"Package": "checkmate",
Expand Down Expand Up @@ -462,10 +403,10 @@
},
"commonmark": {
"Package": "commonmark",
"Version": "1.9.0",
"Version": "1.9.1",
"Source": "Repository",
"Repository": "CRAN",
"Hash": "d691c61bff84bd63c383874d2d0c3307"
"Hash": "5d8225445acb167abf7797de48b2ee3c"
},
"config": {
"Package": "config",
Expand All @@ -477,16 +418,6 @@
],
"Hash": "8b7222e9d9eb5178eea545c0c4d33fc2"
},
"countrycode": {
"Package": "countrycode",
"Version": "1.5.0",
"Source": "Repository",
"Repository": "CRAN",
"Requirements": [
"R"
],
"Hash": "bbc5ab5258e5ddf38f2cd2c5a7afa860"
},
"cpp11": {
"Package": "cpp11",
"Version": "0.4.7",
Expand Down Expand Up @@ -546,17 +477,6 @@
],
"Hash": "cdc4a473222b0112d4df0bcfbed12d44"
},
"data.table": {
"Package": "data.table",
"Version": "1.15.0",
"Source": "Repository",
"Repository": "CRAN",
"Requirements": [
"R",
"methods"
],
"Hash": "cfbbb4aed6e78cd45f17123a9ec9981a"
},
"desc": {
"Package": "desc",
"Version": "1.4.3",
Expand Down Expand Up @@ -660,19 +580,6 @@
"Repository": "CRAN",
"Hash": "8106d78941f34855c440ddb946b8f7a5"
},
"fastDummies": {
"Package": "fastDummies",
"Version": "1.7.3",
"Source": "Repository",
"Repository": "CRAN",
"Requirements": [
"R",
"data.table",
"stringr",
"tibble"
],
"Hash": "e0f9c0c051e0e8d89996d7f0c400539f"
},
"fastmap": {
"Package": "fastmap",
"Version": "1.1.1",
Expand Down Expand Up @@ -856,7 +763,7 @@
},
"httpuv": {
"Package": "httpuv",
"Version": "1.6.13",
"Version": "1.6.14",
"Source": "Repository",
"Repository": "CRAN",
"Requirements": [
Expand All @@ -867,7 +774,7 @@
"promises",
"utils"
],
"Hash": "d23d2879001f3d82ee9dc38a9ef53c4c"
"Hash": "16abeb167dbf511f8cc0552efaf05bab"
},
"httr": {
"Package": "httr",
Expand Down Expand Up @@ -1307,15 +1214,13 @@
"Version": "0.0.0.9005",
"Source": "GitHub",
"RemoteType": "github",
"RemoteHost": "api.github.com",
"RemoteUsername": "2DegreesInvesting",
"RemoteRepo": "r2dii.climate.stress.test",
"RemoteRef": "master",
"RemoteSha": "1497dbec053388c525ead3f4fb0e9a927e85f589",
"Remotes": "github::2DegreesInvesting/STDataMGMT",
"RemoteSha": "053e9d06210ce295a9542ee4da8791c2e91859a5",
"RemoteHost": "api.github.com",
"Requirements": [
"R",
"STDataMGMT",
"dplyr",
"fs",
"ggplot2",
Expand All @@ -1330,18 +1235,18 @@
"withr",
"zoo"
],
"Hash": "890fb717d2d9df6b9c31bec0c60fef2c"
"Hash": "68774ccb037087f5396116fb4a6d2495"
},
"r2dii.colours": {
"Package": "r2dii.colours",
"Version": "0.0.0.9000",
"Source": "GitHub",
"RemoteType": "github",
"RemoteHost": "api.github.com",
"RemoteUsername": "RMI-PACTA",
"RemoteRepo": "r2dii.colours",
"RemoteRef": "master",
"RemoteSha": "7aa52ba455d3343bff3868cc63cba748ea41157d",
"RemoteSha": "748394821220f708b15d007da829ae826e7015d2",
"RemoteHost": "api.github.com",
"Requirements": [
"R",
"dplyr",
Expand All @@ -1354,7 +1259,7 @@
"stringr",
"tibble"
],
"Hash": "0f86a9074e01648ea7f672a185595a20"
"Hash": "4e8ef50159ce03fcc199fcdc4ab6c68c"
},
"r2dii.data": {
"Package": "r2dii.data",
Expand Down Expand Up @@ -1423,28 +1328,6 @@
],
"Hash": "9de96463d2117f6ac49980577939dfb3"
},
"readxl": {
"Package": "readxl",
"Version": "1.4.3",
"Source": "Repository",
"Repository": "CRAN",
"Requirements": [
"R",
"cellranger",
"cpp11",
"progress",
"tibble",
"utils"
],
"Hash": "8cf9c239b96df1bbb133b74aef77ad0a"
},
"rematch": {
"Package": "rematch",
"Version": "2.0.0",
"Source": "Repository",
"Repository": "CRAN",
"Hash": "cbff1b666c6fa6d21202f07e2318d4f1"
},
"rematch2": {
"Package": "rematch2",
"Version": "2.1.2",
Expand Down Expand Up @@ -2044,14 +1927,15 @@
},
"xfun": {
"Package": "xfun",
"Version": "0.41",
"Version": "0.42",
"Source": "Repository",
"Repository": "CRAN",
"Requirements": [
"grDevices",
"stats",
"tools"
],
"Hash": "460a5e0fe46a80ef87424ad216028014"
"Hash": "fd1349170df31f7a10bd98b0189e85af"
},
"xml2": {
"Package": "xml2",
Expand Down Expand Up @@ -2097,10 +1981,10 @@
},
"zip": {
"Package": "zip",
"Version": "2.3.0",
"Version": "2.3.1",
"Source": "Repository",
"Repository": "CRAN",
"Hash": "d98c94dacb7e0efcf83b0a133a705504"
"Hash": "fcc4bd8e6da2d2011eb64a5e5cc685ab"
},
"zoo": {
"Package": "zoo",
Expand Down

0 comments on commit ba0dff1

Please sign in to comment.