Skip to content

Commit 39abfbb

Browse files
committed
renamed "signatures" into "expectation_signatures"
Signed-off-by: Antoine MAZEAS <antoine.mazeas@filigran.io>
1 parent 8283bfe commit 39abfbb

4 files changed

Lines changed: 16 additions & 16 deletions

File tree

pyoaev/apis/signature.py

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -107,7 +107,7 @@ def send_signatures(
107107
return
108108

109109
sig_data = json.loads(payload["execution_output_structured"])
110-
targets = sig_data["signatures"]["targets"]
110+
targets = sig_data["expectation_signatures"]["targets"]
111111
envelopes = self._split_into_envelopes(
112112
payload,
113113
sig_data,
@@ -199,8 +199,8 @@ def _build_envelope(
199199
targets_subset: list[dict[str, Any]],
200200
) -> dict[str, Any]:
201201
subset_sig = dict(sig_data)
202-
subset_sig["signatures"] = dict(sig_data["signatures"])
203-
subset_sig["signatures"]["targets"] = targets_subset
202+
subset_sig["expectation_signatures"] = dict(sig_data["expectation_signatures"])
203+
subset_sig["expectation_signatures"]["targets"] = targets_subset
204204

205205
envelope = dict(base_payload)
206206
envelope["execution_output_structured"] = json.dumps(subset_sig)

pyoaev/signatures/models.py

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -122,15 +122,15 @@ class SignatureOutputStructure(BaseModel):
122122

123123
model_config = ConfigDict(populate_by_name=True, extra="forbid")
124124

125-
signatures: SignaturePayload
125+
expectation_signatures: SignaturePayload
126126

127127
def normalize_signature_payload(self) -> None:
128128
"""
129129
Regroup signature_values by expectation_type within each target.
130130
"""
131131
normalized_targets: list[TargetSignatures] = []
132132

133-
for target in self.signatures.targets:
133+
for target in self.expectation_signatures.targets:
134134
if not target.signature_values:
135135
normalized_targets.append(target)
136136
continue
@@ -156,7 +156,7 @@ def normalize_signature_payload(self) -> None:
156156

157157
normalized_targets.append(normalized_target)
158158

159-
self.signatures.targets = normalized_targets
159+
self.expectation_signatures.targets = normalized_targets
160160

161161

162162
class ExecutionDetails(BaseModel):

pyoaev/signatures/signature_manager.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -221,7 +221,7 @@ def send_signatures(
221221
Raises:
222222
SignatureTransmissionError: Validation failed, 4xx hit, or retries exhausted.
223223
"""
224-
sig_output = SignatureOutputStructure(signatures=SignaturePayload(**signatures))
224+
sig_output = SignatureOutputStructure(expectation_signatures=SignaturePayload(**signatures))
225225

226226
self.client.signature.send_signatures(
227227
inject_id,

test/signatures/test_signature_manager_transmission.py

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -92,7 +92,7 @@ def context():
9292
def _extract_targets(body: dict) -> list[dict]:
9393
"""Parse targets from the SignatureCallbackPayload wire format."""
9494
sig_data = json.loads(body["execution_output_structured"])
95-
return sig_data["signatures"]["targets"]
95+
return sig_data["expectation_signatures"]["targets"]
9696

9797

9898
def _build_signature_payload(
@@ -172,14 +172,14 @@ def _http_post(*args, **kwargs):
172172
context["status_plan"] = [200]
173173
context["error_body"] = ""
174174
context["inject_id"] = "inject-abc-001"
175-
context["signatures"] = _build_signature_payload()
175+
context["expectation_signatures"] = _build_signature_payload()
176176
context["signature_manager"] = SignatureManager(mock_client, logger=logger)
177177

178178

179179
@given(parsers.parse('a compiled post-execution payload for inject_id "{inject_id}"'))
180180
def compiled_post_execution_payload(context, inject_id):
181181
context["inject_id"] = inject_id
182-
context["signatures"] = _build_signature_payload()
182+
context["expectation_signatures"] = _build_signature_payload()
183183

184184

185185
@given(parsers.parse("an updated post-execution execution details object"))
@@ -203,7 +203,7 @@ def compiled_payload_single_target(
203203
signature_type,
204204
signature_value,
205205
):
206-
context["signatures"] = {
206+
context["expectation_signatures"] = {
207207
"targets": [
208208
{
209209
"signature_target": dict(_CANONICAL_SIGNATURE_TARGET),
@@ -230,9 +230,9 @@ def compiled_large_payload(context):
230230
context["signature_manager"] = SignatureManager(
231231
context["mock_client"],
232232
logger=context["logger"],
233-
max_payload_size=700,
233+
max_payload_size=800,
234234
)
235-
context["signatures"] = {
235+
context["expectation_signatures"] = {
236236
"targets": [
237237
{
238238
"signature_target": {
@@ -335,7 +335,7 @@ def compiled_payload_grouped_by_expectation(
335335
expectation_a,
336336
expectation_b,
337337
):
338-
context["signatures"] = {
338+
context["expectation_signatures"] = {
339339
"targets": [
340340
{
341341
"signature_target": dict(_CANONICAL_SIGNATURE_TARGET),
@@ -376,7 +376,7 @@ def call_send_signatures(context, inject_id):
376376
context["signature_manager"].send_signatures(
377377
inject_id,
378378
context["execution_details"],
379-
context["signatures"],
379+
context["expectation_signatures"],
380380
)
381381
except Exception as exc:
382382
context["send_exception"] = exc
@@ -498,7 +498,7 @@ def assert_no_chunk_metadata(context):
498498

499499
@then("the union of targets across all POST requests equals the original target set")
500500
def assert_targets_union_matches_original(context):
501-
original_targets = context["signatures"]["targets"]
501+
original_targets = context["expectation_signatures"]["targets"]
502502
sent_targets = [
503503
target
504504
for call_item in context["captured_calls"]

0 commit comments

Comments
 (0)