New version of {pipaux} powered by {stamp}

.gitignore

@@ -8,3 +8,6 @@ renv/
 /sessionInfoLog
 .DS_Store
 docs
+
+/.quarto/
+inst/doc

DESCRIPTION

@@ -30,15 +30,17 @@ Suggests:
     rmarkdown,
     covr,
     dm,
-    config,
-    myrror
+    myrror,
+    gh,
+    httr,
+    wbstats
 Imports: 
+    stamp,
     haven,
     digest,
     fst,
     readr,
     data.table,
-    wbstats,
     purrr,
     fs,
     magrittr,
@@ -49,15 +51,12 @@ Imports:
     yaml,
     qs,
     glue,
-    gh,
-    httr,
     pipfun (>=  0.0.2),
     lifecycle,
     collapse,
     joyn,
     data.validator,
     assertr,
-    blastula,
     rlang
 VignetteBuilder: knitr
 Remotes:  

NAMESPACE

@@ -1,18 +1,15 @@
 # Generated by roxygen2: do not edit by hand
 
 export("%>%")
-export(auto_aux_update)
 export(aux_censoring)
 export(aux_countries)
 export(aux_country_list)
 export(aux_cp)
 export(aux_cpi)
-export(aux_data)
 export(aux_dictionary)
 export(aux_fun)
 export(aux_gdm)
 export(aux_gdp)
-export(aux_gdp_weo)
 export(aux_income_groups)
 export(aux_indicators)
 export(aux_maddison)
@@ -29,10 +26,8 @@ export(aux_pl)
 export(aux_pl_clean)
 export(aux_pop)
 export(aux_ppp)
-export(aux_prices)
 export(aux_regions)
 export(aux_sna)
-export(aux_update_all)
 export(aux_wdi)
 export(aux_wdi_update)
 export(aux_weo)
@@ -42,7 +37,6 @@ export(clean_validation_report)
 export(compare_aux_releases)
 export(compare_aux_vintages)
 export(compare_vintage_versions)
-export(convert_df_to_base64)
 export(countries_validate_output)
 export(cpi_validate_output)
 export(cpi_validate_raw)
@@ -52,7 +46,6 @@ export(gdm_validate_raw)
 export(gdp_validate_output)
 export(get_error_validation)
 export(incgroup_validate_output)
-export(load_aux)
 export(merger_aux)
 export(metadata_validate_output)
 export(metadata_validate_raw)
@@ -62,6 +55,10 @@ export(npl_validate_raw)
 export(pce_validate_output)
 export(pfw_validate_output)
 export(pfw_validate_raw)
+export(pipaux_get_versioning)
+export(pipaux_reset_stamp_options)
+export(pipaux_set_stamp_option)
+export(pipaux_set_versioning)
 export(pl_validate_output)
 export(pop_validate_output)
 export(pop_validate_raw)
@@ -73,12 +70,10 @@ export(send_report)
 export(sna_fy_validate_raw)
 export(sna_validate_raw)
 export(spop_validate_raw)
-export(update_all_aux)
-export(update_aux)
+export(update_aux_measures)
 export(wdi_validate_raw)
 export(weo_validate_output)
 export(weo_validate_raw)
-import(blastula)
 import(collapse, except = fdroplevels)
 import(data.table)
 import(data.table, except = fdroplevels)
@@ -91,3 +86,5 @@ importFrom(lifecycle,deprecated)
 importFrom(magrittr,"%<>%")
 importFrom(magrittr,"%>%")
 importFrom(pipfun,pip_create_globals)
+importFrom(stamp,st_opts)
+importFrom(stamp,st_opts_get)

R/aux_censoring.R

@@ -9,20 +9,19 @@
 #' If `action = "load"`, the function reads the previously saved local version of the
 #' censoring data and returns it as a list of data.tables.
 #'
-#'
 #' @inheritParams aux_pfw
 #' @inheritParams pipfun::load_from_gh
+#' @param ... Additional arguments passed to [pip_aux_save()] when `action = "update"`.
 #' @export
 aux_censoring  <- function(action  = c("update", "load"),
-                           force   = FALSE,
                            owner   = getOption("pipfun.ghowner"),
-                           maindir = getOption("pipaux.working_dir"),
-                           tag     = NULL) {
+                           tag     = NULL,
+                           ...) {
 
   measure <- "censoring"
   action <- match.arg(action)
 
-  pipfun::get_wrk_release(verbose = FALSE)
+  wrk_release <- get_from_auxenv(key = "wrk_release")
 
   release        <- wrk_release$release
   identity       <- wrk_release$identity
@@ -58,35 +57,26 @@ aux_censoring  <- function(action  = c("update", "load"),
     if (branch == "main") {
     branch <- ""
     }
-    # ----- function raw sha ----------------------
 
-    raw_sha_fun <- digest::digest(body(
-      paste0("aux_", measure))
+    # Define key columns for censoring data
+    key_cols <- c("countries", "regions")
+    setattr(dl, "aux_key", key_cols)
+
+    saved <- pip_aux_save(
+      x        = dl,
+      id       = measure,
+      code     = aux_censoring,
+      code_label = "aux_censoring",
+      #pk       = key_cols,  rm this because of dl being list
+      ...
     )
 
-
-    setattr(dl,
-            "raw_sha_fun",
-            raw_sha_fun)
-
-  msrdir <- fs::path(maindir, "aux_data", branch, measure) # measure dir
-
-    saved <- pipfun::pip_sign_save(
-      x       = dl,
-      measure = measure,
-      msrdir  = msrdir,
-      force   = force,
-      verbose = FALSE
-    )
     return(invisible(saved))
 
   } else {
 
-    dt <- load_aux(
-      maindir = maindir,
-      measure = measure,
-      branch  = branch
-    )
+    dt <- pipload::load_aux_data(measure = measure)
+
     return(dt)
 
   }

R/aux_countries.R

@@ -6,15 +6,14 @@
 #' @inheritParams pipfun::load_from_gh
 #' @export
 aux_countries <- function(action  = c("update", "load"),
-                          force   = FALSE,
                           owner   = getOption("pipfun.ghowner"),
-                          maindir = getOption("pipaux.working_dir"),
-                          tag     = NULL) {
+                          tag     = NULL,
+                          ...) {
 
   measure <- "countries"
-  action <- match.arg(action)
+  action  <- match.arg(action)
 
-  pipfun::get_wrk_release(verbose = FALSE)
+  wrk_release <- get_from_auxenv(key = "wrk_release")
 
   release        <- wrk_release$release
   identity       <- wrk_release$identity
@@ -27,13 +26,9 @@ aux_countries <- function(action  = c("update", "load"),
   if (action == "update") {
 
     ## Special national accounts --------
-    cl <- load_aux(maindir = maindir,
-                   measure = "country_list",
-                   branch  = branch)
+    cl <- pipload::load_aux_data(measure = "country_list")
 
-    pfw <- load_aux(measure = "pfw",
-                    maindir = maindir,
-                    branch  = branch)
+    pfw <- pipload::load_aux_data(measure = "pfw")
 
 
     pfw <- pfw[inpovcal == 1,
@@ -44,42 +39,35 @@ aux_countries <- function(action  = c("update", "load"),
 
 
     countries <- cl[country_code %in% pfw$country_code
-                    ][,
-                      c("pcn_region", "pcn_region_code") := NULL]
+                    # ][,
+                    #   c("pcn_region", "pcn_region_code") := NULL]
+    ]
 
     #~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
     ## save --------
 
     if (branch == "main") {
       branch <- ""
     }
-    msrdir <- fs::path(maindir, "aux_data", branch, measure) # measure dir
 
-    setattr(countries, "aux_name", "countries")
-    setattr(countries,
-            "aux_key",
-            c("country_code"))
 
-    # ----- function raw sha ------
-    raw_sha_fun <- digest::digest(body(
-      paste0("aux_", measure))
+    setattr(countries, "aux_name", "countries")
+    key_cols <- c("country_code")
+    setattr(countries, "aux_key", key_cols)
+
+    pip_aux_save(
+      x        = countries,
+      id       = measure,
+      pk       = key_cols,
+      code     = aux_countries,
+      code_label = "aux_countries",
+      ...
     )
 
-    setattr(countries,
-            "raw_sha_fun",
-            raw_sha_fun)
-
-    pipfun::pip_sign_save(
-      x = countries,
-      measure = measure,
-      msrdir = msrdir,
-      force = force
-    )
   } else {
-    df <- load_aux(
-      maindir = maindir,
-      measure = measure
-    )
+
+    df <- pipload::load_aux_data(measure = measure)
+
     return(df)
   }
 }