diff --git a/dvc/fs/dvc.py b/dvc/fs/dvc.py index 2dd1ea77c..bdddc0693 100644 --- a/dvc/fs/dvc.py +++ b/dvc/fs/dvc.py @@ -261,15 +261,12 @@ class _DVCFileSystem(AbstractFileSystem): # pylint:disable=abstract-method try: return self.repo.fs.open(fs_path, mode=mode) except FileNotFoundError: - repo, dvc_fs, subkey = self._get_subrepo_info(key) + _, dvc_fs, subkey = self._get_subrepo_info(key) if not dvc_fs: raise dvc_path = _get_dvc_path(dvc_fs, subkey) - kw = {} - if kwargs.get("cache_remote_stream", False): - kw["cache_odb"] = repo.cache.local - return dvc_fs.open(dvc_path, mode=mode, **kw) + return dvc_fs.open(dvc_path, mode=mode, cache=kwargs.get("cache", False)) def isdvc(self, path, **kwargs) -> bool: """Is this entry dvc-tracked?""" diff --git a/dvc/repo/plots/__init__.py b/dvc/repo/plots/__init__.py index 878df858a..f37dec1cc 100644 --- a/dvc/repo/plots/__init__.py +++ b/dvc/repo/plots/__init__.py @@ -212,7 +212,7 @@ class Plots: short_rev = "workspace" if rev := getattr(self.repo.fs, "rev", None): short_rev = rev[:7] - _resolve_data_sources(data, short_rev, cache_remote_stream=True) + _resolve_data_sources(data, short_rev, cache=True) result.update(data) errored = errored_revisions(result) @@ -281,9 +281,7 @@ def _is_plot(out: "Output") -> bool: return bool(out.plot) -def _resolve_data_sources( - plots_data: Dict, rev: str, cache_remote_stream: bool = False -): +def _resolve_data_sources(plots_data: Dict, rev: str, cache: bool = False): from dvc.progress import Tqdm values = list(plots_data.values()) @@ -298,7 +296,7 @@ def _resolve_data_sources( def resolve(value): data_source = value.pop("data_source") assert callable(data_source) - value.update(data_source(cache_remote_stream=cache_remote_stream)) + value.update(data_source(cache=cache)) if not to_resolve: return diff --git a/pyproject.toml b/pyproject.toml index d92aa8f62..bdc9826f7 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -34,7 +34,7 @@ dependencies = [ "configobj>=5.0.6", "distro>=1.3", "dpath<3,>=2.1.0", - "dvc-data>=2.14.0,<2.15.0", + "dvc-data>=2.15.0,<2.16.0", "dvc-http>=2.29.0", "dvc-render>=0.3.1,<1", "dvc-studio-client>=0.9.2,<1",