merge: retain audited signal identity and cross-language semantic hashing
This commit is contained in:
@@ -6,6 +6,7 @@ use std::sync::{Arc, Mutex, OnceLock, Weak};
|
||||
|
||||
use chrono::{DateTime, FixedOffset, NaiveDate, NaiveDateTime, NaiveTime, Utc};
|
||||
use serde::{Deserialize, Serialize};
|
||||
use sha2::{Digest, Sha256};
|
||||
|
||||
use crate::strategy::{OrderIntent, StrategyContext};
|
||||
use crate::portfolio::PortfolioState;
|
||||
@@ -150,6 +151,39 @@ fn shanghai(value: DateTime<Utc>) -> NaiveDateTime {
|
||||
}
|
||||
|
||||
impl SignalBook {
|
||||
pub fn content_sha256(&self) -> Result<String, String> {
|
||||
let mut value=serde_json::to_value(self).map_err(|error|error.to_string())?;
|
||||
value.as_object_mut().ok_or("signal_book_object_required")?.remove("versionSha256");
|
||||
value["knowledgeCutoff"]=self.knowledge_cutoff.map(|at|serde_json::json!(at.timestamp_micros())).unwrap_or(serde_json::Value::Null);
|
||||
value["expectedDecisions"]=serde_json::json!(self.expected_decisions.iter().map(DateTime::timestamp_micros).collect::<Vec<_>>());
|
||||
for (raw,snapshot) in value["snapshots"].as_array_mut().ok_or("signal_snapshots_required")?.iter_mut().zip(&self.snapshots) {
|
||||
let object=raw.as_object_mut().ok_or("signal_snapshot_required")?;
|
||||
object.remove("generatedAt");
|
||||
object.remove("publishedAt");
|
||||
for (key,at) in [("signalAt",snapshot.signal_at),("decisionAt",snapshot.decision_at),
|
||||
("inputAsOf",snapshot.input_as_of),("inputAvailableAt",snapshot.input_available_at)] {
|
||||
object.insert(key.into(),serde_json::json!(at.timestamp_micros()));
|
||||
}
|
||||
for (raw,action) in object.get_mut("actions").and_then(serde_json::Value::as_array_mut).ok_or("signal_actions_required")?.iter_mut().zip(&snapshot.actions) {
|
||||
match action {
|
||||
SignalAction::TargetWeight{weight,..}=>raw["weight"]=serde_json::json!(format!("{:016x}",weight.to_bits())),
|
||||
SignalAction::Reduce{remaining_ratio,..}=>raw["remaining_ratio"]=serde_json::json!(format!("{:016x}",remaining_ratio.to_bits())),
|
||||
_=>{}
|
||||
}
|
||||
}
|
||||
}
|
||||
fn sorted(value:serde_json::Value)->serde_json::Value {
|
||||
match value {
|
||||
serde_json::Value::Object(map)=>serde_json::Value::Object(map.into_iter().map(|(key,value)|(key,sorted(value)))
|
||||
.collect::<BTreeMap<_,_>>().into_iter().collect()),
|
||||
serde_json::Value::Array(rows)=>serde_json::Value::Array(rows.into_iter().map(sorted).collect()),
|
||||
other=>other,
|
||||
}
|
||||
}
|
||||
let raw=serde_json::to_vec(&sorted(value)).map_err(|error|error.to_string())?;
|
||||
Ok(format!("{:x}",Sha256::digest(raw)))
|
||||
}
|
||||
|
||||
pub fn validate(self) -> Result<ValidatedSignalBook, String> {
|
||||
if self.schema != SIGNAL_BOOK_SCHEMA || !valid_sha(&self.version_sha256)
|
||||
|| !valid_sha(&self.generator_sha256)
|
||||
@@ -168,6 +202,10 @@ impl SignalBook {
|
||||
let mut previous = None;
|
||||
let mut total_actions = 0usize;
|
||||
for (number, (expected, snapshot)) in self.expected_decisions.iter().zip(&self.snapshots).enumerate() {
|
||||
if [*expected,snapshot.signal_at,snapshot.input_as_of,snapshot.input_available_at,snapshot.generated_at,snapshot.published_at]
|
||||
.iter().any(|at|at.timestamp_subsec_nanos()%1000!=0) || self.knowledge_cutoff.is_some_and(|at|at.timestamp_subsec_nanos()%1000!=0) {
|
||||
return Err("signal_timestamp_requires_microsecond_precision".into());
|
||||
}
|
||||
if snapshot.decision_at != *expected || previous.is_some_and(|value| value >= *expected) {
|
||||
return Err("signal_book_decisions_duplicate_or_unordered".into());
|
||||
}
|
||||
@@ -221,6 +259,9 @@ impl SignalBook {
|
||||
}
|
||||
index.insert(shanghai(*expected), number);
|
||||
}
|
||||
if self.content_sha256()? != self.version_sha256 {
|
||||
return Err("signal_book_content_hash_mismatch".into());
|
||||
}
|
||||
Ok(ValidatedSignalBook { book: self, index })
|
||||
}
|
||||
}
|
||||
@@ -248,7 +289,9 @@ impl ValidatedSignalBook {
|
||||
let snapshot = self.snapshot_at(ctx.execution_date, ctx.current_time(), ctx.is_lagged_execution())?;
|
||||
let logical_clock=ctx.current_datetime().filter(|at|at.date()==ctx.decision_date)
|
||||
.unwrap_or(ctx.decision_date.and_hms_opt(15,0,0).expect("completed decision session"));
|
||||
if shanghai(snapshot.signal_at)>logical_clock || (ctx.is_lagged_execution() && shanghai(snapshot.input_as_of).date()>ctx.decision_date) {
|
||||
let lagged_daily=ctx.is_lagged_execution() && self.book.frequency==SignalFrequency::Daily;
|
||||
if (lagged_daily && shanghai(snapshot.input_as_of).date()>ctx.decision_date)
|
||||
|| (!lagged_daily && shanghai(snapshot.signal_at)>logical_clock) {
|
||||
return Err("next_open_signal_contains_execution_session_inputs".into());
|
||||
}
|
||||
Ok(snapshot)
|
||||
@@ -329,7 +372,7 @@ mod tests {
|
||||
fn book() -> SignalBook {
|
||||
let decision: DateTime<Utc> = "2025-01-07T09:30:00+08:00".parse().unwrap();
|
||||
let source: DateTime<Utc> = "2025-01-06T15:00:00+08:00".parse().unwrap();
|
||||
SignalBook {
|
||||
seal(SignalBook {
|
||||
schema: SIGNAL_BOOK_SCHEMA.into(), version_sha256: "a".repeat(64), generator_sha256: "b".repeat(64),
|
||||
model_sha256: Some("d".repeat(64)),
|
||||
knowledge_cutoff: Some("2024-12-31T15:00:00+08:00".parse().unwrap()),
|
||||
@@ -341,7 +384,12 @@ mod tests {
|
||||
input_sha256: "c".repeat(64), complete_targets: true,
|
||||
actions: vec![SignalAction::TargetWeight { symbol: "000001.SZ".into(), weight: 0.5 }],
|
||||
}],
|
||||
}
|
||||
})
|
||||
}
|
||||
|
||||
fn seal(mut book:SignalBook)->SignalBook {
|
||||
book.version_sha256=book.content_sha256().unwrap();
|
||||
book
|
||||
}
|
||||
|
||||
#[test]
|
||||
@@ -353,7 +401,7 @@ mod tests {
|
||||
assert!(observed.clone().validate().unwrap_err().contains("not_available"));
|
||||
observed.snapshots[0].generated_at = observed.snapshots[0].decision_at;
|
||||
observed.snapshots[0].published_at = observed.snapshots[0].decision_at;
|
||||
observed.validate().unwrap().require_observed().unwrap();
|
||||
seal(observed).validate().unwrap().require_observed().unwrap();
|
||||
}
|
||||
|
||||
#[test]
|
||||
@@ -423,7 +471,7 @@ mod tests {
|
||||
let mut raw = book();
|
||||
raw.snapshots[0].complete_targets = false;
|
||||
raw.snapshots[0].actions = vec![SignalAction::Reduce {symbol:"000001.SZ".into(),remaining_ratio:0.5}];
|
||||
let value = raw.validate().unwrap();
|
||||
let value = seal(raw).validate().unwrap();
|
||||
let day = NaiveDate::from_ymd_opt(2025,1,3).unwrap();
|
||||
for (held, expected) in [(1000,500),(3000,1500)] {
|
||||
let mut portfolio = PortfolioState::new(100_000.0);
|
||||
@@ -439,7 +487,7 @@ mod tests {
|
||||
fn empty_complete_snapshot_clears_only_that_accounts_holdings() {
|
||||
let mut raw = book();
|
||||
raw.snapshots[0].actions.clear();
|
||||
let value = raw.validate().unwrap();
|
||||
let value = seal(raw).validate().unwrap();
|
||||
let day = NaiveDate::from_ymd_opt(2025,1,3).unwrap();
|
||||
let mut portfolio = PortfolioState::new(100_000.0);
|
||||
portfolio.position_mut("000002.SZ").buy(day,200,10.0);
|
||||
@@ -454,4 +502,26 @@ mod tests {
|
||||
assert!(!config.rotation_enabled && config.signal_book.is_some());
|
||||
assert!(matches!(config.explicit_actions.as_slice(),[crate::PlatformTradeAction::ConsumeSignal]));
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn changed_valid_contents_must_not_reuse_a_version_hash() {
|
||||
let mut raw=book();
|
||||
raw.snapshots[0].actions=vec![SignalAction::TargetWeight{symbol:"000001.SZ".into(),weight:0.4}];
|
||||
assert_eq!(raw.clone().validate().unwrap_err(),"signal_book_content_hash_mismatch");
|
||||
seal(raw).validate().unwrap();
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn completed_daily_inputs_may_be_published_after_market_close() {
|
||||
let mut raw=book();
|
||||
raw.expected_decisions=vec!["2026-07-07T09:30:00+08:00".parse().unwrap()];
|
||||
raw.snapshots[0].decision_at=raw.expected_decisions[0];
|
||||
raw.snapshots[0].input_as_of="2026-07-06T15:30:00+08:00".parse().unwrap();
|
||||
raw.snapshots[0].input_available_at="2026-07-06T16:00:00+08:00".parse().unwrap();
|
||||
raw.snapshots[0].signal_at=raw.snapshots[0].input_available_at;
|
||||
raw.snapshots[0].generated_at=raw.snapshots[0].input_available_at;
|
||||
raw.snapshots[0].published_at=raw.snapshots[0].generated_at;
|
||||
raw.provenance=SignalProvenance::Observed;
|
||||
seal(raw).validate().unwrap().require_observed().unwrap();
|
||||
}
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user