From 1f32c94cfd17ab71bc2802f32e7c2ec84b1d074a Mon Sep 17 00:00:00 2001 From: Volodymyr Manilo Date: Thu, 13 Aug 2020 16:53:20 +0300 Subject: [PATCH] Added public_url --- remo/api.py | 8 ++++++++ remo/sdk.py | 5 ++++- remo/version.py | 2 +- 3 files changed, 13 insertions(+), 2 deletions(-) diff --git a/remo/api.py b/remo/api.py index 071dc3b..28e0fce 100755 --- a/remo/api.py +++ b/remo/api.py @@ -43,6 +43,7 @@ class BaseAPI: def __init__(self, server, email, password): self.server = server self.token = None + self._public_url = '' self._login(email, password) def _login(self, email, password): @@ -64,6 +65,13 @@ def _auth_header(self): raise Exception('Not authenticated') return {'Authorization': 'Token {}'.format(self.token)} + def set_public_url(self, public_url: str): + self._public_url = public_url + + def public_url(self, endpoint, *args, **kwargs): + url = self._public_url if self._public_url else self.server + return self._build_url(url, endpoint, *args, **kwargs) + def url(self, endpoint, *args, **kwargs): return self._build_url(self.server, endpoint, *args, **kwargs) diff --git a/remo/sdk.py b/remo/sdk.py index d2006fa..b4a70c3 100755 --- a/remo/sdk.py +++ b/remo/sdk.py @@ -34,6 +34,9 @@ def __init__(self, server: str, email: str, password: str, viewer: str = 'browse self.viewer = None self.set_viewer(viewer) + def set_public_url(self, public_url: str): + self.api.set_public_url(public_url) + def set_viewer(self, viewer: str): """ Allows to choose one of available viewers @@ -780,7 +783,7 @@ def view_annotation_stats(self, annotation_set_id: int): return self._view(frontend.annotation_set_insights.format(annotation_set_id)) def _view(self, url, *args, **kwargs): - return self.viewer.browse(self.api.url(url, *args, **kwargs)) + return self.viewer.browse(self.api.public_url(url, *args, **kwargs)) def generate_annotations_from_folders(self, path_to_data_folder: str): """ diff --git a/remo/version.py b/remo/version.py index 7525d19..66a87bb 100644 --- a/remo/version.py +++ b/remo/version.py @@ -1 +1 @@ -__version__ = '0.1.4' +__version__ = '0.1.5'