From cdd4a488f8df1865e2a98c59f456429e34e763cf Mon Sep 17 00:00:00 2001 From: Benjamin Kane Date: Mon, 25 Nov 2024 14:18:41 -0500 Subject: [PATCH] Fix deleted datasets on App server (#5183) * fix delete and recreate dataset for server * _force_load --- fiftyone/core/singletons.py | 5 ++++- fiftyone/server/query.py | 6 +----- 2 files changed, 5 insertions(+), 6 deletions(-) diff --git a/fiftyone/core/singletons.py b/fiftyone/core/singletons.py index 9068dfa44e..0940152d5f 100644 --- a/fiftyone/core/singletons.py +++ b/fiftyone/core/singletons.py @@ -5,6 +5,7 @@ | `voxel51.com `_ | """ + from collections import defaultdict import weakref @@ -37,7 +38,9 @@ def __call__(cls, name=None, _create=True, *args, **kwargs): name = instance.name # `__init__` may have changed `name` else: try: - instance._update_last_loaded_at() + instance._update_last_loaded_at( + force=kwargs.get("_force_load", False) + ) except ValueError: instance._deleted = True return cls.__call__( diff --git a/fiftyone/server/query.py b/fiftyone/server/query.py index ee5c11894a..7ae0fcf07d 100644 --- a/fiftyone/server/query.py +++ b/fiftyone/server/query.py @@ -585,11 +585,7 @@ def run(): if not fod.dataset_exists(dataset_name): return None - dataset = fod.load_dataset(dataset_name) - - if update_last_loaded_at: - dataset._update_last_loaded_at(force=True) - + dataset = fo.Dataset(dataset_name, _create=False, _force_load=True) dataset.reload() view_name = None try: