dvc: split remotes from trees (#4212)

* dvc: remove tree-specific wrappers from remote

This helps combat the remote/tree/cache confusion.

* dvc: split remotes from trees

Related to #4050

Author: efiop

dvc/api.py

@@ -30,7 +30,7 @@ def get_url(path, repo=None, rev=None, remote=None):
             raise UrlNotDvcRepoError(_repo.url)  # pylint: disable=no-member
         out = _repo.find_out_by_relpath(path)
         remote_obj = _repo.cloud.get_remote(remote)
-        return str(remote_obj.hash_to_path_info(out.checksum))
+        return str(remote_obj.tree.hash_to_path_info(out.checksum))
 
 
 def open(  # noqa, pylint: disable=redefined-builtin

dvc/command/version.py

@@ -122,7 +122,7 @@ def get_linktype_support_info(repo):
 
     @staticmethod
     def get_supported_remotes():
-        from dvc.remote import TREES
+        from dvc.tree import TREES
 
         supported_remotes = []
         for tree_cls in TREES:

dvc/dependency/__init__.py

@@ -12,9 +12,9 @@
 from dvc.dependency.s3 import S3Dependency
 from dvc.dependency.ssh import SSHDependency
 from dvc.output.base import BaseOutput
-from dvc.remote import get_cloud_tree
 from dvc.scheme import Schemes
 
+from ..tree import get_cloud_tree
 from .repo import RepoDependency
 
 DEPS = [

dvc/dependency/azure.py

@@ -1,6 +1,7 @@
 from dvc.dependency.base import BaseDependency
 from dvc.output.base import BaseOutput
-from dvc.remote.azure import AzureRemoteTree
+
+from ..tree.azure import AzureRemoteTree
 
 
 class AzureDependency(BaseDependency, BaseOutput):

dvc/dependency/http.py

@@ -1,6 +1,7 @@
 from dvc.dependency.base import BaseDependency
 from dvc.output.base import BaseOutput
-from dvc.remote.http import HTTPRemoteTree
+
+from ..tree.http import HTTPRemoteTree
 
 
 class HTTPDependency(BaseDependency, BaseOutput):

dvc/dependency/https.py

@@ -1,5 +1,4 @@
-from dvc.remote.https import HTTPSRemoteTree
-
+from ..tree.https import HTTPSRemoteTree
 from .http import HTTPDependency
 
 

dvc/main.py

@@ -9,7 +9,7 @@
 from dvc.exceptions import DvcException, DvcParserError, NotDvcRepoError
 from dvc.external_repo import clean_repos
 from dvc.logger import FOOTER, disable_other_loggers
-from dvc.remote.pool import close_pools
+from dvc.tree.pool import close_pools
 from dvc.utils import format_link
 
 # Workaround for CPython bug. See [1] and [2] for more info.

dvc/output/__init__.py

@@ -10,12 +10,13 @@
 from dvc.output.local import LocalOutput
 from dvc.output.s3 import S3Output
 from dvc.output.ssh import SSHOutput
-from dvc.remote import get_cloud_tree
-from dvc.remote.hdfs import HDFSRemoteTree
-from dvc.remote.local import LocalRemoteTree
-from dvc.remote.s3 import S3RemoteTree
 from dvc.scheme import Schemes
 
+from ..tree import get_cloud_tree
+from ..tree.hdfs import HDFSRemoteTree
+from ..tree.local import LocalRemoteTree
+from ..tree.s3 import S3RemoteTree
+
 OUTS = [
     HDFSOutput,
     S3Output,

dvc/output/base.py

@@ -12,7 +12,8 @@
     DvcException,
     RemoteCacheRequiredError,
 )
-from dvc.remote.base import BaseRemoteTree
+
+from ..tree.base import BaseRemoteTree
 
 logger = logging.getLogger(__name__)
 

dvc/output/gs.py

@@ -1,5 +1,6 @@
 from dvc.output.s3 import S3Output
-from dvc.remote.gs import GSRemoteTree
+
+from ..tree.gs import GSRemoteTree
 
 
 class GSOutput(S3Output):