unitlab 2.1.8__tar.gz → 2.2.0__tar.gz

{unitlab-2.1.8/src/unitlab.egg-info → unitlab-2.2.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: unitlab
-Version: 2.1.8
+Version: 2.2.0
 Home-page: https://github.com/teamunitlab/unitlab-sdk
 Author: Unitlab Inc.
 Author-email: team@unitlab.ai

{unitlab-2.1.8 → unitlab-2.2.0}/setup.py

@@ -2,7 +2,7 @@ from setuptools import find_packages, setup
 
 setup(
     name="unitlab",
-    version="2.1.8",
+    version="2.2.0",
     license="MIT",
     author="Unitlab Inc.",
     author_email="team@unitlab.ai",

{unitlab-2.1.8 → unitlab-2.2.0}/src/unitlab/client.py

@@ -9,8 +9,9 @@ import aiohttp
 import requests
 import tqdm
 
-from . import exceptions, utils
+from . import exceptions
 from .dataset import DatasetUploadHandler
+from .utils import get_api_url, handle_exceptions
 
 logger = logging.getLogger(__name__)
 
@@ -48,14 +49,9 @@ class UnitlabClient:
         :exc:`~unitlab.exceptions.AuthenticationError`: If an invalid API key is used or (when not passing the API key directly) if ``UNITLAB_API_KEY`` is not found in your environment.
     """
 
-    def __init__(self, api_key: str = None, api_url: str = None):
-        if api_key is None:
-            api_key = utils.get_api_key()
-        if api_url is None:
-            api_url = utils.get_api_url()
-
+    def __init__(self, api_key, api_url=None):
         self.api_key = api_key
-        self.api_url = api_url
+        self.api_url = api_url or get_api_url()
         self.api_session = requests.Session()
         adapter = requests.adapters.HTTPAdapter(max_retries=3)
         self.api_session.mount("http://", adapter)
@@ -95,13 +91,13 @@ class UnitlabClient:
     def _get_headers(self):
         return {"Authorization": f"Api-Key {self.api_key}"}
 
-    @utils.handle_exceptions
+    @handle_exceptions
     def _get(self, endpoint):
         return self.api_session.get(
             urllib.parse.urljoin(self.api_url, endpoint), headers=self._get_headers()
         )
 
-    @utils.handle_exceptions
+    @handle_exceptions
     def _post(self, endpoint, data=None):
         return self.api_session.post(
             urllib.parse.urljoin(self.api_url, endpoint),

{unitlab-2.1.8 → unitlab-2.2.0}/src/unitlab/main.py

@@ -6,8 +6,8 @@ import typer
 import validators
 from typing_extensions import Annotated
 
+from . import utils
 from .client import UnitlabClient
-from .utils import get_api_key, write_config
 
 app = typer.Typer()
 project_app = typer.Typer()
@@ -20,7 +20,7 @@ app.add_typer(dataset_app, name="dataset", help="Dataset commands")
 API_KEY = Annotated[
     str,
     typer.Option(
-        default_factory=get_api_key, help="The api-key obtained from unitlab.ai"
+        default_factory=utils.get_api_key, help="The api-key obtained from unitlab.ai"
     ),
 ]
 
@@ -46,7 +46,7 @@ def configure(
 ):
     if not validators.url(api_url, simple_host=True):
         raise typer.BadParameter("Invalid api url")
-    write_config(api_key=api_key, api_url=api_url)
+    utils.write_config(api_key=api_key, api_url=api_url)
 
 
 def get_client(api_key: str) -> UnitlabClient:

{unitlab-2.1.8 → unitlab-2.2.0}/src/unitlab/utils.py

@@ -53,7 +53,7 @@ def get_api_key() -> str:
         return config.get("default", "api_key")
     except Exception:
         raise exceptions.ConfigurationError(
-            f"Key `api_key` not found in {CONFIG_FILE_PATH}. Please run `unitlab configure` or provide one"
+            f"Key `api_key` not found in {CONFIG_FILE_PATH}. Please run `unitlab configure` or provide the api-key using the --api-key option."
         )
 
 

{unitlab-2.1.8 → unitlab-2.2.0/src/unitlab.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: unitlab
-Version: 2.1.8
+Version: 2.2.0
 Home-page: https://github.com/teamunitlab/unitlab-sdk
 Author: Unitlab Inc.
 Author-email: team@unitlab.ai