datalab-api 0.3.0__tar.gz → 0.3.2__tar.gz

{datalab_api-0.3.0/src/datalab_api.egg-info → datalab_api-0.3.2}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: datalab-api
-Version: 0.3.0
+Version: 0.3.2
 Summary: A Python API for instances of the datalab data management platform (https://github.com/datalab-org/datalab).
 Author-email: Matthew Evans <matthew@ml-evs.science>
 License-Expression: MIT
@@ -22,12 +22,12 @@ Description-Content-Type: text/markdown
 License-File: LICENSE
 Requires-Dist: httpx~=0.28
 Requires-Dist: bokeh~=2.4; platform_system != "Emscripten"
-Requires-Dist: rich~=13.0
+Requires-Dist: rich<15,>=13
 Requires-Dist: numpy<2
 Provides-Extra: dev
 Requires-Dist: pre-commit<5,>=3; extra == "dev"
 Requires-Dist: pytest~=8.0; extra == "dev"
-Requires-Dist: pytest-cov<7,>=5; extra == "dev"
+Requires-Dist: pytest-cov<8,>=5; extra == "dev"
 Requires-Dist: respx~=0.22; extra == "dev"
 Provides-Extra: docs
 Requires-Dist: mkdocs; extra == "docs"
@@ -61,7 +61,7 @@ A simple Python API that can interact with [*datalab*](https://github.com/datala
 
 The idea here is to provide a set of utility functions and models for manipulating samples, cells, inventory, files, users and metadata associated with *datalab* entries in an automated way.
 
-This API may not expose all the functionality available in a given *datalab* instance, and the idea would be that this package can support multiple versions of the underlying [*datalab* REST API](https://docs.datalab-org.io/en/stable/rest_api/).
+This API may not expose all the functionality available in a given *datalab* instance, and the idea would be that this package can support multiple versions of the underlying [*datalab* REST API](https://docs.datalab-org.io).
 This means that the API is primarily *functional* in nature, as opposed to object-oriented, since *datalab* instances are free to use their own custom data models.
 The available schemas are reported as instance metadata and in the future object-oriented models may be able to be genereated directly in the client (so e.g., the returned data would be Python objects like `Sample` rather than JSON data).
 

{datalab_api-0.3.0 → datalab_api-0.3.2}/README.md

@@ -14,7 +14,7 @@ A simple Python API that can interact with [*datalab*](https://github.com/datala
 
 The idea here is to provide a set of utility functions and models for manipulating samples, cells, inventory, files, users and metadata associated with *datalab* entries in an automated way.
 
-This API may not expose all the functionality available in a given *datalab* instance, and the idea would be that this package can support multiple versions of the underlying [*datalab* REST API](https://docs.datalab-org.io/en/stable/rest_api/).
+This API may not expose all the functionality available in a given *datalab* instance, and the idea would be that this package can support multiple versions of the underlying [*datalab* REST API](https://docs.datalab-org.io).
 This means that the API is primarily *functional* in nature, as opposed to object-oriented, since *datalab* instances are free to use their own custom data models.
 The available schemas are reported as instance metadata and in the future object-oriented models may be able to be genereated directly in the client (so e.g., the returned data would be Python objects like `Sample` rather than JSON data).
 

{datalab_api-0.3.0 → datalab_api-0.3.2}/pyproject.toml

@@ -26,7 +26,7 @@ requires-python = ">=3.9"
 dependencies = [
     "httpx ~= 0.28",                                 # better HTTP requests
     'bokeh ~= 2.4; platform_system != "Emscripten"', # interactive plots from datalab directly
-    "rich ~= 13.0",                                  # nicer terminal output
+    "rich >= 13,< 15",                                  # nicer terminal output
     "numpy < 2",                                     # upper pin for numpy due to bad pins in bokeh
 ]
 
@@ -35,7 +35,7 @@ dependencies = [
 dev = [
     "pre-commit >= 3,< 5",
     "pytest ~= 8.0",
-    "pytest-cov >= 5,< 7",
+    "pytest-cov >= 5,< 8",
     "respx ~= 0.22",
 ]
 

{datalab_api-0.3.0 → datalab_api-0.3.2}/src/datalab_api/__init__.py

@@ -5,7 +5,7 @@ from collections.abc import Iterable
 from pathlib import Path
 from typing import Any, Optional, Union
 
-from ._base import BaseDatalabClient, DuplicateItemError, __version__
+from ._base import BaseDatalabClient, DatalabAPIError, DuplicateItemError, __version__
 
 __all__ = ("DatalabClient", "DuplicateItemError", "__version__")
 
@@ -150,6 +150,9 @@ class DatalabClient(BaseDatalabClient):
             except RuntimeError:
                 self.create_collection(collection_id)
                 collection_immutable_id = self.get_collection(collection_id)[0]["immutable_id"]
+            except DatalabAPIError:
+                self.create_collection(collection_id)
+                collection_immutable_id = self.get_collection(collection_id)[0]["immutable_id"]
             new_item["collections"] = new_item.get("collections", [])
             new_item["collections"].append({"immutable_id": collection_immutable_id})
 
@@ -157,6 +160,7 @@ class DatalabClient(BaseDatalabClient):
         created_item = self._post(
             create_item_url,
             json={"new_sample_data": new_item, "generate_id_automatically": item_id is None},
+            expected_status=201,
         )
         return created_item["sample_list_entry"]
 

{datalab_api-0.3.0 → datalab_api-0.3.2}/src/datalab_api/_base.py

@@ -2,6 +2,7 @@ import logging
 import os
 import re
 import warnings
+from getpass import getpass
 from importlib.metadata import version
 from typing import Any, Optional
 
@@ -37,6 +38,11 @@ class BaseDatalabClient(metaclass=AutoPrettyPrint):
     _headers: dict[str, str] = {}
     _timeout: httpx.Timeout = httpx.Timeout(10.0, read=60.0)
 
+    interactive: bool = True
+    """Whether the client is being used in an interactive context (e.g., CLI or notebook) or not.
+    Set to false if you want the script to error if no API key is found in the environment variables,
+    rather than prompting for input."""
+
     info: dict[str, Any] = {}
     """The `data` response from the `/info` endpoint of the Datalab API."""
 
@@ -189,9 +195,14 @@ class BaseDatalabClient(metaclass=AutoPrettyPrint):
                 api_key = api_key.strip("'").strip('"')
 
             if api_key is None:
-                raise ValueError(
-                    f"No API key found in environment variables {key_env_var}/<prefix>_{key_env_var}."
-                )
+                if self.interactive:
+                    api_key = getpass(
+                        f"Enter your API key for {self.datalab_api_url} (input will be hidden): "
+                    )
+                else:
+                    raise ValueError(
+                        f"No API key found in environment variables {key_env_var}/<prefix>_{key_env_var}."
+                    )
 
             self._api_key = api_key
 

{datalab_api-0.3.0 → datalab_api-0.3.2/src/datalab_api.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: datalab-api
-Version: 0.3.0
+Version: 0.3.2
 Summary: A Python API for instances of the datalab data management platform (https://github.com/datalab-org/datalab).
 Author-email: Matthew Evans <matthew@ml-evs.science>
 License-Expression: MIT
@@ -22,12 +22,12 @@ Description-Content-Type: text/markdown
 License-File: LICENSE
 Requires-Dist: httpx~=0.28
 Requires-Dist: bokeh~=2.4; platform_system != "Emscripten"
-Requires-Dist: rich~=13.0
+Requires-Dist: rich<15,>=13
 Requires-Dist: numpy<2
 Provides-Extra: dev
 Requires-Dist: pre-commit<5,>=3; extra == "dev"
 Requires-Dist: pytest~=8.0; extra == "dev"
-Requires-Dist: pytest-cov<7,>=5; extra == "dev"
+Requires-Dist: pytest-cov<8,>=5; extra == "dev"
 Requires-Dist: respx~=0.22; extra == "dev"
 Provides-Extra: docs
 Requires-Dist: mkdocs; extra == "docs"
@@ -61,7 +61,7 @@ A simple Python API that can interact with [*datalab*](https://github.com/datala
 
 The idea here is to provide a set of utility functions and models for manipulating samples, cells, inventory, files, users and metadata associated with *datalab* entries in an automated way.
 
-This API may not expose all the functionality available in a given *datalab* instance, and the idea would be that this package can support multiple versions of the underlying [*datalab* REST API](https://docs.datalab-org.io/en/stable/rest_api/).
+This API may not expose all the functionality available in a given *datalab* instance, and the idea would be that this package can support multiple versions of the underlying [*datalab* REST API](https://docs.datalab-org.io).
 This means that the API is primarily *functional* in nature, as opposed to object-oriented, since *datalab* instances are free to use their own custom data models.
 The available schemas are reported as instance metadata and in the future object-oriented models may be able to be genereated directly in the client (so e.g., the returned data would be Python objects like `Sample` rather than JSON data).
 

{datalab_api-0.3.0 → datalab_api-0.3.2}/src/datalab_api.egg-info/requires.txt

@@ -1,5 +1,5 @@
 httpx~=0.28
-rich~=13.0
+rich<15,>=13
 numpy<2
 
 [:platform_system != "Emscripten"]
@@ -19,7 +19,7 @@ click-shell~=2.1
 [dev]
 pre-commit<5,>=3
 pytest~=8.0
-pytest-cov<7,>=5
+pytest-cov<8,>=5
 respx~=0.22
 
 [docs]