Skip to content

Commit

Permalink
Merge branch 'release/v1.1.0' of https://github.com/voxel51/fiftyone
Browse files Browse the repository at this point in the history
…into develop
  • Loading branch information
voxel51-bot committed Nov 25, 2024
2 parents 48c52c4 + cdd4a48 commit 5834afc
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 6 deletions.
5 changes: 4 additions & 1 deletion fiftyone/core/singletons.py
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@
| `voxel51.com <https://voxel51.com/>`_
|
"""

from collections import defaultdict
import weakref

Expand Down Expand Up @@ -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__(
Expand Down
6 changes: 1 addition & 5 deletions fiftyone/server/query.py
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down

0 comments on commit 5834afc

Please sign in to comment.