diff --git a/clearml/storage/helper.py b/clearml/storage/helper.py index e0e26d86..274c0c1b 100644 --- a/clearml/storage/helper.py +++ b/clearml/storage/helper.py @@ -784,6 +784,7 @@ class StorageHelper(object): Listed relative to the base path. """ if prefix: + prefix = self._canonize_url(prefix) if prefix.startswith(self._base_url): prefix = prefix[len(self._base_url):] if self._base_url != "file://": @@ -1240,6 +1241,7 @@ class StorageHelper(object): pass def exists_file(self, remote_url): + remote_url = self._canonize_url(remote_url) object_name = self._normalize_object_name(remote_url) return self._driver.exists_file( container_name=self._container.name if self._container else "", object_name=object_name diff --git a/clearml/storage/manager.py b/clearml/storage/manager.py index 200dfb2b..c0bcd9ed 100644 --- a/clearml/storage/manager.py +++ b/clearml/storage/manager.py @@ -481,8 +481,9 @@ class StorageManager(object): if not obj: return None metadata = helper.get_object_metadata(obj) - if return_full_path and not metadata["name"].startswith(helper.base_url): - metadata["name"] = helper.base_url + ("/" if not helper.base_url.endswith("/") else "") + metadata["name"] + base_url = helper._resolve_base_url(remote_url) + if return_full_path and not metadata["name"].startswith(base_url): + metadata["name"] = base_url + ("/" if not base_url.endswith("/") else "") + metadata["name"] return metadata @classmethod