unitlab 1.8.8__tar.gz → 1.9.0__tar.gz

{unitlab-1.8.8/src/unitlab.egg-info → unitlab-1.9.0}/PKG-INFO

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

{unitlab-1.8.8 → unitlab-1.9.0}/setup.py

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

{unitlab-1.8.8 → unitlab-1.9.0}/src/unitlab/cli.py

@@ -60,28 +60,6 @@ def task_statistics(api_key, task_id):
     print(response.json())
 
 
-def ai_models(api_key):
-    response = send_request(
-        {
-            "method": "GET",
-            "headers": get_headers(api_key),
-            "endpoint": ENDPOINTS["cli_ai_models"],
-        }
-    )
-    print(response.json())
-
-
-def ai_model(api_key, pk):
-    response = send_request(
-        {
-            "method": "GET",
-            "headers": get_headers(api_key),
-            "endpoint": ENDPOINTS["cli_ai_model"].format(pk),
-        }
-    )
-    print(response.json())
-
-
 def datasets(api_key):
     response = send_request(
         {

{unitlab-1.8.8 → unitlab-1.9.0}/src/unitlab/client.py

@@ -304,40 +304,6 @@ class UnitlabClient:
                     f.write(chunk)
         return os.path.abspath(filename)
 
-    def ai_models(self):
-        """Get a list of all ai models.
-
-        Returns:
-            A list of all ai models.
-        """
-        response = send_request(
-            {
-                "method": "GET",
-                "endpoint": ENDPOINTS["ai_models"],
-                "headers": self._get_headers(),
-            },
-            session=self.api_session,
-        )
-        return response.json()
-
-    def ai_model(self, ai_model_id):
-        """Get an ai model by id.
-
-        Args:
-            ai_model_id: The id of the ai model.
-        Returns:
-            An ai model.
-        """
-        response = send_request(
-            {
-                "method": "GET",
-                "endpoint": ENDPOINTS["ai_model"].format(ai_model_id),
-                "headers": self._get_headers(),
-            },
-            session=self.api_session,
-        )
-        return response.json()
-
     def datasets(self):
         """Get a list of all datasets.
 

unitlab-1.9.0/src/unitlab/run.py

@@ -0,0 +1,74 @@
+import logging
+from pathlib import Path
+from typing import Optional
+from uuid import UUID
+
+import typer
+from typing_extensions import Annotated
+
+from . import cli
+from .client import UnitlabClient
+
+app = typer.Typer()
+task_app = typer.Typer()
+app.add_typer(task_app, name="task", help="Task commands")
+
+API_KEY = Annotated[str, typer.Option(help="The api-key obtained from unitlab.ai")]
+
+
+def get_client(api_key: str) -> UnitlabClient:
+    return UnitlabClient(api_key=api_key)
+
+
+@task_app.command(name="list", help="Task List")
+def task_list(api_key: API_KEY):
+    cli.tasks(api_key)
+
+
+@task_app.command(name="detail", help="Task Detail")
+def task_detail(pk: UUID, api_key: API_KEY):
+    cli.task(api_key, pk)
+
+
+@task_app.command(help="Task datasources")
+def data(pk: UUID, api_key: API_KEY):
+    cli.task_data(api_key, pk)
+
+
+@task_app.command(help="Task members")
+def members(pk: UUID, api_key: API_KEY):
+    cli.task_workers(api_key, pk)
+
+
+@task_app.command(help="Task statistics")
+def statistics(pk: UUID, api_key: API_KEY):
+    cli.task_statistics(api_key, pk)
+
+
+@task_app.command(help="Upload data")
+def upload(
+    pk: UUID,
+    api_key: API_KEY,
+    directory: Annotated[
+        Path, typer.Option(help="Directory containing the data to be uploaded")
+    ],
+):
+    get_client(api_key).upload_data(str(pk), directory=directory)
+
+
+@app.command()
+def dataset(
+    api_key: API_KEY,
+    pk: Annotated[Optional[UUID], typer.Argument()] = None,
+):
+    """
+    List or retrieve a dataset if pk is provided
+    """
+    if pk:
+        logging.info(f"File: {get_client(api_key).dataset(pk)}")
+    else:
+        cli.datasets(api_key)
+
+
+if __name__ == "__main__":
+    app()

{unitlab-1.8.8 → unitlab-1.9.0}/src/unitlab/utils.py

@@ -6,8 +6,6 @@ from .exceptions import AuthenticationError
 
 ENDPOINTS = {
     "check": "/api/check/",
-    "ai_models": "/api/sdk/ai-models/",
-    "ai_model": "/api/sdk/ai-model/{}/",
     "tasks": "/api/sdk/tasks/",
     "task": "/api/sdk/tasks/{}/",
     "task_datasources": "/api/sdk/tasks/{}/datasources/",
@@ -17,8 +15,6 @@ ENDPOINTS = {
     "download_data": "/api/sdk/tasks/{}/download-data/",
     "datasets": "/api/sdk/datasets/",
     "dataset": "/api/sdk/datasets/{}/",
-    "cli_ai_models": "/api/cli/ai-models/",
-    "cli_ai_model": "/api/cli/ai-model/{}/",
     "cli_tasks": "/api/cli/tasks/",
     "cli_task": "/api/cli/tasks/{}/",
     "cli_task_datasources": "/api/cli/tasks/{}/datasources/",
@@ -30,8 +26,8 @@ ENDPOINTS = {
 
 def send_request(request, session=None):
     endpoint = request.pop("endpoint")
-    if base_url := os.environ.get("UNITLAB_BASE_URL"):
-        request["url"] = base_url + endpoint
+    if os.environ.get("UNITLAB_BASE_URL"):
+        request["url"] = os.environ.get("UNITLAB_BASE_URL") + endpoint
         response = (
             session.request(**request) if session else requests.request(**request)
         )

{unitlab-1.8.8 → unitlab-1.9.0/src/unitlab.egg-info}/PKG-INFO

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

unitlab-1.8.8/src/unitlab/run.py

@@ -1,82 +0,0 @@
-import logging
-from pathlib import Path
-from uuid import UUID
-
-import typer
-from typing_extensions import Annotated
-
-from . import cli
-from .client import UnitlabClient
-
-app = typer.Typer()
-
-API_KEY = Annotated[str, typer.Option(help="The api-key obtained from unitlab.ai")]
-
-
-def get_client(api_key: str) -> UnitlabClient:
-    return UnitlabClient(api_key=api_key)
-
-
-@app.command(help="Task list")
-def tasks(api_key: API_KEY):
-    cli.tasks(api_key)
-
-
-@app.command(help="Task detail")
-def task(pk: UUID, api_key: API_KEY):
-    cli.task(api_key, pk)
-
-
-@app.command(help="Task datasources")
-def task_data(pk: UUID, api_key: API_KEY):
-    cli.task_data(api_key, pk)
-
-
-@app.command(help="Task workers")
-def task_workers(pk: UUID, api_key: API_KEY):
-    cli.task_workers(api_key, pk)
-
-
-@app.command(help="Task statistics")
-def task_statistics(pk: UUID, api_key: API_KEY):
-    cli.task_statistics(api_key, pk)
-
-
-@app.command(help="Upload data")
-def upload_data(
-    pk: UUID,
-    api_key: API_KEY,
-    directory: Annotated[
-        Path, typer.Option(help="Directory containing the data to be uploaded")
-    ],
-):
-    get_client(api_key).upload_data(str(pk), directory=directory)
-
-
-@app.command(help="Download data")
-def download_data(pk: UUID, api_key: API_KEY):
-    logging.info(f"File: {get_client(api_key).download_data(pk)}")
-
-
-@app.command(help="AI models")
-def ai_models(api_key: API_KEY):
-    cli.ai_models(api_key)
-
-
-@app.command(help="AI model")
-def ai_model(pk: UUID, api_key: API_KEY):
-    cli.ai_model(api_key, pk)
-
-
-@app.command(help="Datasets")
-def datasets(api_key: API_KEY):
-    cli.datasets(api_key)
-
-
-@app.command(help="Dataset")
-def dataset(pk: UUID, api_key: API_KEY):
-    logging.info(f"File: {get_client(api_key).dataset(pk)}")
-
-
-if __name__ == "__main__":
-    app()