chore: bump hubble version (#672)

jina-ai · Feb 14, 2023 · 48d7c60 · 48d7c60
1 parent 9fe960b
commit 48d7c60
Show file tree

Hide file tree

Showing 5 changed files with 23 additions and 11 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -30,6 +30,10 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 - Add proper CSV file for image-image case. ([#667](https://github.com/jina-ai/finetuner/pull/667))
 
+- Fix problems with login function in notebooks by bumping hubble version. ([#672](https://github.com/jina-ai/finetuner/pull/672))
+
+- Fix URL construction. ([#672](https://github.com/jina-ai/finetuner/pull/672)) 
+
 ### Docs
 
 - Add page on loss and pooling to `advanced-topics`. ([#664](https://github.com/jina-ai/finetuner/pull/664))

diff --git a/finetuner/client/client.py b/finetuner/client/client.py
@@ -41,7 +41,7 @@ def create_experiment(
         :param description: Optional description of the experiment.
         :return: Created experiment.
         """
-        url = self._construct_url(self._base_url, API_VERSION, EXPERIMENTS)
+        url = self._construct_url(self._base_url, API_VERSION, EXPERIMENTS) + '/'
         return self._handle_request(
             url=url, method=POST, json_data={NAME: name, DESCRIPTION: description}
         )
@@ -85,7 +85,7 @@ def delete_experiments(self) -> List[dict]:
 
         :return: Experiments to be deleted.
         """
-        url = self._construct_url(self._base_url, API_VERSION, EXPERIMENTS)
+        url = self._construct_url(self._base_url, API_VERSION, EXPERIMENTS) + '/'
         return self._handle_request(url=url, method=DELETE)
 
     """ Run API """

diff --git a/setup.py b/setup.py
@@ -27,14 +27,14 @@
         zip_safe=False,
         setup_requires=['setuptools>=18.0', 'wheel'],
         install_requires=[
-            'docarray[common]>=0.20.1',
+            'docarray[common]>=0.21.0',
             'trimesh==3.16.4',
-            'finetuner-stubs==0.12.4rc13',
-            'jina-hubble-sdk==0.24.0',
+            'finetuner-stubs==0.12.5',
+            'jina-hubble-sdk==0.33.1',
         ],
         extras_require={
             'full': [
-                'finetuner-commons==0.12.4rc13',
+                'finetuner-commons==0.12.5',
             ],
             'test': [
                 'black==22.3.0',

diff --git a/tests/conftest.py b/tests/conftest.py
@@ -5,7 +5,7 @@
 
 @pytest.fixture(autouse=True)
 def overwrite_hubble_registry():
-    os.environ['JINA_FINETUNER_REGISTRY'] = 'https://api-staging.finetuner.fit'
+    os.environ['JINA_FINETUNER_REGISTRY'] = 'https://api.staging.finetuner.fit'
     os.environ['JINA_HUBBLE_REGISTRY'] = 'https://api.hubble.jina.ai'
     yield
     del os.environ['JINA_HUBBLE_REGISTRY']

diff --git a/tests/unit/test_client.py b/tests/unit/test_client.py
@@ -17,8 +17,12 @@
 
 def test_create_experiment(client_mocker, name='name'):
     response = client_mocker.create_experiment(name)
-    assert response['url'] == client_mocker._construct_url(
-        client_mocker._base_url, API_VERSION, EXPERIMENTS
+    assert (
+        response['url']
+        == client_mocker._construct_url(
+            client_mocker._base_url, API_VERSION, EXPERIMENTS
+        )
+        + '/'
     )
     assert response['method'] == POST
     assert response['json_data'][NAME] == name
@@ -50,8 +54,12 @@ def test_delete_experiment(client_mocker, name='name'):
 
 def test_delete_experiments(client_mocker):
     sent_request = client_mocker.delete_experiments()
-    assert sent_request['url'] == client_mocker._construct_url(
-        client_mocker._base_url, API_VERSION, EXPERIMENTS
+    assert (
+        sent_request['url']
+        == client_mocker._construct_url(
+            client_mocker._base_url, API_VERSION, EXPERIMENTS
+        )
+        + '/'
     )
     assert sent_request['method'] == DELETE