Suite 1.17: Batch has no price_factor, the batch price being each model's batch_price_factor in models() and each line's charge in its usage; the docs name the prices a models() entry carries, and the conformance driver reads {"$absent": true} as a key that must not be there [skip publish]

Author: bynnit

.github/workflows/ci.yml

@@ -19,9 +19,9 @@ permissions:
   contents: read
 
 env:
-  # The conformance suite commit this SDK is tested against (suite 1.16, tag v1.16, for specification
+  # The conformance suite commit this SDK is tested against (suite 1.17, tag v1.17, for specification
   # 1.3). Change it here only.
-  CONFORMANCE_REF: 2d2c5a97c1d57e3be74c9edb4c5b9117511802a2
+  CONFORMANCE_REF: 23957bf6992fa53918a9f63ab16c8a6c8b9203f9
   UV_VERSION: "0.7.13"
 
 concurrency:

CHANGELOG.md

@@ -97,6 +97,12 @@ Implements version 1.3 of the SDK specification (`SPEC_VERSION` is `"1.3"`).
 - An image id of more than 64 characters is refused before anything is sent:
   `BadRequestError` `api_usage_error`, "Image <n>: its id is longer than 64 characters."
 
+### Removed
+
+- `Batch.price_factor`. The API does not send it: the batch price is each model's
+  `batch_price_factor` in `models()` (none on a fine-tuned model), and each line's charge
+  is in its usage.
+
 ## [0.2.0] - Unreleased
 
 Implements version 1.2 of the SDK specification (`SPEC_VERSION` is `"1.2"`) and passes

README.md

@@ -532,9 +532,11 @@ the async client the feed may be an async iterator and `on_reply` a coroutine fu
 ## Batches
 
 The Batch API answers many decide requests at the batch price: 50% off the live price on
-`decisionnode-flash`, 30% off on `decisionnode-moe` (each model's `batch_price_factor` in
-`models()`, 0.5 and 0.7). There is no set time at which a batch runs or finishes, so poll
-for it. Requests not answered within 24 hours of finalizing expire and are not charged.
+`decisionnode-flash`, 30% off on `decisionnode-moe`. The batch price is each model's, its
+`batch_price_factor` in `models()` (0.5 and 0.7; a fine-tuned model's entry states none),
+never the batch's, and each line's charge is in its usage. There is no set time at which a
+batch runs or finishes, so poll for it. Requests not answered within 24 hours of finalizing
+expire and are not charged.
 
 ```python
 requests = [
@@ -587,8 +589,9 @@ for m in dn.models():
 ```
 
 Each entry is a `ModelInfo`. `limits` holds every other field the model publishes: the
-token limit, the number grid limits, the upload limits, and the `sessions` and `batch`
-objects.
+prices (`price_per_million_input`, `price_per_million_output`, `price_per_million_image`,
+`price_per_million_video`, in USD per million tokens, and `batch_price_factor`), the token
+limit, the number grid limits, the upload limits, and the `sessions` and `batch` objects.
 
 | Model | |
 |---|---|
@@ -931,7 +934,7 @@ The tests include the DecisionNode SDK conformance suite
 (`Bynn-Intelligence/decision-node-conformance`), run with both the sync and the async
 client. Set `DECISIONNODE_CONFORMANCE_DIR` to a checkout of it, or check it out at
 `conformance/` in this repository; without it the conformance tests fail rather than
-skip. The tests pass suite 1.16; CI checks the suite out at the commit pinned in
+skip. The tests pass suite 1.17; CI checks the suite out at the commit pinned in
 `CONFORMANCE_REF` in `.github/workflows/ci.yml`, with every action pinned to a commit SHA
 and no checkout keeping its credentials.
 

src/decisionnode/_batches.py

@@ -44,6 +44,9 @@
 class Batch:
     """A batch: every field of the API's batch object.
 
+    A batch states no price: the batch price is each model's ``batch_price_factor`` in
+    ``models()``, and each line's charge is in its usage.
+
     Attributes:
         id: ``batch_`` and 10 characters.
         state: ``draft``, ``queued``, ``running``, ``completed``, ``failed``,
@@ -53,7 +56,6 @@ class Batch:
         created_at, finalized_at, expires_at, ended_at, results_expire_at: ISO 8601 UTC
             times, or ``None``.
         results_url: Where the results are, once the batch has ended.
-        price_factor: The share of the live price a line costs.
         usage: ``input_tokens`` and ``output_tokens`` of the lines answered so far.
         error: For a ``failed`` batch, ``error_type`` and ``message``.
         raw: The batch object as received.
@@ -68,7 +70,6 @@ class Batch:
     ended_at: Optional[str]
     results_url: Optional[str]
     results_expire_at: Optional[str]
-    price_factor: Optional[float]
     usage: Dict[str, Any]
     error: Optional[Dict[str, Any]]
     raw: Dict[str, Any] = field(repr=False)
@@ -143,7 +144,6 @@ def parse_batch(body: Any) -> Batch:
         ended_at=raw.get("ended_at"),
         results_url=raw.get("results_url"),
         results_expire_at=raw.get("results_expire_at"),
-        price_factor=raw.get("price_factor"),
         usage=dict(usage) if isinstance(usage, Mapping) else {},
         error=dict(error) if isinstance(error, Mapping) else None,
         raw=raw,

tests/conformance/test_conformance.py

@@ -185,9 +185,17 @@ def same(a: Any, b: Any) -> bool:
     return type(a) is type(b) and a == b
 
 
+# An expected value meaning the key must not be there at all (suite 1.17).
+ABSENT = {"$absent": True}
+
+
 def match(expected: Any, actual: Any, path: str) -> None:
     if isinstance(expected, dict) and isinstance(actual, dict) and not is_pattern(expected):
         for k, v in expected.items():
+            if v == ABSENT:
+                if k in actual:
+                    raise Fail("%s.%s: expected no such key, got %s" % (path, k, short(actual[k])))
+                continue
             if k not in actual:
                 raise Fail("%s.%s: missing (expected %s)" % (path, k, short(v)))
             if k in EXACT:
@@ -202,6 +210,14 @@ def match(expected: Any, actual: Any, path: str) -> None:
         raise Fail("%s: expected %s, got %s" % (path, short(expected), short(actual)))
 
 
+def match_batch(expected: Any, batch: Any, path: str) -> None:
+    """A batch compares as sent; a key expected absent is neither sent nor a field of Batch."""
+    match(expected, batch.raw, path)
+    for k, v in expected.items() if isinstance(expected, dict) else ():
+        if v == ABSENT and hasattr(batch, k):
+            raise Fail("%s.%s: expected no such field on Batch, got %s" % (path, k, short(getattr(batch, k))))
+
+
 def pointer(doc: Any, ptr: str) -> Tuple[bool, Any]:
     cur = doc
     for raw in ptr[1:].split("/") if ptr else []:
@@ -761,7 +777,7 @@ def check_outcome(spec: Dict[str, Any], result: Any, path: str) -> None:
     elif kind == "batch":
         if not isinstance(result, dn.Batch):
             raise Fail("%s: expected a Batch, got %r" % (path, result))
-        match(spec.get("batch", {}), result.raw, path + ".batch")
+        match_batch(spec.get("batch", {}), result, path + ".batch")
     elif kind == "batch_page":
         if not isinstance(result, dn.BatchPage):
             raise Fail("%s: expected a BatchPage, got %r" % (path, result))
@@ -771,7 +787,7 @@ def check_outcome(spec: Dict[str, Any], result: Any, path: str) -> None:
     elif kind == "batch_run":
         if not isinstance(result, dn.BatchRun):
             raise Fail("%s: expected a BatchRun, got %r" % (path, result))
-        match(spec.get("batch", {}), result.batch.raw, path + ".batch")
+        match_batch(spec.get("batch", {}), result.batch, path + ".batch")
         check_results_spec(spec, result.results, path)
     elif kind in COLLECTION_KINDS:
         check_collection_result(kind, spec.get(kind, {}), result, path + "." + kind)
@@ -1068,7 +1084,7 @@ async def run_response(case: Dict[str, Any], mock: Mock, mode: str, env: pytest.
             raise Fail("raw: expected %s, got %s" % (short(exp["raw"]), short(result)))
     elif "batch" in exp:
         assert isinstance(result, dn.Batch)
-        match(exp["batch"], result.raw, "batch")
+        match_batch(exp["batch"], result, "batch")
     elif "batch_page" in exp:
         assert isinstance(result, dn.BatchPage)
         match(exp["batch_page"], result.raw, "batch_page")

tests/test_calls.py

@@ -38,7 +38,6 @@
     "ended_at": None,
     "results_url": None,
     "results_expire_at": None,
-    "price_factor": 0.5,
     "usage": {"input_tokens": 0, "output_tokens": 0},
     "error": None,
 }