ClearML/clearml
1
0
Fork 0
mirror of https://github.com/clearml/clearml synced 2025-02-07 21:33:25 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Fix HTTP download fails constructing URL (#593)

Browse Source
This commit is contained in:
allegroai 2022-03-01 20:30:40 +02:00
parent 226a682621
commit ecee4eaf64
1 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
clearml/storage/helper.py
View File

@ -879,7 +879,7 @@ class StorageHelper(object):
elif parsed.scheme == _GoogleCloudStorageDriver.scheme: elif parsed.scheme == _GoogleCloudStorageDriver.scheme:
conf = cls._gs_configurations.get_config_by_uri(base_url) conf = cls._gs_configurations.get_config_by_uri(base_url)
return str(furl(scheme=parsed.scheme, netloc=conf.bucket)) return str(furl(scheme=parsed.scheme, netloc=conf.bucket))
elif parsed.scheme in ('http', 'https'): elif parsed.scheme in _HttpDriver.schemes:
files_server = cls._get_file_server_host() files_server = cls._get_file_server_host()
if base_url.startswith(files_server): if base_url.startswith(files_server):
return files_server return files_server
@ -1136,7 +1136,11 @@ class _HttpDriver(_Driver):
def get_object(self, container_name, object_name, *args, **kwargs): def get_object(self, container_name, object_name, *args, **kwargs):
is_stream = kwargs.get('stream', True) is_stream = kwargs.get('stream', True)
url = ''.join((container_name, object_name.lstrip('/'))) url = '/'.join((
container_name[:-1] if container_name.endswith('/') else container_name,
object_name.lstrip('/')
))
# url = ''.join((container_name, object_name.lstrip('/')))
return self._HttpSessionHandle(url, is_stream, container_name, object_name) return self._HttpSessionHandle(url, is_stream, container_name, object_name)
def _get_download_object(self, obj): def _get_download_object(self, obj):