Skip to content

feat: Support being able to use in-memory ESMCatalogModel instances #690

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

Merged
merged 2 commits into from
Jan 16, 2025
Merged

feat: Support being able to use in-memory ESMCatalogModel instances #690

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
97ff07f
feat: Support being able to use in-memory ESMCatalogModel instances
lewisjared Nov 17, 2024
7ea6d9e
Merge branch 'main' into allow-initialising
andersy005 Jan 16, 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
9 changes: 6 additions & 3 deletions intake_esm/core.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,8 @@ class esm_datastore(Catalog):

Parameters
----------
obj : str, dict
obj : str, dict, ESMCatalogModel
The ESM Catalog to use, or a path to a JSON file containing the catalog.
If string, this must be a path or URL to an ESM catalog JSON file.
If dict, this must be a dict representation of an ESM catalog.
This dict must have two keys: 'esmcat' and 'df'. The 'esmcat' key must be a
Expand Down Expand Up @@ -79,7 +80,7 @@ class esm_datastore(Catalog):

def __init__(
self,
obj: pydantic.FilePath | pydantic.AnyUrl | dict[str, typing.Any],
obj: pydantic.FilePath | pydantic.AnyUrl | dict[str, typing.Any] | ESMCatalogModel,
*,
progressbar: bool = True,
sep: str = '.',
Expand All @@ -104,7 +105,9 @@ def __init__(
self.read_csv_kwargs = read_csv_kwargs
self.progressbar = progressbar
self.sep = sep
if isinstance(obj, dict):
if isinstance(obj, ESMCatalogModel):
self.esmcat = obj
elif isinstance(obj, dict):
self.esmcat = ESMCatalogModel.from_dict(obj)
else:
self.esmcat = ESMCatalogModel.load(
Expand Down
1 change: 1 addition & 0 deletions tests/test_core.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -68,6 +68,7 @@ def func_multivar(ds):
(multi_variable_cat, '*', {'converters': {'variable': ast.literal_eval}}, None),
(multi_variable_cat, '*', None, ['variable']),
({'esmcat': sample_esmcat_data, 'df': sample_df}, '.', None, None),
(intake_esm.cat.ESMCatalogModel.load(cdf_cat_sample_cmip6), '.', None, None),
],
)
def test_catalog_init(capsys, obj, sep, read_csv_kwargs, columns_with_iterables):
Expand Down
Loading