Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
36 changes: 0 additions & 36 deletions docs/reporting-source-stable-finality.md

This file was deleted.

Original file line number Diff line number Diff line change
Expand Up @@ -148,9 +148,11 @@
configuration_lifecycle,
encode_cursor,
issue_is_retirable,
provisional_observation_reuse_candidate,
reject_reserved_authoritative_party,
validate_adjustment_currency,
validate_managed_revision_rows,
validate_retained_provisional_observation,
validate_revision_currency,
)
from adcp_reporting_storage.ledger.row_storage import (
Expand Down Expand Up @@ -1810,10 +1812,13 @@ async def commit_provisional_observation(
) -> ReportingRevisionRecord:
acquisition = observation.acquisition
key = (acquisition.account_id, acquisition.obligation_id, acquisition.ordinal)
reuse_candidate = provisional_observation_reuse_candidate(
acquisition, observation, revision
)
if revision is not None and (
revision.account_id != acquisition.account_id
or revision.reporting_obligation_id != acquisition.obligation_id
or revision.reporting_revision_id != observation.revision_id
or (revision.reporting_revision_id != observation.revision_id and not reuse_candidate)
):
raise LedgerConflictError("OBSERVATION_CONFLICT", "observation identity differs")
async with self.transaction(), self._connection() as connection:
Expand All @@ -1839,7 +1844,14 @@ async def commit_provisional_observation(
retained_observation = ProvisionalObservation.from_wire(existing[1])
if (
retained_observation.acquisition != acquisition
or existing[0] != observation.revision_id
or (
existing[0] != observation.revision_id
and (
not reuse_candidate
or revision is None
or existing[0] != revision.reporting_revision_id
)
)
or retained_observation.manifest_json != observation.manifest_json
):
raise LedgerConflictError("OBSERVATION_CONFLICT", "observation replay differs")
Expand All @@ -1852,11 +1864,10 @@ async def commit_provisional_observation(
)
# Reuse the immutable publication replay checks while holding
# the observation's account lock and transaction.
return (
await self.commit_revision(revision, rows)
if revision is not None
else retained_revision
)
if revision is None or (reuse_candidate and existing[0] == observation.revision_id):
validate_retained_provisional_observation(retained_revision, observation, rows)
return retained_revision
return await self.commit_revision(revision, rows)
reserved = await (
await connection.execute(
"SELECT payload FROM reporting_provisional_acquisitions"
Expand All @@ -1872,7 +1883,7 @@ async def commit_provisional_observation(
)
if checkpoint is not None and checkpoint.next_observation != acquisition.ordinal:
raise LedgerConflictError("OBSERVATION_CONFLICT", "observation ordinal changed")
if revision is None:
if revision is None or reuse_candidate:
if acquisition.predecessor_revision_id != observation.revision_id:
raise LedgerConflictError(
"OBSERVATION_CONFLICT", "snapshot predecessor differs"
Expand Down Expand Up @@ -1902,6 +1913,16 @@ async def commit_provisional_observation(
raise LedgerConflictError(
"OBSERVATION_CONFLICT", "snapshot predecessor is no longer current"
)
validate_retained_provisional_observation(
committed, observation, rows, require_readable=False
)
if not committed.readable:
if revision is None:
raise LedgerConflictError(
"HISTORY_UNAVAILABLE", "snapshot predecessor is not readable"
)
committed = await self.commit_revision(revision, rows)
observation = replace(observation, revision_id=committed.reporting_revision_id)
else:
committed = await self.commit_revision(revision, rows)
await self.record_restatement_checkpoint(
Expand Down
33 changes: 1 addition & 32 deletions src/adcp/reporting/inline_source.py
Original file line number Diff line number Diff line change
Expand Up @@ -284,12 +284,6 @@ class InlineFetchResult:
scheduling correctly after a restart.
"""

finality_evidence_ref: str | None = field(default=None, kw_only=True)
"""Source evidence reference for an authoritative close."""

finality_stable_since: datetime | None = field(default=None, kw_only=True)
"""Source attestation of when authoritative content last changed."""

cell_availability: Mapping[str, Mapping[str, MetricEvidence]] | None = field(
default=None, kw_only=True
)
Expand Down Expand Up @@ -825,17 +819,6 @@ async def execute(
unavailable_status="delayed",
)

if request.require_finality_evidence and (
not answer.finality_evidence_ref or answer.finality_stable_since is None
):
return ReportingSourceExecutorResult.failed(
ReportingSourceErrorV1(
code="PROVIDER_TRANSIENT",
retry="retryable",
safe_message="source has not supplied official finality evidence",
)
)

return await self._publish(request, answer, cancel=cancel)

# -- fetch ----------------------------------------------------------
Expand Down Expand Up @@ -1038,8 +1021,6 @@ async def _publish(
control_totals=control_totals,
warnings=warnings,
provisional_until=result.provisional_until,
finality_evidence_ref=result.finality_evidence_ref,
finality_stable_since=result.finality_stable_since,
)

manifest_bytes = encode_source_batch_manifest_v1(manifest)
Expand Down Expand Up @@ -1215,8 +1196,6 @@ def _seal_manifest(
control_totals: list[SourceControlTotalV1],
warnings: list[str],
provisional_until: datetime | None,
finality_evidence_ref: str | None,
finality_stable_since: datetime | None,
) -> SourceBatchManifestV1:
coverage = SourceBatchCoverageV1(
denominator_fingerprint=request.coverage.denominator_fingerprint,
Expand Down Expand Up @@ -1251,19 +1230,9 @@ def _seal_manifest(
basis=(
"provisional_observation"
if request.publication_class == "PROVISIONAL_SNAPSHOT"
else (
"provider_declared"
if finality_evidence_ref
else "elapsed_settlement_window"
)
else "elapsed_settlement_window"
),
observed_at=finality_at,
evidence_ref=finality_evidence_ref
if request.publication_class == "AUTHORITATIVE"
else None,
stable_since=finality_stable_since
if request.publication_class == "AUTHORITATIVE"
else None,
provisional_until=(
provisional_until
if request.publication_class == "PROVISIONAL_SNAPSHOT"
Expand Down
Loading
Loading