Default to RemoteStore for fsspec URIs - #2198

Merged
jhamman merged 13 commits into
zarr-developers:v3from
TomAugspurger:fix/auto-remote-store
Sep 19, 2024
Merged

Default to RemoteStore for fsspec URIs#2198
jhamman merged 13 commits into
zarr-developers:v3from
TomAugspurger:fix/auto-remote-store

Conversation

@TomAugspurger

Copy link
Copy Markdown
Contributor

This allows for specifying a RemoteStore by an fsspec URI + storage options, as a convenience (and backwards compatibility shim) for creating a RemoteStore:

In [1]: importzarr.storeIn [2]: g=zarr.open_group(store="az://daymet-zarr/annual/hi.zarr", zarr_format=2, storage_options={"account_name": "daymeteuwest"})
In [3]: list(g.arrays())
Objectat .zmetadataisnotrecognizedasacomponentofaZarrhierarchy.
Out[3]: [<Arrayaz://daymet-zarr/annual/hi.zarr/lambert_conformal_conicshape=() dtype=int16>,
<Arrayaz://daymet-zarr/annual/hi.zarr/latshape=(584, 284) dtype=float32>,
...

Closes#2195

Comment threadsrc/zarr/store/common.py Outdated
elif isinstance(store_like, str):
return StorePath(await LocalStore.open(root=Path(store_like), mode=mode or "r"))
try:
fs, path = fsspec.url_to_fs(store_like, **storage_options)

Copy link
Copy Markdown
ContributorAuthor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Nitpick: this constructs the actual filesystem class instance, but we have to go back to a URL (and reconstruct the filesystem instance) for the RemoteStore interface. It'd be nice to avoid that.

Comment threadsrc/zarr/store/common.py Outdated
try:
fs, path = fsspec.url_to_fs(store_like, **storage_options)
except Exception:
# not sure what to do here, but I don't want this to fail...

Copy link
Copy Markdown
ContributorAuthor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This is bad, but in my experience fsspec.url_to_fs can run pretty much arbitrary code, depending on what packages you have installed and what URI you pass. I really don't want this to fail and cause issues for people who just want a local path. maybe we'd always get an fsspec LocalFileSystem for a plain, non-fsspec URI string, but I'm not sure.

Comment threadsrc/zarr/store/common.py Outdated
else:
raise TypeError

if path is not None:

Copy link
Copy Markdown
ContributorAuthor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Oops, I forgot to revert this. It's not used yet.

We call make_store_path multiple times in a single call by the user (e.g. save_array calls make_store_path and passes the result to AsyncArray.create which also calls make_store_path). I was thinking about consolidating all the store / path stuff in a single spot, but it ended up being a bit much and I wasn't sure what the tolerance was for expanding the API of methods like AsyncArray.create even more. Do we want users to do

AsyncArray.create(store=StorePath(RemoteStore(..., **storage_options), path))

or

AsyncArray.create(store="s3://bucket/path.zarr", storage_options=...)

@dstansbydstansby left a comment

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I don't have much opinion on the actual change, but is it worth adding warnings everywhere if storage_options is passed by the user (ie not None), but they haven't passed an fsspec URL so they aren't used?

Comment threadsrc/zarr/api/asynchronous.py
result = StorePath(await MemoryStore.open(mode=mode))
elif isinstance(store_like, Path):
return StorePath(await LocalStore.open(root=store_like, mode=mode or "r"))
result = StorePath(await LocalStore.open(root=store_like, mode=mode or "r"))

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

we can pass **storage_options to LocalStore as well

Copy link
Copy Markdown
ContributorAuthor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

could be missing something, but I don't think that'll work. LocalStore.open will call LocalStore.__init__, which just takes root and mode, which are passed as regular args here.

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I see what you mean. I was thinking auto_mkdir would be passed through but if that's not the case, let's not get distracted here.

Comment threadsrc/zarr/store/common.py Outdated
elif isinstance(store_like, str):
return StorePath(await LocalStore.open(root=Path(store_like), mode=mode or "r"))
storage_options = storage_options or {}
fs, _ = fsspec.url_to_fs(store_like, **storage_options)

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

A few thoughts here:

  1. It would be nice to avoid creating the FileSystem if possible. A lighter approach could attempt to parse the string and look for :// (and not file://).
  2. If we do have to create filesystem, it would be nice to reuse it when creating the RemoteStore. Something like RemoteStore.from_filesystem(...) could be a nice pattern.

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

See below for the way we used to do this. May be worth replicating parts of this

if"://"instoreor"::"instore:

Copy link
Copy Markdown
ContributorAuthor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Just pushed that refactor. It's a bit bigger than I'd like, but the basic version is that RemoteStores's __init__ matches what it uses internally: you can only given it an async filesystem.

There's a from_url and from_path that handles the other stuff that was previously in __init__.

I removed RemoteStore._url. I think that that's safe to remove, but I need to actually think through how it interacted with store.path

@jhamman
jhamman merged commit f538662 into zarr-developers:v3Sep 19, 2024
dcherian added a commit to dcherian/zarr-python that referenced this pull request Sep 24, 2024
* v3:
chore: update pre-commit hooks (zarr-developers#2222)
fix: validate v3 dtypes when loading/creating v3 metadata (zarr-developers#2209)
fix typo in store integration test (zarr-developers#2223)
Basic Zarr-python 2.x compatibility changes (zarr-developers#2098)
Make Group.arrays, groups compatible with v2 (zarr-developers#2213)
Typing fixes to test_indexing (zarr-developers#2193)
Default to RemoteStore for fsspec URIs (zarr-developers#2198)
Make MemoryStore serialiazable (zarr-developers#2204)
[v3] Implement Group methods for empty, full, ones, and zeros (zarr-developers#2210)
implement `store.list_prefix` and `store._set_many` (zarr-developers#2064)
Fixed codec for v2 data with no fill value (zarr-developers#2207)
Sign up for freeto join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

Default to a RemoteStore for (some) string StoreLike

3 participants

@TomAugspurger@jhamman@dstansby
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Add copy buttons to all
 blocks\n(function() {\n function addCopyButtons() {\n document.querySelectorAll('pre code').forEach(function(codeBlock) {\n if (codeBlock.parentElement.hasAttribute('data-copy-added')) return;\n codeBlock.parentElement.setAttribute('data-copy-added', 'true');\n \n var btn = document.createElement('button');\n btn.textContent = 'Copy';\n btn.style.cssText = 'position:absolute;top:4px;right:4px;padding:2px 8px;font-size:11px;background:#4ecdc4;border:none;border-radius:4px;color:#1a1a2e;cursor:pointer;opacity:0.7;transition:opacity 0.2s;';\n btn.onmouseover = function() { this.style.opacity = '1'; };\n btn.onmouseout = function() { this.style.opacity = '0.7'; };\n btn.onclick = function() {\n navigator.clipboard.writeText(codeBlock.textContent).then(function() {\n btn.textContent = 'Copied!';\n setTimeout(function() { btn.textContent = 'Copy'; }, 1500);\n });\n };\n codeBlock.parentElement.style.position = 'relative';\n codeBlock.parentElement.appendChild(btn);\n });\n }\n \n addCopyButtons();\n \n // Re-run on dynamic content\n var observer = new MutationObserver(addCopyButtons);\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Add Copy Buttons to Code Blocks");
}
} catch(__e) { console.warn('[Userscript:Add Copy Buttons to Code Blocks]', __e); }
})();
(function(){
try {
var __m = "github.com";
var __re = new RegExp('^' + "github\\.com" + '
Skip to content

Default to RemoteStore for fsspec URIs - #2198

Merged
jhamman merged 13 commits into
zarr-developers:v3from
TomAugspurger:fix/auto-remote-store
Sep 19, 2024
Merged

Default to RemoteStore for fsspec URIs#2198
jhamman merged 13 commits into
zarr-developers:v3from
TomAugspurger:fix/auto-remote-store

Conversation

@TomAugspurger

Copy link
Copy Markdown
Contributor

This allows for specifying a RemoteStore by an fsspec URI + storage options, as a convenience (and backwards compatibility shim) for creating a RemoteStore:

In [1]: importzarr.storeIn [2]: g=zarr.open_group(store="az://daymet-zarr/annual/hi.zarr", zarr_format=2, storage_options={"account_name": "daymeteuwest"})
In [3]: list(g.arrays())
Objectat .zmetadataisnotrecognizedasacomponentofaZarrhierarchy.
Out[3]: [<Arrayaz://daymet-zarr/annual/hi.zarr/lambert_conformal_conicshape=() dtype=int16>,
<Arrayaz://daymet-zarr/annual/hi.zarr/latshape=(584, 284) dtype=float32>,
...

Closes#2195

Comment threadsrc/zarr/store/common.py Outdated
elif isinstance(store_like, str):
return StorePath(await LocalStore.open(root=Path(store_like), mode=mode or "r"))
try:
fs, path = fsspec.url_to_fs(store_like, **storage_options)

Copy link
Copy Markdown
ContributorAuthor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Nitpick: this constructs the actual filesystem class instance, but we have to go back to a URL (and reconstruct the filesystem instance) for the RemoteStore interface. It'd be nice to avoid that.

Comment threadsrc/zarr/store/common.py Outdated
try:
fs, path = fsspec.url_to_fs(store_like, **storage_options)
except Exception:
# not sure what to do here, but I don't want this to fail...

Copy link
Copy Markdown
ContributorAuthor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This is bad, but in my experience fsspec.url_to_fs can run pretty much arbitrary code, depending on what packages you have installed and what URI you pass. I really don't want this to fail and cause issues for people who just want a local path. maybe we'd always get an fsspec LocalFileSystem for a plain, non-fsspec URI string, but I'm not sure.

Comment threadsrc/zarr/store/common.py Outdated
else:
raise TypeError

if path is not None:

Copy link
Copy Markdown
ContributorAuthor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Oops, I forgot to revert this. It's not used yet.

We call make_store_path multiple times in a single call by the user (e.g. save_array calls make_store_path and passes the result to AsyncArray.create which also calls make_store_path). I was thinking about consolidating all the store / path stuff in a single spot, but it ended up being a bit much and I wasn't sure what the tolerance was for expanding the API of methods like AsyncArray.create even more. Do we want users to do

AsyncArray.create(store=StorePath(RemoteStore(..., **storage_options), path))

or

AsyncArray.create(store="s3://bucket/path.zarr", storage_options=...)

@dstansbydstansby left a comment

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I don't have much opinion on the actual change, but is it worth adding warnings everywhere if storage_options is passed by the user (ie not None), but they haven't passed an fsspec URL so they aren't used?

Comment threadsrc/zarr/api/asynchronous.py
result = StorePath(await MemoryStore.open(mode=mode))
elif isinstance(store_like, Path):
return StorePath(await LocalStore.open(root=store_like, mode=mode or "r"))
result = StorePath(await LocalStore.open(root=store_like, mode=mode or "r"))

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

we can pass **storage_options to LocalStore as well

Copy link
Copy Markdown
ContributorAuthor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

could be missing something, but I don't think that'll work. LocalStore.open will call LocalStore.__init__, which just takes root and mode, which are passed as regular args here.

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I see what you mean. I was thinking auto_mkdir would be passed through but if that's not the case, let's not get distracted here.

Comment threadsrc/zarr/store/common.py Outdated
elif isinstance(store_like, str):
return StorePath(await LocalStore.open(root=Path(store_like), mode=mode or "r"))
storage_options = storage_options or {}
fs, _ = fsspec.url_to_fs(store_like, **storage_options)

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

A few thoughts here:

  1. It would be nice to avoid creating the FileSystem if possible. A lighter approach could attempt to parse the string and look for :// (and not file://).
  2. If we do have to create filesystem, it would be nice to reuse it when creating the RemoteStore. Something like RemoteStore.from_filesystem(...) could be a nice pattern.

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

See below for the way we used to do this. May be worth replicating parts of this

if"://"instoreor"::"instore:

Copy link
Copy Markdown
ContributorAuthor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Just pushed that refactor. It's a bit bigger than I'd like, but the basic version is that RemoteStores's __init__ matches what it uses internally: you can only given it an async filesystem.

There's a from_url and from_path that handles the other stuff that was previously in __init__.

I removed RemoteStore._url. I think that that's safe to remove, but I need to actually think through how it interacted with store.path

@jhamman
jhamman merged commit f538662 into zarr-developers:v3Sep 19, 2024
dcherian added a commit to dcherian/zarr-python that referenced this pull request Sep 24, 2024
* v3:
chore: update pre-commit hooks (zarr-developers#2222)
fix: validate v3 dtypes when loading/creating v3 metadata (zarr-developers#2209)
fix typo in store integration test (zarr-developers#2223)
Basic Zarr-python 2.x compatibility changes (zarr-developers#2098)
Make Group.arrays, groups compatible with v2 (zarr-developers#2213)
Typing fixes to test_indexing (zarr-developers#2193)
Default to RemoteStore for fsspec URIs (zarr-developers#2198)
Make MemoryStore serialiazable (zarr-developers#2204)
[v3] Implement Group methods for empty, full, ones, and zeros (zarr-developers#2210)
implement `store.list_prefix` and `store._set_many` (zarr-developers#2064)
Fixed codec for v2 data with no fill value (zarr-developers#2207)
Sign up for freeto join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

Default to a RemoteStore for (some) string StoreLike

3 participants

@TomAugspurger@jhamman@dstansby
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Force GitHub README to respect dark mode\n(function() {\n var style = document.createElement('style');\n style.textContent = '\n .markdown-body {\n color-scheme: dark light;\n }\n .markdown-body pre { background: #161b22 !important; }\n .markdown-body code { background: rgba(110, 118, 129, 0.4) !important; }\n .markdown-body table th, .markdown-body table td { border-color: #30363d !important; }\n .markdown-body img { background: #0d1117; }\n .markdown-body blockquote { border-left-color: #8b949e; }\n .markdown-body hr { border-color: #30363d; }\n ';\n document.head.appendChild(style);\n})();", "GitHub Dark Mode README Fix"); } } catch(__e) { console.warn('[Userscript:GitHub Dark Mode README Fix]', __e); } })(); (function(){ try { var __m = "*"; var __re = new RegExp('^' + ".*" + '
Skip to content

Default to RemoteStore for fsspec URIs - #2198

Merged
jhamman merged 13 commits into
zarr-developers:v3from
TomAugspurger:fix/auto-remote-store
Sep 19, 2024
Merged

Default to RemoteStore for fsspec URIs#2198
jhamman merged 13 commits into
zarr-developers:v3from
TomAugspurger:fix/auto-remote-store

Conversation

@TomAugspurger

Copy link
Copy Markdown
Contributor

This allows for specifying a RemoteStore by an fsspec URI + storage options, as a convenience (and backwards compatibility shim) for creating a RemoteStore:

In [1]: importzarr.storeIn [2]: g=zarr.open_group(store="az://daymet-zarr/annual/hi.zarr", zarr_format=2, storage_options={"account_name": "daymeteuwest"})
In [3]: list(g.arrays())
Objectat .zmetadataisnotrecognizedasacomponentofaZarrhierarchy.
Out[3]: [<Arrayaz://daymet-zarr/annual/hi.zarr/lambert_conformal_conicshape=() dtype=int16>,
<Arrayaz://daymet-zarr/annual/hi.zarr/latshape=(584, 284) dtype=float32>,
...

Closes#2195

Comment threadsrc/zarr/store/common.py Outdated
elif isinstance(store_like, str):
return StorePath(await LocalStore.open(root=Path(store_like), mode=mode or "r"))
try:
fs, path = fsspec.url_to_fs(store_like, **storage_options)

Copy link
Copy Markdown
ContributorAuthor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Nitpick: this constructs the actual filesystem class instance, but we have to go back to a URL (and reconstruct the filesystem instance) for the RemoteStore interface. It'd be nice to avoid that.

Comment threadsrc/zarr/store/common.py Outdated
try:
fs, path = fsspec.url_to_fs(store_like, **storage_options)
except Exception:
# not sure what to do here, but I don't want this to fail...

Copy link
Copy Markdown
ContributorAuthor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This is bad, but in my experience fsspec.url_to_fs can run pretty much arbitrary code, depending on what packages you have installed and what URI you pass. I really don't want this to fail and cause issues for people who just want a local path. maybe we'd always get an fsspec LocalFileSystem for a plain, non-fsspec URI string, but I'm not sure.

Comment threadsrc/zarr/store/common.py Outdated
else:
raise TypeError

if path is not None:

Copy link
Copy Markdown
ContributorAuthor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Oops, I forgot to revert this. It's not used yet.

We call make_store_path multiple times in a single call by the user (e.g. save_array calls make_store_path and passes the result to AsyncArray.create which also calls make_store_path). I was thinking about consolidating all the store / path stuff in a single spot, but it ended up being a bit much and I wasn't sure what the tolerance was for expanding the API of methods like AsyncArray.create even more. Do we want users to do

AsyncArray.create(store=StorePath(RemoteStore(..., **storage_options), path))

or

AsyncArray.create(store="s3://bucket/path.zarr", storage_options=...)

@dstansbydstansby left a comment

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I don't have much opinion on the actual change, but is it worth adding warnings everywhere if storage_options is passed by the user (ie not None), but they haven't passed an fsspec URL so they aren't used?

Comment threadsrc/zarr/api/asynchronous.py
result = StorePath(await MemoryStore.open(mode=mode))
elif isinstance(store_like, Path):
return StorePath(await LocalStore.open(root=store_like, mode=mode or "r"))
result = StorePath(await LocalStore.open(root=store_like, mode=mode or "r"))

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

we can pass **storage_options to LocalStore as well

Copy link
Copy Markdown
ContributorAuthor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

could be missing something, but I don't think that'll work. LocalStore.open will call LocalStore.__init__, which just takes root and mode, which are passed as regular args here.

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I see what you mean. I was thinking auto_mkdir would be passed through but if that's not the case, let's not get distracted here.

Comment threadsrc/zarr/store/common.py Outdated
elif isinstance(store_like, str):
return StorePath(await LocalStore.open(root=Path(store_like), mode=mode or "r"))
storage_options = storage_options or {}
fs, _ = fsspec.url_to_fs(store_like, **storage_options)

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

A few thoughts here:

  1. It would be nice to avoid creating the FileSystem if possible. A lighter approach could attempt to parse the string and look for :// (and not file://).
  2. If we do have to create filesystem, it would be nice to reuse it when creating the RemoteStore. Something like RemoteStore.from_filesystem(...) could be a nice pattern.

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

See below for the way we used to do this. May be worth replicating parts of this

if"://"instoreor"::"instore:

Copy link
Copy Markdown
ContributorAuthor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Just pushed that refactor. It's a bit bigger than I'd like, but the basic version is that RemoteStores's __init__ matches what it uses internally: you can only given it an async filesystem.

There's a from_url and from_path that handles the other stuff that was previously in __init__.

I removed RemoteStore._url. I think that that's safe to remove, but I need to actually think through how it interacted with store.path

@jhamman
jhamman merged commit f538662 into zarr-developers:v3Sep 19, 2024
dcherian added a commit to dcherian/zarr-python that referenced this pull request Sep 24, 2024
* v3:
chore: update pre-commit hooks (zarr-developers#2222)
fix: validate v3 dtypes when loading/creating v3 metadata (zarr-developers#2209)
fix typo in store integration test (zarr-developers#2223)
Basic Zarr-python 2.x compatibility changes (zarr-developers#2098)
Make Group.arrays, groups compatible with v2 (zarr-developers#2213)
Typing fixes to test_indexing (zarr-developers#2193)
Default to RemoteStore for fsspec URIs (zarr-developers#2198)
Make MemoryStore serialiazable (zarr-developers#2204)
[v3] Implement Group methods for empty, full, ones, and zeros (zarr-developers#2210)
implement `store.list_prefix` and `store._set_many` (zarr-developers#2064)
Fixed codec for v2 data with no fill value (zarr-developers#2207)
Sign up for freeto join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

Default to a RemoteStore for (some) string StoreLike

3 participants

@TomAugspurger@jhamman@dstansby
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Highlight search terms from Google/DuckDuckGo/Bing referrer\n(function() {\n var ref = document.referrer;\n var terms = [];\n \n if (ref.includes('google.com') || ref.includes('duckduckgo.com') || ref.includes('bing.com')) {\n var url = new URL(ref);\n var q = url.searchParams.get('q') || url.searchParams.get('p');\n if (q) {\n terms = q.split(/\\s+/).filter(function(t) { return t.length > 2; });\n }\n }\n \n if (terms.length === 0) return;\n \n var style = document.createElement('style');\n style.textContent = '.userscript-highlight { background: #fbbf24; color: #1a1a2e; padding: 1px 3px; border-radius: 2px; }';\n document.head.appendChild(style);\n \n function highlight(node) {\n if (node.nodeType === 3) { // text node\n var text = node.textContent;\n var found = false;\n terms.forEach(function(term) {\n var regex = new RegExp('(' + term.replace(/[.*+?^${}()|[\\]\\\\]/g, '\\\\') + ')', 'gi');\n if (regex.test(text)) {\n found = true;\n var frag = document.createDocumentFragment();\n var parts = text.split(regex);\n parts.forEach(function(part, i) {\n if (i % 2 === 0) {\n frag.appendChild(document.createTextNode(part));\n } else {\n var span = document.createElement('span');\n span.className = 'userscript-highlight';\n span.textContent = part;\n frag.appendChild(span);\n }\n });\n node.parentNode.replaceChild(frag, node);\n }\n });\n } else if (node.nodeType === 1 && node.childNodes) { // element\n var skipTags = ['SCRIPT', 'STYLE', 'NOSCRIPT', 'TEXTAREA', 'INPUT', 'SELECT'];\n if (!skipTags.includes(node.tagName)) {\n Array.from(node.childNodes).forEach(highlight);\n }\n }\n }\n \n highlight(document.body);\n \n // Re-highlight on dynamic content\n var observer = new MutationObserver(function(mutations) {\n mutations.forEach(function(m) {\n m.addedNodes.forEach(function(node) {\n if (node.nodeType === 1 || node.nodeType === 3) highlight(node);\n });\n });\n });\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Highlight Search Terms"); } } catch(__e) { console.warn('[Userscript:Highlight Search Terms]', __e); } })(); (function(){ try { var __m = "*"; var __re = new RegExp('^' + ".*" + '
Skip to content

Default to RemoteStore for fsspec URIs - #2198

Merged
jhamman merged 13 commits into
zarr-developers:v3from
TomAugspurger:fix/auto-remote-store
Sep 19, 2024
Merged

Default to RemoteStore for fsspec URIs#2198
jhamman merged 13 commits into
zarr-developers:v3from
TomAugspurger:fix/auto-remote-store

Conversation

@TomAugspurger

Copy link
Copy Markdown
Contributor

This allows for specifying a RemoteStore by an fsspec URI + storage options, as a convenience (and backwards compatibility shim) for creating a RemoteStore:

In [1]: importzarr.storeIn [2]: g=zarr.open_group(store="az://daymet-zarr/annual/hi.zarr", zarr_format=2, storage_options={"account_name": "daymeteuwest"})
In [3]: list(g.arrays())
Objectat .zmetadataisnotrecognizedasacomponentofaZarrhierarchy.
Out[3]: [<Arrayaz://daymet-zarr/annual/hi.zarr/lambert_conformal_conicshape=() dtype=int16>,
<Arrayaz://daymet-zarr/annual/hi.zarr/latshape=(584, 284) dtype=float32>,
...

Closes#2195

Comment threadsrc/zarr/store/common.py Outdated
elif isinstance(store_like, str):
return StorePath(await LocalStore.open(root=Path(store_like), mode=mode or "r"))
try:
fs, path = fsspec.url_to_fs(store_like, **storage_options)

Copy link
Copy Markdown
ContributorAuthor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Nitpick: this constructs the actual filesystem class instance, but we have to go back to a URL (and reconstruct the filesystem instance) for the RemoteStore interface. It'd be nice to avoid that.

Comment threadsrc/zarr/store/common.py Outdated
try:
fs, path = fsspec.url_to_fs(store_like, **storage_options)
except Exception:
# not sure what to do here, but I don't want this to fail...

Copy link
Copy Markdown
ContributorAuthor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This is bad, but in my experience fsspec.url_to_fs can run pretty much arbitrary code, depending on what packages you have installed and what URI you pass. I really don't want this to fail and cause issues for people who just want a local path. maybe we'd always get an fsspec LocalFileSystem for a plain, non-fsspec URI string, but I'm not sure.

Comment threadsrc/zarr/store/common.py Outdated
else:
raise TypeError

if path is not None:

Copy link
Copy Markdown
ContributorAuthor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Oops, I forgot to revert this. It's not used yet.

We call make_store_path multiple times in a single call by the user (e.g. save_array calls make_store_path and passes the result to AsyncArray.create which also calls make_store_path). I was thinking about consolidating all the store / path stuff in a single spot, but it ended up being a bit much and I wasn't sure what the tolerance was for expanding the API of methods like AsyncArray.create even more. Do we want users to do

AsyncArray.create(store=StorePath(RemoteStore(..., **storage_options), path))

or

AsyncArray.create(store="s3://bucket/path.zarr", storage_options=...)

@dstansbydstansby left a comment

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I don't have much opinion on the actual change, but is it worth adding warnings everywhere if storage_options is passed by the user (ie not None), but they haven't passed an fsspec URL so they aren't used?

Comment threadsrc/zarr/api/asynchronous.py
result = StorePath(await MemoryStore.open(mode=mode))
elif isinstance(store_like, Path):
return StorePath(await LocalStore.open(root=store_like, mode=mode or "r"))
result = StorePath(await LocalStore.open(root=store_like, mode=mode or "r"))

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

we can pass **storage_options to LocalStore as well

Copy link
Copy Markdown
ContributorAuthor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

could be missing something, but I don't think that'll work. LocalStore.open will call LocalStore.__init__, which just takes root and mode, which are passed as regular args here.

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I see what you mean. I was thinking auto_mkdir would be passed through but if that's not the case, let's not get distracted here.

Comment threadsrc/zarr/store/common.py Outdated
elif isinstance(store_like, str):
return StorePath(await LocalStore.open(root=Path(store_like), mode=mode or "r"))
storage_options = storage_options or {}
fs, _ = fsspec.url_to_fs(store_like, **storage_options)

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

A few thoughts here:

  1. It would be nice to avoid creating the FileSystem if possible. A lighter approach could attempt to parse the string and look for :// (and not file://).
  2. If we do have to create filesystem, it would be nice to reuse it when creating the RemoteStore. Something like RemoteStore.from_filesystem(...) could be a nice pattern.

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

See below for the way we used to do this. May be worth replicating parts of this

if"://"instoreor"::"instore:

Copy link
Copy Markdown
ContributorAuthor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Just pushed that refactor. It's a bit bigger than I'd like, but the basic version is that RemoteStores's __init__ matches what it uses internally: you can only given it an async filesystem.

There's a from_url and from_path that handles the other stuff that was previously in __init__.

I removed RemoteStore._url. I think that that's safe to remove, but I need to actually think through how it interacted with store.path

@jhamman
jhamman merged commit f538662 into zarr-developers:v3Sep 19, 2024
dcherian added a commit to dcherian/zarr-python that referenced this pull request Sep 24, 2024
* v3:
chore: update pre-commit hooks (zarr-developers#2222)
fix: validate v3 dtypes when loading/creating v3 metadata (zarr-developers#2209)
fix typo in store integration test (zarr-developers#2223)
Basic Zarr-python 2.x compatibility changes (zarr-developers#2098)
Make Group.arrays, groups compatible with v2 (zarr-developers#2213)
Typing fixes to test_indexing (zarr-developers#2193)
Default to RemoteStore for fsspec URIs (zarr-developers#2198)
Make MemoryStore serialiazable (zarr-developers#2204)
[v3] Implement Group methods for empty, full, ones, and zeros (zarr-developers#2210)
implement `store.list_prefix` and `store._set_many` (zarr-developers#2064)
Fixed codec for v2 data with no fill value (zarr-developers#2207)
Sign up for freeto join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

Default to a RemoteStore for (some) string StoreLike

3 participants

@TomAugspurger@jhamman@dstansby
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Strip utm_, fbclid, gclid, etc. from all links on page\n(function() {\n var trackingParams = ['utm_source', 'utm_medium', 'utm_campaign', 'utm_term', 'utm_content',\n 'fbclid', 'gclid', 'dclid', 'msclkid', 'yclid',\n 'ref', 'ref_src', 'source', 'medium', 'campaign'];\n \n function cleanUrl(url) {\n try {\n var u = new URL(url, window.location.origin);\n var changed = false;\n trackingParams.forEach(function(p) {\n if (u.searchParams.has(p)) {\n u.searchParams.delete(p);\n changed = true;\n }\n });\n return changed ? u.toString() : url;\n } catch (e) {\n return url;\n }\n }\n \n function cleanLinks() {\n document.querySelectorAll('a[href]').forEach(function(a) {\n var clean = cleanUrl(a.href);\n if (clean !== a.href) a.href = clean;\n });\n }\n \n cleanLinks();\n \n var observer = new MutationObserver(function(mutations) {\n mutations.forEach(function(m) {\n m.addedNodes.forEach(function(node) {\n if (node.nodeType === 1) {\n if (node.tagName === 'A') cleanLinks();\n node.querySelectorAll('a[href]').forEach(function(a) {\n var clean = cleanUrl(a.href);\n if (clean !== a.href) a.href = clean;\n });\n }\n });\n });\n });\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Remove Tracking Parameters from Links"); } } catch(__e) { console.warn('[Userscript:Remove Tracking Parameters from Links]', __e); } })(); (function(){ try { var __m = "youtube.com"; var __re = new RegExp('^' + "youtube\\.com" + '
Skip to content

Default to RemoteStore for fsspec URIs - #2198

Merged
jhamman merged 13 commits into
zarr-developers:v3from
TomAugspurger:fix/auto-remote-store
Sep 19, 2024
Merged

Default to RemoteStore for fsspec URIs#2198
jhamman merged 13 commits into
zarr-developers:v3from
TomAugspurger:fix/auto-remote-store

Conversation

@TomAugspurger

Copy link
Copy Markdown
Contributor

This allows for specifying a RemoteStore by an fsspec URI + storage options, as a convenience (and backwards compatibility shim) for creating a RemoteStore:

In [1]: importzarr.storeIn [2]: g=zarr.open_group(store="az://daymet-zarr/annual/hi.zarr", zarr_format=2, storage_options={"account_name": "daymeteuwest"})
In [3]: list(g.arrays())
Objectat .zmetadataisnotrecognizedasacomponentofaZarrhierarchy.
Out[3]: [<Arrayaz://daymet-zarr/annual/hi.zarr/lambert_conformal_conicshape=() dtype=int16>,
<Arrayaz://daymet-zarr/annual/hi.zarr/latshape=(584, 284) dtype=float32>,
...

Closes#2195

Comment threadsrc/zarr/store/common.py Outdated
elif isinstance(store_like, str):
return StorePath(await LocalStore.open(root=Path(store_like), mode=mode or "r"))
try:
fs, path = fsspec.url_to_fs(store_like, **storage_options)

Copy link
Copy Markdown
ContributorAuthor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Nitpick: this constructs the actual filesystem class instance, but we have to go back to a URL (and reconstruct the filesystem instance) for the RemoteStore interface. It'd be nice to avoid that.

Comment threadsrc/zarr/store/common.py Outdated
try:
fs, path = fsspec.url_to_fs(store_like, **storage_options)
except Exception:
# not sure what to do here, but I don't want this to fail...

Copy link
Copy Markdown
ContributorAuthor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This is bad, but in my experience fsspec.url_to_fs can run pretty much arbitrary code, depending on what packages you have installed and what URI you pass. I really don't want this to fail and cause issues for people who just want a local path. maybe we'd always get an fsspec LocalFileSystem for a plain, non-fsspec URI string, but I'm not sure.

Comment threadsrc/zarr/store/common.py Outdated
else:
raise TypeError

if path is not None:

Copy link
Copy Markdown
ContributorAuthor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Oops, I forgot to revert this. It's not used yet.

We call make_store_path multiple times in a single call by the user (e.g. save_array calls make_store_path and passes the result to AsyncArray.create which also calls make_store_path). I was thinking about consolidating all the store / path stuff in a single spot, but it ended up being a bit much and I wasn't sure what the tolerance was for expanding the API of methods like AsyncArray.create even more. Do we want users to do

AsyncArray.create(store=StorePath(RemoteStore(..., **storage_options), path))

or

AsyncArray.create(store="s3://bucket/path.zarr", storage_options=...)

@dstansbydstansby left a comment

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I don't have much opinion on the actual change, but is it worth adding warnings everywhere if storage_options is passed by the user (ie not None), but they haven't passed an fsspec URL so they aren't used?

Comment threadsrc/zarr/api/asynchronous.py
result = StorePath(await MemoryStore.open(mode=mode))
elif isinstance(store_like, Path):
return StorePath(await LocalStore.open(root=store_like, mode=mode or "r"))
result = StorePath(await LocalStore.open(root=store_like, mode=mode or "r"))

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

we can pass **storage_options to LocalStore as well

Copy link
Copy Markdown
ContributorAuthor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

could be missing something, but I don't think that'll work. LocalStore.open will call LocalStore.__init__, which just takes root and mode, which are passed as regular args here.

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I see what you mean. I was thinking auto_mkdir would be passed through but if that's not the case, let's not get distracted here.

Comment threadsrc/zarr/store/common.py Outdated
elif isinstance(store_like, str):
return StorePath(await LocalStore.open(root=Path(store_like), mode=mode or "r"))
storage_options = storage_options or {}
fs, _ = fsspec.url_to_fs(store_like, **storage_options)

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

A few thoughts here:

  1. It would be nice to avoid creating the FileSystem if possible. A lighter approach could attempt to parse the string and look for :// (and not file://).
  2. If we do have to create filesystem, it would be nice to reuse it when creating the RemoteStore. Something like RemoteStore.from_filesystem(...) could be a nice pattern.

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

See below for the way we used to do this. May be worth replicating parts of this

if"://"instoreor"::"instore:

Copy link
Copy Markdown
ContributorAuthor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Just pushed that refactor. It's a bit bigger than I'd like, but the basic version is that RemoteStores's __init__ matches what it uses internally: you can only given it an async filesystem.

There's a from_url and from_path that handles the other stuff that was previously in __init__.

I removed RemoteStore._url. I think that that's safe to remove, but I need to actually think through how it interacted with store.path

@jhamman
jhamman merged commit f538662 into zarr-developers:v3Sep 19, 2024
dcherian added a commit to dcherian/zarr-python that referenced this pull request Sep 24, 2024
* v3:
chore: update pre-commit hooks (zarr-developers#2222)
fix: validate v3 dtypes when loading/creating v3 metadata (zarr-developers#2209)
fix typo in store integration test (zarr-developers#2223)
Basic Zarr-python 2.x compatibility changes (zarr-developers#2098)
Make Group.arrays, groups compatible with v2 (zarr-developers#2213)
Typing fixes to test_indexing (zarr-developers#2193)
Default to RemoteStore for fsspec URIs (zarr-developers#2198)
Make MemoryStore serialiazable (zarr-developers#2204)
[v3] Implement Group methods for empty, full, ones, and zeros (zarr-developers#2210)
implement `store.list_prefix` and `store._set_many` (zarr-developers#2064)
Fixed codec for v2 data with no fill value (zarr-developers#2207)
Sign up for freeto join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

Default to a RemoteStore for (some) string StoreLike

3 participants

@TomAugspurger@jhamman@dstansby
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Auto-enable theater mode on YouTube\n(function() {\n function tryTheater() {\n var btn = document.querySelector('button[aria-label=\"Theater mode\"], ytd-player #player button[title=\"Theater mode\"]');\n if (btn && !btn.classList.contains('activated')) {\n btn.click();\n }\n }\n \n // Try immediately\n tryTheater();\n \n // Try after navigation (SPA)\n var lastUrl = location.href;\n setInterval(function() {\n if (location.href !== lastUrl) {\n lastUrl = location.href;\n setTimeout(tryTheater, 500);\n }\n }, 1000);\n \n // Also try on player load\n var observer = new MutationObserver(tryTheater);\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "YouTube Theater Mode Default"); } } catch(__e) { console.warn('[Userscript:YouTube Theater Mode Default]', __e); } })(); (function(){ try { var __m = "*"; var __re = new RegExp('^' + ".*" + '
Skip to content

Default to RemoteStore for fsspec URIs - #2198

Merged
jhamman merged 13 commits into
zarr-developers:v3from
TomAugspurger:fix/auto-remote-store
Sep 19, 2024
Merged

Default to RemoteStore for fsspec URIs#2198
jhamman merged 13 commits into
zarr-developers:v3from
TomAugspurger:fix/auto-remote-store

Conversation

@TomAugspurger

Copy link
Copy Markdown
Contributor

This allows for specifying a RemoteStore by an fsspec URI + storage options, as a convenience (and backwards compatibility shim) for creating a RemoteStore:

In [1]: importzarr.storeIn [2]: g=zarr.open_group(store="az://daymet-zarr/annual/hi.zarr", zarr_format=2, storage_options={"account_name": "daymeteuwest"})
In [3]: list(g.arrays())
Objectat .zmetadataisnotrecognizedasacomponentofaZarrhierarchy.
Out[3]: [<Arrayaz://daymet-zarr/annual/hi.zarr/lambert_conformal_conicshape=() dtype=int16>,
<Arrayaz://daymet-zarr/annual/hi.zarr/latshape=(584, 284) dtype=float32>,
...

Closes#2195

Comment threadsrc/zarr/store/common.py Outdated
elif isinstance(store_like, str):
return StorePath(await LocalStore.open(root=Path(store_like), mode=mode or "r"))
try:
fs, path = fsspec.url_to_fs(store_like, **storage_options)

Copy link
Copy Markdown
ContributorAuthor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Nitpick: this constructs the actual filesystem class instance, but we have to go back to a URL (and reconstruct the filesystem instance) for the RemoteStore interface. It'd be nice to avoid that.

Comment threadsrc/zarr/store/common.py Outdated
try:
fs, path = fsspec.url_to_fs(store_like, **storage_options)
except Exception:
# not sure what to do here, but I don't want this to fail...

Copy link
Copy Markdown
ContributorAuthor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This is bad, but in my experience fsspec.url_to_fs can run pretty much arbitrary code, depending on what packages you have installed and what URI you pass. I really don't want this to fail and cause issues for people who just want a local path. maybe we'd always get an fsspec LocalFileSystem for a plain, non-fsspec URI string, but I'm not sure.

Comment threadsrc/zarr/store/common.py Outdated
else:
raise TypeError

if path is not None:

Copy link
Copy Markdown
ContributorAuthor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Oops, I forgot to revert this. It's not used yet.

We call make_store_path multiple times in a single call by the user (e.g. save_array calls make_store_path and passes the result to AsyncArray.create which also calls make_store_path). I was thinking about consolidating all the store / path stuff in a single spot, but it ended up being a bit much and I wasn't sure what the tolerance was for expanding the API of methods like AsyncArray.create even more. Do we want users to do

AsyncArray.create(store=StorePath(RemoteStore(..., **storage_options), path))

or

AsyncArray.create(store="s3://bucket/path.zarr", storage_options=...)

@dstansbydstansby left a comment

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I don't have much opinion on the actual change, but is it worth adding warnings everywhere if storage_options is passed by the user (ie not None), but they haven't passed an fsspec URL so they aren't used?

Comment threadsrc/zarr/api/asynchronous.py
result = StorePath(await MemoryStore.open(mode=mode))
elif isinstance(store_like, Path):
return StorePath(await LocalStore.open(root=store_like, mode=mode or "r"))
result = StorePath(await LocalStore.open(root=store_like, mode=mode or "r"))

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

we can pass **storage_options to LocalStore as well

Copy link
Copy Markdown
ContributorAuthor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

could be missing something, but I don't think that'll work. LocalStore.open will call LocalStore.__init__, which just takes root and mode, which are passed as regular args here.

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I see what you mean. I was thinking auto_mkdir would be passed through but if that's not the case, let's not get distracted here.

Comment threadsrc/zarr/store/common.py Outdated
elif isinstance(store_like, str):
return StorePath(await LocalStore.open(root=Path(store_like), mode=mode or "r"))
storage_options = storage_options or {}
fs, _ = fsspec.url_to_fs(store_like, **storage_options)

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

A few thoughts here:

  1. It would be nice to avoid creating the FileSystem if possible. A lighter approach could attempt to parse the string and look for :// (and not file://).
  2. If we do have to create filesystem, it would be nice to reuse it when creating the RemoteStore. Something like RemoteStore.from_filesystem(...) could be a nice pattern.

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

See below for the way we used to do this. May be worth replicating parts of this

if"://"instoreor"::"instore:

Copy link
Copy Markdown
ContributorAuthor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Just pushed that refactor. It's a bit bigger than I'd like, but the basic version is that RemoteStores's __init__ matches what it uses internally: you can only given it an async filesystem.

There's a from_url and from_path that handles the other stuff that was previously in __init__.

I removed RemoteStore._url. I think that that's safe to remove, but I need to actually think through how it interacted with store.path

@jhamman
jhamman merged commit f538662 into zarr-developers:v3Sep 19, 2024
dcherian added a commit to dcherian/zarr-python that referenced this pull request Sep 24, 2024
* v3:
chore: update pre-commit hooks (zarr-developers#2222)
fix: validate v3 dtypes when loading/creating v3 metadata (zarr-developers#2209)
fix typo in store integration test (zarr-developers#2223)
Basic Zarr-python 2.x compatibility changes (zarr-developers#2098)
Make Group.arrays, groups compatible with v2 (zarr-developers#2213)
Typing fixes to test_indexing (zarr-developers#2193)
Default to RemoteStore for fsspec URIs (zarr-developers#2198)
Make MemoryStore serialiazable (zarr-developers#2204)
[v3] Implement Group methods for empty, full, ones, and zeros (zarr-developers#2210)
implement `store.list_prefix` and `store._set_many` (zarr-developers#2064)
Fixed codec for v2 data with no fill value (zarr-developers#2207)
Sign up for freeto join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

Default to a RemoteStore for (some) string StoreLike

3 participants

@TomAugspurger@jhamman@dstansby
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Remove or un-stick sticky/fixed headers that block content\n(function() {\n function unstick() {\n document.querySelectorAll('header, nav, [role=\"banner\"], .header, .navbar, .sticky, .fixed-top, [style*=\"position: fixed\"], [style*=\"position:sticky\"]').forEach(function(el) {\n if (el.style.position === 'fixed' || el.style.position === 'sticky' || \n getComputedStyle(el).position === 'fixed' || getComputedStyle(el).position === 'sticky') {\n el.style.position = 'static';\n el.style.top = 'auto';\n el.style.zIndex = 'auto';\n }\n });\n }\n \n unstick();\n \n var observer = new MutationObserver(unstick);\n observer.observe(document.body, { childList: true, subtree: true, attributes: true, attributeFilter: ['style', 'class'] });\n})();", "Kill Sticky Headers"); } } catch(__e) { console.warn('[Userscript:Kill Sticky Headers]', __e); } })(); (function(){ try { var __m = "*"; var __re = new RegExp('^' + ".*" + '
Skip to content

Default to RemoteStore for fsspec URIs - #2198

Merged
jhamman merged 13 commits into
zarr-developers:v3from
TomAugspurger:fix/auto-remote-store
Sep 19, 2024
Merged

Default to RemoteStore for fsspec URIs#2198
jhamman merged 13 commits into
zarr-developers:v3from
TomAugspurger:fix/auto-remote-store

Conversation

@TomAugspurger

Copy link
Copy Markdown
Contributor

This allows for specifying a RemoteStore by an fsspec URI + storage options, as a convenience (and backwards compatibility shim) for creating a RemoteStore:

In [1]: importzarr.storeIn [2]: g=zarr.open_group(store="az://daymet-zarr/annual/hi.zarr", zarr_format=2, storage_options={"account_name": "daymeteuwest"})
In [3]: list(g.arrays())
Objectat .zmetadataisnotrecognizedasacomponentofaZarrhierarchy.
Out[3]: [<Arrayaz://daymet-zarr/annual/hi.zarr/lambert_conformal_conicshape=() dtype=int16>,
<Arrayaz://daymet-zarr/annual/hi.zarr/latshape=(584, 284) dtype=float32>,
...

Closes#2195

Comment threadsrc/zarr/store/common.py Outdated
elif isinstance(store_like, str):
return StorePath(await LocalStore.open(root=Path(store_like), mode=mode or "r"))
try:
fs, path = fsspec.url_to_fs(store_like, **storage_options)

Copy link
Copy Markdown
ContributorAuthor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Nitpick: this constructs the actual filesystem class instance, but we have to go back to a URL (and reconstruct the filesystem instance) for the RemoteStore interface. It'd be nice to avoid that.

Comment threadsrc/zarr/store/common.py Outdated
try:
fs, path = fsspec.url_to_fs(store_like, **storage_options)
except Exception:
# not sure what to do here, but I don't want this to fail...

Copy link
Copy Markdown
ContributorAuthor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This is bad, but in my experience fsspec.url_to_fs can run pretty much arbitrary code, depending on what packages you have installed and what URI you pass. I really don't want this to fail and cause issues for people who just want a local path. maybe we'd always get an fsspec LocalFileSystem for a plain, non-fsspec URI string, but I'm not sure.

Comment threadsrc/zarr/store/common.py Outdated
else:
raise TypeError

if path is not None:

Copy link
Copy Markdown
ContributorAuthor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Oops, I forgot to revert this. It's not used yet.

We call make_store_path multiple times in a single call by the user (e.g. save_array calls make_store_path and passes the result to AsyncArray.create which also calls make_store_path). I was thinking about consolidating all the store / path stuff in a single spot, but it ended up being a bit much and I wasn't sure what the tolerance was for expanding the API of methods like AsyncArray.create even more. Do we want users to do

AsyncArray.create(store=StorePath(RemoteStore(..., **storage_options), path))

or

AsyncArray.create(store="s3://bucket/path.zarr", storage_options=...)

@dstansbydstansby left a comment

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I don't have much opinion on the actual change, but is it worth adding warnings everywhere if storage_options is passed by the user (ie not None), but they haven't passed an fsspec URL so they aren't used?

Comment threadsrc/zarr/api/asynchronous.py
result = StorePath(await MemoryStore.open(mode=mode))
elif isinstance(store_like, Path):
return StorePath(await LocalStore.open(root=store_like, mode=mode or "r"))
result = StorePath(await LocalStore.open(root=store_like, mode=mode or "r"))

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

we can pass **storage_options to LocalStore as well

Copy link
Copy Markdown
ContributorAuthor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

could be missing something, but I don't think that'll work. LocalStore.open will call LocalStore.__init__, which just takes root and mode, which are passed as regular args here.

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I see what you mean. I was thinking auto_mkdir would be passed through but if that's not the case, let's not get distracted here.

Comment threadsrc/zarr/store/common.py Outdated
elif isinstance(store_like, str):
return StorePath(await LocalStore.open(root=Path(store_like), mode=mode or "r"))
storage_options = storage_options or {}
fs, _ = fsspec.url_to_fs(store_like, **storage_options)

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

A few thoughts here:

  1. It would be nice to avoid creating the FileSystem if possible. A lighter approach could attempt to parse the string and look for :// (and not file://).
  2. If we do have to create filesystem, it would be nice to reuse it when creating the RemoteStore. Something like RemoteStore.from_filesystem(...) could be a nice pattern.

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

See below for the way we used to do this. May be worth replicating parts of this

if"://"instoreor"::"instore:

Copy link
Copy Markdown
ContributorAuthor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Just pushed that refactor. It's a bit bigger than I'd like, but the basic version is that RemoteStores's __init__ matches what it uses internally: you can only given it an async filesystem.

There's a from_url and from_path that handles the other stuff that was previously in __init__.

I removed RemoteStore._url. I think that that's safe to remove, but I need to actually think through how it interacted with store.path

@jhamman
jhamman merged commit f538662 into zarr-developers:v3Sep 19, 2024
dcherian added a commit to dcherian/zarr-python that referenced this pull request Sep 24, 2024
* v3:
chore: update pre-commit hooks (zarr-developers#2222)
fix: validate v3 dtypes when loading/creating v3 metadata (zarr-developers#2209)
fix typo in store integration test (zarr-developers#2223)
Basic Zarr-python 2.x compatibility changes (zarr-developers#2098)
Make Group.arrays, groups compatible with v2 (zarr-developers#2213)
Typing fixes to test_indexing (zarr-developers#2193)
Default to RemoteStore for fsspec URIs (zarr-developers#2198)
Make MemoryStore serialiazable (zarr-developers#2204)
[v3] Implement Group methods for empty, full, ones, and zeros (zarr-developers#2210)
implement `store.list_prefix` and `store._set_many` (zarr-developers#2064)
Fixed codec for v2 data with no fill value (zarr-developers#2207)
Sign up for freeto join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

Default to a RemoteStore for (some) string StoreLike

3 participants

@TomAugspurger@jhamman@dstansby
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Universal Dark Mode - works on any site\n(function() {\n var enabled = true;\n \n function applyDarkMode() {\n if (!enabled) return;\n \n // Create style element if it doesn't exist\n var style = document.getElementById('universal-dark-mode-style');\n if (!style) {\n style = document.createElement('style');\n style.id = 'universal-dark-mode-style';\n document.head.appendChild(style);\n }\n \n // Dark mode CSS - inverts colors but preserves images/video\n style.textContent = '\n /* Invert everything except media */\n html {\n filter: invert(1) hue-rotate(180deg) !important;\n background: #1a1a2e !important;\n }\n \n /* Restore images, videos, iframes, canvas */\n img, video, iframe, canvas, svg, picture, [style*=\"background-image\"] {\n filter: invert(1) hue-rotate(180deg) !important;\n }\n \n /* Preserve specific elements that should not be inverted */\n .no-dark-mode, .no-dark-mode *,\n [data-theme=\"light\"], [data-theme=\"light\"],\n .ace_editor, .ace_editor *,\n .CodeMirror, .CodeMirror *,\n .monaco-editor, .monaco-editor *,\n .markdown-body pre, .markdown-body pre *,\n .highlight, .highlight *,\n pre code, pre code * {\n filter: none !important;\n }\n \n /* Fix common UI elements */\n .modal, .popup, .dropdown-menu, .tooltip, .popover {\n filter: invert(1) hue-rotate(180deg) !important;\n background: #2d2d44 !important;\n border-color: #444 !important;\n }\n \n /* Scrollbars */\n ::-webkit-scrollbar { background: #1a1a2e !important; }\n ::-webkit-scrollbar-thumb { background: #444 !important; }\n ::-webkit-scrollbar-thumb:hover { background: #555 !important; }\n \n /* Selection */\n ::selection { background: #4ecdc4 !important; color: #1a1a2e !important; }\n ::-moz-selection { background: #4ecdc4 !important; color: #1a1a2e !important; }\n ';\n }\n \n function removeDarkMode() {\n var style = document.getElementById('universal-dark-mode-style');\n if (style) style.remove();\n }\n \n // Toggle with Alt+Shift+D\n document.addEventListener('keydown', function(e) {\n if (e.altKey && e.shiftKey && e.key === 'D') {\n e.preventDefault();\n enabled = !enabled;\n if (enabled) {\n applyDarkMode();\n console.log('[Universal Dark Mode] Enabled');\n } else {\n removeDarkMode();\n console.log('[Universal Dark Mode] Disabled');\n }\n }\n });\n \n // Apply on load\n applyDarkMode();\n \n // Re-apply on dynamic content\n var observer = new MutationObserver(function(mutations) {\n if (enabled && !document.getElementById('universal-dark-mode-style')) {\n applyDarkMode();\n }\n });\n observer.observe(document.head, { childList: true });\n \n console.log('[Universal Dark Mode] Loaded - Press Alt+Shift+D to toggle');\n})();", "Universal Dark Mode"); } } catch(__e) { console.warn('[Userscript:Universal Dark Mode]', __e); } })(); })();
Skip to content

Default to RemoteStore for fsspec URIs - #2198

Merged
jhamman merged 13 commits into
zarr-developers:v3from
TomAugspurger:fix/auto-remote-store
Sep 19, 2024
Merged

Default to RemoteStore for fsspec URIs#2198
jhamman merged 13 commits into
zarr-developers:v3from
TomAugspurger:fix/auto-remote-store

Conversation

@TomAugspurger

Copy link
Copy Markdown
Contributor

This allows for specifying a RemoteStore by an fsspec URI + storage options, as a convenience (and backwards compatibility shim) for creating a RemoteStore:

In [1]: importzarr.storeIn [2]: g=zarr.open_group(store="az://daymet-zarr/annual/hi.zarr", zarr_format=2, storage_options={"account_name": "daymeteuwest"})
In [3]: list(g.arrays())
Objectat .zmetadataisnotrecognizedasacomponentofaZarrhierarchy.
Out[3]: [<Arrayaz://daymet-zarr/annual/hi.zarr/lambert_conformal_conicshape=() dtype=int16>,
<Arrayaz://daymet-zarr/annual/hi.zarr/latshape=(584, 284) dtype=float32>,
...

Closes#2195

Comment threadsrc/zarr/store/common.py Outdated
elif isinstance(store_like, str):
return StorePath(await LocalStore.open(root=Path(store_like), mode=mode or "r"))
try:
fs, path = fsspec.url_to_fs(store_like, **storage_options)

Copy link
Copy Markdown
ContributorAuthor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Nitpick: this constructs the actual filesystem class instance, but we have to go back to a URL (and reconstruct the filesystem instance) for the RemoteStore interface. It'd be nice to avoid that.

Comment threadsrc/zarr/store/common.py Outdated
try:
fs, path = fsspec.url_to_fs(store_like, **storage_options)
except Exception:
# not sure what to do here, but I don't want this to fail...

Copy link
Copy Markdown
ContributorAuthor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This is bad, but in my experience fsspec.url_to_fs can run pretty much arbitrary code, depending on what packages you have installed and what URI you pass. I really don't want this to fail and cause issues for people who just want a local path. maybe we'd always get an fsspec LocalFileSystem for a plain, non-fsspec URI string, but I'm not sure.

Comment threadsrc/zarr/store/common.py Outdated
else:
raise TypeError

if path is not None:

Copy link
Copy Markdown
ContributorAuthor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Oops, I forgot to revert this. It's not used yet.

We call make_store_path multiple times in a single call by the user (e.g. save_array calls make_store_path and passes the result to AsyncArray.create which also calls make_store_path). I was thinking about consolidating all the store / path stuff in a single spot, but it ended up being a bit much and I wasn't sure what the tolerance was for expanding the API of methods like AsyncArray.create even more. Do we want users to do

AsyncArray.create(store=StorePath(RemoteStore(..., **storage_options), path))

or

AsyncArray.create(store="s3://bucket/path.zarr", storage_options=...)

@dstansbydstansby left a comment

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I don't have much opinion on the actual change, but is it worth adding warnings everywhere if storage_options is passed by the user (ie not None), but they haven't passed an fsspec URL so they aren't used?

Comment threadsrc/zarr/api/asynchronous.py
result = StorePath(await MemoryStore.open(mode=mode))
elif isinstance(store_like, Path):
return StorePath(await LocalStore.open(root=store_like, mode=mode or "r"))
result = StorePath(await LocalStore.open(root=store_like, mode=mode or "r"))

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

we can pass **storage_options to LocalStore as well

Copy link
Copy Markdown
ContributorAuthor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

could be missing something, but I don't think that'll work. LocalStore.open will call LocalStore.__init__, which just takes root and mode, which are passed as regular args here.

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I see what you mean. I was thinking auto_mkdir would be passed through but if that's not the case, let's not get distracted here.

Comment threadsrc/zarr/store/common.py Outdated
elif isinstance(store_like, str):
return StorePath(await LocalStore.open(root=Path(store_like), mode=mode or "r"))
storage_options = storage_options or {}
fs, _ = fsspec.url_to_fs(store_like, **storage_options)

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

A few thoughts here:

  1. It would be nice to avoid creating the FileSystem if possible. A lighter approach could attempt to parse the string and look for :// (and not file://).
  2. If we do have to create filesystem, it would be nice to reuse it when creating the RemoteStore. Something like RemoteStore.from_filesystem(...) could be a nice pattern.

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

See below for the way we used to do this. May be worth replicating parts of this

if"://"instoreor"::"instore:

Copy link
Copy Markdown
ContributorAuthor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Just pushed that refactor. It's a bit bigger than I'd like, but the basic version is that RemoteStores's __init__ matches what it uses internally: you can only given it an async filesystem.

There's a from_url and from_path that handles the other stuff that was previously in __init__.

I removed RemoteStore._url. I think that that's safe to remove, but I need to actually think through how it interacted with store.path

@jhamman
jhamman merged commit f538662 into zarr-developers:v3Sep 19, 2024
dcherian added a commit to dcherian/zarr-python that referenced this pull request Sep 24, 2024
* v3:
chore: update pre-commit hooks (zarr-developers#2222)
fix: validate v3 dtypes when loading/creating v3 metadata (zarr-developers#2209)
fix typo in store integration test (zarr-developers#2223)
Basic Zarr-python 2.x compatibility changes (zarr-developers#2098)
Make Group.arrays, groups compatible with v2 (zarr-developers#2213)
Typing fixes to test_indexing (zarr-developers#2193)
Default to RemoteStore for fsspec URIs (zarr-developers#2198)
Make MemoryStore serialiazable (zarr-developers#2204)
[v3] Implement Group methods for empty, full, ones, and zeros (zarr-developers#2210)
implement `store.list_prefix` and `store._set_many` (zarr-developers#2064)
Fixed codec for v2 data with no fill value (zarr-developers#2207)
Sign up for freeto join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

Default to a RemoteStore for (some) string StoreLike

3 participants

@TomAugspurger@jhamman@dstansby