ClearML/clearml
1
0
Fork 0
mirror of https://github.com/clearml/clearml synced 2025-03-03 10:42:00 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Fix files http/s host ending with /

Browse Source
This commit is contained in:
allegroai 2019-11-28 00:48:48 +02:00
parent b3d4ce0b71
commit 09257b7247
2 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
trains/backend_api/session/session.py
View File

@ -426,7 +426,7 @@ class Session(TokenManager):
from ...config import config_obj
config = config_obj
return ENV_HOST.get(default=(config.get("api.api_server", None) or
config.get("api.host", None) or cls.default_host))
config.get("api.host", None) or cls.default_host)).rstrip('/')
@classmethod
def get_app_server_host(cls, config=None):
@ -435,7 +435,7 @@ class Session(TokenManager):
config = config_obj
# get from config/environment
web_host = ENV_WEB_HOST.get(default=config.get("api.web_server", None))
web_host = ENV_WEB_HOST.get(default=config.get("api.web_server", "")).rstrip('/')
if web_host:
return web_host
@ -462,7 +462,7 @@ class Session(TokenManager):
from ...config import config_obj
config = config_obj
# get from config/environment
files_host = ENV_FILES_HOST.get(default=(config.get("api.files_server", None)))
files_host = ENV_FILES_HOST.get(default=(config.get("api.files_server", ""))).rstrip('/')
if files_host:
return files_host

7
trains/storage/helper.py
View File

@ -17,7 +17,6 @@ from tempfile import mktemp
from time import time
from types import GeneratorType
import numpy as np
import requests
import six
from _socket import gethostname
@ -740,8 +739,10 @@ class StorageHelper(object):
# TODO: ugly py3 hack, please remove ASAP
if six.PY3 and not isinstance(stream, GeneratorType):
import numpy as np
return np.frombuffer(stream, dtype=np.uint8)
else:
import numpy as np
return np.asarray(bytearray(b''.join(stream)), dtype=np.uint8)
except Exception as e:
@ -962,9 +963,9 @@ class _HttpDriver(_Driver):
from ..backend_interface.base import InterfaceBase
self._default_backend_session = InterfaceBase._get_default_session()
if self._default_files_server_host is None:
self._default_files_server_host = self._default_backend_session.get_files_server_host()
self._default_files_server_host = self._default_backend_session.get_files_server_host().rstrip('/')
if url.startswith(self._default_files_server_host):
if url == self._default_files_server_host or url.startswith(self._default_files_server_host + '/'):
return self._default_backend_session.add_auth_headers({})
return None