Candidate deephaven-fixes head, final (do not merge)

.github/workflows/lint.yml

@@ -4,7 +4,7 @@ on:
     tags:
       - v*
     branches:
-      - '**'
+      - v1
   pull_request:
 permissions:
   contents: read

.github/workflows/test.yml

@@ -4,7 +4,7 @@ on:
     tags:
       - v*
     branches:
-      - '**'
+      - v1
   pull_request:
 permissions:
   contents: read
@@ -33,39 +33,22 @@ jobs:
       - name: Unit tests
         run: make test
   test-free-threaded:
-    strategy:
-      fail-fast: false
-      matrix:
-        python-version: ['3.13t', '3.14t']
     runs-on: ubuntu-latest
-    name: ubuntu-latest Unit test ${{ matrix.python-version }} (PYTHON_GIL=0)
+    name: ubuntu-latest Unit test 3.14t (PYTHON_GIL=0)
+    env:
+      PYTHON_GIL: '0'
     steps:
       - uses: actions/checkout@v3
       - name: Setup Python
         uses: actions/setup-python@v5
         with:
-          python-version: ${{ matrix.python-version }}
-      - name: Setup Poetry
-        # with the runner's own Python: some of Poetry's dependencies (e.g.
-        # cryptography) don't build on free-threaded 3.13
-        run: pipx install poetry
+          python-version: '3.14t'
       - name: Install pypi deps
-        # orjson, a dev dependency used only by the examples, does not support
-        # free-threaded Python, so install the package and the test dependency
-        # (pook) at their locked versions instead of `poetry install`
-        run: |
-          poetry env use python${{ matrix.python-version }}
-          poetry install --only main
-          poetry run python - > "$RUNNER_TEMP/constraints.txt" <<'EOF'
-          import tomllib
-          with open("poetry.lock", "rb") as f:
-              for p in tomllib.load(f)["package"]:
-                  print(f"{p['name']}=={p['version']}")
-          EOF
-          poetry run pip install pook -c "$RUNNER_TEMP/constraints.txt"
+        # the tests need only the package and pook, not the dev tools
+        run: pip install -e . pook
+      - name: Check that the GIL is off
+        run: python -c "import sys; assert not sys._is_gil_enabled(), sys.version"
       - name: Unit tests
-        env:
-          PYTHON_GIL: '0'
         run: |
-          poetry run python -c 'import sys; assert not sys._is_gil_enabled(), sys.version'
-          make test
+          python -m unittest discover -s test_rest
+          python -m unittest discover -s test_websocket

AGENTS.md

@@ -51,6 +51,7 @@ The OpenAPI spec at https://api.massive.com/openapi is the source of truth for p
    - Single-object endpoints are named `get_<...>` and call `self._get(...)`.
    - Every query param is a keyword argument defaulting to `None`. Write range filters as `x_gt`, `x_gte`, `x_lt`, `x_lte`, `x_any_of`; `_get_params` turns them into `x.gt` and so on.
    - Always end the signature with `params: Optional[Dict[str, Any]] = None, raw: bool = False, options: Optional[RequestOptionBuilder] = None`.
+   - Precede the method with three `@overload`s that copy its signature, so callers get the precise type for each value of `raw`: `raw: Literal[False] = False` returns the model type (`Iterator[Model]`, `List[Model]` or `Model`); `*, raw: Literal[True]` (keyword-only) returns `HTTPResponse`; and `raw: bool = False` returns the full `Union`. Copy an existing method, such as `list_aggs` in `massive/rest/aggs.py`.
 4. **New domain only.** Create a `BaseClient` subclass and add it to `RESTClient`'s bases in `massive/rest/__init__.py`.
 5. **Tests, examples, docs.** For core endpoints, add a fixture under `test_rest/mocks/<url path>.json`, a test in `test_rest/test_<domain>.py`, an example in `examples/rest/`, and an `automethod` entry in `docs/source/*.rst`.
 6. Run `make lint` and `make test`.

Makefile

@@ -27,7 +27,9 @@ style:
 ## Check static types
 static:
 	poetry run mypy massive test_* examples
-	cd test_typing && poetry run mypy --strict consumer.py
+	@# From test_rest/, massive resolves to the installed package, as it does
+	@# for users, so this also fails if the package stops shipping py.typed.
+	cd test_rest && poetry run mypy --strict typing_consumer.py
 
 ## Check code style and static types
 lint: style static

docs/source/WebSocket.rst

@@ -40,9 +40,9 @@ Set subscriptions
 .. automethod:: massive.WebSocketClient.set_subscriptions
 
 ============================
-Unsubscribe all
+Resubscribe
 ============================
-.. automethod:: massive.WebSocketClient.unsubscribe_all
+.. automethod:: massive.WebSocketClient.resubscribe
 
 ============================
 Close

massive/exceptions.py

@@ -1,5 +1,8 @@
 from typing import Optional
 
+# the package star-imports this module; keep Optional out of its namespace
+__all__ = ["AuthError", "BadResponse"]
+
 
 class AuthError(Exception):
     """
@@ -13,26 +16,10 @@ class BadResponse(Exception):
     """
     Non-200 response from API
 
-    The exception message (``str(exc)`` and ``exc.args[0]``) is the response
-    body, as before. The HTTP status code and the decoded body are also
-    available as attributes, so callers can tell, for example, a 403 from a
-    429 without parsing the message.
-
-    :param message: The exception message, normally the response body.
-    :param status: The HTTP status code of the response, if known.
-    :param body: The decoded response body. Defaults to ``message``.
-    :ivar status: The HTTP status code of the response, or ``None`` if the
-        exception was raised without one.
-    :ivar body: The decoded response body.
+    The message is the response body. ``status`` is the HTTP status code, or
+    None if not given.
     """
 
-    def __init__(
-        self,
-        message: str,
-        *,
-        status: Optional[int] = None,
-        body: Optional[str] = None,
-    ):
-        super().__init__(message)
+    def __init__(self, *args: object, status: Optional[int] = None):
+        super().__init__(*args)
         self.status = status
-        self.body = message if body is None else body

massive/modelclass.py

@@ -1,9 +1,13 @@
 import inspect
+import sys
 import typing
 from dataclasses import dataclass
 
 if typing.TYPE_CHECKING:
-    from typing_extensions import dataclass_transform
+    if sys.version_info >= (3, 11):
+        from typing import dataclass_transform
+    else:
+        from typing_extensions import dataclass_transform
 else:
 
     def dataclass_transform(**kwargs):

massive/rest/__init__.py

@@ -66,6 +66,7 @@ def __init__(
         ca_certs: Optional[str] = None,
         proxy: Optional[str] = None,
         connection_pool_kw: Optional[Dict[str, Any]] = None,
+        raise_on_status: bool = True,
     ):
         """
         :param maxsize: Connections kept open per host, for reuse across threads.
@@ -75,6 +76,9 @@ def __init__(
             Environment proxy variables (HTTPS_PROXY etc.) are not used.
         :param connection_pool_kw: Other urllib3 PoolManager options. They override
             the client's defaults.
+        :param raise_on_status: When a retried status (413, 429, 499, 500, 502, 503,
+            504) is still returned after the last retry: if True, urllib3 raises
+            MaxRetryError; if False, the client raises BadResponse with that status.
         """
         # resolve once, so the main and vx clients share it and warn only once
         ca_certs = ca_certs or ca_bundle_path(logger)
@@ -93,6 +97,7 @@ def __init__(
             ca_certs=ca_certs,
             proxy=proxy,
             connection_pool_kw=connection_pool_kw,
+            raise_on_status=raise_on_status,
         )
         self.vx = VXClient(
             api_key=api_key,
@@ -109,4 +114,5 @@ def __init__(
             ca_certs=ca_certs,
             proxy=proxy,
             connection_pool_kw=connection_pool_kw,
+            raise_on_status=raise_on_status,
         )