Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Add active binding for observable_regex #204

Open
wants to merge 3 commits into
base: main
Choose a base branch
from
Open

Add active binding for observable_regex #204

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
173e055
feat(DiseasystoreBase): Add active binding for `observable_regex`
RasmusSkytte Jan 30, 2025
b79323b
docs(NEWS): Add entry on public `observable_regex`
RasmusSkytte Jan 30, 2025
b104b85
chore: Update pak.lock
RasmusSkytte Jan 30, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 5 additions & 1 deletion NEWS.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,10 @@
# diseasystore (development version)

## Minor Improvements and Fixes

* The `$observable_regex` field is added, which shows the regex that demarcates observables from stratifications (#204).


# diseasystore 0.3.0

## Breaking change
Expand Down Expand Up @@ -56,7 +61,6 @@

* Added benchmarking vignette `vignette("benchmarks")` (#144).


## Minor Improvements and Fixes

* `diseasyoption()` can now be called without the `option` argument to return all `diseasy/diseasystore` options (#159).
Expand Down
21 changes: 15 additions & 6 deletions R/DiseasystoreBase.R
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -500,7 +500,7 @@ DiseasystoreBase <- R6::R6Class(
),


#' @field available_features (`character`)\cr
#' @field available_features (`character()`)\cr
#' A list of available features in the feature store. Read only.
available_features = purrr::partial(
.f = active_binding,
Expand All @@ -509,25 +509,34 @@ DiseasystoreBase <- R6::R6Class(
),


#' @field available_observables (`character`)\cr
#' @field available_observables (`character()`)\cr
#' A list of available observables in the feature store. Read only.
available_observables = purrr::partial(
.f = active_binding,
name = "available_observables",
expr = return(purrr::keep(self$available_features, ~ stringr::str_detect(., private$.observables_regex)))
expr = return(purrr::keep(self$available_features, ~ stringr::str_detect(., self$observables_regex)))
),


#' @field available_stratifications (`character`)\cr
#' @field available_stratifications (`character()`)\cr
#' A list of available stratifications in the feature store. Read only.
available_stratifications = purrr::partial(
.f = active_binding,
name = "available_stratifications",
expr = return(purrr::discard(self$available_features, ~ stringr::str_detect(., private$.observables_regex)))
expr = return(purrr::discard(self$available_features, ~ stringr::str_detect(., self$observables_regex)))
),


#' @field label (`character`)\cr
#' @field observables_regex (`character(1)`)\cr
#' A list of available stratifications in the feature store. Read only.
observables_regex = purrr::partial(
.f = active_binding,
name = "observables_regex",
expr = return(private$.observables_regex)
),


#' @field label (`character(1)`)\cr
#' A human readable label of the feature store. Read only.
label = purrr::partial(
.f = active_binding,
Expand Down
11 changes: 7 additions & 4 deletions man/DiseasystoreBase.Rd
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

100 changes: 50 additions & 50 deletions pak.lock
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -162,7 +162,7 @@
{
"ref": "bit64",
"package": "bit64",
"version": "4.5.2",
"version": "4.6.0-1",
"type": "standard",
"direct": false,
"binary": true,
Expand All @@ -174,10 +174,10 @@
"RemoteRef": "bit64",
"RemoteRepos": "https://packagemanager.posit.co/cran/__linux__/noble/latest",
"RemotePkgPlatform": "x86_64-pc-linux-gnu-ubuntu-24.04",
"RemoteSha": "4.5.2"
"RemoteSha": "4.6.0-1"
},
"sources": "https://packagemanager.posit.co/cran/__linux__/noble/latest/src/contrib/bit64_4.5.2.tar.gz",
"target": "src/contrib/x86_64-pc-linux-gnu-ubuntu-24.04/4.4/bit64_4.5.2.tar.gz",
"sources": "https://packagemanager.posit.co/cran/__linux__/noble/latest/src/contrib/bit64_4.6.0-1.tar.gz",
"target": "src/contrib/x86_64-pc-linux-gnu-ubuntu-24.04/4.4/bit64_4.6.0-1.tar.gz",
"platform": "x86_64-pc-linux-gnu-ubuntu-24.04",
"rversion": "4.4",
"directpkg": false,
Expand Down Expand Up @@ -610,7 +610,7 @@
{
"ref": "curl",
"package": "curl",
"version": "6.1.0",
"version": "6.2.0",
"type": "standard",
"direct": false,
"binary": true,
Expand All @@ -622,10 +622,10 @@
"RemoteRef": "curl",
"RemoteRepos": "https://packagemanager.posit.co/cran/__linux__/noble/latest",
"RemotePkgPlatform": "x86_64-pc-linux-gnu-ubuntu-24.04",
"RemoteSha": "6.1.0"
"RemoteSha": "6.2.0"
},
"sources": "https://packagemanager.posit.co/cran/__linux__/noble/latest/src/contrib/curl_6.1.0.tar.gz",
"target": "src/contrib/x86_64-pc-linux-gnu-ubuntu-24.04/4.4/curl_6.1.0.tar.gz",
"sources": "https://packagemanager.posit.co/cran/__linux__/noble/latest/src/contrib/curl_6.2.0.tar.gz",
"target": "src/contrib/x86_64-pc-linux-gnu-ubuntu-24.04/4.4/curl_6.2.0.tar.gz",
"platform": "x86_64-pc-linux-gnu-ubuntu-24.04",
"rversion": "4.4",
"directpkg": false,
Expand Down Expand Up @@ -933,7 +933,7 @@
{
"ref": "duckdb",
"package": "duckdb",
"version": "1.1.3-1",
"version": "1.1.3-2",
"type": "standard",
"direct": false,
"binary": true,
Expand All @@ -945,10 +945,10 @@
"RemoteRef": "duckdb",
"RemoteRepos": "https://packagemanager.posit.co/cran/__linux__/noble/latest",
"RemotePkgPlatform": "x86_64-pc-linux-gnu-ubuntu-24.04",
"RemoteSha": "1.1.3-1"
"RemoteSha": "1.1.3-2"
},
"sources": "https://packagemanager.posit.co/cran/__linux__/noble/latest/src/contrib/duckdb_1.1.3-1.tar.gz",
"target": "src/contrib/x86_64-pc-linux-gnu-ubuntu-24.04/4.4/duckdb_1.1.3-1.tar.gz",
"sources": "https://packagemanager.posit.co/cran/__linux__/noble/latest/src/contrib/duckdb_1.1.3-2.tar.gz",
"target": "src/contrib/x86_64-pc-linux-gnu-ubuntu-24.04/4.4/duckdb_1.1.3-2.tar.gz",
"platform": "x86_64-pc-linux-gnu-ubuntu-24.04",
"rversion": "4.4",
"directpkg": false,
Expand Down Expand Up @@ -1002,7 +1002,7 @@
{
"ref": "evaluate",
"package": "evaluate",
"version": "1.0.1",
"version": "1.0.3",
"type": "standard",
"direct": false,
"binary": true,
Expand All @@ -1014,10 +1014,10 @@
"RemoteRef": "evaluate",
"RemoteRepos": "https://packagemanager.posit.co/cran/__linux__/noble/latest",
"RemotePkgPlatform": "x86_64-pc-linux-gnu-ubuntu-24.04",
"RemoteSha": "1.0.1"
"RemoteSha": "1.0.3"
},
"sources": "https://packagemanager.posit.co/cran/__linux__/noble/latest/src/contrib/evaluate_1.0.1.tar.gz",
"target": "src/contrib/x86_64-pc-linux-gnu-ubuntu-24.04/4.4/evaluate_1.0.1.tar.gz",
"sources": "https://packagemanager.posit.co/cran/__linux__/noble/latest/src/contrib/evaluate_1.0.3.tar.gz",
"target": "src/contrib/x86_64-pc-linux-gnu-ubuntu-24.04/4.4/evaluate_1.0.3.tar.gz",
"platform": "x86_64-pc-linux-gnu-ubuntu-24.04",
"rversion": "4.4",
"directpkg": false,
Expand Down Expand Up @@ -1625,7 +1625,7 @@
{
"ref": "httr2",
"package": "httr2",
"version": "1.0.7",
"version": "1.1.0",
"type": "standard",
"direct": false,
"binary": true,
Expand All @@ -1637,10 +1637,10 @@
"RemoteRef": "httr2",
"RemoteRepos": "https://packagemanager.posit.co/cran/__linux__/noble/latest",
"RemotePkgPlatform": "x86_64-pc-linux-gnu-ubuntu-24.04",
"RemoteSha": "1.0.7"
"RemoteSha": "1.1.0"
},
"sources": "https://packagemanager.posit.co/cran/__linux__/noble/latest/src/contrib/httr2_1.0.7.tar.gz",
"target": "src/contrib/x86_64-pc-linux-gnu-ubuntu-24.04/4.4/httr2_1.0.7.tar.gz",
"sources": "https://packagemanager.posit.co/cran/__linux__/noble/latest/src/contrib/httr2_1.1.0.tar.gz",
"target": "src/contrib/x86_64-pc-linux-gnu-ubuntu-24.04/4.4/httr2_1.1.0.tar.gz",
"platform": "x86_64-pc-linux-gnu-ubuntu-24.04",
"rversion": "4.4",
"directpkg": false,
Expand Down Expand Up @@ -2495,7 +2495,7 @@
{
"ref": "openssl",
"package": "openssl",
"version": "2.3.0",
"version": "2.3.1",
"type": "standard",
"direct": false,
"binary": true,
Expand All @@ -2507,10 +2507,10 @@
"RemoteRef": "openssl",
"RemoteRepos": "https://packagemanager.posit.co/cran/__linux__/noble/latest",
"RemotePkgPlatform": "x86_64-pc-linux-gnu-ubuntu-24.04",
"RemoteSha": "2.3.0"
"RemoteSha": "2.3.1"
},
"sources": "https://packagemanager.posit.co/cran/__linux__/noble/latest/src/contrib/openssl_2.3.0.tar.gz",
"target": "src/contrib/x86_64-pc-linux-gnu-ubuntu-24.04/4.4/openssl_2.3.0.tar.gz",
"sources": "https://packagemanager.posit.co/cran/__linux__/noble/latest/src/contrib/openssl_2.3.1.tar.gz",
"target": "src/contrib/x86_64-pc-linux-gnu-ubuntu-24.04/4.4/openssl_2.3.1.tar.gz",
"platform": "x86_64-pc-linux-gnu-ubuntu-24.04",
"rversion": "4.4",
"directpkg": false,
Expand Down Expand Up @@ -2595,7 +2595,7 @@
{
"ref": "pkgbuild",
"package": "pkgbuild",
"version": "1.4.5",
"version": "1.4.6",
"type": "standard",
"direct": false,
"binary": true,
Expand All @@ -2607,10 +2607,10 @@
"RemoteRef": "pkgbuild",
"RemoteRepos": "https://packagemanager.posit.co/cran/__linux__/noble/latest",
"RemotePkgPlatform": "x86_64-pc-linux-gnu-ubuntu-24.04",
"RemoteSha": "1.4.5"
"RemoteSha": "1.4.6"
},
"sources": "https://packagemanager.posit.co/cran/__linux__/noble/latest/src/contrib/pkgbuild_1.4.5.tar.gz",
"target": "src/contrib/x86_64-pc-linux-gnu-ubuntu-24.04/4.4/pkgbuild_1.4.5.tar.gz",
"sources": "https://packagemanager.posit.co/cran/__linux__/noble/latest/src/contrib/pkgbuild_1.4.6.tar.gz",
"target": "src/contrib/x86_64-pc-linux-gnu-ubuntu-24.04/4.4/pkgbuild_1.4.6.tar.gz",
"platform": "x86_64-pc-linux-gnu-ubuntu-24.04",
"rversion": "4.4",
"directpkg": false,
Expand Down Expand Up @@ -3154,7 +3154,7 @@
{
"ref": "Rcpp",
"package": "Rcpp",
"version": "1.0.13-1",
"version": "1.0.14",
"type": "standard",
"direct": false,
"binary": true,
Expand All @@ -3166,10 +3166,10 @@
"RemoteRef": "Rcpp",
"RemoteRepos": "https://packagemanager.posit.co/cran/__linux__/noble/latest",
"RemotePkgPlatform": "x86_64-pc-linux-gnu-ubuntu-24.04",
"RemoteSha": "1.0.13-1"
"RemoteSha": "1.0.14"
},
"sources": "https://packagemanager.posit.co/cran/__linux__/noble/latest/src/contrib/Rcpp_1.0.13-1.tar.gz",
"target": "src/contrib/x86_64-pc-linux-gnu-ubuntu-24.04/4.4/Rcpp_1.0.13-1.tar.gz",
"sources": "https://packagemanager.posit.co/cran/__linux__/noble/latest/src/contrib/Rcpp_1.0.14.tar.gz",
"target": "src/contrib/x86_64-pc-linux-gnu-ubuntu-24.04/4.4/Rcpp_1.0.14.tar.gz",
"platform": "x86_64-pc-linux-gnu-ubuntu-24.04",
"rversion": "4.4",
"directpkg": false,
Expand Down Expand Up @@ -3285,7 +3285,7 @@
{
"ref": "rlang",
"package": "rlang",
"version": "1.1.4",
"version": "1.1.5",
"type": "standard",
"direct": false,
"binary": true,
Expand All @@ -3297,10 +3297,10 @@
"RemoteRef": "rlang",
"RemoteRepos": "https://packagemanager.posit.co/cran/__linux__/noble/latest",
"RemotePkgPlatform": "x86_64-pc-linux-gnu-ubuntu-24.04",
"RemoteSha": "1.1.4"
"RemoteSha": "1.1.5"
},
"sources": "https://packagemanager.posit.co/cran/__linux__/noble/latest/src/contrib/rlang_1.1.4.tar.gz",
"target": "src/contrib/x86_64-pc-linux-gnu-ubuntu-24.04/4.4/rlang_1.1.4.tar.gz",
"sources": "https://packagemanager.posit.co/cran/__linux__/noble/latest/src/contrib/rlang_1.1.5.tar.gz",
"target": "src/contrib/x86_64-pc-linux-gnu-ubuntu-24.04/4.4/rlang_1.1.5.tar.gz",
"platform": "x86_64-pc-linux-gnu-ubuntu-24.04",
"rversion": "4.4",
"directpkg": false,
Expand Down Expand Up @@ -3871,22 +3871,22 @@
{
"ref": "systemfonts",
"package": "systemfonts",
"version": "1.1.0",
"version": "1.2.1",
"type": "standard",
"direct": false,
"binary": true,
"dependencies": "lifecycle",
"dependencies": ["jsonlite", "lifecycle"],
"vignettes": false,
"metadata": {
"RemotePkgRef": "systemfonts",
"RemoteType": "standard",
"RemoteRef": "systemfonts",
"RemoteRepos": "https://packagemanager.posit.co/cran/__linux__/noble/latest",
"RemotePkgPlatform": "x86_64-pc-linux-gnu-ubuntu-24.04",
"RemoteSha": "1.1.0"
"RemoteSha": "1.2.1"
},
"sources": "https://packagemanager.posit.co/cran/__linux__/noble/latest/src/contrib/systemfonts_1.1.0.tar.gz",
"target": "src/contrib/x86_64-pc-linux-gnu-ubuntu-24.04/4.4/systemfonts_1.1.0.tar.gz",
"sources": "https://packagemanager.posit.co/cran/__linux__/noble/latest/src/contrib/systemfonts_1.2.1.tar.gz",
"target": "src/contrib/x86_64-pc-linux-gnu-ubuntu-24.04/4.4/systemfonts_1.2.1.tar.gz",
"platform": "x86_64-pc-linux-gnu-ubuntu-24.04",
"rversion": "4.4",
"directpkg": false,
Expand Down Expand Up @@ -3915,7 +3915,7 @@
{
"ref": "testthat",
"package": "testthat",
"version": "3.2.2",
"version": "3.2.3",
"type": "standard",
"direct": false,
"binary": true,
Expand All @@ -3927,10 +3927,10 @@
"RemoteRef": "testthat",
"RemoteRepos": "https://packagemanager.posit.co/cran/__linux__/noble/latest",
"RemotePkgPlatform": "x86_64-pc-linux-gnu-ubuntu-24.04",
"RemoteSha": "3.2.2"
"RemoteSha": "3.2.3"
},
"sources": "https://packagemanager.posit.co/cran/__linux__/noble/latest/src/contrib/testthat_3.2.2.tar.gz",
"target": "src/contrib/x86_64-pc-linux-gnu-ubuntu-24.04/4.4/testthat_3.2.2.tar.gz",
"sources": "https://packagemanager.posit.co/cran/__linux__/noble/latest/src/contrib/testthat_3.2.3.tar.gz",
"target": "src/contrib/x86_64-pc-linux-gnu-ubuntu-24.04/4.4/testthat_3.2.3.tar.gz",
"platform": "x86_64-pc-linux-gnu-ubuntu-24.04",
"rversion": "4.4",
"directpkg": false,
Expand All @@ -3946,22 +3946,22 @@
{
"ref": "textshaping",
"package": "textshaping",
"version": "0.4.1",
"version": "1.0.0",
"type": "standard",
"direct": false,
"binary": true,
"dependencies": ["lifecycle", "systemfonts"],
"dependencies": ["lifecycle", "stringi", "systemfonts"],
"vignettes": false,
"metadata": {
"RemotePkgRef": "textshaping",
"RemoteType": "standard",
"RemoteRef": "textshaping",
"RemoteRepos": "https://packagemanager.posit.co/cran/__linux__/noble/latest",
"RemotePkgPlatform": "x86_64-pc-linux-gnu-ubuntu-24.04",
"RemoteSha": "0.4.1"
"RemoteSha": "1.0.0"
},
"sources": "https://packagemanager.posit.co/cran/__linux__/noble/latest/src/contrib/textshaping_0.4.1.tar.gz",
"target": "src/contrib/x86_64-pc-linux-gnu-ubuntu-24.04/4.4/textshaping_0.4.1.tar.gz",
"sources": "https://packagemanager.posit.co/cran/__linux__/noble/latest/src/contrib/textshaping_1.0.0.tar.gz",
"target": "src/contrib/x86_64-pc-linux-gnu-ubuntu-24.04/4.4/textshaping_1.0.0.tar.gz",
"platform": "x86_64-pc-linux-gnu-ubuntu-24.04",
"rversion": "4.4",
"directpkg": false,
Expand Down
Loading