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

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

@@ -1,6 +1,6 @@
-Metadata-Version: 2.2
+Metadata-Version: 2.4
 Name: datalab-api
-Version: 0.2.9
+Version: 0.2.11
 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
@@ -43,6 +43,7 @@ Requires-Dist: pandas~=2.2; extra == "cheminventory-helper"
 Requires-Dist: openpyxl~=3.0; extra == "cheminventory-helper"
 Provides-Extra: all
 Requires-Dist: datalab-api[cli,dev,docs]; extra == "all"
+Dynamic: license-file
 
 # <div align="center"><i>datalab</i> Python API</div>
 

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

@@ -153,10 +153,10 @@ class DatalabClient(BaseDatalabClient):
 
         if collection_id is not None:
             try:
-                collection_immutable_id = self.get_collection(collection_id)["immutable_id"]
+                collection_immutable_id = self.get_collection(collection_id)[0]["immutable_id"]
             except RuntimeError:
                 self.create_collection(collection_id)
-                collection_immutable_id = self.get_collection(collection_id)["immutable_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})
 
@@ -173,6 +173,10 @@ class DatalabClient(BaseDatalabClient):
                     f"Item {item_id=} already exists at {create_item_url}: {created_item['status']!r}."
                 )
             if created_item["status"] != "success":
+                if "DuplicateKeyError" in created_item["message"]:
+                    raise DuplicateItemError(
+                        f"Item {item_id=} already exists at {create_item_url}: {created_item['status']!r}."
+                    )
                 raise RuntimeError(f"Failed to create item at {create_item_url}: {created_item}.")
             return created_item["sample_list_entry"]
 
@@ -282,8 +286,9 @@ class DatalabClient(BaseDatalabClient):
                 warnings.warn(f"Will not overwrite existing file {f['name']}")
                 continue
             with open(f["name"], "wb") as file:
-                response = self.session.get(url, follow_redirects=True)
-                file.write(response.content)
+                with self.session.stream("GET", url, follow_redirects=True) as response:
+                    for chunk in response.iter_bytes(chunk_size=1024):
+                        file.write(chunk)
 
     def get_block(self, item_id: str, block_id: str, block_data: dict[str, Any]) -> dict[str, Any]:
         """Get a block with a given ID and block data.
@@ -467,14 +472,15 @@ class DatalabClient(BaseDatalabClient):
 
         return resp.json()["new_block_data"]
 
-    def get_collection(self, collection_id: str) -> dict[str, Any]:
+    def get_collection(self, collection_id: str) -> tuple[dict[str, Any], list[dict[str, Any]]]:
         """Get a collection with a given ID.
 
         Parameters:
             collection_id: The ID of the collection to search for.
 
         Returns:
-            A dictionary of collection data for the collection with the given ID.
+            A dictionary of collection data for the collection with the given ID,
+            and a list of the member items.
 
         """
         collection_url = f"{self.datalab_api_url}/collections/{collection_id}"
@@ -488,7 +494,7 @@ class DatalabClient(BaseDatalabClient):
             raise RuntimeError(
                 f"Failed to get collection at {collection_url}: {collection['status']!r}."
             )
-        return collection["data"]
+        return collection["data"], collection["child_items"]
 
     def create_collection(
         self, collection_id: str, collection_data: dict | None = None

{datalab_api-0.2.9 → datalab_api-0.2.11}/src/datalab_api/_base.py

@@ -270,7 +270,7 @@ class BaseDatalabClient(metaclass=AutoPrettyPrint):
 
         return self.api_key
 
-    def __enter__(self) -> "BaseDatalabClient":
+    def __enter__(self):
         return self
 
     def __exit__(self, *_):

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

@@ -1,6 +1,6 @@
-Metadata-Version: 2.2
+Metadata-Version: 2.4
 Name: datalab-api
-Version: 0.2.9
+Version: 0.2.11
 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
@@ -43,6 +43,7 @@ Requires-Dist: pandas~=2.2; extra == "cheminventory-helper"
 Requires-Dist: openpyxl~=3.0; extra == "cheminventory-helper"
 Provides-Extra: all
 Requires-Dist: datalab-api[cli,dev,docs]; extra == "all"
+Dynamic: license-file
 
 # <div align="center"><i>datalab</i> Python API</div>
 

{datalab_api-0.2.9 → datalab_api-0.2.11}/tests/test_client.py

@@ -28,7 +28,7 @@ def test_redirect_url(fake_ui_html, fake_info_json, fake_block_info_json):
 
 
 @respx.mock
-def test_sample_list(fake_samples_json, fake_info_json, fake_block_info_json):
+def test_sample_list(fake_samples_json, fake_info_json, fake_sample_json, fake_block_info_json):
     fake_api = respx.get("https://api.datalab.industries/").mock(
         return_value=Response(200, content="<!doctype html></html>")
     )
@@ -41,6 +41,9 @@ def test_sample_list(fake_samples_json, fake_info_json, fake_block_info_json):
     fake_block_info_api = respx.get("https://api.datalab.industries/info/blocks").mock(
         return_value=Response(200, json=fake_block_info_json)
     )
+    fake_item_api = respx.get("https://api.datalab.industries/get-item-data/KUVEKJ").mock(
+        return_value=Response(200, json=fake_sample_json)
+    )
     with DatalabClient("https://api.datalab.industries") as client:
         samples = client.get_items(display=True)
         assert fake_samples_api.called
@@ -49,3 +52,30 @@ def test_sample_list(fake_samples_json, fake_info_json, fake_block_info_json):
         assert fake_block_info_api.called
         assert len(samples)
         assert samples[0]["item_id"] == "test"
+        sample = client.get_item("KUVEKJ", display=True)
+        assert fake_item_api.called
+        assert sample["item_id"] == "KUVEKJ"
+
+
+@respx.mock
+def test_collection_get(fake_info_json, fake_block_info_json, fake_collection_json):
+    fake_api = respx.get("https://api.datalab.industries/").mock(
+        return_value=Response(200, content="<!doctype html></html>")
+    )
+    fake_info_api = respx.get("https://api.datalab.industries/info").mock(
+        return_value=Response(200, json=fake_info_json)
+    )
+    fake_block_info_api = respx.get("https://api.datalab.industries/info/blocks").mock(
+        return_value=Response(200, json=fake_block_info_json)
+    )
+
+    fake_collection_api = respx.get(
+        "https://api.datalab.industries/collections/test_collection"
+    ).mock(return_value=Response(200, json=fake_collection_json))
+
+    with DatalabClient("https://api.datalab.industries") as client:
+        collection, children = client.get_collection("test_collection")
+        assert fake_api.called
+        assert fake_info_api.called
+        assert fake_block_info_api.called
+        assert fake_collection_api.called