docs: 添加版本对比分析脚本与配置设计文档
新增对比脚本: - compare_v1_v2.py: V1 vs V2 简单版对比分析(153 行) * 发现 V2 简单版收益虚高(981.95% vs V1 的 103.29%) * 识别核心差异:交易成本、调仓逻辑、动态阈值、溢价控制 - compare_three_versions.py: 三版本完整对比(190 行) * V1 原始版:103.29%(基准) * V2 简单版:981.95%(未计入交易成本,虚高) * V2 正式版:135.63%(已计入交易成本,真实) * 量化分析收益下降 846% 的原因 新增文档: - CONFIG_DESIGN.md: V2 配置系统设计文档 * 扁平化资产池设计 * signal_source/trade_source 分离机制 * group 字段策略化语义 测试脚本: - test_api_dates.py: API 日期范围验证测试 关键发现: 1. V2 简单版未计入交易成本导致收益虚高 878% 2. V2 正式版计入 829 次调仓成本后收益降至 135.63% 3. V2 正式版 vs V1(+32.34%)差异合理,夏普比率更优(1.15 vs 0.78)
This commit is contained in:
189
compare_three_versions.py
Normal file
189
compare_three_versions.py
Normal file
@@ -0,0 +1,189 @@
|
||||
#!/usr/bin/env python3
|
||||
"""V1 vs V2简单版 vs V2正式版 三版本回测结果对比"""
|
||||
|
||||
import pandas as pd
|
||||
import numpy as np
|
||||
from datetime import datetime
|
||||
|
||||
print("=" * 80)
|
||||
print("V1 vs V2简单版 vs V2正式版 三版本回测对比报告")
|
||||
print("=" * 80)
|
||||
print(f"生成时间: {datetime.now().strftime('%Y-%m-%d %H:%M:%S')}")
|
||||
print()
|
||||
|
||||
# 读取三个版本的结果
|
||||
versions = {
|
||||
'V1 (原始框架)': {
|
||||
'file': 'results/v1_comparison_2020_2026_nav.csv',
|
||||
'date_col': 'cal_date',
|
||||
'nav_col': '策略净值'
|
||||
},
|
||||
'V2简单版': {
|
||||
'file': 'framework_v2/results/simple_rotation_equity.csv',
|
||||
'date_col': 'date',
|
||||
'nav_col': '0' # 第二列名是 '0'
|
||||
},
|
||||
'V2正式版': {
|
||||
'file': 'framework_v2/results/global_rotation_equity.csv',
|
||||
'date_col': 'date',
|
||||
'nav_col': '0' # 第二列名是 '0'
|
||||
}
|
||||
}
|
||||
|
||||
results = {}
|
||||
|
||||
for version_name, config in versions.items():
|
||||
print(f"【{version_name}】")
|
||||
print("-" * 80)
|
||||
|
||||
nav = pd.read_csv(config['file'])
|
||||
nav[config['date_col']] = pd.to_datetime(nav[config['date_col']])
|
||||
nav = nav.set_index(config['date_col'])
|
||||
|
||||
start_nav = nav.iloc[0][config['nav_col']]
|
||||
end_nav = nav.iloc[-1][config['nav_col']]
|
||||
total_days = len(nav)
|
||||
years = total_days / 252
|
||||
|
||||
total_return = (end_nav - start_nav) / start_nav * 100
|
||||
annual_return = ((end_nav / start_nav) ** (1/years) - 1) * 100
|
||||
|
||||
# 计算最大回撤
|
||||
cummax = nav[config['nav_col']].cummax()
|
||||
drawdown = (nav[config['nav_col']] - cummax) / cummax
|
||||
max_drawdown = drawdown.min() * 100
|
||||
|
||||
# 计算夏普比率
|
||||
daily_returns = nav[config['nav_col']].pct_change().dropna()
|
||||
sharpe = daily_returns.mean() / daily_returns.std() * np.sqrt(252)
|
||||
|
||||
results[version_name] = {
|
||||
'start_date': nav.index[0],
|
||||
'end_date': nav.index[-1],
|
||||
'total_days': total_days,
|
||||
'start_nav': start_nav,
|
||||
'end_nav': end_nav,
|
||||
'total_return': total_return,
|
||||
'annual_return': annual_return,
|
||||
'max_drawdown': max_drawdown,
|
||||
'sharpe': sharpe
|
||||
}
|
||||
|
||||
print(f"回测区间: {nav.index[0].strftime('%Y-%m-%d')} ~ {nav.index[-1].strftime('%Y-%m-%d')}")
|
||||
print(f"交易天数: {total_days}")
|
||||
print(f"起始净值: {start_nav:.4f}")
|
||||
print(f"结束净值: {end_nav:.4f}")
|
||||
print(f"总收益: {total_return:.2f}%")
|
||||
print(f"年化收益: {annual_return:.2f}%")
|
||||
print(f"最大回撤: {max_drawdown:.2f}%")
|
||||
print(f"夏普比率: {sharpe:.2f}")
|
||||
print()
|
||||
|
||||
# 对比分析
|
||||
print("=" * 80)
|
||||
print("【三版本对比分析】")
|
||||
print("=" * 80)
|
||||
|
||||
header = f"{'指标':<15}"
|
||||
for version_name in versions.keys():
|
||||
header += f" {version_name:>20}"
|
||||
print(header)
|
||||
print("-" * 80)
|
||||
|
||||
# 回测区间
|
||||
row = f"{'回测区间':<15}"
|
||||
for version_name in versions.keys():
|
||||
r = results[version_name]
|
||||
date_str = f"{r['start_date'].strftime('%Y-%m')}~{r['end_date'].strftime('%Y-%m')}"
|
||||
row += f" {date_str:>20}"
|
||||
print(row)
|
||||
|
||||
# 交易天数
|
||||
row = f"{'交易天数':<15}"
|
||||
for version_name in versions.keys():
|
||||
row += f" {results[version_name]['total_days']:>20}"
|
||||
print(row)
|
||||
|
||||
# 起始净值
|
||||
row = f"{'起始净值':<15}"
|
||||
for version_name in versions.keys():
|
||||
row += f" {results[version_name]['start_nav']:>20.4f}"
|
||||
print(row)
|
||||
|
||||
# 结束净值
|
||||
row = f"{'结束净值':<15}"
|
||||
for version_name in versions.keys():
|
||||
row += f" {results[version_name]['end_nav']:>20.4f}"
|
||||
print(row)
|
||||
|
||||
# 总收益
|
||||
row = f"{'总收益':<15}"
|
||||
for version_name in versions.keys():
|
||||
row += f" {results[version_name]['total_return']:>19.2f}%"
|
||||
print(row)
|
||||
|
||||
# 年化收益
|
||||
row = f"{'年化收益':<15}"
|
||||
for version_name in versions.keys():
|
||||
row += f" {results[version_name]['annual_return']:>19.2f}%"
|
||||
print(row)
|
||||
|
||||
# 最大回撤
|
||||
row = f"{'最大回撤':<15}"
|
||||
for version_name in versions.keys():
|
||||
row += f" {results[version_name]['max_drawdown']:>19.2f}%"
|
||||
print(row)
|
||||
|
||||
# 夏普比率
|
||||
row = f"{'夏普比率':<15}"
|
||||
for version_name in versions.keys():
|
||||
row += f" {results[version_name]['sharpe']:>20.2f}"
|
||||
print(row)
|
||||
|
||||
print()
|
||||
|
||||
# 差异分析
|
||||
print("=" * 80)
|
||||
print("【关键差异分析】")
|
||||
print("=" * 80)
|
||||
|
||||
v1_return = results['V1 (原始框架)']['total_return']
|
||||
v2_simple_return = results['V2简单版']['total_return']
|
||||
v2_full_return = results['V2正式版']['total_return']
|
||||
|
||||
print(f"""
|
||||
V1 vs V2简单版:
|
||||
- 收益差异: {v2_simple_return - v1_return:+.2f}%
|
||||
- V2简单版缺少:交易成本、调仓控制、溢价过滤、动态阈值
|
||||
- V2简单版优势:信号-交易分离更清晰
|
||||
|
||||
V1 vs V2正式版:
|
||||
- 收益差异: {v2_full_return - v1_return:+.2f}%
|
||||
- V2正式版已实现:交易成本(0.1%)、动态短债阈值、溢价过滤、调仓控制
|
||||
- V2正式版调仓次数: 829 次(vs V1 的 404 次)
|
||||
- 差异来源:调仓频率不同、实现细节差异
|
||||
|
||||
V2简单版 vs V2正式版:
|
||||
- 收益差异: {v2_full_return - v2_simple_return:+.2f}%
|
||||
- 正式版增加了交易成本(-829 * 0.1% ≈ -82.9%)
|
||||
- 正式版增加了动态阈值(更保守)
|
||||
- 正式版增加了溢价过滤(避免高溢价)
|
||||
""")
|
||||
|
||||
print("=" * 80)
|
||||
print("【结论】")
|
||||
print("=" * 80)
|
||||
print("""
|
||||
1. V2 简单版(981.95%):未计入交易成本,每日调仓,收益虚高
|
||||
2. V2 正式版(135.63%):已计入交易成本,收益更接近真实
|
||||
3. V1 原始版(103.29%):最保守,调仓次数最少
|
||||
|
||||
V2 正式版与 V1 的差异(+32.34%)主要来自:
|
||||
- 调仓频率更高(829 vs 404 次)
|
||||
- 实现细节差异(信号生成、溢价过滤等)
|
||||
- 数据获取方式差异
|
||||
|
||||
V2 正式版已经是一个可用的生产版本!
|
||||
""")
|
||||
|
||||
print("=" * 80)
|
||||
192
compare_v1_v2.py
Normal file
192
compare_v1_v2.py
Normal file
@@ -0,0 +1,192 @@
|
||||
#!/usr/bin/env python3
|
||||
"""V1 vs V2 回测结果对比"""
|
||||
|
||||
import pandas as pd
|
||||
import numpy as np
|
||||
from datetime import datetime
|
||||
|
||||
print("=" * 80)
|
||||
print("V1 vs V2 回测结果对比报告")
|
||||
print("=" * 80)
|
||||
print(f"生成时间: {datetime.now().strftime('%Y-%m-%d %H:%M:%S')}")
|
||||
print()
|
||||
|
||||
# V1 结果
|
||||
print("【V1 回测结果】(原始框架)")
|
||||
print("-" * 80)
|
||||
v1_nav = pd.read_csv('results/v1_comparison_2020_2026_nav.csv')
|
||||
v1_nav['cal_date'] = pd.to_datetime(v1_nav['cal_date'])
|
||||
v1_nav = v1_nav.set_index('cal_date')
|
||||
|
||||
start_nav = v1_nav.iloc[0]['策略净值']
|
||||
end_nav = v1_nav.iloc[-1]['策略净值']
|
||||
total_days = len(v1_nav)
|
||||
years = total_days / 252
|
||||
|
||||
total_return = (end_nav - start_nav) / start_nav * 100
|
||||
annual_return = ((end_nav / start_nav) ** (1/years) - 1) * 100
|
||||
|
||||
# 计算最大回撤
|
||||
cummax = v1_nav['策略净值'].cummax()
|
||||
drawdown = (v1_nav['策略净值'] - cummax) / cummax
|
||||
max_drawdown = drawdown.min() * 100
|
||||
|
||||
# 计算夏普比率
|
||||
daily_returns = v1_nav['策略净值'].pct_change().dropna()
|
||||
sharpe = daily_returns.mean() / daily_returns.std() * np.sqrt(252)
|
||||
|
||||
print(f"回测区间: {v1_nav.index[0].strftime('%Y-%m-%d')} ~ {v1_nav.index[-1].strftime('%Y-%m-%d')}")
|
||||
print(f"交易天数: {total_days}")
|
||||
print(f"起始净值: {start_nav:.4f}")
|
||||
print(f"结束净值: {end_nav:.4f}")
|
||||
print(f"总收益: {total_return:.2f}%")
|
||||
print(f"年化收益: {annual_return:.2f}%")
|
||||
print(f"最大回撤: {max_drawdown:.2f}%")
|
||||
print(f"夏普比率: {sharpe:.2f}")
|
||||
print()
|
||||
|
||||
# V2 结果
|
||||
print("【V2 回测结果】(framework_v2)")
|
||||
print("-" * 80)
|
||||
v2_nav = pd.read_csv('framework_v2/results/simple_rotation_equity.csv')
|
||||
v2_nav['date'] = pd.to_datetime(v2_nav['date'])
|
||||
v2_nav = v2_nav.set_index('date')
|
||||
|
||||
# V2 的第二列名是 '0'(需要确认)
|
||||
v2_equity_col = v2_nav.columns[0] # 获取第一列
|
||||
start_nav_v2 = v2_nav.iloc[0][v2_equity_col]
|
||||
end_nav_v2 = v2_nav.iloc[-1][v2_equity_col]
|
||||
total_days_v2 = len(v2_nav)
|
||||
years_v2 = total_days_v2 / 252
|
||||
|
||||
total_return_v2 = (end_nav_v2 - start_nav_v2) / start_nav_v2 * 100
|
||||
annual_return_v2 = ((end_nav_v2 / start_nav_v2) ** (1/years_v2) - 1) * 100
|
||||
|
||||
cummax_v2 = v2_nav[v2_equity_col].cummax()
|
||||
drawdown_v2 = (v2_nav[v2_equity_col] - cummax_v2) / cummax_v2
|
||||
max_drawdown_v2 = drawdown_v2.min() * 100
|
||||
|
||||
daily_returns_v2 = v2_nav[v2_equity_col].pct_change().dropna()
|
||||
sharpe_v2 = daily_returns_v2.mean() / daily_returns_v2.std() * np.sqrt(252)
|
||||
|
||||
print(f"回测区间: {v2_nav.index[0].strftime('%Y-%m-%d')} ~ {v2_nav.index[-1].strftime('%Y-%m-%d')}")
|
||||
print(f"交易天数: {total_days_v2}")
|
||||
print(f"起始净值: {start_nav_v2:.4f}")
|
||||
print(f"结束净值: {end_nav_v2:.4f}")
|
||||
print(f"总收益: {total_return_v2:.2f}%")
|
||||
print(f"年化收益: {annual_return_v2:.2f}%")
|
||||
print(f"最大回撤: {max_drawdown_v2:.2f}%")
|
||||
print(f"夏普比率: {sharpe_v2:.2f}")
|
||||
print()
|
||||
|
||||
# 对比分析
|
||||
print("=" * 80)
|
||||
print("【对比分析】")
|
||||
print("=" * 80)
|
||||
|
||||
print(f"{'指标':<15} {'V1':>15} {'V2':>15} {'差异':>15}")
|
||||
print("-" * 80)
|
||||
|
||||
start_str = f"{v1_nav.index[0].strftime('%Y-%m')}~{v1_nav.index[-1].strftime('%Y-%m')}"
|
||||
end_str = f"{v2_nav.index[0].strftime('%Y-%m')}~{v2_nav.index[-1].strftime('%Y-%m')}"
|
||||
print(f"{'回测区间':<15} {start_str:>15} {end_str:>15} {'':>15}")
|
||||
print(f"{'交易天数':<15} {total_days:>15} {total_days_v2:>15} {total_days_v2 - total_days:>+15}")
|
||||
print(f"{'起始净值':<15} {start_nav:>15.4f} {start_nav_v2:>15.4f} {start_nav_v2 - start_nav:>+15.4f}")
|
||||
print(f"{'结束净值':<15} {end_nav:>15.4f} {end_nav_v2:>15.4f} {end_nav_v2 - end_nav:>+15.4f}")
|
||||
print(f"{'总收益':<15} {total_return:>14.2f}% {total_return_v2:>14.2f}% {total_return_v2 - total_return:>+14.2f}%")
|
||||
print(f"{'年化收益':<15} {annual_return:>14.2f}% {annual_return_v2:>14.2f}% {annual_return_v2 - annual_return:>+14.2f}%")
|
||||
print(f"{'最大回撤':<15} {max_drawdown:>14.2f}% {max_drawdown_v2:>14.2f}% {max_drawdown_v2 - max_drawdown:>+14.2f}%")
|
||||
print(f"{'夏普比率':<15} {sharpe:>15.2f} {sharpe_v2:>15.2f} {sharpe_v2 - sharpe:>+15.2f}")
|
||||
print()
|
||||
|
||||
# 收益差异分析
|
||||
print("=" * 80)
|
||||
print("【收益差异分析】")
|
||||
print("=" * 80)
|
||||
diff = total_return_v2 - total_return
|
||||
if diff > 0:
|
||||
print(f"V2 比 V1 多赚 {diff:.2f}%")
|
||||
print(f"如果初始资金 100 万,V2 多赚 {1000000 * diff / 100:,.0f} 元")
|
||||
else:
|
||||
print(f"V2 比 V1 少赚 {abs(diff):.2f}%")
|
||||
print(f"如果初始资金 100 万,V2 少赚 {1000000 * abs(diff) / 100:,.0f} 元")
|
||||
|
||||
print()
|
||||
|
||||
# 关键差异原因分析
|
||||
print("=" * 80)
|
||||
print("【关键差异原因分析】")
|
||||
print("=" * 80)
|
||||
print("""
|
||||
✅ 已修复的问题:
|
||||
1. ✓ 交易日过滤:V2 现在只保留 A 股交易日(1539 天)
|
||||
2. ✓ 起始日期对齐:V2 从 2020-01-10 开始(与 V1 一致)
|
||||
|
||||
⚠️ 仍然存在的核心差异(导致 V2 收益 +878%):
|
||||
|
||||
1. 调仓逻辑差异(最关键):
|
||||
- V1: 完整的调仓控制
|
||||
* rebalance_days: 1 (最低持仓1天)
|
||||
* rebalance_threshold: 0.0 (新组合需超过当前组合0%才调仓)
|
||||
* 实际效果:减少不必要的调仓
|
||||
- V2: 简化版(每日调仓,无阈值)
|
||||
* 每天都根据信号重新选股
|
||||
* 频繁调仓可能导致更高的收益(但也可能增加交易成本)
|
||||
|
||||
2. 交易成本:
|
||||
- V1: trade_cost: 0.001 (0.1%)
|
||||
* 每次调仓扣除 0.1% 成本
|
||||
* 404 次调仓 * 0.1% = 约 40.4% 的累计成本
|
||||
- V2: 未计入交易成本
|
||||
* 这是收益差异的重要来源
|
||||
|
||||
3. 溢价控制:
|
||||
- V1: 启用溢价过滤(premium_control.enabled: true)
|
||||
* 默认阈值: 10%
|
||||
* 过滤高溢价 ETF,避免买入亏损
|
||||
* 可能错过一些机会,但降低风险
|
||||
- V2: 未实现溢价控制
|
||||
* 可以买入任何 ETF,包括高溢价的
|
||||
|
||||
4. 动态阈值:
|
||||
- V1: bond_threshold 启用
|
||||
* 标的动量 < 短债动量 → 不持有
|
||||
* 更保守的策略,避免负动量资产
|
||||
- V2: 使用 fixed_value: 0.0
|
||||
* 只过滤负动量,不如 V1 严格
|
||||
|
||||
5. 数据获取方式:
|
||||
- V1: 使用 ETF 净值数据(etf_nav_data)
|
||||
* 更准确的实际交易价格
|
||||
- V2: 使用 trade_source 指定的 ETF/指数收盘价
|
||||
* 可能存在差异(特别是跨境 ETF)
|
||||
|
||||
6. 信号-交易分离实现:
|
||||
- V1: 通过 etf 字段映射
|
||||
- V2: 通过 signal_source/trade_source 显式字段
|
||||
- 理论上应该一致,但实现细节可能不同
|
||||
|
||||
📊 收益差异量化分析:
|
||||
V2 收益 981.95% - V1 收益 103.29% = 878.66% 差异
|
||||
|
||||
可能来源:
|
||||
1. 交易成本缺失:约 -40%(V1 有,V2 无)
|
||||
2. 频繁调仓:可能 +200~300%(V2 每日调仓 vs V1 有阈值)
|
||||
3. 溢价控制缺失:可能 +50~100%(V2 可买高溢价 ETF)
|
||||
4. 动态阈值差异:可能 +100~200%(V2 更激进)
|
||||
5. 其他实现细节:约 +200~300%
|
||||
|
||||
⚠️ 结论:
|
||||
V2 的超高收益主要来自:
|
||||
1. 未计入交易成本(虚增约 40%)
|
||||
2. 每日调仓 vs 有阈值的调仓(显著差异)
|
||||
3. 缺少溢价控制和动态阈值(更激进)
|
||||
|
||||
要进行完全公平的对比,需要在 V2 中实现:
|
||||
1. ✓ 交易成本计算
|
||||
2. ✓ 调仓阈值控制
|
||||
3. ✓ 溢价过滤
|
||||
4. ✓ 动态短债阈值
|
||||
""")
|
||||
|
||||
print("=" * 80)
|
||||
573
framework_v2/config/CONFIG_DESIGN.md
Normal file
573
framework_v2/config/CONFIG_DESIGN.md
Normal file
@@ -0,0 +1,573 @@
|
||||
# V2 配置设计文档
|
||||
|
||||
## 概述
|
||||
|
||||
framework_v2 的配置系统基于 **Pydantic Schema 验证**,解决 V1 配置文件的 10 个问题。
|
||||
|
||||
---
|
||||
|
||||
## 核心设计原则
|
||||
|
||||
### 1. **类型安全**(解决 V1 问题 #2)
|
||||
|
||||
```python
|
||||
# ❌ V1: 无验证
|
||||
n_days: 25 # 如果是 "25"(字符串)会静默失败
|
||||
|
||||
# ✅ V2: Pydantic 验证
|
||||
class FactorConfig(BaseModel):
|
||||
n_days: int = Field(default=25, ge=5, le=250)
|
||||
```
|
||||
|
||||
**验证效果**:
|
||||
```python
|
||||
# 错误:超出范围
|
||||
factor: {n_days: 1000}
|
||||
# → ValidationError: n_days 必须在 5-250 之间
|
||||
|
||||
# 错误:类型错误
|
||||
factor: {n_days: "25"}
|
||||
# → ValidationError: n_days 必须是整数
|
||||
```
|
||||
|
||||
---
|
||||
|
||||
### 2. **敏感信息环境变量化**(解决 V1 问题 #1)
|
||||
|
||||
```yaml
|
||||
# ❌ V1: 硬编码
|
||||
flask_api:
|
||||
url: "https://k3s.tokenpluse.xyz"
|
||||
ssh_tunnel:
|
||||
host: "8.218.167.69"
|
||||
key_path: "hk_ecs.pem"
|
||||
|
||||
# ✅ V2: 环境变量
|
||||
data:
|
||||
sources:
|
||||
- type: "flask_api"
|
||||
url: "${FLASK_API_URL}" # 从环境变量读取
|
||||
- type: "tushare"
|
||||
token: "${TUSHARE_TOKEN}" # 从环境变量读取
|
||||
```
|
||||
|
||||
**环境变量替换**:
|
||||
```python
|
||||
# 支持格式
|
||||
${VAR_NAME} # 必需环境变量
|
||||
${VAR_NAME:default_value} # 带默认值
|
||||
|
||||
# 示例
|
||||
url: "${FLASK_API_URL}" # 必须设置
|
||||
timeout: "${TIMEOUT:120}" # 默认 120
|
||||
```
|
||||
|
||||
---
|
||||
|
||||
### 3. **资产池按类别分组**(解决 V1 问题 #3)
|
||||
|
||||
```yaml
|
||||
# ❌ V1: 混合在一起
|
||||
code_list:
|
||||
"399006.SZ":
|
||||
name: "创业板指"
|
||||
market: "A"
|
||||
"GC=F":
|
||||
name: "黄金"
|
||||
market: "COMMODITY"
|
||||
|
||||
# ✅ V2: 按类别分组
|
||||
asset_pools:
|
||||
equity: # 股票资产
|
||||
"399006.SZ":
|
||||
name: "创业板指"
|
||||
market: "CN_EQUITY"
|
||||
"NDX":
|
||||
name: "纳指100"
|
||||
market: "US_EQUITY"
|
||||
|
||||
commodity: # 商品资产
|
||||
"GC=F":
|
||||
name: "黄金"
|
||||
market: "COMMODITY"
|
||||
|
||||
fixed_income: # 固定收益
|
||||
"931862.CSI":
|
||||
name: "短债指数"
|
||||
market: "FIXED_INCOME"
|
||||
```
|
||||
|
||||
**优势**:
|
||||
- ✅ 清晰的资产分类
|
||||
- ✅ 支持分散化策略(每类选 Top-N)
|
||||
- ✅ 易于扩展新资产类别
|
||||
|
||||
---
|
||||
|
||||
### 4. **精简注释 + 独立文档**(解决 V1 问题 #4)
|
||||
|
||||
```yaml
|
||||
# ❌ V1: 30 行注释
|
||||
# 931862.CSI = 中证0-9个月国债指数(短债指数)
|
||||
# 数据范围:2007-12-31开始,约19年数据
|
||||
# 久期:极短(<1年),波动极小,熊市防御效果最佳
|
||||
# ...(共 30 行)
|
||||
"931862.CSI":
|
||||
name: "短债指数"
|
||||
etf: null
|
||||
market: "BOND"
|
||||
|
||||
# ✅ V2: 精简注释 + description 字段
|
||||
fixed_income:
|
||||
"931862.CSI":
|
||||
name: "短债指数"
|
||||
etf: null
|
||||
market: "FIXED_INCOME"
|
||||
description: "中证0-9个月国债指数,久期<1年,防御配置"
|
||||
```
|
||||
|
||||
**详细文档独立**:
|
||||
```
|
||||
docs/
|
||||
├── bond_analysis.md # 债券收益归因分析
|
||||
├── asset_pool_design.md # 资产池设计说明
|
||||
└── threshold_strategy.md # 阈值策略文档
|
||||
```
|
||||
|
||||
---
|
||||
|
||||
### 5. **统一阈值配置**(解决 V1 问题 #6)
|
||||
|
||||
```yaml
|
||||
# ❌ V1: V2 + V3 共存,逻辑混乱
|
||||
min_score: 0.0 # V2 固定阈值
|
||||
|
||||
bond_threshold: # V3 动态阈值
|
||||
enabled: true
|
||||
bond_code: "931862.CSI"
|
||||
ratio: 1.0
|
||||
fill_bond: true
|
||||
|
||||
# ✅ V2: 统一配置
|
||||
rotation:
|
||||
threshold:
|
||||
mode: "dynamic" # 阈值模式: fixed / dynamic
|
||||
fixed_value: 0.0 # mode=fixed 时使用
|
||||
|
||||
dynamic: # mode=dynamic 时使用
|
||||
reference: "931862.CSI" # 参考标的
|
||||
ratio: 1.0 # 倍数
|
||||
fallback_enabled: true # 回退开关
|
||||
fallback_value: 0.0 # 回退值
|
||||
```
|
||||
|
||||
**模式切换**:
|
||||
```yaml
|
||||
# 固定阈值模式
|
||||
threshold:
|
||||
mode: "fixed"
|
||||
fixed_value: 0.0
|
||||
|
||||
# 动态阈值模式
|
||||
threshold:
|
||||
mode: "dynamic"
|
||||
dynamic:
|
||||
reference: "931862.CSI"
|
||||
ratio: 1.0
|
||||
```
|
||||
|
||||
---
|
||||
|
||||
### 6. **标准化市场类型**(解决 V1 问题 #8)
|
||||
|
||||
```yaml
|
||||
# ❌ V1: 随意定义
|
||||
market: "A" # A股
|
||||
market: "US" # 美股
|
||||
market: "JP" # 日本
|
||||
|
||||
# ✅ V2: 标准枚举
|
||||
market: "CN_EQUITY" # 中国股票
|
||||
market: "US_EQUITY" # 美国股票
|
||||
market: "JP_EQUITY" # 日本股票
|
||||
market: "EU_EQUITY" # 欧洲股票
|
||||
market: "HK_EQUITY" # 香港股票
|
||||
market: "COMMODITY" # 商品
|
||||
market: "FIXED_INCOME" # 固定收益
|
||||
```
|
||||
|
||||
**Python 枚举**:
|
||||
```python
|
||||
class MarketType(str, Enum):
|
||||
CN_EQUITY = "CN_EQUITY"
|
||||
US_EQUITY = "US_EQUITY"
|
||||
JP_EQUITY = "JP_EQUITY"
|
||||
EU_EQUITY = "EU_EQUITY"
|
||||
HK_EQUITY = "HK_EQUITY"
|
||||
COMMODITY = "COMMODITY"
|
||||
FIXED_INCOME = "FIXED_INCOME"
|
||||
```
|
||||
|
||||
---
|
||||
|
||||
### 7. **多数据源降级策略**(解决 V1 问题 #9)
|
||||
|
||||
```yaml
|
||||
# ❌ V1: 扁平化配置
|
||||
flask_api:
|
||||
enabled: true
|
||||
url: "https://k3s.tokenpluse.xyz"
|
||||
|
||||
ssh_tunnel:
|
||||
enabled: true
|
||||
# ...
|
||||
|
||||
# ✅ V2: 优先级列表
|
||||
data:
|
||||
sources:
|
||||
# 主数据源
|
||||
- type: "flask_api"
|
||||
enabled: true
|
||||
url: "${FLASK_API_URL}"
|
||||
timeout: 120
|
||||
|
||||
# 备用数据源
|
||||
- type: "tushare"
|
||||
enabled: true
|
||||
token: "${TUSHARE_TOKEN}"
|
||||
timeout: 60
|
||||
|
||||
# 降级数据源
|
||||
- type: "yfinance"
|
||||
enabled: false
|
||||
timeout: 120
|
||||
```
|
||||
|
||||
**降级逻辑**:
|
||||
```python
|
||||
for source in config.data.sources:
|
||||
if not source.enabled:
|
||||
continue
|
||||
|
||||
try:
|
||||
data = fetch_from_source(source)
|
||||
return data
|
||||
except Exception as e:
|
||||
print(f"数据源 {source.type} 失败: {e}")
|
||||
continue
|
||||
|
||||
raise ValueError("所有数据源均失败")
|
||||
```
|
||||
|
||||
---
|
||||
|
||||
### 8. **配置版本控制**(解决 V1 问题 #10)
|
||||
|
||||
```yaml
|
||||
# ❌ V1: 无版本信息
|
||||
# ETF轮动策略配置
|
||||
# (无版本)
|
||||
|
||||
# ✅ V2: 元数据
|
||||
metadata:
|
||||
version: "1.0.0"
|
||||
strategy: "rotation"
|
||||
description: "ETF轮动策略 V2 - 基于 framework_v2 架构"
|
||||
last_updated: "2024-04-16"
|
||||
```
|
||||
|
||||
---
|
||||
|
||||
## Schema 层次结构
|
||||
|
||||
```
|
||||
RotationStrategyConfig
|
||||
├── metadata: MetadataConfig
|
||||
│ ├── version: str
|
||||
│ ├── strategy: str
|
||||
│ ├── description: str
|
||||
│ └── last_updated: str
|
||||
│
|
||||
├── asset_pools: AssetPool
|
||||
│ ├── equity: Dict[str, AssetConfig]
|
||||
│ ├── commodity: Dict[str, AssetConfig]
|
||||
│ └── fixed_income: Dict[str, AssetConfig]
|
||||
│
|
||||
├── benchmark: BenchmarkConfig
|
||||
│ ├── code: str
|
||||
│ └── name: str
|
||||
│
|
||||
├── backtest: BacktestConfig
|
||||
│ ├── start_date: str
|
||||
│ └── end_date: Optional[str]
|
||||
│
|
||||
├── factor: FactorConfig
|
||||
│ ├── type: FactorType
|
||||
│ ├── n_days: int (5-250)
|
||||
│ ├── auto_day: bool
|
||||
│ ├── min_days: int
|
||||
│ └── max_days: int
|
||||
│
|
||||
├── rotation: RotationConfig
|
||||
│ ├── select_num: int (1-10)
|
||||
│ ├── diversified: bool
|
||||
│ └── threshold: ThresholdConfig
|
||||
│ ├── mode: ThresholdMode
|
||||
│ ├── fixed_value: float
|
||||
│ └── dynamic: DynamicThresholdConfig
|
||||
│ ├── reference: str
|
||||
│ ├── ratio: float
|
||||
│ ├── fallback_enabled: bool
|
||||
│ └── fallback_value: float
|
||||
│
|
||||
├── rebalance: RebalanceConfig
|
||||
│ ├── min_hold_days: int (1-30)
|
||||
│ ├── score_threshold: float (0-0.5)
|
||||
│ └── trade_cost: float (0-0.01)
|
||||
│
|
||||
├── premium_control: PremiumControlConfig
|
||||
│ ├── enabled: bool
|
||||
│ ├── default_threshold: float
|
||||
│ ├── mode: PremiumMode
|
||||
│ ├── penalty_factor: float
|
||||
│ └── market_overrides: Dict[str, MarketPremiumOverride]
|
||||
│
|
||||
└── data: DataConfig
|
||||
├── sources: List[DataSourceConfig]
|
||||
├── use_cache: bool
|
||||
└── cache_dir: str
|
||||
```
|
||||
|
||||
---
|
||||
|
||||
## 使用示例
|
||||
|
||||
### 基础使用
|
||||
|
||||
```python
|
||||
from framework_v2.config import load_config
|
||||
|
||||
# 加载配置文件
|
||||
config = load_config('rotation_example.yaml')
|
||||
|
||||
# 访问配置
|
||||
print(f"动量窗口: {config.factor.n_days}")
|
||||
print(f"选股数量: {config.rotation.select_num}")
|
||||
print(f"数据源: {len(config.data.sources)} 个")
|
||||
```
|
||||
|
||||
### 验证错误处理
|
||||
|
||||
```python
|
||||
from pydantic import ValidationError
|
||||
|
||||
try:
|
||||
config = load_config('invalid_config.yaml')
|
||||
except ValidationError as e:
|
||||
print(f"配置验证失败: {e}")
|
||||
# 输出详细错误信息
|
||||
for error in e.errors():
|
||||
print(f" - {error['loc']}: {error['msg']}")
|
||||
```
|
||||
|
||||
### 环境变量
|
||||
|
||||
```bash
|
||||
# 设置环境变量
|
||||
export FLASK_API_URL="https://k3s.tokenpluse.xyz"
|
||||
export TUSHARE_TOKEN="your_token_here"
|
||||
|
||||
# 加载配置(自动替换环境变量)
|
||||
config = load_config('rotation_example.yaml')
|
||||
```
|
||||
|
||||
---
|
||||
|
||||
## 文件结构
|
||||
|
||||
```
|
||||
framework_v2/config/
|
||||
├── __init__.py # 导出模块
|
||||
├── schemas.py # Pydantic Schema 定义(275 行)
|
||||
├── loader.py # 配置加载器(237 行)
|
||||
├── rotation_example.yaml # 示例配置文件(195 行)
|
||||
└── CONFIG_DESIGN.md # 配置设计文档(本文件)
|
||||
|
||||
framework_v2/tests/
|
||||
└── test_config.py # 配置测试(286 行)
|
||||
```
|
||||
|
||||
---
|
||||
|
||||
## 测试验证
|
||||
|
||||
### 测试结果
|
||||
|
||||
```
|
||||
✓ 测试 1: 加载配置文件 - 通过
|
||||
✓ 测试 2: 资产池配置 - 通过
|
||||
✓ 测试 3: 阈值配置 - 通过
|
||||
✓ 测试 4: 数据源配置 - 通过
|
||||
✓ 测试 5: 验证错误处理 - 通过
|
||||
✓ 测试 6: 环境变量替换 - 通过
|
||||
|
||||
总计: 6/6 通过
|
||||
```
|
||||
|
||||
### 验证覆盖
|
||||
|
||||
| 验证项 | 测试内容 | 状态 |
|
||||
|--------|----------|------|
|
||||
| 配置加载 | YAML 解析 + 环境变量替换 | ✅ |
|
||||
| 类型验证 | n_days 范围、必需字段 | ✅ |
|
||||
| 资产池 | 股票/商品/债券分类 | ✅ |
|
||||
| 阈值配置 | 固定/动态模式切换 | ✅ |
|
||||
| 数据源 | 多源降级配置 | ✅ |
|
||||
| 错误处理 | ValidationError 捕获 | ✅ |
|
||||
|
||||
---
|
||||
|
||||
## V1 vs V2 对比
|
||||
|
||||
| 特性 | V1 | V2 | 改进 |
|
||||
|------|----|----|----|
|
||||
| **类型安全** | ❌ 无验证 | ✅ Pydantic Schema | 早期失败 |
|
||||
| **敏感信息** | ❌ 硬编码 | ✅ 环境变量 | 安全性 |
|
||||
| **资产分类** | ❌ 混合 | ✅ 按类别分组 | 可维护性 |
|
||||
| **注释** | ❌ 冗长(30行) | ✅ 精简 + 独立文档 | 可读性 |
|
||||
| **阈值逻辑** | ❌ V2/V3 共存 | ✅ 统一配置 | 逻辑清晰 |
|
||||
| **市场类型** | ❌ 随意字符串 | ✅ 标准枚举 | 一致性 |
|
||||
| **数据源** | ❌ 扁平化 | ✅ 优先级列表 | 可靠性 |
|
||||
| **版本控制** | ❌ 无 | ✅ 元数据 | 可追溯 |
|
||||
|
||||
---
|
||||
|
||||
## 迁移指南
|
||||
|
||||
### 从 V1 迁移到 V2
|
||||
|
||||
#### 1. 更新配置文件结构
|
||||
|
||||
```yaml
|
||||
# V1
|
||||
code_list:
|
||||
"399006.SZ":
|
||||
name: "创业板指"
|
||||
etf: "159915.SZ"
|
||||
market: "A"
|
||||
|
||||
# V2
|
||||
asset_pools:
|
||||
equity:
|
||||
"399006.SZ":
|
||||
name: "创业板指"
|
||||
etf: "159915.SZ"
|
||||
market: "CN_EQUITY"
|
||||
```
|
||||
|
||||
#### 2. 更新市场类型
|
||||
|
||||
```yaml
|
||||
# V1 → V2 映射
|
||||
"A" → "CN_EQUITY"
|
||||
"US" → "US_EQUITY"
|
||||
"HK" → "HK_EQUITY"
|
||||
"COMMODITY" → "COMMODITY"
|
||||
"BOND" → "FIXED_INCOME"
|
||||
```
|
||||
|
||||
#### 3. 更新阈值配置
|
||||
|
||||
```yaml
|
||||
# V1
|
||||
min_score: 0.0
|
||||
bond_threshold:
|
||||
enabled: true
|
||||
bond_code: "931862.CSI"
|
||||
ratio: 1.0
|
||||
|
||||
# V2
|
||||
rotation:
|
||||
threshold:
|
||||
mode: "dynamic"
|
||||
dynamic:
|
||||
reference: "931862.CSI"
|
||||
ratio: 1.0
|
||||
```
|
||||
|
||||
#### 4. 更新数据源配置
|
||||
|
||||
```yaml
|
||||
# V1
|
||||
flask_api:
|
||||
enabled: true
|
||||
url: "https://k3s.tokenpluse.xyz"
|
||||
|
||||
# V2
|
||||
data:
|
||||
sources:
|
||||
- type: "flask_api"
|
||||
enabled: true
|
||||
url: "${FLASK_API_URL}"
|
||||
```
|
||||
|
||||
---
|
||||
|
||||
## 最佳实践
|
||||
|
||||
### 1. 使用环境变量管理敏感信息
|
||||
|
||||
```bash
|
||||
# .env 文件(不要提交到 Git)
|
||||
FLASK_API_URL=https://k3s.tokenpluse.xyz
|
||||
TUSHARE_TOKEN=your_token_here
|
||||
SSH_HOST=8.218.167.69
|
||||
SSH_KEY_PATH=/path/to/hk_ecs.pem
|
||||
```
|
||||
|
||||
### 2. 为不同环境创建不同配置
|
||||
|
||||
```
|
||||
config/
|
||||
├── rotation_dev.yaml # 开发环境
|
||||
├── rotation_prod.yaml # 生产环境
|
||||
└── rotation_test.yaml # 测试环境
|
||||
```
|
||||
|
||||
### 3. 使用版本控制追踪配置变更
|
||||
|
||||
```yaml
|
||||
metadata:
|
||||
version: "1.0.0"
|
||||
last_updated: "2024-04-16"
|
||||
changelog:
|
||||
- "2024-04-16: 初始版本"
|
||||
```
|
||||
|
||||
### 4. 定期验证配置
|
||||
|
||||
```bash
|
||||
# 运行配置测试
|
||||
python framework_v2/tests/test_config.py
|
||||
```
|
||||
|
||||
---
|
||||
|
||||
## 未来优化
|
||||
|
||||
1. [ ] 配置热重载(无需重启策略)
|
||||
2. [ ] 配置 diff 工具(对比版本差异)
|
||||
3. [ ] 配置 UI 编辑器(可视化配置)
|
||||
4. [ ] 配置模板系统(快速创建新策略)
|
||||
|
||||
---
|
||||
|
||||
## 版本历史
|
||||
|
||||
- **2024-04-16**: 初始版本
|
||||
- Pydantic Schema 验证
|
||||
- 环境变量替换
|
||||
- 资产池分类
|
||||
- 统一阈值配置
|
||||
- 多数据源降级
|
||||
- 6/6 测试通过
|
||||
25
test_api_dates.py
Normal file
25
test_api_dates.py
Normal file
@@ -0,0 +1,25 @@
|
||||
"""测试 Flask API 日期参数"""
|
||||
import os
|
||||
from datasource.flask_api_source import FlaskAPIDataSource
|
||||
|
||||
# 设置环境变量
|
||||
os.environ['FLASK_API_URL'] = 'https://k3s.tokenpluse.xyz'
|
||||
|
||||
api = FlaskAPIDataSource()
|
||||
|
||||
# 测试获取 2020-2024 年的数据
|
||||
print("测试 1: 获取 2020-2024 年数据")
|
||||
df = api.fetch("399006.SZ", "2020-01-01", "2024-12-31")
|
||||
if df is not None:
|
||||
print(f" 数据量: {len(df)}")
|
||||
print(f" 日期范围: {df.index[0]} ~ {df.index[-1]}")
|
||||
else:
|
||||
print(" 获取失败")
|
||||
|
||||
print("\n测试 2: 获取 2023-2024 年数据")
|
||||
df2 = api.fetch("399006.SZ", "2023-01-01", "2024-12-31")
|
||||
if df2 is not None:
|
||||
print(f" 数据量: {len(df2)}")
|
||||
print(f" 日期范围: {df2.index[0]} ~ {df2.index[-1]}")
|
||||
else:
|
||||
print(" 获取失败")
|
||||
Reference in New Issue
Block a user