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

Correctly record the time when a dataset is created and update the last_used time #945

Merged
merged 2 commits into from
Jan 22, 2025
Merged

Correctly record the time when a dataset is created and update the last_used time #945

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
3b0af72
Correctly record the time when a dataset is created. Also update the …
BenGalewsky Dec 18, 2024
c8b677a
Make initial dataset last used and last updated consistent for new re…
BenGalewsky Jan 22, 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
14 changes: 10 additions & 4 deletions servicex_app/servicex_app/dataset_manager.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,10 +51,11 @@ def from_did(cls, did: DIDParser, logger: Logger, extras: dict[str, str] = None,
db: SQLAlchemy = None):
dataset = Dataset.find_by_name(did.full_did)
if not dataset:
dataset_timestamp = datetime.now(tz=timezone.utc)
dataset = Dataset(
name=did.full_did,
last_used=datetime.now(tz=timezone.utc),
last_updated=datetime.fromtimestamp(0),
last_used=dataset_timestamp,
last_updated=dataset_timestamp,
lookup_status=DatasetStatus.created,
did_finder=did.scheme
)
Expand All @@ -64,6 +65,8 @@ def from_did(cls, did: DIDParser, logger: Logger, extras: dict[str, str] = None,
else:
logger.info(f"Found existing dataset: {dataset.name}, id is {dataset.id}",
extra=extras)
dataset.last_used = datetime.now(tz=timezone.utc)
dataset.save_to_db()

return cls(dataset, logger, db)

Expand All @@ -79,10 +82,11 @@ def from_file_list(cls, file_list: List[str], logger: Logger,
dataset = Dataset.find_by_name(name)

if not dataset:
dataset_timestamp = datetime.now(tz=timezone.utc)
dataset = Dataset(
name=name,
last_used=datetime.now(tz=timezone.utc),
last_updated=datetime.fromtimestamp(0),
last_used=dataset_timestamp,
last_updated=dataset_timestamp,
lookup_status=DatasetStatus.complete,
did_finder='user',
files=[
Expand All @@ -101,6 +105,8 @@ def from_file_list(cls, file_list: List[str], logger: Logger,
else:
logger.info(f"Found existing dataset for file list. Dataset Id is {dataset.id}",
extra=extras)
dataset.last_used = datetime.now(tz=timezone.utc)
dataset.save_to_db()

return cls(dataset, logger, db)

Expand Down
10 changes: 6 additions & 4 deletions servicex_app/servicex_app_test/test_dataset_manager.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -98,14 +98,15 @@ def test_from_existing_did(self, client):
did = "rucio://my-did?files=1"
with client.application.app_context():
d = Dataset(name=did, did_finder="rucio", lookup_status=DatasetStatus.looking,
last_used=datetime.now(tz=timezone.utc),
last_updated=datetime.fromtimestamp(0))
last_used=datetime.fromtimestamp(0),
last_updated=datetime.now(tz=timezone.utc))
d.save_to_db()
dm = DatasetManager.from_did(DIDParser(did), logger=client.application.logger, db=db)
assert dm.dataset.name == did
assert dm.dataset.did_finder == "rucio"
assert dm.dataset.lookup_status == DatasetStatus.looking
assert dm.dataset.id == d.id
assert dm.dataset.last_used > datetime.fromtimestamp(0)

def test_from_new_file_list(self, client):
file_list = ["root://eospublic.cern.ch/1.root", "root://eospublic.cern.ch/2.root"]
Expand All @@ -127,8 +128,8 @@ def test_from_existing_file_list(self, client):
with client.application.app_context():
d = Dataset(name=DatasetManager.file_list_hash(file_list),
did_finder="user", lookup_status=DatasetStatus.created,
last_used=datetime.now(tz=timezone.utc),
last_updated=datetime.fromtimestamp(0),
last_used=datetime.fromtimestamp(0),
last_updated=datetime.now(tz=timezone.utc),
files=[
DatasetFile(
paths=file,
Expand All @@ -144,6 +145,7 @@ def test_from_existing_file_list(self, client):
assert dm.dataset.did_finder == "user"
assert dm.dataset.lookup_status == DatasetStatus.created
assert dm.dataset.id == d.id
assert dm.dataset.last_used > datetime.fromtimestamp(0)

def test_from_dataset_id(self, client):
file_list = ["root://eospublic.cern.ch/1.root", "root://eospublic.cern.ch/2.root"]
Expand Down
Loading