Skip to content

Commit e58a00f

Browse files
authored
Merge pull request #1924 from adcontextprotocol/rmatani/ai-22538-remove-sdk-managed-official-finality-policy
fix(reporting): keep snapshot finality source-owned
2 parents 881607b + d2381ee commit e58a00f

12 files changed

Lines changed: 264 additions & 322 deletions

File tree

‎docs/reporting-source-stable-finality.md‎

Lines changed: 0 additions & 36 deletions
This file was deleted.

‎packages/adcp-reporting-storage/src/adcp_reporting_storage/ledger/pg.py‎

Lines changed: 29 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -148,9 +148,11 @@
148148
configuration_lifecycle,
149149
encode_cursor,
150150
issue_is_retirable,
151+
provisional_observation_reuse_candidate,
151152
reject_reserved_authoritative_party,
152153
validate_adjustment_currency,
153154
validate_managed_revision_rows,
155+
validate_retained_provisional_observation,
154156
validate_revision_currency,
155157
)
156158
from adcp_reporting_storage.ledger.row_storage import (
@@ -1810,10 +1812,13 @@ async def commit_provisional_observation(
18101812
) -> ReportingRevisionRecord:
18111813
acquisition = observation.acquisition
18121814
key = (acquisition.account_id, acquisition.obligation_id, acquisition.ordinal)
1815+
reuse_candidate = provisional_observation_reuse_candidate(
1816+
acquisition, observation, revision
1817+
)
18131818
if revision is not None and (
18141819
revision.account_id != acquisition.account_id
18151820
or revision.reporting_obligation_id != acquisition.obligation_id
1816-
or revision.reporting_revision_id != observation.revision_id
1821+
or (revision.reporting_revision_id != observation.revision_id and not reuse_candidate)
18171822
):
18181823
raise LedgerConflictError("OBSERVATION_CONFLICT", "observation identity differs")
18191824
async with self.transaction(), self._connection() as connection:
@@ -1839,7 +1844,14 @@ async def commit_provisional_observation(
18391844
retained_observation = ProvisionalObservation.from_wire(existing[1])
18401845
if (
18411846
retained_observation.acquisition != acquisition
1842-
or existing[0] != observation.revision_id
1847+
or (
1848+
existing[0] != observation.revision_id
1849+
and (
1850+
not reuse_candidate
1851+
or revision is None
1852+
or existing[0] != revision.reporting_revision_id
1853+
)
1854+
)
18431855
or retained_observation.manifest_json != observation.manifest_json
18441856
):
18451857
raise LedgerConflictError("OBSERVATION_CONFLICT", "observation replay differs")
@@ -1852,11 +1864,10 @@ async def commit_provisional_observation(
18521864
)
18531865
# Reuse the immutable publication replay checks while holding
18541866
# the observation's account lock and transaction.
1855-
return (
1856-
await self.commit_revision(revision, rows)
1857-
if revision is not None
1858-
else retained_revision
1859-
)
1867+
if revision is None or (reuse_candidate and existing[0] == observation.revision_id):
1868+
validate_retained_provisional_observation(retained_revision, observation, rows)
1869+
return retained_revision
1870+
return await self.commit_revision(revision, rows)
18601871
reserved = await (
18611872
await connection.execute(
18621873
"SELECT payload FROM reporting_provisional_acquisitions"
@@ -1872,7 +1883,7 @@ async def commit_provisional_observation(
18721883
)
18731884
if checkpoint is not None and checkpoint.next_observation != acquisition.ordinal:
18741885
raise LedgerConflictError("OBSERVATION_CONFLICT", "observation ordinal changed")
1875-
if revision is None:
1886+
if revision is None or reuse_candidate:
18761887
if acquisition.predecessor_revision_id != observation.revision_id:
18771888
raise LedgerConflictError(
18781889
"OBSERVATION_CONFLICT", "snapshot predecessor differs"
@@ -1902,6 +1913,16 @@ async def commit_provisional_observation(
19021913
raise LedgerConflictError(
19031914
"OBSERVATION_CONFLICT", "snapshot predecessor is no longer current"
19041915
)
1916+
validate_retained_provisional_observation(
1917+
committed, observation, rows, require_readable=False
1918+
)
1919+
if not committed.readable:
1920+
if revision is None:
1921+
raise LedgerConflictError(
1922+
"HISTORY_UNAVAILABLE", "snapshot predecessor is not readable"
1923+
)
1924+
committed = await self.commit_revision(revision, rows)
1925+
observation = replace(observation, revision_id=committed.reporting_revision_id)
19051926
else:
19061927
committed = await self.commit_revision(revision, rows)
19071928
await self.record_restatement_checkpoint(

‎src/adcp/reporting/inline_source.py‎

Lines changed: 1 addition & 32 deletions
Original file line numberDiff line numberDiff line change
@@ -284,12 +284,6 @@ class InlineFetchResult:
284284
scheduling correctly after a restart.
285285
"""
286286

287-
finality_evidence_ref: str | None = field(default=None, kw_only=True)
288-
"""Source evidence reference for an authoritative close."""
289-
290-
finality_stable_since: datetime | None = field(default=None, kw_only=True)
291-
"""Source attestation of when authoritative content last changed."""
292-
293287
cell_availability: Mapping[str, Mapping[str, MetricEvidence]] | None = field(
294288
default=None, kw_only=True
295289
)
@@ -825,17 +819,6 @@ async def execute(
825819
unavailable_status="delayed",
826820
)
827821

828-
if request.require_finality_evidence and (
829-
not answer.finality_evidence_ref or answer.finality_stable_since is None
830-
):
831-
return ReportingSourceExecutorResult.failed(
832-
ReportingSourceErrorV1(
833-
code="PROVIDER_TRANSIENT",
834-
retry="retryable",
835-
safe_message="source has not supplied official finality evidence",
836-
)
837-
)
838-
839822
return await self._publish(request, answer, cancel=cancel)
840823

841824
# -- fetch ----------------------------------------------------------
@@ -1038,8 +1021,6 @@ async def _publish(
10381021
control_totals=control_totals,
10391022
warnings=warnings,
10401023
provisional_until=result.provisional_until,
1041-
finality_evidence_ref=result.finality_evidence_ref,
1042-
finality_stable_since=result.finality_stable_since,
10431024
)
10441025

10451026
manifest_bytes = encode_source_batch_manifest_v1(manifest)
@@ -1215,8 +1196,6 @@ def _seal_manifest(
12151196
control_totals: list[SourceControlTotalV1],
12161197
warnings: list[str],
12171198
provisional_until: datetime | None,
1218-
finality_evidence_ref: str | None,
1219-
finality_stable_since: datetime | None,
12201199
) -> SourceBatchManifestV1:
12211200
coverage = SourceBatchCoverageV1(
12221201
denominator_fingerprint=request.coverage.denominator_fingerprint,
@@ -1251,19 +1230,9 @@ def _seal_manifest(
12511230
basis=(
12521231
"provisional_observation"
12531232
if request.publication_class == "PROVISIONAL_SNAPSHOT"
1254-
else (
1255-
"provider_declared"
1256-
if finality_evidence_ref
1257-
else "elapsed_settlement_window"
1258-
)
1233+
else "elapsed_settlement_window"
12591234
),
12601235
observed_at=finality_at,
1261-
evidence_ref=finality_evidence_ref
1262-
if request.publication_class == "AUTHORITATIVE"
1263-
else None,
1264-
stable_since=finality_stable_since
1265-
if request.publication_class == "AUTHORITATIVE"
1266-
else None,
12671236
provisional_until=(
12681237
provisional_until
12691238
if request.publication_class == "PROVISIONAL_SNAPSHOT"

0 commit comments

Comments
 (0)