datalab-api 0.2.8__tar.gz → 0.2.10__tar.gz

{datalab_api-0.2.8/src/datalab_api.egg-info → datalab_api-0.2.10}/PKG-INFO

@@ -1,7 +1,7 @@
-Metadata-Version: 2.2
+Metadata-Version: 2.4
 Name: datalab-api
-Version: 0.2.8
-Summary: A Python API for instances of the datalab data management platform (https://github.com/the-grey-group/datalab).
+Version: 0.2.10
+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
 Project-URL: homepage, https://github.com/datalab-org/datalab-api
@@ -10,7 +10,6 @@ Project-URL: documentation, https://datalab-python-api.readthedocs.io
 Project-URL: changelog, https://github.com/datalab-org/datalab-api/releases
 Classifier: Programming Language :: Python :: 3
 Classifier: Programming Language :: Python :: 3.9
-Classifier: Programming Language :: Python :: 3
 Classifier: Programming Language :: Python :: 3.10
 Classifier: Programming Language :: Python :: 3.11
 Classifier: Programming Language :: Python :: 3.12
@@ -22,7 +21,7 @@ Requires-Python: >=3.9
 Description-Content-Type: text/markdown
 License-File: LICENSE
 Requires-Dist: httpx~=0.27
-Requires-Dist: bokeh~=2.4
+Requires-Dist: bokeh~=2.4; platform_system != "Emscripten"
 Requires-Dist: rich~=13.0
 Requires-Dist: numpy<2
 Provides-Extra: dev
@@ -44,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.8 → datalab_api-0.2.10}/pyproject.toml

@@ -5,14 +5,15 @@ build-backend = "setuptools.build_meta"
 [project]
 name = "datalab-api"
 readme = "README.md"
-description = "A Python API for instances of the datalab data management platform (https://github.com/the-grey-group/datalab)."
+description = "A Python API for instances of the datalab data management platform (https://github.com/datalab-org/datalab)."
 keywords = []
 license = { text = "MIT" }
 authors = [{ name = "Matthew Evans", email = "matthew@ml-evs.science" }]
 dynamic = ["version"]
 classifiers = [
-    "Programming Language :: Python :: 3", "Programming Language :: Python :: 3.9",
-    "Programming Language :: Python :: 3", "Programming Language :: Python :: 3.10",
+    "Programming Language :: Python :: 3",
+    "Programming Language :: Python :: 3.9",
+    "Programming Language :: Python :: 3.10",
     "Programming Language :: Python :: 3.11",
     "Programming Language :: Python :: 3.12",
     "Intended Audience :: Science/Research",
@@ -22,11 +23,11 @@ classifiers = [
 ]
 
 requires-python = ">=3.9"
-dependencies =[
-    "httpx ~= 0.27", # better HTTP requests
-    "bokeh ~= 2.4",  # interactive plots from datalab directly
-    "rich ~= 13.0",  # nicer terminal output
-    "numpy < 2", # upper pin for numpy due to bad pins in bokeh
+dependencies = [
+    "httpx ~= 0.27",                                 # better HTTP requests
+    'bokeh ~= 2.4; platform_system != "Emscripten"', # interactive plots from datalab directly
+    "rich ~= 13.0",                                  # nicer terminal output
+    "numpy < 2",                                     # upper pin for numpy due to bad pins in bokeh
 ]
 
 
@@ -47,18 +48,13 @@ docs = [
 ]
 
 cli = [
-    "typer ~= 0.9",   # command line interface
+    "typer ~= 0.9",       # command line interface
     "click-shell ~= 2.1", # REPL-like interface
 ]
 
-cheminventory-helper = [
-    "pandas ~= 2.2",
-    "openpyxl ~= 3.0"
-]
+cheminventory-helper = ["pandas ~= 2.2", "openpyxl ~= 3.0"]
 
-all = [
-    "datalab-api[dev,docs,cli]"
-]
+all = ["datalab-api[dev,docs,cli]"]
 
 [project.scripts]
 datalab = "datalab_api.cli:app"
@@ -130,7 +126,6 @@ ignore = [
     "PLW0603",
     "PLW2901",
     "PT003",
-    "PT004",   # pytest-missing-fixture-name-underscore
     "PT006",   # pytest-parametrize-names-wrong-type
     "PT013",   # pytest-incorrect-pytest-import
     "PTH",     # prefer Pathlib to os.path
@@ -165,7 +160,7 @@ ignore = [
 pydocstyle.convention = "numpy"
 isort.known-first-party = ["jobflow_remote"]
 isort.split-on-trailing-comma = false
-fixable = ["A", "B", "C", "D", "E", "F", "I"]
+fixable = ["A", "B", "C", "D", "E", "F", "I", "PT", "RUF"]
 unfixable = []
 # Allow unused variables when underscore-prefixed.
 dummy-variable-rgx = "^(_+|(_+[a-zA-Z0-9_]*[a-zA-Z0-9]+?))$"

{datalab_api-0.2.8 → datalab_api-0.2.10}/src/datalab_api/__init__.py

@@ -7,7 +7,7 @@ from typing import Any, Optional, Union
 
 from ._base import BaseDatalabClient, __version__
 
-__all__ = ("__version__", "DatalabClient")
+__all__ = ("DatalabClient", "__version__")
 
 
 class DuplicateItemError(ValueError):
@@ -282,8 +282,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.

{datalab_api-0.2.8 → datalab_api-0.2.10}/src/datalab_api/_base.py

@@ -14,7 +14,7 @@ from rich.table import Table
 
 __version__ = version("datalab-api")
 
-__all__ = ("__version__", "BaseDatalabClient")
+__all__ = ("BaseDatalabClient", "__version__")
 
 
 def pretty_displayer(method):
@@ -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.8 → datalab_api-0.2.10/src/datalab_api.egg-info}/PKG-INFO

@@ -1,7 +1,7 @@
-Metadata-Version: 2.2
+Metadata-Version: 2.4
 Name: datalab-api
-Version: 0.2.8
-Summary: A Python API for instances of the datalab data management platform (https://github.com/the-grey-group/datalab).
+Version: 0.2.10
+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
 Project-URL: homepage, https://github.com/datalab-org/datalab-api
@@ -10,7 +10,6 @@ Project-URL: documentation, https://datalab-python-api.readthedocs.io
 Project-URL: changelog, https://github.com/datalab-org/datalab-api/releases
 Classifier: Programming Language :: Python :: 3
 Classifier: Programming Language :: Python :: 3.9
-Classifier: Programming Language :: Python :: 3
 Classifier: Programming Language :: Python :: 3.10
 Classifier: Programming Language :: Python :: 3.11
 Classifier: Programming Language :: Python :: 3.12
@@ -22,7 +21,7 @@ Requires-Python: >=3.9
 Description-Content-Type: text/markdown
 License-File: LICENSE
 Requires-Dist: httpx~=0.27
-Requires-Dist: bokeh~=2.4
+Requires-Dist: bokeh~=2.4; platform_system != "Emscripten"
 Requires-Dist: rich~=13.0
 Requires-Dist: numpy<2
 Provides-Extra: dev
@@ -44,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.8 → datalab_api-0.2.10}/src/datalab_api.egg-info/requires.txt

@@ -1,8 +1,10 @@
 httpx~=0.27
-bokeh~=2.4
 rich~=13.0
 numpy<2
 
+[:platform_system != "Emscripten"]
+bokeh~=2.4
+
 [all]
 datalab-api[cli,dev,docs]
 

datalab_api-0.2.10/tests/test_client.py

@@ -0,0 +1,57 @@
+import pytest
+import respx
+from httpx import Response
+
+from datalab_api import DatalabClient
+
+
+@respx.mock
+def test_redirect_url(fake_ui_html, fake_info_json, fake_block_info_json):
+    fake_ui = respx.get("https://ui.datalab.industries").mock(
+        return_value=Response(200, content=fake_ui_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)
+    )
+    with pytest.warns(
+        UserWarning,
+        match="^Found API URL https://api.datalab.industries in HTML meta tag. Creating client with this URL instead.$",
+    ):
+        client = DatalabClient("https://ui.datalab.industries")
+    assert fake_ui.called
+    assert fake_info_api.called
+    assert fake_block_info_api.called
+    assert client.datalab_api_url == "https://api.datalab.industries"
+
+
+@respx.mock
+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>")
+    )
+    fake_samples_api = respx.get("https://api.datalab.industries/samples").mock(
+        return_value=Response(200, json=fake_samples_json)
+    )
+    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_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
+        assert fake_api.called
+        assert fake_info_api.called
+        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"

datalab_api-0.2.8/tests/test_client.py

@@ -1,26 +0,0 @@
-import pytest
-import respx
-from datalab_api import DatalabClient
-from httpx import Response
-
-
-@respx.mock
-def test_redirect_url(fake_ui_html, fake_info_json, fake_block_info_json):
-    fake_ui = respx.get("https://ui.datalab.industries").mock(
-        return_value=Response(200, content=fake_ui_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)
-    )
-    with pytest.warns(
-        UserWarning,
-        match="^Found API URL https://api.datalab.industries in HTML meta tag. Creating client with this URL instead.$",
-    ):
-        client = DatalabClient("https://ui.datalab.industries")
-    assert fake_ui.called
-    assert fake_info_api.called
-    assert fake_block_info_api.called
-    assert client.datalab_api_url == "https://api.datalab.industries"