datalab-api 0.6.0__tar.gz → 0.7.0__tar.gz

{datalab_api-0.6.0/src/datalab_api.egg-info → datalab_api-0.7.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: datalab-api
-Version: 0.6.0
+Version: 0.7.0
 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
@@ -17,7 +17,7 @@ Classifier: Intended Audience :: Science/Research
 Classifier: Intended Audience :: Information Technology
 Classifier: Topic :: Other/Nonlisted Topic
 Classifier: Topic :: Scientific/Engineering
-Requires-Python: >=3.10
+Requires-Python: >=3.11
 Description-Content-Type: text/markdown
 License-File: LICENSE
 Requires-Dist: httpx2~=2.13
@@ -29,7 +29,7 @@ Provides-Extra: networkx
 Requires-Dist: networkx>=3; extra == "networkx"
 Provides-Extra: dev
 Requires-Dist: pre-commit<5,>=3; extra == "dev"
-Requires-Dist: pytest~=8.0; extra == "dev"
+Requires-Dist: pytest~=9.0; extra == "dev"
 Requires-Dist: pytest-cov<8,>=5; extra == "dev"
 Requires-Dist: respx~=0.22; extra == "dev"
 Provides-Extra: docs

{datalab_api-0.6.0 → datalab_api-0.7.0}/pyproject.toml

@@ -22,7 +22,7 @@ classifiers = [
     "Topic :: Scientific/Engineering",
 ]
 
-requires-python = ">=3.10"
+requires-python = ">=3.11"
 dependencies = [
     "httpx2 ~= 2.13",                                 # better HTTP requests
     "rich >= 13,< 15",                                  # nicer terminal output
@@ -41,7 +41,7 @@ networkx = [
 
 dev = [
     "pre-commit >= 3,< 5",
-    "pytest ~= 8.0",
+    "pytest ~= 9.0",
     "pytest-cov >= 5,< 8",
     "respx ~= 0.22",
 ]
@@ -71,12 +71,18 @@ documentation = "https://datalab-python-api.readthedocs.io"
 changelog = "https://github.com/datalab-org/datalab-api/releases"
 
 [tool.uv]
+required-version = ">=0.9.8"  # first release supporting exclude-dependencies; also used by setup-uv in CI
+exclude-dependencies = ["httpx", "httpcore"]
 cache-keys = [{ git = true }]
 
 [tool.versioningit.vcs]
 method = "git"
 default-tag = "0.0.1"
 
+[tool.pytest.ini_options]
+# respx's plugin imports httpx at startup, before conftest can alias it to httpx2
+addopts = "-p no:respx"
+
 [tool.mypy]
 # plugins = "pydantic.mypy"
 ignore_missing_imports = true

{datalab_api-0.6.0 → datalab_api-0.7.0}/src/datalab_api/__init__.py

@@ -5,7 +5,7 @@ from collections.abc import Iterable
 from pathlib import Path
 from typing import TYPE_CHECKING, Any, Optional, Union
 
-import httpx
+import httpx2
 
 from ._base import BaseDatalabClient, DatalabAPIError, DuplicateItemError, __version__
 from .utils import networkx_from_item_graph
@@ -398,7 +398,7 @@ class DatalabClient(BaseDatalabClient):
 
         # Use a longer read timeout for uploads, as the server may do
         # significant processing before responding
-        upload_timeout = httpx.Timeout(self._timeout.connect, read=600.0, pool=self._timeout.pool)
+        upload_timeout = httpx2.Timeout(self._timeout.connect, read=600.0, pool=self._timeout.pool)
 
         upload_url = f"{self.datalab_api_url}/upload-file/"
         with open(file_path, "rb") as file:
@@ -501,7 +501,7 @@ class DatalabClient(BaseDatalabClient):
             RuntimeError: If the block update fails.
 
         """
-        payload = {k: v for k, v in block_data.items()}
+        payload = {**block_data}
         payload["block_id"] = block_id
         payload["blocktype"] = block_type
         payload["item_id"] = item_id

{datalab_api-0.6.0 → datalab_api-0.7.0}/src/datalab_api/_base.py

@@ -6,7 +6,7 @@ from getpass import getpass
 from importlib.metadata import version
 from typing import Any
 
-import httpx
+import httpx2
 from rich.logging import RichHandler
 
 from .utils import AutoPrettyPrint
@@ -34,9 +34,9 @@ class BaseDatalabClient(metaclass=AutoPrettyPrint):
     """
 
     _api_key: str | None = None
-    _session: httpx.Client | None = None
+    _session: httpx2.Client | None = None
     _headers: dict[str, str]
-    _timeout: httpx.Timeout = httpx.Timeout(10.0, read=60.0)
+    _timeout: httpx2.Timeout = httpx2.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.
@@ -103,7 +103,7 @@ class BaseDatalabClient(metaclass=AutoPrettyPrint):
         logging.basicConfig(level=log_level, handlers=[RichHandler()])
         self.log = logging.getLogger(__name__)
 
-        self._http_client = httpx.Client
+        self._http_client = httpx2.Client
         self._headers = {"User-Agent": f"Datalab Python API/{__version__}"}
 
         self._detect_api_url()
@@ -126,7 +126,7 @@ class BaseDatalabClient(metaclass=AutoPrettyPrint):
         Do not use the session for this, so we are not passing the API key to arbitrary URLs.
 
         """
-        response = httpx.get(self.datalab_api_url)
+        response = httpx2.get(self.datalab_api_url)
         match = re.search(
             r'<meta name="x_datalab_api_url" content="(.*?)">',
             response.text,
@@ -145,7 +145,7 @@ class BaseDatalabClient(metaclass=AutoPrettyPrint):
         raise NotImplementedError
 
     @property
-    def session(self) -> httpx.Client:
+    def session(self) -> httpx2.Client:
         if self._session is None:
             return self._http_client(headers=self.headers, timeout=self.timeout)
         return self._session
@@ -156,7 +156,7 @@ class BaseDatalabClient(metaclass=AutoPrettyPrint):
         return self._headers
 
     @property
-    def timeout(self) -> httpx.Timeout:
+    def timeout(self) -> httpx2.Timeout:
         """A timeout object to use for the datalab API session."""
         return self._timeout
 
@@ -246,7 +246,7 @@ class BaseDatalabClient(metaclass=AutoPrettyPrint):
             self._session.close()
 
     def _handle_response(
-        self, response: httpx.Response, url: str, expected_status: int | list[int] = 200
+        self, response: httpx2.Response, url: str, expected_status: int | list[int] = 200
     ) -> dict[str, Any]:
         """Handle HTTP response with consistent error handling.
 
@@ -390,7 +390,7 @@ This is likely a server-side bug. Please report this issue to the datalab develo
                 method, url, follow_redirects=True, timeout=timeout, **kwargs
             )
             return self._handle_response(response, url, expected_status)
-        except (httpx.RequestError, httpx.HTTPStatusError) as e:
+        except (httpx2.RequestError, httpx2.HTTPStatusError) as e:
             raise DatalabAPIError(f"Request failed for {url}: {e}")
 
     def _apply_elevation(self, method: str, kwargs: dict[str, Any]) -> dict[str, Any]:

{datalab_api-0.6.0 → datalab_api-0.7.0/src/datalab_api.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: datalab-api
-Version: 0.6.0
+Version: 0.7.0
 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
@@ -17,7 +17,7 @@ Classifier: Intended Audience :: Science/Research
 Classifier: Intended Audience :: Information Technology
 Classifier: Topic :: Other/Nonlisted Topic
 Classifier: Topic :: Scientific/Engineering
-Requires-Python: >=3.10
+Requires-Python: >=3.11
 Description-Content-Type: text/markdown
 License-File: LICENSE
 Requires-Dist: httpx2~=2.13
@@ -29,7 +29,7 @@ Provides-Extra: networkx
 Requires-Dist: networkx>=3; extra == "networkx"
 Provides-Extra: dev
 Requires-Dist: pre-commit<5,>=3; extra == "dev"
-Requires-Dist: pytest~=8.0; extra == "dev"
+Requires-Dist: pytest~=9.0; extra == "dev"
 Requires-Dist: pytest-cov<8,>=5; extra == "dev"
 Requires-Dist: respx~=0.22; extra == "dev"
 Provides-Extra: docs

{datalab_api-0.6.0 → datalab_api-0.7.0}/src/datalab_api.egg-info/requires.txt

@@ -10,7 +10,7 @@ click-shell~=2.1
 
 [dev]
 pre-commit<5,>=3
-pytest~=8.0
+pytest~=9.0
 pytest-cov<8,>=5
 respx~=0.22
 

{datalab_api-0.6.0 → datalab_api-0.7.0}/tests/test_client.py

@@ -2,7 +2,7 @@ import re
 
 import pytest
 import respx
-from httpx import Response
+from httpx2 import Response
 
 from datalab_api import DatalabClient
 from datalab_api._base import DatalabAPIError