datalab-api 0.2.11__tar.gz → 0.2.12__tar.gz

{datalab_api-0.2.11/src/datalab_api.egg-info → datalab_api-0.2.12}/PKG-INFO

@@ -1,9 +1,9 @@
 Metadata-Version: 2.4
 Name: datalab-api
-Version: 0.2.11
+Version: 0.2.12
 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: MIT
+License-Expression: MIT
 Project-URL: homepage, https://github.com/datalab-org/datalab-api
 Project-URL: repository, https://github.com/datalab-org/datalab-api
 Project-URL: documentation, https://datalab-python-api.readthedocs.io

{datalab_api-0.2.11 → datalab_api-0.2.12}/pyproject.toml

@@ -7,7 +7,7 @@ name = "datalab-api"
 readme = "README.md"
 description = "A Python API for instances of the datalab data management platform (https://github.com/datalab-org/datalab)."
 keywords = []
-license = { text = "MIT" }
+license = "MIT"
 authors = [{ name = "Matthew Evans", email = "matthew@ml-evs.science" }]
 dynamic = ["version"]
 classifiers = [

{datalab_api-0.2.11 → datalab_api-0.2.12}/src/datalab_api/__init__.py

@@ -83,9 +83,17 @@ class DatalabClient(BaseDatalabClient):
             A list of items of the given type.
 
         """
+        endpoint_type_map = {
+            "cells": "samples",
+            "samples": "samples",
+            "starting_materials": "starting-materials",
+            "equipment": "equipment",
+        }
+
         if item_type is None:
             item_type = "samples"
-        items_url = f"{self.datalab_api_url}/{item_type}"
+
+        items_url = f"{self.datalab_api_url}/{endpoint_type_map.get(item_type, item_type.replace('_', '-'))}"
         items_resp = self.session.get(items_url, follow_redirects=True)
         if items_resp.status_code != 200:
             raise RuntimeError(
@@ -94,7 +102,15 @@ class DatalabClient(BaseDatalabClient):
         items = items_resp.json()
         if items["status"] != "success":
             raise RuntimeError(f"Failed to list items at {items_url}: {items['status']!r}.")
-        return items[item_type]
+
+        if item_type in items:
+            # Old approach
+            return items[item_type]
+        if "items" in items:
+            return items["items"]
+
+        else:
+            return items
 
     def search_items(
         self, query: str, item_types: Iterable[str] | str = ("samples", "cells")

{datalab_api-0.2.11 → datalab_api-0.2.12/src/datalab_api.egg-info}/PKG-INFO

@@ -1,9 +1,9 @@
 Metadata-Version: 2.4
 Name: datalab-api
-Version: 0.2.11
+Version: 0.2.12
 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: MIT
+License-Expression: MIT
 Project-URL: homepage, https://github.com/datalab-org/datalab-api
 Project-URL: repository, https://github.com/datalab-org/datalab-api
 Project-URL: documentation, https://datalab-python-api.readthedocs.io