Merge pull request #40 from eco4cast/main

main to prod

.github/workflows/combined.yaml

@@ -19,6 +19,8 @@ jobs:
     container: eco4cast/rocker-neon4cast:latest
     steps:
       - uses: actions/checkout@v3
+        with:
+          ref: prod
 
       - name: Process submissions
         shell: Rscript {0}
@@ -36,6 +38,8 @@ jobs:
     container: eco4cast/rocker-neon4cast:latest
     steps:
       - uses: actions/checkout@v3
+        with:
+          ref: prod
 
       - name: Generate scores
         shell: Rscript {0}
@@ -61,8 +65,9 @@ jobs:
 
       - uses: actions/checkout@v3
         with:
-           fetch-depth: 0
-           set-safe-directory: '*'
+          ref: prod
+          fetch-depth: 0
+          set-safe-directory: '*'
 
       - name: install validator
         run: |
@@ -91,8 +96,9 @@ jobs:
 
       - uses: actions/checkout@v3
         with:
-           fetch-depth: 0
-           set-safe-directory: '*'
+          ref: prod
+          fetch-depth: 0
+          set-safe-directory: '*'
 
       - uses: quarto-dev/quarto-actions/setup@v2
         with:

catalog/R/stac_functions.R

@@ -16,9 +16,12 @@ generate_model_assets <- function(m_vars, m_duration, aws_path){
     "1"= list(
       'type'= 'application/json',
       'title' = 'Model Metadata',
-      'href' = paste0("https://", config$endpoint,"/", config$model_metadata_bucket,"/",m,".json"),
+      'href' = paste0("https://", config$endpoint,"/",
+                      config$model_metadata_bucket,"/",
+                      "project_id=",config$project_id, "/",
+                      m,".json"),
       'description' = paste0("Use `jsonlite::fromJSON()` to download the model metadata JSON file. This R code will return metadata provided during the model registration.
-      \n\n### R\n\n```{r}\n# Use code below\n\nmodel_metadata <- jsonlite::fromJSON(",paste0('"','https://', config$endpoint,'/', config$model_metadata_bucket,'/',m,'.json"'),")\n\n")
+      \n\n### R\n\n```{r}\n# Use code below\n\nmodel_metadata <- jsonlite::fromJSON(",paste0('"','https://', config$endpoint,'/', config$model_metadata_bucket,'/', 'project_id=', config$project_id, '/', m,'.json"'),")\n\n")
     )
   )
 
@@ -516,8 +519,8 @@ build_group_variables <- function(table_schema,
                   ),
                   list(
                     "rel" = "describedby",
-                    "href" = "https://ltreb-reservoirs.github.io/vera4cast/",
-                    "title" = "VERA Forecast Challenge Dashboard",
+                    "href" = "https://ltreb-reservoirs.github.io/vera4cast/", # TODO: update this to something?
+                    "title" = "EFI-USGS Forecast Challenge Dashboard",
                     "type" = "text/html"
                   )
                 )),