Compare commits
7 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
| 4664f1a2d3 | |||
| 40481e8825 | |||
| 2473cc04bb | |||
| 3fa1004ec5 | |||
| c4632bacf1 | |||
| 7dcaae594a | |||
| 999bf5bd01 |
@@ -15,6 +15,13 @@ fn main() -> Result<(), Box<dyn std::error::Error>> {
|
||||
io::stdin().read_to_string(&mut input)?;
|
||||
let output = if input.trim().is_empty() {
|
||||
factor_events::catalog()
|
||||
} else if serde_json::from_str::<Value>(&input)?.get("rank_history").is_some() {
|
||||
#[derive(Deserialize)]
|
||||
#[serde(deny_unknown_fields)]
|
||||
struct Rank { dates:Vec<chrono::NaiveDate>, universe:Vec<String>, values:std::collections::BTreeMap<String,Vec<Option<f64>>> }
|
||||
let value:Value=serde_json::from_str(&input)?;
|
||||
let request:Rank=serde_json::from_value(value["rank_history"].clone())?;
|
||||
json!({"result":fidc_core::factor_cross_section::rank_history(&request.dates,&request.universe,&request.values)?})
|
||||
} else {
|
||||
let request: Request = serde_json::from_str(&input)?;
|
||||
let results = request
|
||||
|
||||
@@ -0,0 +1,9 @@
|
||||
use std::io::{self, Read};
|
||||
fn main() {
|
||||
let mut input=String::new();io::stdin().read_to_string(&mut input).unwrap();
|
||||
let request=serde_json::from_str(&input).unwrap();
|
||||
match fidc_core::market_event_context::aggregate(request) {
|
||||
Ok(value)=>println!("{}",serde_json::to_string(&value).unwrap()),
|
||||
Err(error)=>{eprintln!("{error}");std::process::exit(1);}
|
||||
}
|
||||
}
|
||||
@@ -233,7 +233,7 @@ pub(crate) fn evaluate_with_context(
|
||||
.iter()
|
||||
.map(|b| (b.date, b))
|
||||
.collect::<BTreeMap<_, _>>();
|
||||
if by_day.len() != series.bars.len() || series.bars.iter().any(|b| !days.contains(&b.date)) {
|
||||
if by_day.len() != series.bars.len() || series.bars.iter().any(|b| days.binary_search(&b.date).is_err()) {
|
||||
return Err(format!(
|
||||
"pattern_input_invalid: symbol={}, reason=duplicate_or_out_of_scope",
|
||||
series.symbol
|
||||
@@ -393,7 +393,7 @@ pub(crate) fn evaluate_with_context(
|
||||
)?;
|
||||
if value < 0.0 || (name == "prev_close" && value == 0.0) {
|
||||
return Err(format!(
|
||||
"pattern_input_invalid: {} {d} {name}",
|
||||
"pattern_input_invalid: symbol={}, date={d}, field={name}, reason=invalid_value",
|
||||
series.symbol
|
||||
));
|
||||
}
|
||||
@@ -674,6 +674,13 @@ pub fn evaluate_batch(
|
||||
spec: PatternSpec,
|
||||
days: &[NaiveDate],
|
||||
series: &[PatternSeries],
|
||||
) -> Result<Value, String> {
|
||||
evaluate_batch_with_policy(spec, days, series, false)
|
||||
}
|
||||
|
||||
/// Partial results are research diagnostics, never strategy execution inputs.
|
||||
pub fn evaluate_batch_with_policy(
|
||||
spec: PatternSpec, days: &[NaiveDate], series: &[PatternSeries], isolate_data_errors: bool,
|
||||
) -> Result<Value, String> {
|
||||
let spec = spec.validate()?;
|
||||
if series.is_empty()
|
||||
@@ -689,13 +696,26 @@ pub fn evaluate_batch(
|
||||
}
|
||||
let rows = series
|
||||
.iter()
|
||||
.map(|s| evaluate(&spec, days, s))
|
||||
.map(|s| research_row(evaluate(&spec, days, s), s, isolate_data_errors))
|
||||
.collect::<Result<Vec<_>, _>>()?;
|
||||
Ok(
|
||||
json!({"contract":CONTRACT,"spec":spec,"required_history":spec.history_len(),"rows":rows,"read_only":true}),
|
||||
)
|
||||
}
|
||||
|
||||
fn research_row(result: Result<PatternResult, String>, series: &PatternSeries, isolate: bool) -> Result<Value, String> {
|
||||
match result {
|
||||
Ok(row) => Ok(json!(row)),
|
||||
Err(detail) if isolate && detail.starts_with(&format!("pattern_input_invalid: symbol={},", series.symbol)) => {
|
||||
let fields = detail.split(", ").filter_map(|p| p.split_once('=')).collect::<BTreeMap<_,_>>();
|
||||
Ok(json!({"symbol":series.symbol,"name":series.name,"matched":null,"score":null,
|
||||
"checks":[],"values":{},"anchor":null,"exclusion":null,
|
||||
"data_issue":{"reason":fields.get("reason"),"date":fields.get("date"),"field":fields.get("field"),"detail":detail}}))
|
||||
},
|
||||
Err(error) => Err(error),
|
||||
}
|
||||
}
|
||||
|
||||
/// Values are supplied only by the verified research transport or dataset context builder.
|
||||
#[derive(Debug, Clone, Default, Deserialize)]
|
||||
#[serde(deny_unknown_fields)]
|
||||
@@ -710,8 +730,17 @@ pub fn evaluate_research_batch(
|
||||
spec: PatternSpec, days: &[NaiveDate], series: &[PatternSeries],
|
||||
context: &ResearchContext, numeric_output: bool,
|
||||
) -> Result<Value, String> {
|
||||
let common_fields = ["index_open", "index_high", "index_low", "index_close"];
|
||||
let symbol_fields = ["scope_rank", "scope_percentile", "scope_size"];
|
||||
evaluate_research_batch_with_policy(spec, days, series, context, numeric_output, false)
|
||||
}
|
||||
|
||||
pub fn evaluate_research_batch_with_policy(
|
||||
spec: PatternSpec, days: &[NaiveDate], series: &[PatternSeries],
|
||||
context: &ResearchContext, numeric_output: bool, isolate_data_errors: bool,
|
||||
) -> Result<Value, String> {
|
||||
let common_fields = ["index_open", "index_high", "index_low", "index_close"].into_iter()
|
||||
.chain(crate::market_event_context::COMMON_FIELDS.iter().copied()).collect::<Vec<_>>();
|
||||
let symbol_fields = ["scope_rank", "scope_percentile", "scope_size"].into_iter()
|
||||
.chain(crate::market_event_context::INDUSTRY_FIELDS.iter().copied()).collect::<Vec<_>>();
|
||||
if spec.template != "expression" || series.is_empty() || series.len() > 200
|
||||
|| series.iter().map(|s| &s.symbol).collect::<BTreeSet<_>>().len() != series.len()
|
||||
|| context.common.keys().any(|k| !common_fields.contains(&k.as_str()))
|
||||
@@ -720,7 +749,9 @@ pub fn evaluate_research_batch(
|
||||
return Err("research_context_scope_or_fields_invalid".into());
|
||||
}
|
||||
for (name, values) in &context.common {
|
||||
if values.len() != days.len() || values.iter().any(|v| !v.is_some_and(|x| x.is_finite() && x > 0.0)) {
|
||||
if values.len() != days.len() || values.iter().any(|v| if name.starts_with("index_") {
|
||||
!v.is_some_and(|x| x.is_finite() && x > 0.0)
|
||||
} else { v.is_some_and(|x| !x.is_finite()) }) {
|
||||
return Err(format!("research_index_window_incomplete: {name}"));
|
||||
}
|
||||
}
|
||||
@@ -741,8 +772,8 @@ pub fn evaluate_research_batch(
|
||||
return Err(format!("research_context_invalid: {} {name}", item.symbol));
|
||||
}
|
||||
}
|
||||
let mut result = evaluate_with_context(&spec, days, item, &fields, numeric_output)?;
|
||||
result.values["research_context_latest"] = json!(fields.iter().map(|(k,v)|(k,v.last().copied().flatten())).collect::<BTreeMap<_,_>>());
|
||||
let mut result = research_row(evaluate_with_context(&spec, days, item, &fields, numeric_output), item, isolate_data_errors)?;
|
||||
result["values"]["research_context_latest"] = json!(fields.iter().map(|(k,v)|(k,v.last().copied().flatten())).collect::<BTreeMap<_,_>>());
|
||||
rows.push(result);
|
||||
}
|
||||
Ok(json!({"contract":CONTRACT,"context_contract":"fidc_research_event_context_v1","spec":spec,
|
||||
@@ -786,6 +817,22 @@ pub fn expression_specs(expression: &str) -> Result<Vec<PatternSpec>, String> {
|
||||
mod tests {
|
||||
use super::*;
|
||||
#[test]
|
||||
fn research_isolates_missing_listing_day_without_weakening_execution() {
|
||||
let days = ["2026-06-11", "2026-06-12"].map(|d|d.parse::<NaiveDate>().unwrap());
|
||||
let spec: PatternSpec = serde_json::from_value(json!({"template":"ma_below","parameters":{"ma_window":2}})).unwrap();
|
||||
let make = |symbol: &str| -> PatternSeries { serde_json::from_value(json!({"symbol":symbol,"listed_at":"2026-06-11","bars":days.map(|d|json!({"date":d,"open":10.,"high":11.,"low":9.,"close":10.,"volume":100.,"adjustment_factor_backward1":1.,"paused":false,"source_path":"/controlled/source.parquet"}))})).unwrap() };
|
||||
let complete=make("300395.SZ");let mut missing=make("920083.BJ");missing.bars.remove(0);
|
||||
let members=[complete.clone(),missing];
|
||||
assert!(evaluate_batch(spec.clone(),&days,&members).unwrap_err().contains("missing_market_row"));
|
||||
let partial=evaluate_batch_with_policy(spec.clone(),&days,&members,true).unwrap();
|
||||
assert_eq!(partial["rows"][0],json!(evaluate(&spec.validate().unwrap(),&days,&complete).unwrap()));
|
||||
assert!(partial["rows"][1]["matched"].is_null());
|
||||
assert_eq!(partial["rows"][1]["data_issue"]["date"],"2026-06-11");
|
||||
assert_eq!(partial["rows"][1]["data_issue"]["reason"],"missing_market_row");
|
||||
let invalid:PatternSpec=serde_json::from_value(json!({"template":"not-a-template"})).unwrap();
|
||||
assert!(evaluate_batch_with_policy(invalid,&days,&members,true).is_err());
|
||||
}
|
||||
#[test]
|
||||
fn research_index_and_ranking_context_never_unlock_strategy_mapping() {
|
||||
let days=["2026-09-04","2026-09-07","2026-09-08"].map(|s|s.parse::<NaiveDate>().unwrap());
|
||||
let spec:PatternSpec=serde_json::from_value(json!({"template":"expression","parameters":{"history_window":3},
|
||||
|
||||
@@ -3375,6 +3375,12 @@ impl DataSet {
|
||||
.unwrap_or(&[])
|
||||
}
|
||||
|
||||
pub fn is_reference_only_benchmark(&self, symbol: &str) -> bool {
|
||||
if symbol != self.benchmark_code() { return false; }
|
||||
let Some(symbol_id) = self.symbol_id(symbol) else { return true; };
|
||||
!self.candidate_symbol_ids_by_date.values().any(|ids| ids.contains(&symbol_id))
|
||||
}
|
||||
|
||||
pub fn bundle_on(&self, date: NaiveDate) -> Result<DailySnapshotBundle, DataSetError> {
|
||||
let benchmark = self
|
||||
.benchmark(date)
|
||||
@@ -6229,7 +6235,7 @@ mod tests {
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn baseline_selection_uses_structured_instrument_dates_and_status_only() {
|
||||
fn baseline_selection_uses_dated_lifecycle_not_latest_undated_status() {
|
||||
let date = NaiveDate::parse_from_str("2025-01-02", "%Y-%m-%d").unwrap();
|
||||
let instrument = |name: &str, status: &str, delisted_at: Option<NaiveDate>| Instrument {
|
||||
symbol: "000001.SZ".to_string(),
|
||||
@@ -6257,7 +6263,7 @@ mod tests {
|
||||
Some(&instrument("退市测试", "active", None)),
|
||||
date
|
||||
));
|
||||
assert!(!instrument_passes_baseline_selection(
|
||||
assert!(instrument_passes_baseline_selection(
|
||||
Some(&instrument("正常名称", "delisted", None)),
|
||||
date
|
||||
));
|
||||
|
||||
+112
-18
@@ -468,9 +468,17 @@ pub struct BacktestEngine<S, C, R> {
|
||||
preplanned_decision_quote_symbols_by_date: Option<Arc<BTreeMap<NaiveDate, BTreeSet<String>>>>,
|
||||
execution_quote_request_cache:
|
||||
BTreeSet<(NaiveDate, String, Option<NaiveTime>, Option<NaiveTime>)>,
|
||||
execution_absence_notes: BTreeMap<NaiveDate, Vec<String>>,
|
||||
execution_lifecycle_reported: BTreeSet<(String, String)>,
|
||||
risk_free_rate_contract: Option<RiskFreeRateContract>,
|
||||
}
|
||||
|
||||
fn all_instruments_have_dated_absence(data: &DataSet, date: NaiveDate) -> bool {
|
||||
let mut instruments = data.instruments().values()
|
||||
.filter(|instrument| !data.is_reference_only_benchmark(&instrument.symbol)).peekable();
|
||||
instruments.peek().is_some() && instruments.all(|instrument| instrument.dated_market_absence_reason(date).is_some())
|
||||
}
|
||||
|
||||
fn backtest_execution_schedule(
|
||||
data: &DataSet,
|
||||
start_date: Option<NaiveDate>,
|
||||
@@ -493,10 +501,15 @@ fn backtest_execution_schedule(
|
||||
if decision_lag_trading_days == 0 {
|
||||
if has_decision_inputs(execution_date) {
|
||||
schedule.push((execution_date, Some((calendar_idx, execution_date))));
|
||||
} else if all_instruments_have_dated_absence(data, execution_date) {
|
||||
schedule.push((execution_date, None));
|
||||
}
|
||||
continue;
|
||||
}
|
||||
if !has_execution_market(execution_date) {
|
||||
if all_instruments_have_dated_absence(data, execution_date) {
|
||||
schedule.push((execution_date, None));
|
||||
}
|
||||
continue;
|
||||
}
|
||||
let decision_slot = calendar_idx
|
||||
@@ -507,6 +520,7 @@ fn backtest_execution_schedule(
|
||||
schedule.push((execution_date, decision_slot));
|
||||
}
|
||||
None => schedule.push((execution_date, None)),
|
||||
Some((_, decision_date)) if all_instruments_have_dated_absence(data, decision_date) => schedule.push((execution_date, None)),
|
||||
_ => {}
|
||||
}
|
||||
}
|
||||
@@ -554,6 +568,8 @@ impl<S, C, R> BacktestEngine<S, C, R> {
|
||||
execution_quote_loader: None,
|
||||
preplanned_decision_quote_symbols_by_date: None,
|
||||
execution_quote_request_cache: BTreeSet::new(),
|
||||
execution_absence_notes: BTreeMap::new(),
|
||||
execution_lifecycle_reported: BTreeSet::new(),
|
||||
risk_free_rate_contract: None,
|
||||
}
|
||||
}
|
||||
@@ -768,6 +784,31 @@ where
|
||||
end_time: Option<NaiveTime>,
|
||||
symbols: &mut BTreeSet<String>,
|
||||
) -> Result<(), BacktestError> {
|
||||
let mut available = BTreeSet::new();
|
||||
for symbol in symbols.iter() {
|
||||
let instrument = self.data.instrument(symbol).ok_or_else(|| BacktestError::Execution(format!(
|
||||
"execution_data_missing reason=instrument_metadata_or_code_mapping_missing symbol={symbol} execution_date={execution_date}"
|
||||
)))?;
|
||||
if let Some(reason) = instrument.dated_market_absence_reason(execution_date) {
|
||||
if self.data.price(execution_date, symbol, PriceField::Close).is_some()
|
||||
|| !self.data.execution_quotes_on(execution_date, symbol).is_empty()
|
||||
{
|
||||
return Err(BacktestError::Execution(format!(
|
||||
"execution_data_conflict reason={reason} symbol={symbol} execution_date={execution_date} listed_at={:?} delisted_at={:?}",
|
||||
instrument.listed_at, instrument.delisted_at
|
||||
)));
|
||||
}
|
||||
if self.execution_lifecycle_reported.insert((symbol.clone(), reason.to_string())) {
|
||||
self.execution_absence_notes.entry(execution_date).or_default().push(format!(
|
||||
"execution_data_absence reason={reason} symbol={symbol} execution_date={execution_date} listed_at={:?} delisted_at={:?} no_price_fill=true",
|
||||
instrument.listed_at, instrument.delisted_at
|
||||
));
|
||||
}
|
||||
continue;
|
||||
}
|
||||
available.insert(symbol.clone());
|
||||
}
|
||||
*symbols = available;
|
||||
symbols.retain(|symbol| {
|
||||
let request_key = (execution_date, symbol.clone(), start_time, end_time);
|
||||
if self.execution_quote_request_cache.contains(&request_key) {
|
||||
@@ -835,9 +876,6 @@ where
|
||||
let mut paused_with_quotes = Vec::new();
|
||||
let mut missing_daily_market = Vec::new();
|
||||
for symbol in requested_symbols {
|
||||
let Some(_candidate) = self.data.candidate(execution_date, symbol) else {
|
||||
continue;
|
||||
};
|
||||
let Some(market) = self.data.market(execution_date, symbol) else {
|
||||
missing_daily_market.push(symbol.clone());
|
||||
continue;
|
||||
@@ -2191,12 +2229,13 @@ where
|
||||
date: execution_date,
|
||||
})?;
|
||||
let notes = join_text_parts(corporate_action_notes.into_iter());
|
||||
let absence = all_instruments_have_dated_absence(&self.data, execution_date);
|
||||
let diagnostics = join_text_parts(
|
||||
std::iter::once(format!(
|
||||
"decision_lag_warmup lag_days={} execution_index={}",
|
||||
self.config.decision_lag_trading_days, execution_idx
|
||||
))
|
||||
.chain(broker_diagnostics.into_iter()),
|
||||
std::iter::once(if absence {
|
||||
format!("execution_data_absence reason=all_instruments_outside_dated_lifecycle execution_date={execution_date} cash_period_retained=true no_price_fill=true")
|
||||
} else { format!("decision_lag_warmup lag_days={} execution_index={}", self.config.decision_lag_trading_days, execution_idx) })
|
||||
.chain(broker_diagnostics.into_iter())
|
||||
.chain(self.execution_absence_notes.remove(&execution_date).unwrap_or_default()),
|
||||
);
|
||||
let holdings_for_day = portfolio.holdings_summary(execution_date);
|
||||
let holding_start = result.daily_holdings.len();
|
||||
@@ -2213,7 +2252,7 @@ where
|
||||
previous_external_cash_flow_total = portfolio.external_cash_flow_total();
|
||||
|
||||
result.equity_curve.push(DailyEquityPoint {
|
||||
signal_baseline: true,
|
||||
signal_baseline: execution_idx == 0,
|
||||
date: execution_date,
|
||||
cash: aggregate_cash,
|
||||
market_value: aggregate_market_value,
|
||||
@@ -3364,7 +3403,8 @@ where
|
||||
decision
|
||||
.diagnostics
|
||||
.into_iter()
|
||||
.chain(broker_diagnostics.into_iter()),
|
||||
.chain(broker_diagnostics.into_iter())
|
||||
.chain(self.execution_absence_notes.remove(&execution_date).unwrap_or_default()),
|
||||
);
|
||||
let holdings_for_day = portfolio.holdings_summary(execution_date);
|
||||
let holding_start = result.daily_holdings.len();
|
||||
@@ -3964,17 +4004,11 @@ where
|
||||
let Some(instrument) = self.data.instrument(&symbol) else {
|
||||
continue;
|
||||
};
|
||||
let is_unresolved = instrument.is_delisted_on_or_before(date)
|
||||
|| (instrument.status.eq_ignore_ascii_case("delisted")
|
||||
&& instrument.delisted_at.is_none()
|
||||
&& self.data.market(date, &symbol).is_none());
|
||||
let is_unresolved = instrument.is_delisted_on_or_before(date);
|
||||
if !is_unresolved {
|
||||
continue;
|
||||
}
|
||||
let effective_delisted_at = instrument
|
||||
.delisted_at
|
||||
.or_else(|| self.data.calendar().previous_day(date))
|
||||
.unwrap_or(date);
|
||||
let effective_delisted_at = instrument.delisted_at.expect("dated delisting checked");
|
||||
let reason = format!(
|
||||
concat!(
|
||||
"unresolved_delisted_position symbol={} quantity={} effective_date={} status={} ",
|
||||
@@ -5543,6 +5577,34 @@ mod tests {
|
||||
);
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn wholly_prelisting_universe_retains_cash_days_without_fabricating_prices() {
|
||||
let dates = [d(2025, 1, 2), d(2025, 1, 3), d(2025, 1, 6)];
|
||||
let mut engine = engine_with_matching(MatchingType::CurrentBarClose, PriceField::Close, 0);
|
||||
engine.config.end_date = Some(dates[2]);
|
||||
let mut markets = vec![market(dates[2], 10.0, 10.0)];
|
||||
markets.extend(dates.iter().map(|date| DailyMarketSnapshot { symbol: "000852.SH".into(), ..market(*date, 1000.0, 1000.0) }));
|
||||
engine.data = DataSet::from_components(
|
||||
vec![Instrument { listed_at: Some(dates[2]), ..default_instrument() }, Instrument { symbol: "000852.SH".into(), listed_at: None, ..default_instrument() }],
|
||||
markets, vec![factor(dates[2])], vec![candidate(dates[2])],
|
||||
dates.iter().map(|date| benchmark(*date)).collect(),
|
||||
).unwrap();
|
||||
assert_eq!(super::backtest_execution_dates(&engine.data, Some(dates[0]), Some(dates[2]), 0), dates);
|
||||
assert_eq!(super::backtest_execution_dates(&engine.data, Some(dates[0]), Some(dates[2]), 1), dates);
|
||||
let result = engine.run().unwrap();
|
||||
assert_eq!(result.equity_curve.len(), 3);
|
||||
for point in &result.equity_curve[..2] {
|
||||
assert_eq!(point.total_equity, 100_000.0);
|
||||
assert_eq!(point.market_value, 0.0);
|
||||
assert!(point.diagnostics.contains("cash_period_retained=true"));
|
||||
}
|
||||
assert!(result.order_events.is_empty());
|
||||
assert!(engine.data.market(dates[0], SYMBOL).is_none());
|
||||
assert!(result.equity_curve[0].signal_baseline);
|
||||
assert!(!result.equity_curve[1].signal_baseline);
|
||||
assert!(!super::all_instruments_have_dated_absence(&dataset(), dates[0]));
|
||||
}
|
||||
|
||||
fn engine_with_matching(
|
||||
matching_type: MatchingType,
|
||||
execution_price_field: PriceField,
|
||||
@@ -5996,6 +6058,38 @@ mod tests {
|
||||
.expect("zero-volume stock may have no minute bars");
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn lifecycle_quote_filter_skips_only_dated_legal_absence_before_loading() {
|
||||
let date = d(2025, 9, 10);
|
||||
for (symbol, listed_at, delisted_at, reason) in [
|
||||
("920038.BJ", Some(d(2026, 8, 5)), None, "not_yet_listed"),
|
||||
("563360.SH", Some(d(2026, 8, 5)), None, "not_yet_listed"),
|
||||
("000001.SZ", Some(d(2010, 1, 1)), Some(d(2025, 9, 9)), "delisted"),
|
||||
] {
|
||||
let instrument = Instrument { symbol: symbol.into(), listed_at, delisted_at, ..default_instrument() };
|
||||
let data = DataSet::from_components(vec![instrument], vec![], vec![], vec![], vec![benchmark(date)]).unwrap();
|
||||
let mut engine = full_day_coverage_engine(data, date);
|
||||
engine.execution_quote_loader = Some(Box::new(|_| panic!("legal lifecycle absence must not load prices")));
|
||||
engine.load_missing_execution_quotes(date, None, None, &mut BTreeSet::from([symbol.to_string()])).unwrap();
|
||||
let notes = engine.execution_absence_notes.get(&date).unwrap();
|
||||
assert!(notes[0].contains(reason));
|
||||
assert!(notes[0].contains(symbol));
|
||||
engine.load_missing_execution_quotes(date, None, None, &mut BTreeSet::from([symbol.to_string()])).unwrap();
|
||||
assert_eq!(engine.execution_absence_notes[&date].len(), 1);
|
||||
}
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn unknown_identity_or_missing_candidate_does_not_waive_quote_coverage() {
|
||||
let date = d(2025, 9, 10);
|
||||
let data = DataSet::from_components(vec![default_instrument()], vec![], vec![], vec![], vec![benchmark(date)]).unwrap();
|
||||
let mut engine = full_day_coverage_engine(data, date);
|
||||
let error = engine.load_missing_execution_quotes(date, None, None, &mut BTreeSet::from(["unmapped".to_string()])).unwrap_err();
|
||||
assert!(error.to_string().contains("instrument_metadata_or_code_mapping_missing"));
|
||||
let error = engine.validate_full_day_execution_quote_coverage(date, &[SYMBOL.to_string()]).unwrap_err();
|
||||
assert!(error.to_string().contains("missing_daily_market"));
|
||||
}
|
||||
|
||||
fn run_scheduled_next_open_with_dataset(dataset: DataSet) -> super::BacktestResult {
|
||||
run_scheduled_next_open_with_dataset_and_broker(
|
||||
dataset,
|
||||
|
||||
@@ -169,6 +169,12 @@ const OPERATORS: &[&str] = &[
|
||||
];
|
||||
|
||||
pub fn catalog() -> Value {
|
||||
use sha2::{Digest, Sha256};
|
||||
let mut implementation = Sha256::new();
|
||||
for file in [include_bytes!("factor_events.rs").as_slice(), include_bytes!("factor_cross_section.rs").as_slice(),
|
||||
include_bytes!("daily_patterns.rs").as_slice(),include_bytes!("market_event_context.rs").as_slice(),
|
||||
include_bytes!("session_events.rs").as_slice(),include_bytes!("pattern_context.rs").as_slice(),TA_REV.as_bytes()] {implementation.update(file);}
|
||||
let implementation_sha256=format!("{:x}",implementation.finalize());
|
||||
let indicators: Vec<Value> = abstract_api::funcs().map(|f| json!({
|
||||
"name":f.name, "group":format!("{:?}",f.group), "description":f.hint,
|
||||
"inputs":f.inputs.iter().map(|p|json!({"name":p.param_name,"kind":format!("{:?}",p.kind),"flags":p.flags.0})).collect::<Vec<_>>(),
|
||||
@@ -176,9 +182,13 @@ pub fn catalog() -> Value {
|
||||
"outputs":f.outputs.iter().enumerate().map(|(i,p)|json!({"index":i,"name":p.param_name,"kind":format!("{:?}",p.kind)})).collect::<Vec<_>>(),
|
||||
"unstable_period":format!("{:?}",f.unst_id), "production_eligible":false,
|
||||
})).collect();
|
||||
json!({"contract":CONTRACT,"library":{"name":"TA-Lib native Rust","revision":TA_REV,"license":"BSD-3-Clause"},
|
||||
json!({"contract":CONTRACT,"expression_kernel_sha256":implementation_sha256,"library":{"name":"TA-Lib native Rust","revision":TA_REV,"license":"BSD-3-Clause"},
|
||||
"execution_context_contract":crate::pattern_context::CONTRACT,
|
||||
"execution_context_fields":crate::pattern_context::CONTEXT_FIELDS,
|
||||
"market_event_context_contract":crate::market_event_context::CONTRACT,
|
||||
"market_event_kernel_sha256":crate::market_event_context::implementation_sha256(),
|
||||
"market_event_common_fields":crate::market_event_context::COMMON_FIELDS,
|
||||
"market_event_industry_fields":crate::market_event_context::INDUSTRY_FIELDS,
|
||||
"session_events":crate::session_events::EVENTS,"session_event_contract":crate::session_events::CONTRACT,
|
||||
"indicators":indicators,"operators":OPERATORS,"cross_section_operators":crate::factor_cross_section::OPERATORS,"read_only":true,"live_routing":false,
|
||||
"policies":{"null":"unknown_not_false","warmup":"null_until_full_history","recursive_seed":"frozen_input_start",
|
||||
|
||||
@@ -70,8 +70,17 @@ impl Instrument {
|
||||
|
||||
pub fn is_active_on(&self, date: NaiveDate) -> bool {
|
||||
self.listed_at.is_none_or(|listed_at| listed_at <= date)
|
||||
&& !self.is_delisted_before(date)
|
||||
&& !(self.status.eq_ignore_ascii_case("inactive") && self.delisted_at.is_none())
|
||||
&& !self.is_delisted_on_or_before(date)
|
||||
}
|
||||
|
||||
pub fn dated_market_absence_reason(&self, date: NaiveDate) -> Option<&'static str> {
|
||||
if self.listed_at.is_some_and(|listed| date < listed) {
|
||||
Some("not_yet_listed")
|
||||
} else if self.is_delisted_on_or_before(date) {
|
||||
Some("delisted")
|
||||
} else {
|
||||
None
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@@ -107,6 +116,25 @@ mod tests {
|
||||
}
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn lifecycle_is_dated_and_latest_undated_terminal_status_is_not_historical_evidence() {
|
||||
let mut item = instrument("BJS", 100);
|
||||
let listing = chrono::NaiveDate::from_ymd_opt(2026, 8, 5).unwrap();
|
||||
let removal = chrono::NaiveDate::from_ymd_opt(2026, 9, 10).unwrap();
|
||||
item.listed_at = Some(listing);
|
||||
item.delisted_at = Some(removal);
|
||||
assert_eq!(item.dated_market_absence_reason(listing.pred_opt().unwrap()), Some("not_yet_listed"));
|
||||
assert!(item.is_active_on(listing));
|
||||
assert!(!item.is_active_on(removal));
|
||||
assert_eq!(item.dated_market_absence_reason(removal), Some("delisted"));
|
||||
item.delisted_at = None;
|
||||
for status in ["delisting", "delisted", "inactive", "terminated"] {
|
||||
item.status = status.into();
|
||||
assert!(item.is_active_on(listing));
|
||||
assert_eq!(item.dated_market_absence_reason(listing), None);
|
||||
}
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn order_quantity_rules_are_case_insensitive_without_allocating_normalized_boards() {
|
||||
let kcb = instrument(" kSh ", 100);
|
||||
|
||||
@@ -7,6 +7,7 @@ pub mod pattern_context;
|
||||
pub mod session_events;
|
||||
pub mod factor_events;
|
||||
pub mod factor_cross_section;
|
||||
pub mod market_event_context;
|
||||
pub mod engine;
|
||||
pub mod event_bus;
|
||||
pub mod events;
|
||||
|
||||
@@ -0,0 +1,257 @@
|
||||
//! Complete published daily cross sections, independent of trading candidates and accounts.
|
||||
use chrono::NaiveDate;
|
||||
use serde::{Deserialize, Serialize};
|
||||
use std::collections::{BTreeMap, BTreeSet};
|
||||
|
||||
pub const CONTRACT: &str = "fidc_market_event_context_v1";
|
||||
pub fn implementation_sha256() -> String {
|
||||
use sha2::{Digest, Sha256};
|
||||
format!("{:x}", Sha256::digest(include_bytes!("market_event_context.rs")))
|
||||
}
|
||||
pub const COMMON_FIELDS: &[&str] = &[
|
||||
"market_breadth", "market_return", "market_limit_up_count", "market_limit_down_count",
|
||||
"market_limit_up_rate", "market_broken_limit_rate", "market_high_board", "market_profit_effect",
|
||||
];
|
||||
pub const INDUSTRY_FIELDS: &[&str] = &[
|
||||
"industry_close", "industry_return_20", "industry_breadth", "industry_rank", "industry_size",
|
||||
];
|
||||
|
||||
#[derive(Clone, Deserialize)]
|
||||
#[serde(deny_unknown_fields)]
|
||||
pub struct Observation {
|
||||
pub symbol: String,
|
||||
pub industry: Option<String>,
|
||||
pub close: Option<f64>,
|
||||
pub high: Option<f64>,
|
||||
pub previous_close: Option<f64>,
|
||||
pub upper_limit: Option<f64>,
|
||||
pub lower_limit: Option<f64>,
|
||||
pub no_limit: Option<bool>,
|
||||
pub paused: Option<bool>,
|
||||
}
|
||||
|
||||
#[derive(Deserialize)]
|
||||
#[serde(deny_unknown_fields)]
|
||||
pub struct Day {
|
||||
pub date: NaiveDate,
|
||||
pub universe: Vec<String>,
|
||||
pub rows: Vec<Observation>,
|
||||
}
|
||||
|
||||
#[derive(Default, Clone, Deserialize, Serialize)]
|
||||
#[serde(default, deny_unknown_fields)]
|
||||
pub struct State {
|
||||
pub last_date: Option<NaiveDate>,
|
||||
pub streaks: BTreeMap<String, Option<u32>>,
|
||||
pub limit_ups: BTreeSet<String>,
|
||||
pub industry_history: BTreeMap<String, Vec<f64>>,
|
||||
}
|
||||
|
||||
#[derive(Deserialize)]
|
||||
#[serde(deny_unknown_fields)]
|
||||
pub struct Request {
|
||||
pub days: Vec<Day>,
|
||||
#[serde(default)]
|
||||
pub previous: State,
|
||||
}
|
||||
|
||||
#[derive(Serialize)]
|
||||
pub struct OutputDay {
|
||||
pub date: NaiveDate,
|
||||
pub common: BTreeMap<String, Option<f64>>,
|
||||
pub industries: BTreeMap<String, BTreeMap<String, Option<f64>>>,
|
||||
pub members: BTreeMap<String, Option<String>>,
|
||||
pub securities: usize,
|
||||
pub active: usize,
|
||||
pub paused: usize,
|
||||
pub no_limit: usize,
|
||||
pub profit_effect_members: Vec<String>,
|
||||
pub profit_effect_missing: Vec<String>,
|
||||
pub industry_missing: Vec<String>,
|
||||
}
|
||||
|
||||
#[derive(Serialize)]
|
||||
pub struct Output {
|
||||
pub contract: &'static str,
|
||||
pub days: Vec<OutputDay>,
|
||||
pub state: State,
|
||||
}
|
||||
|
||||
fn positive(value: Option<f64>, symbol: &str, field: &str) -> Result<f64, String> {
|
||||
value.filter(|v| v.is_finite() && *v > 0.0)
|
||||
.ok_or_else(|| format!("market_event_input_invalid: {symbol} {field}"))
|
||||
}
|
||||
fn average(values: impl Iterator<Item = f64>, n: usize) -> f64 {
|
||||
values.map(|v| v / n as f64).sum()
|
||||
}
|
||||
|
||||
pub fn aggregate(request: Request) -> Result<Output, String> {
|
||||
let mut state = request.previous;
|
||||
if request.days.is_empty() || request.days.len() > 30
|
||||
|| request.days.iter().map(|d| d.rows.len()).sum::<usize>() > 60_000
|
||||
|| state.streaks.len() > 20_000 || state.limit_ups.len() > 20_000
|
||||
|| state.industry_history.len() > 2000
|
||||
|| state.industry_history.values().any(|v| v.is_empty() || v.len() > 21
|
||||
|| v.iter().any(|x| !x.is_finite() || *x <= 0.0))
|
||||
|| state.last_date.is_none() && (!state.streaks.is_empty() || !state.limit_ups.is_empty() || !state.industry_history.is_empty()) {
|
||||
return Err("market_event_history_budget_or_state_invalid".into());
|
||||
}
|
||||
let mut output = Vec::new();
|
||||
for day in request.days {
|
||||
if state.last_date.is_some_and(|d| d >= day.date)
|
||||
|| day.universe.is_empty() || day.universe.len() > 20_000
|
||||
|| day.universe.iter().collect::<BTreeSet<_>>().len() != day.universe.len()
|
||||
|| day.rows.len() != day.universe.len()
|
||||
|| day.rows.iter().map(|r| &r.symbol).collect::<BTreeSet<_>>() != day.universe.iter().collect::<BTreeSet<_>>() {
|
||||
return Err(format!("market_event_incomplete_cross_section: {}", day.date));
|
||||
}
|
||||
let mut returns = BTreeMap::new();
|
||||
let mut groups: BTreeMap<String, Vec<f64>> = BTreeMap::new();
|
||||
let mut members = BTreeMap::new();
|
||||
let mut streaks = BTreeMap::new();
|
||||
let mut ups = BTreeSet::new();
|
||||
let mut downs = 0; let mut touched = 0; let mut broken = 0; let mut paused = 0; let mut unlimited = 0;
|
||||
for row in &day.rows {
|
||||
let industry = row.industry.clone().filter(|s| !s.trim().is_empty());
|
||||
members.insert(row.symbol.clone(), industry.clone());
|
||||
match row.paused {
|
||||
Some(true) => {
|
||||
paused += 1;
|
||||
streaks.insert(row.symbol.clone(), state.streaks.get(&row.symbol).copied().flatten());
|
||||
continue;
|
||||
},
|
||||
Some(false) => {},
|
||||
None => return Err(format!("market_event_pause_state_missing: {} {}", day.date, row.symbol)),
|
||||
}
|
||||
let c = positive(row.close, &row.symbol, "close")?;
|
||||
let h = positive(row.high, &row.symbol, "high")?;
|
||||
let p = positive(row.previous_close, &row.symbol, "previous_close")?;
|
||||
if h + 1e-8 < c { return Err(format!("market_event_high_below_close: {}", row.symbol)); }
|
||||
let change = c / p - 1.0;
|
||||
returns.insert(row.symbol.clone(), change);
|
||||
if let Some(industry) = industry { groups.entry(industry).or_default().push(change); }
|
||||
let is_up = match row.no_limit {
|
||||
Some(true) => { unlimited += 1; false },
|
||||
Some(false) => {
|
||||
let upper = positive(row.upper_limit, &row.symbol, "upper_limit")?;
|
||||
let lower = positive(row.lower_limit, &row.symbol, "lower_limit")?;
|
||||
if lower >= upper || c > upper + 1e-8 || c < lower - 1e-8 {
|
||||
return Err(format!("market_event_limit_bounds_invalid: {} {}", day.date, row.symbol));
|
||||
}
|
||||
let at_up = (c - upper).abs() <= 1e-8;
|
||||
if (c - lower).abs() <= 1e-8 { downs += 1; }
|
||||
if h >= upper - 1e-8 { touched += 1; if !at_up { broken += 1; } }
|
||||
at_up
|
||||
},
|
||||
None => return Err(format!("market_event_limit_policy_missing: {}", row.symbol)),
|
||||
};
|
||||
if is_up {
|
||||
ups.insert(row.symbol.clone());
|
||||
// The first observed limit-up may already be a continuing streak.
|
||||
streaks.insert(row.symbol.clone(), state.streaks.get(&row.symbol).copied().flatten().map(|v| v + 1));
|
||||
} else { streaks.insert(row.symbol.clone(), Some(0)); }
|
||||
}
|
||||
let active = returns.len();
|
||||
if active == 0 { return Err(format!("market_event_no_active_market: {}", day.date)); }
|
||||
let previous_ups = state.limit_ups.iter().cloned().collect::<Vec<_>>();
|
||||
let profit_missing = previous_ups.iter().filter(|s| !returns.contains_key(*s)).cloned().collect::<Vec<_>>();
|
||||
let profit = if previous_ups.is_empty() || !profit_missing.is_empty() { None }
|
||||
else { Some(average(previous_ups.iter().map(|s| returns[s]), previous_ups.len())) };
|
||||
let board = if ups.iter().any(|s| streaks[s].is_none()) { None }
|
||||
else { Some(ups.iter().map(|s| streaks[s].unwrap()).max().unwrap_or(0) as f64) };
|
||||
let common = BTreeMap::from([
|
||||
("market_breadth".into(), Some(returns.values().filter(|v| **v > 0.0).count() as f64 / active as f64)),
|
||||
("market_return".into(), Some(average(returns.values().copied(), active))),
|
||||
("market_limit_up_count".into(), Some(ups.len() as f64)),
|
||||
("market_limit_down_count".into(), Some(downs as f64)),
|
||||
("market_limit_up_rate".into(), (touched > 0).then(|| ups.len() as f64 / touched as f64)),
|
||||
("market_broken_limit_rate".into(), (touched > 0).then(|| broken as f64 / touched as f64)),
|
||||
("market_high_board".into(), board),
|
||||
("market_profit_effect".into(), profit),
|
||||
]);
|
||||
let mut industries = BTreeMap::new();
|
||||
// A disappeared group breaks its continuous history; no stale NAV is carried forward.
|
||||
state.industry_history.retain(|key, _| groups.contains_key(key));
|
||||
for (industry, values) in groups {
|
||||
let history = state.industry_history.entry(industry.clone()).or_default();
|
||||
let nav = history.last().copied().unwrap_or(1.0) * (1.0 + average(values.iter().copied(), values.len()));
|
||||
history.push(nav);
|
||||
if history.len() > 21 { history.remove(0); }
|
||||
let momentum = (history.len() == 21).then(|| nav / history[0] - 1.0);
|
||||
industries.insert(industry, BTreeMap::from([
|
||||
("industry_close".into(), Some(nav)), ("industry_return_20".into(), momentum),
|
||||
("industry_breadth".into(), Some(values.iter().filter(|v| **v > 0.0).count() as f64 / values.len() as f64)),
|
||||
]));
|
||||
}
|
||||
let universe = industries.keys().cloned().collect::<Vec<_>>();
|
||||
let known = industries.values().all(|g| g["industry_return_20"].is_some());
|
||||
let ranks = if known && !universe.is_empty() {
|
||||
crate::factor_cross_section::evaluate("RANK", &universe, &industries.iter().map(|(s,g)|
|
||||
crate::factor_cross_section::Observation {symbol:s.clone(), value:g["industry_return_20"].unwrap(),industry:None,market_cap:None}).collect::<Vec<_>>(),0.0)?
|
||||
.into_iter().map(|r|(r.symbol,r.value)).collect::<BTreeMap<_,_>>()
|
||||
} else { BTreeMap::new() };
|
||||
for (name, fields) in &mut industries {
|
||||
fields.insert("industry_rank".into(), ranks.get(name).copied());
|
||||
fields.insert("industry_size".into(), Some(universe.len() as f64));
|
||||
}
|
||||
let industry_missing=members.iter().filter(|(_,group)|group.is_none()).map(|(s,_)|s.clone()).collect::<Vec<_>>();
|
||||
if !industry_missing.is_empty() {
|
||||
// An unclassified member may belong to any group; never silently shrink a group.
|
||||
state.industry_history.clear();
|
||||
for fields in industries.values_mut() { for value in fields.values_mut() { *value=None; } }
|
||||
}
|
||||
output.push(OutputDay { date:day.date, common, industries, members, securities:day.rows.len(), active, paused,
|
||||
no_limit:unlimited, profit_effect_members:previous_ups, profit_effect_missing:profit_missing, industry_missing });
|
||||
state.last_date = Some(day.date); state.streaks = streaks; state.limit_ups = ups;
|
||||
}
|
||||
Ok(Output {contract:CONTRACT, days:output, state})
|
||||
}
|
||||
|
||||
#[cfg(test)]
|
||||
mod tests {
|
||||
use super::*;
|
||||
fn day(n: u32, up: bool) -> Day {
|
||||
Day {date:NaiveDate::from_ymd_opt(2026,9,n).unwrap(), universe:vec!["A".into(),"B".into()], rows:vec![
|
||||
Observation{symbol:"A".into(),industry:Some("I".into()),close:Some(if up {11.0}else{10.0}),high:Some(11.0),previous_close:Some(10.0),upper_limit:Some(11.0),lower_limit:Some(9.0),no_limit:Some(false),paused:Some(false)},
|
||||
Observation{symbol:"B".into(),industry:Some("J".into()),close:Some(9.0),high:Some(10.0),previous_close:Some(10.0),upper_limit:Some(11.0),lower_limit:Some(9.0),no_limit:Some(false),paused:Some(false)}]}
|
||||
}
|
||||
#[test]
|
||||
fn formulas_use_real_limits_and_full_denominators() {
|
||||
let r=aggregate(Request{days:vec![day(1,false),day(2,true),day(3,true)],previous:State::default()}).unwrap();
|
||||
let d=&r.days[1];
|
||||
assert_eq!(d.common["market_breadth"],Some(0.5));
|
||||
assert_eq!(d.common["market_limit_down_count"],Some(1.0));
|
||||
assert_eq!(d.common["market_limit_up_rate"],Some(1.0));
|
||||
assert_eq!(r.days[0].common["market_limit_up_rate"],Some(0.0));
|
||||
assert_eq!(r.days[0].common["market_broken_limit_rate"],Some(1.0));
|
||||
assert_eq!(r.days[2].common["market_high_board"],Some(2.0));
|
||||
assert!((r.days[2].common["market_profit_effect"].unwrap()-0.1).abs()<1e-12);
|
||||
assert_eq!(r.days[0].common["market_profit_effect"],None);
|
||||
}
|
||||
#[test]
|
||||
fn missing_duplicate_and_unproven_limit_states_fail() {
|
||||
let mut d=day(1,true);d.rows.pop();assert!(aggregate(Request{days:vec![d],previous:State::default()}).is_err());
|
||||
let mut d=day(1,true);d.rows[0].upper_limit=None;assert!(aggregate(Request{days:vec![d],previous:State::default()}).is_err());
|
||||
let mut d=day(1,true);d.rows[0].no_limit=Some(true);d.rows[0].upper_limit=None;
|
||||
assert_eq!(aggregate(Request{days:vec![d],previous:State::default()}).unwrap().days[0].no_limit,1);
|
||||
}
|
||||
#[test]
|
||||
fn chunking_and_future_append_preserve_history() {
|
||||
let first=aggregate(Request{days:vec![day(1,false),day(2,true)],previous:State::default()}).unwrap();
|
||||
let next=aggregate(Request{days:vec![day(3,true)],previous:first.state}).unwrap();
|
||||
let full=aggregate(Request{days:vec![day(1,false),day(2,true),day(3,true)],previous:State::default()}).unwrap();
|
||||
assert_eq!(serde_json::to_value(&first.days).unwrap(),serde_json::to_value(&full.days[..2]).unwrap());
|
||||
assert_eq!(serde_json::to_value(&next.days).unwrap(),serde_json::to_value(&full.days[2..]).unwrap());
|
||||
let unknown=aggregate(Request{days:vec![day(1,true)],previous:State::default()}).unwrap();
|
||||
assert_eq!(unknown.days[0].common["market_high_board"],None);
|
||||
}
|
||||
#[test]
|
||||
fn missing_industry_does_not_invent_groups_or_disable_independent_market_facts() {
|
||||
let mut missing=day(2,true);missing.rows[0].industry=None;
|
||||
let r=aggregate(Request{days:vec![day(1,false),missing,day(3,true)],previous:State::default()}).unwrap();
|
||||
assert_eq!(r.days[1].common["market_breadth"],Some(0.5));
|
||||
assert_eq!(r.days[1].industry_missing,vec!["A"]);
|
||||
assert!(r.days[1].industries.values().flat_map(|g|g.values()).all(Option::is_none));
|
||||
assert_eq!(r.days[2].industries["I"]["industry_return_20"],None);
|
||||
}
|
||||
}
|
||||
@@ -1587,13 +1587,7 @@ impl PlatformExprStrategy {
|
||||
.filter(|position| position.quantity > 0)
|
||||
.filter_map(|position| {
|
||||
let instrument = ctx.data.instrument(&position.symbol)?;
|
||||
let unresolved = instrument.is_delisted_on_or_before(ctx.execution_date)
|
||||
|| (instrument.status.eq_ignore_ascii_case("delisted")
|
||||
&& instrument.delisted_at.is_none()
|
||||
&& ctx
|
||||
.data
|
||||
.market(ctx.execution_date, &position.symbol)
|
||||
.is_none());
|
||||
let unresolved = instrument.is_delisted_on_or_before(ctx.execution_date);
|
||||
unresolved.then(|| position.symbol.clone())
|
||||
})
|
||||
.collect()
|
||||
@@ -3859,16 +3853,9 @@ impl PlatformExprStrategy {
|
||||
{
|
||||
continue;
|
||||
}
|
||||
if !defer_execution_risk
|
||||
&& self
|
||||
.buy_rejection_reason(
|
||||
ctx,
|
||||
execution_date,
|
||||
symbol,
|
||||
self.stock_state(ctx, execution_date, symbol)?.as_ref(),
|
||||
)?
|
||||
.is_some()
|
||||
{
|
||||
if !defer_execution_risk && self.buy_rejection_reason(
|
||||
ctx, execution_date, symbol, self.stock_state(ctx, execution_date, symbol)?.as_ref(),
|
||||
)?.is_some() {
|
||||
continue;
|
||||
}
|
||||
let decision_stock = self.stock_state_with_factor_date(
|
||||
@@ -14019,16 +14006,10 @@ impl PlatformExprStrategy {
|
||||
if target_value <= 0.0 {
|
||||
continue;
|
||||
}
|
||||
if !defer_execution_risk
|
||||
&& self
|
||||
.buy_rejection_reason(
|
||||
ctx,
|
||||
execution_date,
|
||||
symbol,
|
||||
self.stock_state(ctx, execution_date, symbol)?.as_ref(),
|
||||
)?
|
||||
.is_some()
|
||||
{
|
||||
if !defer_execution_risk && let Some(reason) = self.buy_rejection_reason(
|
||||
ctx, execution_date, symbol, self.stock_state(ctx, execution_date, symbol)?.as_ref(),
|
||||
)? {
|
||||
risk_decisions.push(FidcRiskDecisionAudit::rejected_buy_plan(execution_date, symbol, &reason));
|
||||
continue;
|
||||
}
|
||||
if !self.stock_passes_expr(ctx, &day, &decision_stock)? {
|
||||
@@ -14305,6 +14286,37 @@ mod tests {
|
||||
assert_eq!(strategy.selection_quote_usage, StockFilterQuoteUsage::DailyOnly);
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn periodic_selected_bjse_buy_rejection_is_audited_without_creating_an_order() {
|
||||
let dates = [d(2026, 8, 5), d(2026, 8, 6)];
|
||||
let symbol = "920038.BJ";
|
||||
let data = single_symbol_platform_data(&dates, symbol);
|
||||
let portfolio = PortfolioState::new(100_000.0);
|
||||
let subscriptions = BTreeSet::new();
|
||||
let ctx = StrategyContext {
|
||||
execution_date: dates[1], decision_date: dates[1], decision_index: 1, data: &data,
|
||||
portfolio: &portfolio, futures_account: None, open_orders: &[], dynamic_universe: None,
|
||||
subscriptions: &subscriptions, process_events: &[], active_process_event: None,
|
||||
active_datetime: None, order_events: &[], fills: &[],
|
||||
};
|
||||
let mut cfg = PlatformExprStrategyConfig::generic();
|
||||
cfg.signal_symbol = symbol.into();
|
||||
cfg.stock_filter_expr = "close > 0".into();
|
||||
cfg.hold_until_exit_enabled = true;
|
||||
cfg.target_portfolio_daily_enabled = true;
|
||||
cfg.daily_top_up_enabled = true;
|
||||
cfg.daily_position_target_adjust_enabled = true;
|
||||
cfg.rebalance_existing_positions = true;
|
||||
cfg.risk_config.static_rules.reject_bjse_selection = false;
|
||||
cfg.risk_config.static_rules.reject_bjse_buy = true;
|
||||
let decision = PlatformExprStrategy::new(cfg.clone()).on_day(&ctx).unwrap();
|
||||
assert!(decision.order_intents.is_empty());
|
||||
assert!(decision.risk_decisions.iter().any(|audit| audit.symbol == symbol && audit.stage == "buy_planning" && audit.rule_code == "bjse" && !audit.accepted));
|
||||
cfg.risk_config.static_rules.reject_bjse_buy = false;
|
||||
let allowed = PlatformExprStrategy::new(cfg).on_day(&ctx).unwrap();
|
||||
assert!(!allowed.order_intents.is_empty());
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn daily_pattern_runtime_uses_the_shared_kernel_and_rejects_early_visibility() {
|
||||
let dates=(0..21).map(|n|d(2025,1,1)+chrono::Duration::days(n)).collect::<Vec<_>>();
|
||||
|
||||
@@ -1047,8 +1047,6 @@ impl PortfolioState {
|
||||
let unresolved_delisting = current_market_missing
|
||||
&& data.instrument(&position.symbol).is_some_and(|instrument| {
|
||||
instrument.is_delisted_on_or_before(date)
|
||||
|| (instrument.status.eq_ignore_ascii_case("delisted")
|
||||
&& instrument.delisted_at.is_none())
|
||||
});
|
||||
if unresolved_delisting {
|
||||
position.last_price = 0.0;
|
||||
@@ -1068,11 +1066,13 @@ impl PortfolioState {
|
||||
position.refresh_day_pnl();
|
||||
continue;
|
||||
}
|
||||
let confirmed_pause = data.market(date, &position.symbol).is_some_and(|row| row.paused)
|
||||
|| data.candidate(date, &position.symbol).is_some_and(|row| row.is_paused);
|
||||
let price = data
|
||||
.price(date, &position.symbol, field)
|
||||
.or_else(|| data.price_on_or_before(date, &position.symbol, field))
|
||||
.or_else(|| confirmed_pause.then(|| data.price_on_or_before(date, &position.symbol, field)).flatten())
|
||||
.or_else(|| {
|
||||
(position.last_price.is_finite() && position.last_price > 0.0)
|
||||
(confirmed_pause && position.last_price.is_finite() && position.last_price > 0.0)
|
||||
.then_some(position.last_price)
|
||||
})
|
||||
.ok_or_else(|| DataSetError::MissingSnapshot {
|
||||
@@ -1774,7 +1774,7 @@ mod tests {
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn portfolio_carries_last_price_when_position_market_row_is_missing() {
|
||||
fn portfolio_missing_market_requires_formal_suspension_before_carrying_price() {
|
||||
let prev_date = NaiveDate::from_ymd_opt(2025, 5, 26).unwrap();
|
||||
let missing_date = NaiveDate::from_ymd_opt(2025, 5, 27).unwrap();
|
||||
let mut portfolio = PortfolioState::new(10_000.0);
|
||||
@@ -1832,9 +1832,23 @@ mod tests {
|
||||
.update_prices(prev_date, &dataset, PriceField::Close)
|
||||
.expect("previous close");
|
||||
portfolio.begin_trading_day();
|
||||
portfolio
|
||||
let error = portfolio
|
||||
.update_prices(missing_date, &dataset, PriceField::Close)
|
||||
.expect("missing current row should carry previous close");
|
||||
.expect_err("unclassified missing current price must not be filled from history");
|
||||
assert!(error.to_string().contains("601028.SH"));
|
||||
let paused_dataset = DataSet::from_components(
|
||||
vec![dataset.instrument("601028.SH").unwrap().clone()],
|
||||
vec![dataset.market(prev_date, "601028.SH").unwrap().clone()],
|
||||
Vec::new(),
|
||||
vec![crate::data::CandidateEligibility {
|
||||
date: missing_date, symbol: "601028.SH".into(), is_st: false, is_star_st: false,
|
||||
is_new_listing: false, is_paused: true, allow_buy: false, allow_sell: false,
|
||||
is_kcb: false, is_one_yuan: false, risk_level_code: None,
|
||||
}],
|
||||
vec![dataset.benchmark(prev_date).unwrap().clone()],
|
||||
).unwrap();
|
||||
portfolio.update_prices(missing_date, &paused_dataset, PriceField::Close)
|
||||
.expect("dated suspension permits keeping the last known valuation, not creating a fill");
|
||||
|
||||
let position = portfolio.position("601028.SH").expect("position");
|
||||
assert!((position.last_price - 10.3).abs() < 1e-6);
|
||||
|
||||
@@ -138,6 +138,16 @@ pub struct FidcRiskDecisionAudit {
|
||||
}
|
||||
|
||||
impl FidcRiskDecisionAudit {
|
||||
pub fn rejected_buy_plan(date: NaiveDate, symbol: &str, reason: &str) -> Self {
|
||||
Self {
|
||||
date, symbol: symbol.into(), scope: RiskCheckScope::Buy,
|
||||
stage: "buy_planning".into(), accepted: false,
|
||||
rule_code: reason.into(), reason: reason.into(),
|
||||
config_version: Some("inline_risk_policy".into()), data_epoch: date.to_string(),
|
||||
selection_batch_id: None, order_id: None,
|
||||
}
|
||||
}
|
||||
|
||||
pub fn rejected_selection(
|
||||
date: NaiveDate,
|
||||
symbol: impl Into<String>,
|
||||
@@ -208,14 +218,8 @@ impl ChinaAShareRiskControl {
|
||||
{
|
||||
return Some("inactive_or_delisted");
|
||||
}
|
||||
let status = instrument.status.trim().to_ascii_lowercase();
|
||||
let terminal_status = matches!(
|
||||
status.as_str(),
|
||||
"inactive" | "delisted" | "terminated" | "expired"
|
||||
);
|
||||
if terminal_status && instrument.delisted_at.is_none() {
|
||||
return Some("inactive_or_delisted");
|
||||
}
|
||||
// Latest reference status has no historical as-of date. Execution-day
|
||||
// risk snapshots remain authoritative; missing quotes are not waived.
|
||||
None
|
||||
}
|
||||
|
||||
@@ -843,7 +847,7 @@ mod tests {
|
||||
Some(&instrument("delisted", None)),
|
||||
date,
|
||||
),
|
||||
Some("inactive_or_delisted")
|
||||
None
|
||||
);
|
||||
assert_eq!(
|
||||
ChinaAShareRiskControl::instrument_rejection_reason(
|
||||
|
||||
@@ -0,0 +1,15 @@
|
||||
# 生命周期、价格缺失与历史状态
|
||||
|
||||
证券有效区间为 `[listed_at, delisted_at)`。无明确摘牌日期的最新 terminal 标签不能反向污染历史;已知未来摘牌日不阻断此前的正常交易。退市整理期不是已摘牌。
|
||||
|
||||
执行价加载前分别核验证券身份、正式上市/摘牌边界。合法上市前、摘牌后不查询和补价,记录结构化原因;同一日已有正执行价与生命周期边界冲突时报错。未知身份/代码映射、上市后的分钟缺口、候选事实缺失继续失败,不因 missing candidate 而跳过校验。持仓仅在当日正式暂停交易事实成立时允许按既定估值合同沿用历史价格;普通行情缺口不再无条件沿用旧价。
|
||||
|
||||
整个明确证券范围尚未上市时保留官方日历内现金净值点,不缩短回测范围,不伪造成交或 OHLCV。基准只在首个基线点归一,后续无交易日不反复重置。
|
||||
|
||||
513 项核心测试通过,6 项原有测试忽略。新增验证包含沪深北股票和 ETF 上市前、实际摘牌日、未知证券身份、候选缺失、正式停牌和普通价格缺口、全池上市前现金期间。对单个正式分区的数据缺口仍需数据源修复,不从这些测试外推全市场完整性。
|
||||
|
||||
## 真实边界回放补充
|
||||
|
||||
177 回测 `btr_1789041425783_797911_1`:920038.BJ,2026-08-04 至 08-07。真实上市日08-05,原结果只保留08-05至08-07三个净值点。原因是准备面同时加载基准000300.SH,基准不是交易候选但参与了“全部证券生命周期外”的判定。现在只排除已声明且没有交易候选记录的基准,不按代码或名称猜测指数,也不把真实候选排除;补充真实准备结构的回归后,4日现金区间完整保留。
|
||||
|
||||
该草稿沿用源池 `rejectBjseSelection=false`、`rejectBjseBuy=true`,所以选中北交所但不下单符合其买入政策;原规划阶段没有记录拒绝原因则是审计缺项。新增 `scope=buy, stage=buy_planning` 审计,不伪造订单ID,不把买入否决改写成选股排除。测试验证禁止时无订单且有bjse原因,放开买入政策时正常生成意图。最新核心514项通过、6项原有忽略。
|
||||
Reference in New Issue
Block a user