Merge pull request #1746 from adcontextprotocol/claude/issue-1695-owed-names

feat(reporting): use owed and list_subscription_principals, as the TypeScript SDK does

Author: bokelley

docs/reliable-reporting-service.md

@@ -422,13 +422,13 @@ platform = reporting.install(MySeller())  # then serve the platform as usual
 The rest of this section describes the building blocks the managed path
 composes, for sellers who wire them by hand.
 
-**Buyer.** `expected_subscription_periods(...)` is the coverage rule as a pure
+**Buyer.** `owed_subscription_periods(...)` is the coverage rule as a pure
 function over plain data. Pass it the `get_principal` subscription readback,
 the buys you can see (`SubscriptionBuy`, with earlier flights when a buy was
 extended or reinstated), the offerings with the seller's dimension mapping
 (`SubscriptionOffering`), the account timezone, the account's grant history,
 and the `subscription_coverage[]` exceptions and gaps. It returns
-`ExpectedSubscriptionPeriod` values, which are `ExpectedReportingPeriod`s, so
+`OwedSubscriptionPeriod` values, which are `ExpectedReportingPeriod`s, so
 they feed `evaluate_reporting_ledger` and the consumer-status planner as they
 are.
 

docs/reporting-subscriptions-buyer.md

@@ -49,7 +49,7 @@ An `all_authorized_accounts` subscription follows every grant, including account
 
 ## Reconcile
 
-`client.reporting.reconcile()` and `explain()` arrive in a later beta. Until then, `expected_subscription_periods(...)` and `ReportingSubscriptionTracker` compute owed periods from your own records (see [Coverage, explained](reporting-subscriptions-coverage.md#the-owed-rules)).
+`client.reporting.reconcile()` and `explain()` arrive in a later beta. Until then, `owed_subscription_periods(...)` and `ReportingSubscriptionTracker` compute owed periods from your own records (see [Coverage, explained](reporting-subscriptions-coverage.md#the-owed-rules)).
 
 ## Events
 

docs/reporting-subscriptions-coverage.md

@@ -1,6 +1,6 @@
 # Coverage, explained
 
-Both sides compute which periods a subscription owes with one function, `expected_subscription_periods`, over the same facts. Never compute periods yourself.
+Both sides compute which periods a subscription owes with one function, `owed_subscription_periods`, over the same facts. Never compute periods yourself.
 
 ## The owed rules
 

llms.txt

@@ -86,7 +86,7 @@ docs/reporting-subscriptions-buyer.md.
 - DON'T pick `subscription_version` yourself: `subscribe` chooses it.
 - DO send an explicit scope: `{"all_authorized_accounts": True}` or `{"account_ids": [...]}`.
 - DON'T compute reporting periods with local time; use
-  `expected_subscription_periods` (and, later, `client.reporting.reconcile`).
+  `owed_subscription_periods` (and, later, `client.reporting.reconcile`).
 - DO switch on `next_step(outcome)` for accounts. DON'T fetch
   `pending_action.url`: show it to a person.
 - Sellers: DON'T call `engine.reconcile` from request handlers; the service

src/adcp/reporting/_reconcile.py

@@ -74,7 +74,6 @@ async def get_reporting_status(
 
 
 class ReportingReconciliationClient(ReportingStatusClient, Protocol):
-
     async def sync_reporting_receipts(
         self, request: SyncReportingReceiptsRequest
     ) -> TaskResult[SyncReportingReceiptsResponse]:

src/adcp/reporting/conformance.py

@@ -777,8 +777,7 @@ def _assert_cells_do_not_regress(
         if item.status in _AVAILABLE and (later is None or later.status not in _AVAILABLE):
             raise _fail(
                 "REVISION_SEQUENCE_INVALID",
-                f"{label} must not remove or degrade constituent availability from its "
-                "predecessor",
+                f"{label} must not remove or degrade constituent availability from its predecessor",
             )
         if item.data_through is not None and (
             later is None

src/adcp/reporting/feed/projection.py

@@ -330,9 +330,9 @@ def capture_feed(
                 and owners[owner_id].generation_key in bindings
                 and record.canonical_content_digest is not None
             ):
-                wires[identity][
-                    "canonical_content_digest"
-                ] = record.canonical_content_digest.to_wire()
+                wires[identity]["canonical_content_digest"] = (
+                    record.canonical_content_digest.to_wire()
+                )
             if record.supersedes_reporting_revision_id is not None:
                 predecessor = revisions.get(record.supersedes_reporting_revision_id)
                 if predecessor is None or predecessor.reporting_obligation_id != owner_id:
@@ -481,7 +481,9 @@ def capture_feed(
             finality = (
                 revisions[revision_id].finality
                 if revision_id in revisions
-                else owners[owner_id].required_finality if owner_id in owners else None
+                else owners[owner_id].required_finality
+                if owner_id in owners
+                else None
             )
             if finality not in finalities:
                 matches = False

src/adcp/reporting/ledger/consumer_status.py

@@ -258,7 +258,7 @@ async def _find_period_obligation(
                 and item.delivery_config_version == record.delivery_config_version
                 and item.report_definition_id == record.report_definition_id
             ),
-            key=lambda item: (item.subscription.offering_id if item.subscription else ""),
+            key=lambda item: item.subscription.offering_id if item.subscription else "",
         ):
             candidate = await self.store.find_obligation(
                 account_id=record.account_id,

src/adcp/reporting/ledger/reconciliation_projection.py

@@ -258,7 +258,9 @@ def project_reconciliation(
         wire["reconciliation_status"] = (
             "rejected"
             if rejected
-            else "accepted" if accepted and not pending_adjustments else "pending"
+            else "accepted"
+            if accepted and not pending_adjustments
+            else "pending"
         )
     else:
         wire["reconciliation_status"] = "not_required"

src/adcp/reporting/outbox/worker.py

@@ -226,9 +226,10 @@ async def deliver_one(self, *, account_id: str) -> bool:
             return False
         observation = _HttpObservation()
         if self.delivery_window is not None:
-            observation.retry_deadline, observation.retry_window_expired = (
-                await self.delivery_window.inspect(lease, now=self._clock())
-            )
+            (
+                observation.retry_deadline,
+                observation.retry_window_expired,
+            ) = await self.delivery_window.inspect(lease, now=self._clock())
         try:
             opened = self.cipher.open(lease.delivery)
         except (ReportingNotificationError, ValueError, TypeError):