Skip to content

Add last_updated to the ESMCatalogModel #442

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
Feb 1, 2022
Merged

Add last_updated to the ESMCatalogModel #442

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
d2cfc60
Add `last_updated` to the `ESMCatalogModel`
andersy005 Feb 1, 2022
ae44322
More updates
andersy005 Feb 1, 2022
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
10 changes: 9 additions & 1 deletion intake_esm/cat.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
import datetime
import enum
import json
import os
Expand Down Expand Up @@ -93,6 +94,7 @@ class ESMCatalogModel(pydantic.BaseModel):
catalog_file: pydantic.StrictStr = None
description: pydantic.StrictStr = None
title: pydantic.StrictStr = None
last_updated: typing.Optional[typing.Union[datetime.datetime, datetime.date]] = None
_df: typing.Optional[pd.DataFrame] = pydantic.PrivateAttr()

class Config:
Expand All @@ -113,6 +115,8 @@ def validate_catalog(cls, values):
def from_dict(cls, data: typing.Dict) -> 'ESMCatalogModel':
esmcat = data['esmcat']
df = data['df']
if 'last_updated' not in esmcat:
esmcat['last_updated'] = None
cat = cls.parse_obj(esmcat)
cat._df = df
return cat
Expand Down Expand Up @@ -166,6 +170,7 @@ def save(
for key in {'catalog_dict', 'catalog_file'}:
data.pop(key, None)
data['id'] = name
data['last_updated'] = datetime.datetime.now().utcnow().strftime('%Y-%m-%dT%H:%M:%SZ')

if catalog_type == 'file':
csv_kwargs = {'index': False}
Expand Down Expand Up @@ -211,7 +216,10 @@ def load(
_mapper = fsspec.get_mapper(json_file, **storage_options)

with fsspec.open(json_file, **storage_options) as fobj:
cat = cls.parse_raw(fobj.read())
data = json.loads(fobj.read())
if 'last_updated' not in data:
data['last_updated'] = None
cat = cls.parse_obj(data)
if cat.catalog_file:
if _mapper.fs.exists(cat.catalog_file):
csv_path = cat.catalog_file
Expand Down