Skip to content

Commit 7946ea3

Browse files
Updated readme to give cloud-volume error fix
* Solution to update cloud-volume: fafbseg::simple_python('none', pkgs='cloud-volume~=8.32.1')
1 parent b61ad43 commit 7946ea3

File tree

4 files changed

+21
-17
lines changed

4 files changed

+21
-17
lines changed

R/cave-tables.R

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -106,7 +106,7 @@ banc_nuclei <- function (rootids = NULL,
106106
#' @importFrom nat xyzmatrix2str
107107
banc_cell_info <- function(rootids = NULL, rawcoords = FALSE){
108108
table <- "cell_info"
109-
res <- get_cave_table_data(table)
109+
res <- with_banc(get_cave_table_data(table))
110110
if (isTRUE(rawcoords))
111111
res
112112
else {
@@ -118,27 +118,27 @@ banc_cell_info <- function(rootids = NULL, rawcoords = FALSE){
118118
#' @rdname banc_cave_tables
119119
#' @export
120120
banc_cell_ids <- function(rootids = NULL){
121-
get_cave_table_data('cell_ids', rootids)
121+
with_banc(get_cave_table_data('cell_ids', rootids))
122122
}
123123

124124
#' @rdname banc_cave_tables
125125
#' @export
126126
banc_neck_connective_neurons <- function(rootids = NULL,
127127
table = c("neck_connective_y92500", "neck_connective_y121000")){
128128
table <- match.arg(table)
129-
get_cave_table_data(table, rootids)
129+
with_banc(get_cave_table_data(table, rootids))
130130
}
131131

132132
#' @rdname banc_cave_tables
133133
#' @export
134134
banc_peripheral_nerves <- function(rootids = NULL){
135-
get_cave_table_data("peripheral_nerves", rootids)
135+
with_banc(get_cave_table_data("peripheral_nerves", rootids))
136136
}
137137

138138
#' @rdname banc_cave_tables
139139
#' @export
140140
banc_backbone_proofread <- function(rootids = NULL){
141-
get_cave_table_data("backbone_proofread", rootids)
141+
with_banc(get_cave_table_data("backbone_proofread", rootids))
142142
}
143143

144144
# hidden

R/cave.R

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -18,9 +18,8 @@
1818
#' filter(tag2=='anterior-posterior projection pattern') %>%
1919
#' count(tag)
2020
#' }
21-
banc_cave_query <- function(table, datastack_name = NULL, live=TRUE, ...) {
22-
if(is.null(datastack_name)) datastack_name=banc_datastack_name()
23-
fafbseg::flywire_cave_query(table = table, datastack_name = datastack_name, live=live, ...)
21+
banc_cave_query <- function(table, live=TRUE, ...) {
22+
with_banc(fafbseg::flywire_cave_query(table = table, live=live, ...))
2423
}
2524

2625
#' Low level access to banc's CAVE annotation infrastructure
@@ -35,6 +34,6 @@ banc_cave_query <- function(table, datastack_name = NULL, live=TRUE, ...) {
3534
#' fcc$materialize$get_table_metadata(tables[1])
3635
#' }
3736
banc_cave_client <- function() {
38-
with_banc(flywire_cave_client())
37+
with_banc(fafbseg::flywire_cave_client())
3938
}
4039

README.md

Lines changed: 12 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -61,7 +61,7 @@ To check that everything is set up properly, try:
6161
# diagnose issues
6262
dr_banc()
6363

64-
# confirm functionality
64+
# confirm functionality, should return FALSE
6565
banc_islatest("720575941562355975")
6666
```
6767

@@ -71,14 +71,21 @@ called using the `reticulate` package.
7171
You can install full set of recommended libraries including `fafbseg-py`:
7272

7373
```
74-
simple_python("full")
74+
fafbseg::simple_python("full")
7575
```
7676

7777
Note that this package is designed to play nicely with `fafbseg`, which has
7878
been used mainly for the *FAFB-FlyWire* project, but could be used to work with
7979
data from many neuroglancer/CAVE based projects.
8080

81-
Use `with_banc()` to wrap many additional fafbseg::flywire_* functions
81+
If you get an error related to not finding cloud-volume or the
82+
cloud-volume version, the solution may be to update cloud-volume, as so:
83+
84+
```r
85+
fafbseg::simple_python('none', pkgs='cloud-volume~=8.32.1')
86+
```
87+
88+
Use `with_banc()` to wrap many additional `fafbseg::flywire_*` functions
8289
for use with the *BANC*. Alternatively `choose_banc()` to set all
8390
`flywire_*` functions from `fafbseg` to target the *BANC*. Not all functions
8491
will work.
@@ -95,7 +102,7 @@ remotes::install_github('flyconnectome/bancr')
95102
If you need to update a specific Python library dependent, you can do:
96103

97104
```r
98-
reticulate::py_install("fafbseg", upgrade = TRUE)
105+
fafbseg::simple_python(pkgs='fafbseg')
99106
```
100107

101108
Ascending Neuron Vignette
@@ -107,6 +114,7 @@ First we need to load the package, and direct ourselves to the *BANC* data set.
107114

108115
```r
109116
library(bancr)
117+
# choose_banc()
110118
```
111119

112120
### Identify the neurons we care about

man/banc_cave_query.Rd

Lines changed: 1 addition & 4 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)