Skip to content

Commit 353bf3d

Browse files
committed
fix(reporting): align source timezone days to local midnight
1 parent ef276dc commit 353bf3d

6 files changed

Lines changed: 263 additions & 33 deletions

File tree

‎src/adcp/reporting/ledger/consumer_status.py‎

Lines changed: 3 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -574,9 +574,7 @@ def validate_consumer_status_timing(
574574
record: ConsumerStatusRecord, generation: ReportingConfiguration, *, as_of: datetime
575575
) -> None:
576576
"""Validate a statement's derived calendar and observation at the locked boundary."""
577-
from zoneinfo import ZoneInfo
578-
579-
from adcp.reporting.ledger.models import derive_period, iso_duration_to_timedelta
577+
from adcp.reporting.ledger.models import _schedule_clock, derive_period
580578

581579
stamps = (
582580
record.period_start,
@@ -602,12 +600,8 @@ def validate_consumer_status_timing(
602600
raise LedgerConflictError(
603601
"INVALID_STATUS_PERIOD", "status timezone differs from the accepted schedule"
604602
)
605-
zone = ZoneInfo(zone_name)
606-
anchor = generation.schedule.period_anchor or datetime(1970, 1, 1, tzinfo=timezone.utc)
607-
delta = record.period_start.astimezone(zone).replace(tzinfo=None) - anchor.astimezone(
608-
zone
609-
).replace(tzinfo=None)
610-
duration = iso_duration_to_timedelta(generation.schedule.period_duration)
603+
zone, duration, anchor = _schedule_clock(generation.schedule, generation.account_timezone)
604+
delta = record.period_start.astimezone(zone).replace(tzinfo=None) - anchor
611605
if duration <= timedelta(0) or delta % duration:
612606
raise LedgerConflictError(
613607
"INVALID_STATUS_PERIOD", "status period is not a scheduled boundary"

‎src/adcp/reporting/ledger/models.py‎

Lines changed: 20 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -205,7 +205,7 @@ class ReportingScheduleSpec:
205205

206206
period_duration: str
207207
delivery_sla: str
208-
alignment: Literal["utc", "account_timezone", "custom_timezone"] = "utc"
208+
alignment: Literal["utc", "account_timezone", "custom_timezone", "source_timezone"] = "utc"
209209
period_timezone: str | None = None
210210
period_anchor: datetime | None = None
211211

@@ -214,6 +214,10 @@ def timezone_name(self, account_timezone: str) -> str:
214214
return "UTC"
215215
if self.alignment == "account_timezone":
216216
return account_timezone
217+
if self.alignment == "source_timezone":
218+
if not self.period_timezone:
219+
raise ValueError("source_timezone alignment requires period_timezone")
220+
return self.period_timezone
217221
if not self.period_timezone:
218222
raise ValueError("custom_timezone alignment requires period_timezone")
219223
return self.period_timezone
@@ -243,12 +247,18 @@ def _schedule_clock(
243247
duration = iso_duration_to_timedelta(schedule.period_duration)
244248
if duration <= timedelta(0):
245249
raise ValueError("period_duration must be positive")
246-
anchor = (
247-
_utc(schedule.period_anchor)
248-
if schedule.period_anchor is not None
249-
else datetime(1970, 1, 1, tzinfo=timezone.utc)
250-
)
251-
return zone, duration, anchor.astimezone(zone).replace(tzinfo=None)
250+
if schedule.alignment == "source_timezone":
251+
if schedule.period_anchor is not None:
252+
raise ValueError("source_timezone alignment does not accept period_anchor")
253+
anchor = datetime(1970, 1, 1)
254+
else:
255+
instant = (
256+
_utc(schedule.period_anchor)
257+
if schedule.period_anchor is not None
258+
else datetime(1970, 1, 1, tzinfo=timezone.utc)
259+
)
260+
anchor = instant.astimezone(zone).replace(tzinfo=None)
261+
return zone, duration, anchor
252262

253263

254264
def _period_instants(
@@ -277,9 +287,9 @@ def derive_period(
277287
evidence that nothing happened. That only works if the derivation is
278288
identical, so it lives here rather than in each side's handler.
279289
280-
Periods are anchored at the Unix epoch in the schedule's timezone (or at an
281-
explicit ``period_anchor`` for billing-cycle alignment), which is what makes
282-
"the next full boundary" unambiguous. A configuration activated mid-period
290+
Source-timezone periods use local midnight as their civil-day origin.
291+
Other periods use the Unix epoch's local clock or an explicit anchor.
292+
A configuration activated mid-period
283293
begins at the next boundary -- a partial first period would be reported as
284294
complete and understate delivery.
285295
"""

‎src/adcp/reporting/production/offerings.py‎

Lines changed: 13 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -229,6 +229,7 @@ def check_source(self, *, effective: bool = False) -> ReportingSourceCapabilitie
229229
raise failure("UNSUPPORTED_VERIFICATION")
230230
if (
231231
schedule["alignment"] == "source_timezone"
232+
and source_offering.source_timezone is not None
232233
and schedule.get("period_timezone") != source_offering.source_timezone
233234
):
234235
raise failure("UNSUPPORTED_VERIFICATION")
@@ -269,15 +270,16 @@ def configuration_schedule(self, configuration: ReportingConfiguration) -> dict[
269270
offered = self.wire()["schedule"]
270271
schedule = configuration.schedule
271272
alignment = offered["alignment"]
272-
expected_alignment = (
273-
alignment if alignment in {"utc", "account_timezone"} else "custom_timezone"
274-
)
273+
expected_alignment = alignment if alignment != "billing_cycle" else "custom_timezone"
275274
zone, duration, anchor = _schedule_clock(schedule, configuration.account_timezone)
276275
if (
277276
schedule.alignment != expected_alignment
278277
or schedule.period_duration != offered["period_duration"]
279278
or schedule.delivery_sla != offered["delivery_sla"]
280-
or (alignment != "billing_cycle" and (anchor - datetime(1970, 1, 1)) % duration)
279+
or (
280+
alignment not in {"billing_cycle", "source_timezone"}
281+
and (anchor - datetime(1970, 1, 1)) % duration
282+
)
281283
or (alignment == "billing_cycle" and schedule.period_anchor is None)
282284
):
283285
raise failure("BINDING_MISMATCH")
@@ -302,8 +304,13 @@ def configuration_schedule(self, configuration: ReportingConfiguration) -> dict[
302304
raise failure("BINDING_MISMATCH")
303305
if (
304306
alignment == "source_timezone"
305-
and zone.key
306-
!= self.check_source(effective=True).offering(self.source_offering_id).source_timezone
307+
and (
308+
source_zone := self.check_source(effective=True)
309+
.offering(self.source_offering_id)
310+
.source_timezone
311+
)
312+
is not None
313+
and zone.key != source_zone
307314
):
308315
raise failure("BINDING_MISMATCH")
309316
return result

‎tests/conformance/reporting/_production_support.py‎

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -393,6 +393,7 @@ async def production_harness(
393393
adcp_version=None,
394394
source_registry_factory=None,
395395
service_factory=None,
396+
offering_schedule=None,
396397
):
397398
from contextlib import AsyncExitStack
398399

@@ -585,11 +586,8 @@ async def production_harness(
585586
"report_definition_uri": key.definition.report_definition_uri,
586587
"report_definition_sha256": key.definition.report_definition_sha256,
587588
"reporting_profile": profile,
588-
"schedule": {
589-
"period_duration": "PT1H",
590-
"alignment": "utc",
591-
"delivery_sla": "PT1H",
592-
},
589+
"schedule": offering_schedule
590+
or {"period_duration": "PT1H", "alignment": "utc", "delivery_sla": "PT1H"},
593591
"supported_finality": [config.required_finality],
594592
"reconciliation_mode": binding.reconciliation_mode,
595593
"method": writer.delivery_methods[0].wire(),

‎tests/conformance/reporting/test_reporting_production_configuration.py‎

Lines changed: 80 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,19 +4,25 @@
44
import json
55
import sqlite3
66
from dataclasses import replace
7-
from datetime import timedelta, timezone
7+
from datetime import datetime, timedelta, timezone
8+
from typing import Any
89

910
import pytest
1011

12+
from adcp.reporting.ledger import ReportingScheduleSpec
1113
from adcp.reporting.ledger.notification_models import ReportingNotificationError
1214
from adcp.reporting.materializer.contracts import ReportingWriterError, binding_fingerprint
1315
from adcp.reporting.materializer.work import ReportingMaterializerLease
1416
from adcp.reporting.production.configuration import ReportingConfigurationAdmission
17+
from adcp.reporting.source import (
18+
ReportingSourceCapabilitiesV1,
19+
reporting_source_capabilities_sha256_v1,
20+
)
1521
from adcp.validation.schema_loader import get_named_validator
1622

1723
from ._feed_support import feed_request, walk
1824
from ._generation_support import END
19-
from ._production_support import production_harness
25+
from ._production_support import Source, production_harness
2026
from ._production_transport import MountedProduction
2127
from ._receipt_transport import error_code
2228
from .test_reporting_production_bindings import source_documents
@@ -42,6 +48,78 @@ def wire_configuration(h):
4248
}
4349

4450

51+
@pytest.mark.parametrize(
52+
"policy,offered_zone,accepted",
53+
[
54+
("account_resolved", None, True),
55+
("fixed", "America/Los_Angeles", False),
56+
],
57+
)
58+
async def test_source_timezone_admission_uses_the_resolved_network_zone(
59+
policy, offered_zone, accepted, tmp_path
60+
):
61+
class AccountResolvedSource(Source):
62+
def __init__(self, *args: Any, **kwargs: Any) -> None:
63+
super().__init__(*args, **kwargs)
64+
raw = self.capabilities.model_dump(mode="json", exclude_none=True)
65+
raw["offerings"][0].pop("source_timezone")
66+
raw["capabilities_sha256"] = reporting_source_capabilities_sha256_v1(raw)
67+
self.capabilities = ReportingSourceCapabilitiesV1.model_validate(raw)
68+
69+
offered_schedule = {
70+
"period_duration": "P1D",
71+
"delivery_sla": "PT1H",
72+
"alignment": "source_timezone",
73+
"period_timezone_policy": policy,
74+
}
75+
if offered_zone is not None:
76+
offered_schedule["period_timezone"] = offered_zone
77+
async with production_harness(
78+
"memory",
79+
tmp_path / "destination.sqlite",
80+
count=0,
81+
source_factory=AccountResolvedSource,
82+
offering_schedule=offered_schedule,
83+
) as h:
84+
installed = h.production.offerings[0]
85+
source = installed.producer._source
86+
assert source.capabilities.scope == "effective_account"
87+
assert source.capabilities.offering(installed.source_offering_id).source_timezone is None
88+
config = replace(
89+
h.item.config,
90+
delivery_config_version=2,
91+
account_timezone="UTC",
92+
activated_at=datetime(2026, 3, 8, 5, tzinfo=timezone.utc),
93+
schedule=ReportingScheduleSpec("P1D", "PT1H", "source_timezone", "America/New_York"),
94+
)
95+
binding = replace(h.item.binding, generation_key=config.generation_key)
96+
source.bind_generation(config)
97+
h.item.writer.grant(binding)
98+
await h.production.activate(account_id=config.account_id)
99+
if accepted:
100+
await h.store.admit_production_configuration(
101+
config, binding, offering_id=installed.offering_id
102+
)
103+
assert installed.configuration_schedule(config) == {
104+
"period_duration": "P1D",
105+
"delivery_sla": "PT1H",
106+
"alignment": "source_timezone",
107+
"period_timezone": "America/New_York",
108+
}
109+
assert config in await h.store.list_configurations(
110+
caller=binding.principal, delivery_config_ids=[config.delivery_config_id]
111+
)
112+
else:
113+
with pytest.raises(ReportingWriterError) as denied:
114+
await h.store.admit_production_configuration(
115+
config, binding, offering_id=installed.offering_id
116+
)
117+
assert denied.value.failure.code == "BINDING_MISMATCH"
118+
assert config not in await h.store.list_configurations(
119+
caller=binding.principal, delivery_config_ids=[config.delivery_config_id]
120+
)
121+
122+
45123
def state_for(h, configuration):
46124
ids = list(h.item.config.media_buy_ids)
47125
coverage = {

0 commit comments

Comments
 (0)