Compare commits
1
Commits
v0.6.7
..
feec86bf13
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
feec86bf13 |
No files matched your search
+7
-335
@@ -4,347 +4,19 @@
|
|||||||
|
|
||||||
## [0.6.7] - 2026-10-22
|
## [0.6.7] - 2026-10-22
|
||||||
|
|
||||||
### 性能
|
|
||||||
|
|
||||||
- **全市场 A股报价 3.5s → 0.33s:单连接流水线 + 工作窃取**(5,227 只 / 66 片实测)。
|
|
||||||
|
|
||||||
老实现 `get_quotes` 是**纯串行 for 循环**逐片发请求:协议硬上限 80 只/请求,
|
|
||||||
全市场必须切 66 片,每片一次往返(≈60ms)→ 3.5s 全花在等网络上。
|
|
||||||
|
|
||||||
关键发现:通达信响应是**自描述长度帧**(16B 帧头 + body)且服务器**按序应答**,
|
|
||||||
因此同一 TCP 连接上可以连续下发多条请求、只付一次往返。实测单连接流水 66 个请求
|
|
||||||
只要 526ms(串行 7,372ms),响应顺序与代码完全对得上(用昨收价交叉比对 30 只,零错配)。
|
|
||||||
|
|
||||||
| 位置 | 变化 |
|
|
||||||
|---|---|
|
|
||||||
| `TdxConnection.execute_pipeline(cmds)`(新) | 一次 write 全部请求 → 按序读回全部响应。中途失败**强制断连**(响应流已错配,不可复用) |
|
|
||||||
| `PooledConnection.execute_pipeline`(新) | 池化包装转发 |
|
|
||||||
| `api._execute_std_pipeline`(新) | 借一条连接流水一整组分片;节点不支持流水线时自动降级为逐片 |
|
|
||||||
| `get_quotes(..., pipeline=True, concurrency=None)` | 新参数;小批量(≤80 只)仍走原路径,零额外开销 |
|
|
||||||
| `_quotes_std` | 改为**工作窃取**:分片放队列,连接做完一批回来再取,快的多干、慢的少干 |
|
|
||||||
| `DynamicPool.warm(n)`(新) | **并发**预建连接。`acquire()` 建连在全局锁内一次一条,22 并发首次会串行握手 22 次 —— 全市场首拉因此多花 5~6s;预热后降到 0.78s |
|
|
||||||
| `CacheManager.get_or_fetch_obj`(新) | 回源直接返回对象,省掉冷路径「pickle→立刻 unpickle」的一次白烧(5,227 条实测 ~40ms) |
|
|
||||||
| `TdxData(pool_max=)` | 默认 12 → 24,让报价并发能到「每台 2 连接」(池仍是懒扩容,不影响其他接口) |
|
|
||||||
|
|
||||||
调优实测(5,227 只 A股,11 台服务器,p50/max):
|
|
||||||
|
|
||||||
| 并发 | 每台连接 | 流水深度 | p50 | max |
|
|
||||||
|---|---|---|---|---|
|
|
||||||
| 11 | 1 | 6 | 455ms | 464ms |
|
|
||||||
| 12 | 1~2 | 3 | 457ms | 523ms |
|
|
||||||
| **22** | **2** | **3** | **325ms** | **334ms** |
|
|
||||||
| 33 | 3 | 2 | 328ms | 345ms |
|
|
||||||
|
|
||||||
⚠️ 剩余下限由公网决定:本机 → 服务器 TCP 握手 RTT 59~80ms,66 片最多只能压到
|
|
||||||
「1 次往返」;网络抖动时段实测会到 460~600ms。
|
|
||||||
|
|
||||||
端到端实测(全默认参数 `TdxData()`,11 台服务器,5,227 只):
|
|
||||||
|
|
||||||
| 场景 | 耗时 |
|
|
||||||
|---|---|
|
|
||||||
| 首次调用(含并发建 22 条连接) | 783ms |
|
|
||||||
| 稳态(第 2 次起) | **300~343ms** |
|
|
||||||
| 命中 TTL 缓存 | 67ms |
|
|
||||||
| 老版本对照(串行) | 5,996ms(首次)/ 3,460ms(稳态) |
|
|
||||||
|
|
||||||
### 修复
|
|
||||||
|
|
||||||
- **指数 / ETF / LOF 的 `trade_count` 不再伪装成成交笔数**。
|
|
||||||
|
|
||||||
通达信对**指数**和**多数场内基金**不提供笔数,但逐笔报文里那 4 字节仍塞了值:
|
|
||||||
指数是「当时均价 × 1000」,ETF/LOF 是「价格 × 1000」,货币 ETF(`sh511990`)恒为 `0`。
|
|
||||||
旧版直接把它当笔数,于是 `tdx transactions sh510310` 会打印出「3994笔」这种假数据
|
|
||||||
(实测 2026-10-22,价 3.989,原字段 3994)。
|
|
||||||
|
|
||||||
| 位置 | 变化 |
|
|
||||||
|---|---|
|
|
||||||
| `TransactionRecord.trade_count_available`(新字段) | 该品种协议上是否带笔数;默认 `True` |
|
|
||||||
| `symbols.has_order_count(market, code)`(新函数) | 按品种判定;**沪市 501x/502x/506x 实测有真实笔数**,不能按「5 开头=基金」一刀切 |
|
|
||||||
| `transaction.py` 三个解析器 | 不可用时 `trade_count=0` + `trade_count_available=False`;历史通道(0x013001,无笔数字段)同样标记 |
|
|
||||||
| `tdx transactions` CLI | 不可用时打印 `(-)`,不再打印假笔数 |
|
|
||||||
|
|
||||||
实测样本(2026-10-22,按前缀各取样):沪股票/科创/深股票/深可转债/沪逆回购 → 真实笔数;
|
|
||||||
沪 `51/52/56/58`、深 `159/15x/16x/17x/18x`、所有指数 → 不可用。
|
|
||||||
|
|
||||||
### 文档
|
|
||||||
|
|
||||||
- **可转债的量纲口径补全**(数据本身无缺陷,但对外文档一片空白,很容易被误判成 bug)。
|
|
||||||
|
|
||||||
起因:核查可转债的分时(`0x122D`)与逐笔(`0x122F`)是否有类似 ETF/LOF 的笔数问题。
|
|
||||||
结论是**价格 / 成交量 / 笔数三样全部正确**,顺带确认了 K 线标度也对;唯一的问题是
|
|
||||||
`vol` 的单位没人写清楚 —— 直接拿 `amount / vol` 算均价会**错 10 倍**。
|
|
||||||
|
|
||||||
实测(2026-10-22,16 只 A股可转债当日 + 8 只历史日 `2026-10-21`):
|
|
||||||
|
|
||||||
| 校验项 | 结果 |
|
|
||||||
|---|---|
|
|
||||||
| 分时末价 / 快照现价 | **1.000000** |
|
|
||||||
| Σ分时 vol / 日线 vol | **1.000000** |
|
|
||||||
| Σ逐笔 vol / 日线 vol | **1.000000** |
|
|
||||||
| 逐笔 VWAP vs `amount/(vol×10)` | 吻合(差 ≤0.002,是 amount 精度) |
|
|
||||||
| 快照 `pre_close` vs 上一交易日日线 `close` | **16/16 精确相等** |
|
|
||||||
| `trade_count` | 真实笔数(`sh111000` 3631 条切片 / 20443 笔) |
|
|
||||||
|
|
||||||
关键口径对照(这是文档缺失的部分):
|
|
||||||
|
|
||||||
| 品种 | 分时 / 逐笔 `vol` | 日线 `vol` | `Σ分时vol / 日线vol` | `amount / vol` |
|
|
||||||
|---|---|---|---|---|
|
|
||||||
| 股票 / ETF / LOF | 手(= 100 股) | 股 | **0.01** | 均价 ✓ |
|
|
||||||
| 可转债 | 手(= 10 张) | **手** | **1.0** | 均价 **×10** ⚠️ |
|
|
||||||
|
|
||||||
| 位置 | 变化 |
|
|
||||||
|---|---|
|
|
||||||
| `SecurityBar` / `TransactionRecord` / `MinuteBar` | 量纲注释补可转债(`vol`=手;日线 `amount/vol` 需再 `/10`) |
|
|
||||||
| `symbols.has_order_count` | 实测表补沪可转债 `110/111/113/118`、沪 EB `132`、深可转债 `123/127/128`,并说明它们走「排除法」兜底分支 |
|
|
||||||
| `docs/API_REFERENCE.md` | 新增**跨品种量纲对照表** |
|
|
||||||
| `docs/llms.txt` / `SKILL.md` | 同步同一口径 |
|
|
||||||
|
|
||||||
**代码逻辑未改**:可转债在 `has_order_count` 里本来就判为「有笔数」(不在基金/指数的
|
|
||||||
排除前缀里),本次只是把实测依据补进注释与文档。
|
|
||||||
|
|
||||||
## [0.6.6] - 2026-10-22
|
|
||||||
|
|
||||||
### 改进
|
|
||||||
|
|
||||||
- **价格小数位改用协议自带的权威值,前缀规则降为兜底**。
|
|
||||||
|
|
||||||
0.6.5 修好债券/回购标度时,采用的是「按代码前缀推断」+「用全量清单做离线校验」。
|
|
||||||
但同一份证券清单接口(`get_universe`,底层 `GetSecurityListCmd`)本来就**返回**
|
|
||||||
`SecurityInfo.decimal_point`(外加自描述浮点的 `pre_close`)——权威值一直就在手上,
|
|
||||||
只是没接进取数路径。本次把它接进来:
|
|
||||||
|
|
||||||
| 位置 | 说明 |
|
|
||||||
|---|---|
|
|
||||||
| `price_decimal_digits` | 查找顺序改为 **权威表 → 静态前缀规则**,未同步时行为与 0.6.5 完全一致 |
|
|
||||||
| `decimal_sync`(新模块) | 每日后台同步一次 + 磁盘缓存(`%LOCALAPPDATA%\pytdxdata\decimal-points.json`) |
|
|
||||||
| `TdxData.sync_decimal_points()` | 手动强制刷新(排障 / 立刻要权威表) |
|
|
||||||
| `TdxData.decimal_point_status()` | 状态:`source` / `stock` / `mixed_prefixes` / `syncing` |
|
|
||||||
|
|
||||||
**对用户仍无感**:`start()` 命中当日缓存就直接装表(实测 60 ms、零网络),
|
|
||||||
未命中则挂后台 task(实测首次 50 s,含沪 27,520 + 深 24,462 条清单),
|
|
||||||
不阻塞 `start()`(`start()` 仍 1.5 s);`close()` 会取消未完成的同步。
|
|
||||||
|
|
||||||
**表结构刻意做小**:全量 51,982 只标的只产生 **179 个**「三位前缀 → 小数位」映射
|
|
||||||
(沪 96 + 深 83),内存里就是 179 条。若将来某段代码混用两种小数位,该前缀自动
|
|
||||||
退化为**逐代码表**,只存例外代码(`mixed_prefixes` 会 > 0,可据此发现),
|
|
||||||
不会静默算错。清单拉取不完整时表会偏小 —— 缺的部分退回静态规则,不影响正确性。
|
|
||||||
|
|
||||||
为什么保留前缀规则:`get_quotes` 解析是纯同步、无网络的路径,解析那一刻可能还没
|
|
||||||
同步过清单;离线 / 首次安装也必须能出价格。实测两者在全量清单上**零分歧**
|
|
||||||
(51,982 条逐条比对,不一致 0 条),并存不会造成口径冲突。
|
|
||||||
|
|
||||||
开关:`PYPYTDX_DATA_DISABLE_DECIMAL_SYNC=1` 关闭后台同步(CI / 测试用)。
|
|
||||||
|
|
||||||
### 说明
|
|
||||||
|
|
||||||
- 新增回归测试 16 项(权威表优先级 / 混合前缀退化 / 缓存跨日失效 / 损坏容错 /
|
|
||||||
后台任务取消),测试总数 **289 → 306**。
|
|
||||||
|
|
||||||
## [0.6.5] - 2026-10-22
|
|
||||||
|
|
||||||
### 新增
|
### 新增
|
||||||
|
- `get_index_members` / `get_index_trade_stats` / `get_index_trade_stats_multi`:指数成分股与逐笔聚合统计(分钟级增量;北交所成分无笔数自动剔除)
|
||||||
- **指数成分成交汇总:一条接口拿到「某指数下全部股票的成交量与成交笔数」**
|
- `sync_decimal_points` / `decimal_point_status`:权威价格小数位表运行时同步(报价标度不再依赖硬编码前缀规则),`start()` 自动装载
|
||||||
(`get_index_members` / `get_index_trade_stats` / `get_index_trade_stats_multi`)。
|
- `decimal_sync` 模块
|
||||||
|
|
||||||
起因是一个绕不开的协议事实:**指数本身没有成交笔数**。指数逐笔(`sh000001`)的
|
|
||||||
`trade_count` 字段实际是「当时均价 × 1000」(2026-10-21 已验证),`get_minutes` /
|
|
||||||
`get_market_stat` / `SecurityBar` / `get_quotes` 的 160 个字段位里也都**没有**笔数
|
|
||||||
(扫描 0x122C 全字段位确认,`0x8`/`0x9` 是外盘/内盘手数)。所以「指数笔数」唯一可行
|
|
||||||
的口径是**把成分股的逐笔笔数累加**。
|
|
||||||
|
|
||||||
```python
|
|
||||||
async with TdxData() as td:
|
|
||||||
st = await td.get_index_trade_stats("000300") # 沪深300,约 10 s
|
|
||||||
for hhmm, cum in st.cum_trade_count(): # 截止该分钟的累计笔数
|
|
||||||
print(hhmm, cum)
|
|
||||||
st.minutes[0] # MinuteTradeStat(time='09:25', volume=…, trade_count=…)
|
|
||||||
st.total_volume # 手
|
|
||||||
st.total_trade_count # 笔
|
|
||||||
```
|
|
||||||
|
|
||||||
| 方法 | 作用 |
|
|
||||||
|---|---|
|
|
||||||
| `get_index_members(index, *, fields=None, count=100000)` | 指数成分股(含实时报价)。裸 6 位按**指数语义**解析:`000001`=上证指数,不是平安银行 |
|
|
||||||
| `get_index_trade_stats(index, date=None, *, concurrency=24, batch_size=50, members=None, skip_errors=True, on_progress=None)` | 成分逐笔 → 每分钟成交量/笔数;`date` 支持历史 |
|
|
||||||
| `get_index_trade_stats_multi(index, dates, *, ...)` | 多日批量(成分只请求一次),用于「近 N 日同时点均值」基准 |
|
|
||||||
|
|
||||||
**口径校验(2026-10-22 实测)**:``total_amount`` 是**成分股**合计。对「成分 = 指数
|
|
||||||
覆盖面」的指数,它与指数快照 ``amount`` 完全相等 —— 说明成分清单与量能口径一致。
|
|
||||||
|
|
||||||
| 指数 | 成分 | 成分合计 | 指数快照 | 比值 | 耗时 |
|
|
||||||
|---|---|---|---|---|---|
|
|
||||||
| `sh000016` 上证50 | 50 | 661.38 亿 | 661.34 亿 | 1.0001 | 5.8 s |
|
|
||||||
| `sh000300` 沪深300 | 300 | 2373.98 亿 | 2373.98 亿 | 1.0000 | 9.7 s |
|
|
||||||
| `sh000001` 上证指数 | 2230 | 3907.00 亿 | 4111.56 亿 | 0.9503 | 35.6 s |
|
|
||||||
|
|
||||||
历史日期同样成立(2026-10-21 收盘数据):`sh000016` 1046.29 / 1045.59 亿(1.0007)、
|
|
||||||
`sh000300` 3881.65 / 3879.30 亿(1.0006)。
|
|
||||||
|
|
||||||
单只股票级别的口径更硬:`Σ(逐笔价 × 手 × 100)` 与日线 `amount` 比值
|
|
||||||
**1.0000~1.0004**(`sh600000` / `sz000001` / `sh601398` / `bj920002` / `bj920015`
|
|
||||||
全部吻合),`Σvol` 与快照 `vol` 比值 1.0000。
|
|
||||||
|
|
||||||
CLI 同步新增:`tdx index-stats 000300 --top 10`。
|
|
||||||
|
|
||||||
**三个必须知道的限制**:
|
|
||||||
|
|
||||||
1. **深市 `399xxx` 的指数成交额是「全板块」口径**,不是样本股 —— 实测
|
|
||||||
`sz399001` 快照 5081.40 亿 = 深市 2908 只股票合计 5081.01 亿,`sz399006`
|
|
||||||
2568.60 亿 = 创业板全部股票合计。所以拿它跟 `total_amount` 比会得到 0.43 这种
|
|
||||||
无意义比值,不是数据错。**`get_index_trade_stats` 返回的始终是成分口径。**
|
|
||||||
2. **北交所(`899xxx`)没有笔数字段** —— 逐笔 `trade_count` 恒为 0,此时
|
|
||||||
`trade_count_available` 为 `False`,只有成交量可用。
|
|
||||||
3. **成分表比全市场滞后** —— 上证指数返回 2230 只,而 `get_universe("sh")` 里
|
|
||||||
股票段共 2360 只,差 130 只(新上市尚未纳入服务端板块),这正是上表
|
|
||||||
0.9503 的来源;`sh000016`/`sh000300` 这类固定样本指数不受影响。
|
|
||||||
需要精确覆盖时可自行传 `members=[...]`。
|
|
||||||
|
|
||||||
### 修复
|
### 修复
|
||||||
|
- **指数/ETF/LOF 逐笔的 `trade_count` 语义修正**:协议字段在指数上是「均价×1000」、ETF/LOF 上是「价格×1000」,**不是笔数**;新增 `TransactionRecord.trade_count_available`(判定见 `symbols.has_order_count`),CLI 对无笔数口径标的显示 `(-)` 而非假笔数
|
||||||
- **债券与回购价格全线偏差:沪市少 100 倍、深市少 10 倍**(`get_quotes`)。
|
- 集合竞价委托(bs_flag=8)不再混入逐笔结果(会被覆盖、Σvol 虚高 20%~160%、不同主机条数不一致)
|
||||||
|
- 缓存管理器 / 连接池 / 分页调度若干健壮性修复
|
||||||
`price_decimal_digits` 只覆盖了「股票 2 位 / 基金 3 位」两档,债券与回购没有对应
|
|
||||||
分支,落到默认档位。它们实际是 **4 位小数**,于是被读大了两个数量级:
|
|
||||||
|
|
||||||
| 标的 | 真实价 | 修复前 | 偏差 |
|
|
||||||
|---|---|---|---|
|
|
||||||
| `sh019742` 国债 24特国01 | 110.2280 | 11022.8000 | ×100 |
|
|
||||||
| `sh110077` 可转债 洪城转债 | 199.2790 | 19927.9000 | ×100 |
|
|
||||||
| `sh204001` 回购 GC001 | 1.3850 | 138.5000 | ×100 |
|
|
||||||
| `sh900901` B股 云赛B股 | 0.5670 | 5.6700 | ×10 |
|
|
||||||
| `sz123107` 可转债 温氏转债 | 112.1890 | 1121.8900 | ×10 |
|
|
||||||
| `sz131810` 回购 R-001 | 1.3800 | 13.8000 | ×10 |
|
|
||||||
|
|
||||||
沪市 `010/018/019/020/1xx/2xx` 与深市 `10x-14x/19x/50x/52x/56x` 全部改为 4 位;
|
|
||||||
沪市 B 股 `900xxx` 另改为 3 位(与深市 `200xxx` 的 2 位不同,两市不一致)。
|
|
||||||
股票 / ETF / 指数 / 板块的行为**不变**。
|
|
||||||
|
|
||||||
**验证方式(可作为该函数的验收标准)**:拿 `pre_close`(五档快照口径,走
|
|
||||||
`price_decimal_digits`)除以上一交易日**日线收盘**(K线口径,走独立的 `/1000`
|
|
||||||
路径),比值 1.0 即两口径一致。修复后 15 类标的全数为 1.0000,零偏差。
|
|
||||||
|
|
||||||
**权威来源已确认**:证券列表里协议**自带** `SecurityInfo.decimal_point` 字段。
|
|
||||||
2026-10-22 拉取全量 **51,982 只**(沪 27,520 + 深 24,462)逐条比对,本函数与
|
|
||||||
协议字段**完全一致、零例外**——因为全量清单里没有任何一个「三位前缀」出现混合
|
|
||||||
小数位。`get_quotes` 解析时拿不到证券清单,故仍用前缀推断;需要权威值时读
|
|
||||||
`SecurityInfo.decimal_point`。
|
|
||||||
|
|
||||||
- **美股(EX 通道)分时的 `hour` 是非法时钟值**(`get_minutes("usAAPL")`)。
|
|
||||||
|
|
||||||
EX 分时的 `minutes` 字段是**自开盘起的连续分钟数**,不是「当天的分钟数」。
|
|
||||||
旧代码直接 `minutes // 60`,于是 390 条里 **240 条** 的 `hour` ≥ 24:
|
|
||||||
|
|
||||||
```
|
|
||||||
修复前: 21:30, 21:31, ..., 23:59, 24:00, 24:01, ..., 27:59 ← hour=27 不存在
|
|
||||||
修复后: 21:30, 21:31, ..., 23:59, 00:00, 00:01, ..., 03:59 ← 真实北京时间
|
|
||||||
```
|
|
||||||
|
|
||||||
任何 `datetime(...)` 拼接都会因 `hour=27` 抛 `ValueError`,按小时聚合也会把
|
|
||||||
凌晨段错误地归到同一个自然日。
|
|
||||||
|
|
||||||
**修法**:`MinuteBar.__post_init__` 把越界的 `hour` 拆成
|
|
||||||
「`hour %= 24` + `day_offset += hour // 24`」,并新增两个只读属性:
|
|
||||||
|
|
||||||
| 属性 | 用途 |
|
|
||||||
|---|---|
|
|
||||||
| `MinuteBar.datetime` | 该分时点的时刻(北京时间,已含跨日偏移) |
|
|
||||||
| `MinuteBar.trading_date` | 归属的交易日 `YYYY-MM-DD`。美股一个交易日横跨两个北京自然日(21:30~次日 04:00),**按交易日聚合必须用它**,与 `SecurityBar.trading_date` 口径一致 |
|
|
||||||
|
|
||||||
A股(合成时间 09:30~15:00)/ 港股(09:30~16:00)/ 期货的 `hour` 本就合法
|
|
||||||
→ **零行为变化**,`day_offset` 恒为 0。
|
|
||||||
|
|
||||||
实测(2026-10-22):`usAAPL` / `usTSLA` / `usNVDA` 各 390 条,修复后
|
|
||||||
`hour` 全在 0~23、时间轴严格单调、`trading_date` 收敛为单一交易日;
|
|
||||||
`hk00700` 90 条无任何变化。
|
|
||||||
|
|
||||||
### 说明
|
### 说明
|
||||||
|
- 0.6.4~0.6.6 为中间迭代,未单独发版记录;本次合并 PyPI sdist 与仓库,源码恢复双仓一致
|
||||||
|
|
||||||
- 新增回归测试:债券/回购/B股小数位 ×29、美股分时跨日 ×6、指数成分成交汇总 ×34、
|
|
||||||
全接口 ×1,测试总数 **217 → 289**。
|
|
||||||
|
|
||||||
## [0.6.4] - 2026-10-22
|
|
||||||
|
|
||||||
### 修复
|
|
||||||
|
|
||||||
- **`get_ticks()` 返回列表不是时间序,每 `page_size` 处时间回跳一次**。
|
|
||||||
|
|
||||||
`0x122F`(A股逐笔)与 EX 逐笔通道的偏移量 `start` 都是**从最新一笔往回数**的:
|
|
||||||
实测 `sh600000`,`start=0` 返回 `14:07:48..15:20:16`(当天最新 1000 条),
|
|
||||||
`start=4000` 返回 `09:15:03..09:41:18`(当天最早)。而 `paginator` 按 `start`
|
|
||||||
升序拼接,于是拼出"新的块在前、旧的块在后"的倒序结构:
|
|
||||||
|
|
||||||
| | 修复前 | 修复后 |
|
|
||||||
|---|---|---|
|
|
||||||
| `sh600000` 时间轴 | 4 处逆序跳跃(index 999 / 1999 / 2999) | 严格升序 |
|
|
||||||
| `hk00700` 时间轴 | 21 处逆序跳跃(每 1800 条一次) | 严格升序 |
|
|
||||||
|
|
||||||
修复分两层:① `PageSpec.newest_first=True` 让 `paginator` 反页序拼装(页内本身升序,
|
|
||||||
只翻页序),这条能力保留给将来需要按"最新优先"锚点分页的命令;② A股逐笔最终改为
|
|
||||||
**单连接串行游标**(见下一条),从根上避开多主机锚点错位。
|
|
||||||
|
|
||||||
**`start` 参数语义同时明确**:它是"从最新往回数的偏移",不是"从最早往后数的偏移",
|
|
||||||
`docstring` 已补充。注意这修正的是**顺序**,数据本身无缺口、无重复(4304 条唯一时间戳)。
|
|
||||||
|
|
||||||
- **`TransactionRecord.trade_count` 在集合竞价段被读成 42 亿量级脏值**。
|
|
||||||
|
|
||||||
该字段在协议里是**有符号** `int32`,但解析格式串写的是无符号 `I`。集合竞价段
|
|
||||||
(`bs_flag=8`)真实值为负数,按 uint32 解出 `4294966422`:
|
|
||||||
|
|
||||||
```
|
|
||||||
原始 18 字节: 17820000 0ad71b41 d9000000 96fcffff 0800
|
|
||||||
修复前: trade_count = 4294966422
|
|
||||||
修复后: trade_count = -874 ← 0xfffffc96 的 int32 补码
|
|
||||||
```
|
|
||||||
|
|
||||||
实测 `sh600000` 全天 4304 条中有 **38 条**命中(占 0.88%),全部落在 09:15~09:25
|
|
||||||
集合竞价段;正常交易段(`bs_flag` 0/1/2/5)**无一条为负**。旧行为会让
|
|
||||||
`max()` / `mean()` 等统计直接失真(曾算出 `mean=37,920,247`)。
|
|
||||||
|
|
||||||
格式串由 `<IfIIH` 改为 `<IfIiH`。**注意负值语义尚未确证**(可能是撤单量/净委托),
|
|
||||||
目前只是如实保留符号,未做业务解释。
|
|
||||||
|
|
||||||
- **`get_quotes()` 沪市指数价格整体少 10 倍**。
|
|
||||||
|
|
||||||
`price_decimal_digits` 把沪市 `000`(如 000001/000016/000300/000688)与 `8`
|
|
||||||
开头(如板块指数 880001/880305)一律判成 3 位小数(除 1000),但协议原始整数
|
|
||||||
实际是 **2 位**(除 100)→ 上证指数 3713 被读成 371、上证50 2747 被读成 274。
|
|
||||||
|
|
||||||
实证(2026-10-21):沪市指数 6 只 + 板块 2 只全部 `分时中位价 / 快照价 = 10.0`,
|
|
||||||
而沪市 ETF(510300/588000/511010/501018)、股票(60/601)、科创板(688)、
|
|
||||||
深市指数/股票/创业板/ETF 全部 `= 1.0` 正确。修法是**把沪市 `000`/`8` 从 3 位改回 2 位**,
|
|
||||||
其余前缀(`5` ETF/基金、深市 `1` 基金转债)保持 3 位不变。回归测试覆盖 21 组代码。
|
|
||||||
|
|
||||||
- **`get_ticks()` 把集合竞价**委托**(`bs_flag=8`)当成成交计入,导致 Σvol 虚高且跨主机不稳定**。
|
|
||||||
|
|
||||||
`0x122F` 第 5 字段 `bs_flag=8` 的记录是 **09:15~09:25 / 14:57~15:00 竞价段的撮合委托
|
|
||||||
快照**,`vol` 是**累计值**(可被同段后续记录覆盖),根本不是成交增量。旧代码把它一并
|
|
||||||
返回,两个后果:
|
|
||||||
|
|
||||||
1. **Σvol 比真值虚高**:`sh600000` 全天 Σvol 含 b8 时 = 668,693,快照 vol = 462,562,
|
|
||||||
比值 1.4456;剔掉 b8 后 Σvol = 462,634,比值 **1.000156**(与快照精确一致)。
|
|
||||||
2. **跨主机不稳定**:干净主机不收录 b8(0 条)、脏主机收录 135 条。并发分页时各页
|
|
||||||
来自不同主机,同一 `start`(从最新往回数的相对锚点)在不同主机落到**不同的真实成交**
|
|
||||||
上 → 页边界既**重叠**(sh600000 冗余 116 条)又**漏条**(13:03 附近丢 59 条),
|
|
||||||
同一查询两次调用结果不同。
|
|
||||||
|
|
||||||
修复:① 分页拼装后**统一剔除 `bs_flag=8`**;② A股逐笔改用**单连接串行游标翻页**
|
|
||||||
(`_ticks_cn_serial`),彻底消除跨主机锚点错位。修复后单主机 1.0002、剔 b8 后跨主机
|
|
||||||
公共时间窗**逐条一致**。
|
|
||||||
|
|
||||||
- **文档化指数逐笔字段的量纲差异**(非 bug,是数据源固有语义)。
|
|
||||||
|
|
||||||
指数(如 `sh000016`)的 `vol` 单位是**百元**(成交额/100),`trade_count` 是**均价×1000**
|
|
||||||
(不是笔数),与个股完全不同。实测 `快照amount / Σtick.vol = 100.0002`、`tc/1000` 与分时
|
|
||||||
`avg_price` 差 < 1.1。已写进 `TransactionRecord` 类注释与 `get_ticks` docstring,
|
|
||||||
避免用户把指数 Σvol 直接和成分股成交量比(会误得 ~26 倍)。
|
|
||||||
|
|
||||||
### 说明
|
|
||||||
|
|
||||||
- 新增回归测试:价格小数位 ×20(19 组参数化 + 1 组去 NUL)、`get_ticks` 剔 b8 /
|
|
||||||
单连接串行 / 多页无重叠 ×3,测试总数 **194 → 217**。
|
|
||||||
|
|
||||||
## [0.6.3] - 2026-10-18
|
|
||||||
|
|
||||||
- fix(pool): ExPool acquire 背压等待(Condition 排队,默认 30s 超时)替代 3x0.05s 快速失败;超时异常带池状态
|
- fix(pool): ExPool acquire 背压等待(Condition 排队,默认 30s 超时)替代 3x0.05s 快速失败;超时异常带池状态
|
||||||
- feat(api): 新增 ex_pool_cap 参数(默认 2),单 EX 服务器场景不再静默退化为 1 并发(fixes #1)
|
- feat(api): 新增 ex_pool_cap 参数(默认 2),单 EX 服务器场景不再静默退化为 1 并发(fixes #1)
|
||||||
|
|||||||
@@ -142,15 +142,13 @@ await td.get_bars("cffex:IFL0", KlinePeriod.DAY, count=700) # 期货合约
|
|||||||
| 全市场标的清单(A股+港股+期货…) | `get_universe(market=None)` |
|
| 全市场标的清单(A股+港股+期货…) | `get_universe(market=None)` |
|
||||||
| 日/周/月/分钟 K 线(任意市场) | `get_bars(symbols, period, *, count, adjust, start_date, end_date)` |
|
| 日/周/月/分钟 K 线(任意市场) | `get_bars(symbols, period, *, count, adjust, start_date, end_date)` |
|
||||||
| K 线 + MACD/KDJ/RSI/BOLL | `get_indicators(symbols, indicators, ...)` |
|
| K 线 + MACD/KDJ/RSI/BOLL | `get_indicators(symbols, indicators, ...)` |
|
||||||
| 实时五档报价(A股)/ 基础报价(港股/美股/期货) | `get_quotes(symbols, *, fields=None, pipeline=True)` |
|
| 实时五档报价(A股)/ 基础报价(港股/美股/期货) | `get_quotes(symbols, *, fields=None)` |
|
||||||
| 逐笔成交(任意市场) | `get_ticks(symbols, *, date)` |
|
| 逐笔成交(任意市场) | `get_ticks(symbols, *, date)` |
|
||||||
| 分时图 / 缩略采样 | `get_minutes(symbols, *, date, sampling=True)` |
|
| 分时图 / 缩略采样 | `get_minutes(symbols, *, date, sampling=True)` |
|
||||||
| 全市场股票列表(缓存 1 天) | `get_universe("sz")` / `get_universe("sh")` |
|
| 全市场股票列表(缓存 1 天) | `get_universe("sz")` / `get_universe("sh")` |
|
||||||
| 除权除息 / 财务快照 | `get_xdxr(symbols)` / `get_finance(symbols)` |
|
| 除权除息 / 财务快照 | `get_xdxr(symbols)` / `get_finance(symbols)` |
|
||||||
| F10 公司资料 | `get_f10(symbol, section)` |
|
| F10 公司资料 | `get_f10(symbol, section)` |
|
||||||
| 板块列表 / 成分股 / 涨跌排行 | `get_boards` / `get_board_members` / `get_board_ranking` |
|
| 板块列表 / 成分股 / 涨跌排行 | `get_boards` / `get_board_members` / `get_board_ranking` |
|
||||||
| **指数的成交量 + 成交笔数**(每分钟曲线) | `get_index_trade_stats(index, date)` → `.cum_trade_count()` |
|
|
||||||
| **指数成分股** | `get_index_members(index)`(裸 `000001` 按指数语义解析) |
|
|
||||||
| 个股所属板块 | `get_board_of(symbols)` |
|
| 个股所属板块 | `get_board_of(symbols)` |
|
||||||
| 集合竞价 / 异动 / 资金流 | `get_auction` / `get_unusual` / `get_capital_flow` |
|
| 集合竞价 / 异动 / 资金流 | `get_auction` / `get_unusual` / `get_capital_flow` |
|
||||||
| 个股特征快照 | `get_snapshot(symbols)` |
|
| 个股特征快照 | `get_snapshot(symbols)` |
|
||||||
@@ -169,16 +167,7 @@ await td.get_bars("cffex:IFL0", KlinePeriod.DAY, count=700) # 期货合约
|
|||||||
- **K 线时间戳统一为北京时间**(v0.6.2 起)。美股原始报文里日期是美东交易日、时分是北京时间(两个时区拼在一起),库已自动归一化,`bar.datetime` 可直接排序 / 比较 / 过滤。但**美股一个交易日横跨两个北京自然日**,按交易日聚合(分钟线合成日线、日内统计)必须用 `bar.trading_date`。
|
- **K 线时间戳统一为北京时间**(v0.6.2 起)。美股原始报文里日期是美东交易日、时分是北京时间(两个时区拼在一起),库已自动归一化,`bar.datetime` 可直接排序 / 比较 / 过滤。但**美股一个交易日横跨两个北京自然日**,按交易日聚合(分钟线合成日线、日内统计)必须用 `bar.trading_date`。
|
||||||
- **`count` 很大时会自动多连接并发分页**,无需手动翻页。但标准通道 K 线 `count < 100` 部分服务器会返回空——内部已强制 `min_page=100` 规避。
|
- **`count` 很大时会自动多连接并发分页**,无需手动翻页。但标准通道 K 线 `count < 100` 部分服务器会返回空——内部已强制 `min_page=100` 规避。
|
||||||
- **`get_quotes` 一次 >80 只自动切批**;走 MAC 字段位通道(`fields=`)时上限为 80 只/次。
|
- **`get_quotes` 一次 >80 只自动切批**;走 MAC 字段位通道(`fields=`)时上限为 80 只/次。
|
||||||
- **全市场报价用默认参数即可,别自己写循环**。`get_quotes(全部A股)` 内部会切 66 片并走**单连接流水线**(一条连接连发多个分片、只付一次往返)+ 工作窃取调度,5,227 只实测 **p50 325ms**(老版本串行 3.5s)。自己 for 循环逐只/逐片调会把流水线优势全部丢掉。
|
- **历史逐笔没有笔数字段**,只有当日逐笔的 `trade_count` 有效。
|
||||||
- 想更保守可 `concurrency=11`(每台 1 连接),代价 p50 457ms。
|
|
||||||
- 个别服务器不支持流水线时自动降级逐片,结果不受影响。
|
|
||||||
- **可转债(110/111/113/118/123/127/128)三样都是真的**:价格、`vol`(手=10 张)、`trade_count`(真实笔数,3631 条切片 / 20443 笔量级)全部可用,`Σvol` 与日线 `vol` **1:1 相等**。
|
|
||||||
⚠️ 唯一要小心的是 **日线 `amount / vol` 不等于均价,而是均价的 10 倍**(`vol` 单位是手=10 张)。算可转债均价用 `amount / vol / 10`,或直接用 `Σ(price×vol) / Σvol`——后者跨品种都成立,最稳。
|
|
||||||
对照:股票/ETF 的 `Σ逐笔vol / 日线vol = 0.01`(逐笔手、日线股),而 `amount/vol` 恰好就是均价。
|
|
||||||
- **指数本身没有成交笔数**。`get_ticks("sh000001")` 的 `trade_count` 是「当时均价×1000」、`vol` 单位是百元(成交额/100)。要笔数只能用 `get_index_trade_stats(index)`(成分股逐笔累加,2230 只约 36-60 s)。北交所成分无笔数字段,该方法会返回 `trade_count_available=False`。
|
|
||||||
- **ETF / LOF 也没有成交笔数**。`get_ticks("sh510310")` 的 `trade_count` 是「价格×1000」(货币 ETF 恒为 0)。判定用 `symbols.has_order_count(market, code)`,读记录时看 `TransactionRecord.trade_count_available`——为 `False` 时 `trade_count` 已被置 0,不要求和/求均值。注意**沪市 `501x/502x/506x` 实测有真实笔数**,不能按「5 开头=基金」一刀切。
|
|
||||||
- **历史逐笔有笔数**(MAC `0x122F` 支持历史日期,实测可回溯最近 5 个交易日;更早返回空)。
|
|
||||||
- **小数位表不用手动管,但可以手动刷**。`start()` 会检查当日缓存并后台同步一次(`SecurityInfo.decimal_point` 权威值);要强制刷新用 `await td.sync_decimal_points()`,看同步状态用 `await td.decimal_point_status()`。`PYPYTDX_DATA_DISABLE_DECIMAL_SYNC=1` 可关闭后台同步。
|
|
||||||
- 板块文件(`block_*.dat`)/ 行业(`tdxhy.cfg`)/ 财报(`gpcw*.zip`)是**服务器上的静态文件**,解析后是普通 dataclass,**落 JSON 后完全脱网可用**——适合做离线快照。
|
- 板块文件(`block_*.dat`)/ 行业(`tdxhy.cfg`)/ 财报(`gpcw*.zip`)是**服务器上的静态文件**,解析后是普通 dataclass,**落 JSON 后完全脱网可用**——适合做离线快照。
|
||||||
|
|
||||||
## 陷阱清单
|
## 陷阱清单
|
||||||
@@ -196,9 +185,6 @@ await td.get_bars("cffex:IFL0", KlinePeriod.DAY, count=700) # 期货合约
|
|||||||
| 循环里逐个 `await get_bars` | 慢 | 用列表传多个标的,自动并发 |
|
| 循环里逐个 `await get_bars` | 慢 | 用列表传多个标的,自动并发 |
|
||||||
| 港股/美股五档 bid/ask | 没有(协议不支持) | `fields` 字段位通道有 name 但无五档 |
|
| 港股/美股五档 bid/ask | 没有(协议不支持) | `fields` 字段位通道有 name 但无五档 |
|
||||||
| 美股分钟线用 `datetime.date()` 分组做日聚合 | 一个交易日被拆成两天(美股跨北京零点) | 用 `bar.trading_date`;`bar.datetime` 是归一化后的北京时间 |
|
| 美股分钟线用 `datetime.date()` 分组做日聚合 | 一个交易日被拆成两天(美股跨北京零点) | 用 `bar.trading_date`;`bar.datetime` 是归一化后的北京时间 |
|
||||||
| 拿指数逐笔的 `trade_count` 当笔数 | 拿到的是「均价×1000」,数值荒谬 | 用 `get_index_trade_stats(index)` 由成分累加 |
|
|
||||||
| 拿 ETF/LOF 逐笔的 `trade_count` 当笔数 | 拿到的是「价格×1000」(`sh510310` 显示 3994 笔) | 看 `trade_count_available`,或 `symbols.has_order_count()` |
|
|
||||||
| 拿深市 `399xxx` 的 `amount` 校验成分合计 | 比值 0.43,误以为数据错 | 深市指数 amount 是**全板块**口径(`sz399001`=深市全部 5081 亿),不是样本股 |
|
|
||||||
| 依赖实时性做信号 | 数据是 15 分钟前的 | 换券商实时源 |
|
| 依赖实时性做信号 | 数据是 15 分钟前的 | 换券商实时源 |
|
||||||
| 手动改包内 `servers.json` / 写死 IP | 容器只读、升级被覆盖、快节点捞不回来 | 日常靠内置的**当日测速缓存**自动选路;要强制指定就用 `PYPYTDX_DATA_{STANDARD,MAC,EX}_HOSTS` 环境变量 |
|
| 手动改包内 `servers.json` / 写死 IP | 容器只读、升级被覆盖、快节点捞不回来 | 日常靠内置的**当日测速缓存**自动选路;要强制指定就用 `PYPYTDX_DATA_{STANDARD,MAC,EX}_HOSTS` 环境变量 |
|
||||||
|
|
||||||
|
|||||||
+20
-25
@@ -47,15 +47,13 @@ from pytdxdata import (
|
|||||||
|
|
||||||
| 方法 | 返回 | 说明 |
|
| 方法 | 返回 | 说明 |
|
||||||
|------|------|------|
|
|------|------|------|
|
||||||
| `get_universe(market=None)` | `list[SecurityInfo]` | 跨市场标的清单(A 股+港股+美股+期货/期权);每条带协议自带的 `decimal_point`(价格小数位)与 `pre_close` |
|
| `get_universe(market=None)` | `list[SecurityInfo]` | 跨市场标的清单(A 股+港股+美股+期货/期权) |
|
||||||
| `sync_decimal_points(markets=("sh","sz"))` | `dict` | 从证券清单同步**权威价格小数位表**(`SecurityInfo.decimal_point`),灌进 `price_decimal_digits` 的运行时表;`start()` 已自动做(当日缓存命中则零网络),此方法用于强制刷新/排障 |
|
|
||||||
| `decimal_point_status()` | `dict` | 小数位表状态:`source`(`cache`/`universe`/空)、`stock`、`mixed_prefixes`、`syncing` |
|
|
||||||
|
|
||||||
#### 报价
|
#### 报价
|
||||||
|
|
||||||
| 方法 | 返回 | 说明 |
|
| 方法 | 返回 | 说明 |
|
||||||
|------|------|------|
|
|------|------|------|
|
||||||
| `get_quotes(symbols, *, fields=None, concurrency=None, pipeline=True)` | `list[SecurityQuote]` | 跨市场混合报价(A 股标准五档;给了 fields 走 MAC/EX 字段位有 name)。超 80 只自动切批,`pipeline` 开启**单连接流水线**,全市场 5,200 只 ~0.33s |
|
| `get_quotes(symbols, *, fields=None)` | `list[SecurityQuote]` | 跨市场混合报价(A 股标准五档;给了 fields 走 MAC/EX 字段位有 name) |
|
||||||
| `get_snapshot(symbols)` | `list[SymbolSnapshot]` | 个股特征快照(A 股) |
|
| `get_snapshot(symbols)` | `list[SymbolSnapshot]` | 个股特征快照(A 股) |
|
||||||
| `get_auction(symbols)` | `list[AuctionItem]` | 集合竞价(A 股) |
|
| `get_auction(symbols)` | `list[AuctionItem]` | 集合竞价(A 股) |
|
||||||
| `get_capital_flow(symbols)` | `list[CapitalFlow]` | 个股资金流向(A 股) |
|
| `get_capital_flow(symbols)` | `list[CapitalFlow]` | 个股资金流向(A 股) |
|
||||||
@@ -71,7 +69,7 @@ from pytdxdata import (
|
|||||||
|
|
||||||
| 方法 | 返回 | 说明 |
|
| 方法 | 返回 | 说明 |
|
||||||
|------|------|------|
|
|------|------|------|
|
||||||
| `get_ticks(symbols, *, date=None, start=0, count=None, concurrency=6)` | `list[TransactionRecord]` | 跨市场逐笔成交。返回按时间升序;`start` **从最新一笔往回数**;`vol`/`trade_count` 为约 3 秒切片的增量值(非累计)。**已剔除 `bs_flag=8` 竞价委托**(非成交,`vol` 为累计撮合量)。**指数**:`vol` 单位是百元(成交额/100)、`trade_count` 是均价×1000,均非股票语义;**可转债**:`vol` 是手(=10 张)、`trade_count` 是**真实笔数**,`Σvol` 与日线 `vol` **1:1** |
|
| `get_ticks(symbols, *, date=None, start=0, count=None, concurrency=6)` | `list[TransactionRecord]` | 跨市场逐笔成交 |
|
||||||
| `get_minutes(symbols, *, date=None, sampling=False, concurrency=6)` | `list[MinuteBar]` | 跨市场分时(sampling=True 取缩略采样:A股由 0x122D 派生,扩展市场 0x254D) |
|
| `get_minutes(symbols, *, date=None, sampling=False, concurrency=6)` | `list[MinuteBar]` | 跨市场分时(sampling=True 取缩略采样:A股由 0x122D 派生,扩展市场 0x254D) |
|
||||||
|
|
||||||
#### 公司信息/文件/板块
|
#### 公司信息/文件/板块
|
||||||
@@ -83,9 +81,21 @@ from pytdxdata import (
|
|||||||
| `get_boards(kind="all", *, count=10000)` | `list[BoardInfo]` | 板块列表 |
|
| `get_boards(kind="all", *, count=10000)` | `list[BoardInfo]` | 板块列表 |
|
||||||
| `get_board_members(board, *, fields=None, count=100000)` | `list[SecurityQuote]` | 板块成分股报价(归一模型) |
|
| `get_board_members(board, *, fields=None, count=100000)` | `list[SecurityQuote]` | 板块成分股报价(归一模型) |
|
||||||
| `get_board_of(symbols)` | `list[BelongBoard]` | 个股所属板块 |
|
| `get_board_of(symbols)` | `list[BelongBoard]` | 个股所属板块 |
|
||||||
| `get_index_members(index, *, fields=None, count=100000)` | `list[SecurityQuote]` | **指数成分股**报价。裸 6 位按**指数语义**解析(`000001`=上证指数,不是平安银行):`000/999/880`→沪、`399`→深、`899`→北交所 |
|
|
||||||
| `get_index_trade_stats(index, date=None, *, concurrency=24, batch_size=50, members=None, skip_errors=True, on_progress=None)` | `IndexTradeStats` | **指数成分逐笔汇总**成每分钟成交量/成交笔数。协议里指数本身没有笔数(`trade_count` 是均价×1000),故由成分股逐笔累加;`.cumulative()` 取「截止该分钟累计」,`.cum_trade_count()` 直接给 `[(HH:MM, 累计笔数)]`。2230 只(上证)约 36-60 s |
|
#### 指数成分与统计(v0.6.7)
|
||||||
| `get_index_trade_stats_multi(index, dates, *, ...)` | `list[IndexTradeStats]` | 多日批量版(成分只请求一次),用于「近 N 日同时点累计均值」基准 |
|
|
||||||
|
| 方法 | 返回 | 说明 |
|
||||||
|
|------|------|------|
|
||||||
|
| `get_index_members(index, *, count=100000, fields=None)` | `list[SecurityQuote]` | 指数成分股含实时报价(MAC 0x122C,指数码→板块码映射) |
|
||||||
|
| `get_index_trade_stats(index, *, date=None, members=None, batch_size=50, concurrency=24, skip_errors=True)` | `IndexTradeStats` | 指数逐笔聚合统计(分钟级增量 vol/trade_count/amount;北交所成分无笔数自动剔除) |
|
||||||
|
| `get_index_trade_stats_multi(index, dates, *, concurrency=24, batch_size=50, skip_errors=True, on_progress=None)` | `dict[int, IndexTradeStats]` | 多日批量版(按日期键) |
|
||||||
|
|
||||||
|
#### 价格小数位(v0.6.7)
|
||||||
|
|
||||||
|
| 方法 | 返回 | 说明 |
|
||||||
|
|------|------|------|
|
||||||
|
| `sync_decimal_points(markets=("sh","sz"))` | `dict[str, int]` | 从证券清单同步权威价格小数位表(`start()` 已自动处理,此为手动刷新口) |
|
||||||
|
| `decimal_point_status()` | `dict` | 小数位表当前状态(source/stock/syncing,排障用) |
|
||||||
|
|
||||||
### 2.2 K线(旧接口,共 6 个) {#legacy-kline}
|
### 2.2 K线(旧接口,共 6 个) {#legacy-kline}
|
||||||
|
|
||||||
@@ -102,7 +112,7 @@ from pytdxdata import (
|
|||||||
|
|
||||||
| 方法 | 返回 | 说明 |
|
| 方法 | 返回 | 说明 |
|
||||||
|------|------|------|
|
|------|------|------|
|
||||||
| `get_quotes(symbols, *, fields=None, concurrency=None, pipeline=True)` | `list[SecurityQuote]` | 五档报价;>80 只自动切批(流水线+工作窃取,5,200 只 ~0.33s);TTL 5s |
|
| `get_quotes(symbols, *, fields=None)` | `list[SecurityQuote]` | 五档报价;>80 只自动切批;TTL 5s |
|
||||||
| `get_stock_quotes(stocks, bits=None)` | `list[MemberQuote]` | MAC 自定义字段报价(≤80只/次) |
|
| `get_stock_quotes(stocks, bits=None)` | `list[MemberQuote]` | MAC 自定义字段报价(≤80只/次) |
|
||||||
| `get_stock_quotes_list(category, *, start=0, count=80, sort_type=0)` | `list[MemberQuote]` | 市场分类报价(0沪A/2深A/6全A/8科创/14创业) |
|
| `get_stock_quotes_list(category, *, start=0, count=80, sort_type=0)` | `list[MemberQuote]` | 市场分类报价(0沪A/2深A/6全A/8科创/14创业) |
|
||||||
| `get_market_stat()` | `MarketStat` | 全市场统计(涨跌家数/总额/市值/涨跌停数) |
|
| `get_market_stat()` | `MarketStat` | 全市场统计(涨跌家数/总额/市值/涨跌停数) |
|
||||||
@@ -204,7 +214,7 @@ from pytdxdata import (
|
|||||||
| `SecurityQuote` | price/pre_close/OHLC/vol/amount/s_vol/b_vol/`bid[5]`/`ask[5]`/server_time/trading_status/cur_vol/rise_speed/limit_up/limit_down/decimal_point/open_amount |
|
| `SecurityQuote` | price/pre_close/OHLC/vol/amount/s_vol/b_vol/`bid[5]`/`ask[5]`/server_time/trading_status/cur_vol/rise_speed/limit_up/limit_down/decimal_point/open_amount |
|
||||||
| `SecurityInfo` | market/code/name/volunit/decimal_point/pre_close |
|
| `SecurityInfo` | market/code/name/volunit/decimal_point/pre_close |
|
||||||
| `TransactionRecord` | market/code/time/price/vol/`trade_count`/bs_flag |
|
| `TransactionRecord` | market/code/time/price/vol/`trade_count`/bs_flag |
|
||||||
| `MinuteBar` | price/vol/avg_price/hour/minute/day_offset + `datetime`/`trading_date` 只读属性(hour 恒为合法时钟值 0~23;美股一个交易日跨两个北京自然日,按交易日聚合用 `trading_date`) |
|
| `MinuteBar` | price/vol/avg_price/hour/minute |
|
||||||
| `XdxrRecord` | 分红送转/配股/缩股/行权 + 股本变动 + `date` 属性 |
|
| `XdxrRecord` | 分红送转/配股/缩股/行权 + 股本变动 + `date` 属性 |
|
||||||
| `FinanceRecord` | 股本/资产/负债/营收/利润等 36 个字段(万元/万股) |
|
| `FinanceRecord` | 股本/资产/负债/营收/利润等 36 个字段(万元/万股) |
|
||||||
| `BoardInfo` | 板块 + 领涨股信息 |
|
| `BoardInfo` | 板块 + 领涨股信息 |
|
||||||
@@ -223,21 +233,6 @@ from pytdxdata import (
|
|||||||
|
|
||||||
> 注:`__init__` 仅导出 `Market/ExMarket/KlinePeriod/Adjust` 与 6 个核心模型;`BoardInfo/MemberQuote/AuctionItem` 等需 `from pytdxdata.models import ...`。
|
> 注:`__init__` 仅导出 `Market/ExMarket/KlinePeriod/Adjust` 与 6 个核心模型;`BoardInfo/MemberQuote/AuctionItem` 等需 `from pytdxdata.models import ...`。
|
||||||
|
|
||||||
**量纲对照(跨品种,2026-10-22 实测)**
|
|
||||||
|
|
||||||
同名字段在不同品种上单位不同。最典型的坑是用 `amount / vol` 算均价——它在可转债上会**错 10 倍**:
|
|
||||||
|
|
||||||
| 品种 | 分时 / 逐笔 `vol` | 日线 `SecurityBar.vol` | `Σ分时vol / 日线vol` | 日线 `amount / vol` |
|
|
||||||
|---|---|---|---|---|
|
|
||||||
| 股票 / ETF / LOF | 手(= 100 股) | 股 | **0.01** | 均价 ✓ |
|
|
||||||
| 可转债(110/111/113/118/123/127/128) | 手(= 10 张) | **手** | **1.0** | 均价 **×10** ⚠️ |
|
|
||||||
| 指数 | 百元(成交额/100) | 手 | — | 无意义(`amount` 是全板块口径) |
|
|
||||||
|
|
||||||
算均价:股票 `amount / vol`;可转债 `amount / vol / 10`;跨品种统一用 `Σ(price×vol) / Σvol`。
|
|
||||||
|
|
||||||
> 可转债的价格标度、分时、逐笔已全量校验(16 只当日 + 8 只历史日):分时末价 / 快照现价、`Σvol / 日线vol`、逐笔 VWAP vs `amount/(vol×10)` 比值均为 **1.000000**。
|
|
||||||
|
|
||||||
|
|
||||||
## 四、辅助模块
|
## 四、辅助模块
|
||||||
|
|
||||||
**`pytdxdata.indicator`**(技术指标,纯函数)
|
**`pytdxdata.indicator`**(技术指标,纯函数)
|
||||||
|
|||||||
+2
-6
@@ -47,12 +47,8 @@ asyncio.run(main())
|
|||||||
- **标的清单**:`get_universe`(A股 + 港股 + 美股 + 期货/期权)
|
- **标的清单**:`get_universe`(A股 + 港股 + 美股 + 期货/期权)
|
||||||
- **K 线**:`get_bars`(自动并发分页、支持复权与日期区间、多标的并发)
|
- **K 线**:`get_bars`(自动并发分页、支持复权与日期区间、多标的并发)
|
||||||
- **技术指标**:`get_indicators`(K线 + MACD/KDJ/RSI/BOLL/MA/EMA)
|
- **技术指标**:`get_indicators`(K线 + MACD/KDJ/RSI/BOLL/MA/EMA)
|
||||||
- **报价**:`get_quotes`(五档,>80 只自动切批;**单连接流水线**默认开启,全市场 5,200 只 A股 ~0.33s)、`get_snapshot`(个股特征)、`get_market_stat`
|
- **报价**:`get_quotes`(五档,>80 只自动切批)、`get_snapshot`(个股特征)、`get_market_stat`
|
||||||
- 价格标度:协议给的是整数,真实价 = `整数 / 10**小数位`。小数位由 `price_decimal_digits` 决定,
|
- **逐笔 / 分时**:`get_ticks`(含 `trade_count`,支持历史日期)、`get_minutes`(`sampling=True` 取缩略采样)
|
||||||
优先用**权威表**(证券清单自带的 `SecurityInfo.decimal_point`,`start()` 每日后台同步一次,
|
|
||||||
也可 `await td.sync_decimal_points()` 强制刷新),未同步时退回静态前缀规则。
|
|
||||||
债券/回购是 **4 位**、沪市 B 股 3 位 —— 这里错过两次(整批价格差 100 倍/10 倍)。
|
|
||||||
- **逐笔 / 分时**:`get_ticks`(含 `trade_count`,支持历史日期,返回按时间升序;`vol`/`trade_count` 为约 3 秒切片增量而非累计;已剔除 `bs_flag=8` 竞价委托;**指数**的 `vol` 是百元、`trade_count` 是均价×1000;**可转债**的 `vol` 是手=10 张、`trade_count` 是真实笔数,故日线 `amount/vol` 是均价的 **10 倍**,算均价要再 /10)、`get_minutes`(`sampling=True` 取缩略采样;`hour` 恒为合法时钟值 0~23,美股一个交易日跨两个北京自然日,按交易日聚合用 `MinuteBar.trading_date`、取时刻用 `MinuteBar.datetime`)
|
|
||||||
- **财务 / 除权**:`get_finance`(最新快照)、`get_xdxr`、`get_price_limits`(本地计算涨跌停)
|
- **财务 / 除权**:`get_finance`(最新快照)、`get_xdxr`、`get_price_limits`(本地计算涨跌停)
|
||||||
- **F10**:`get_f10`(公司资料目录 + 正文)
|
- **F10**:`get_f10`(公司资料目录 + 正文)
|
||||||
- **板块**:`get_boards`、`get_board_members`、`get_board_of`、`get_board_summary`、
|
- **板块**:`get_boards`、`get_board_members`、`get_board_of`、`get_board_summary`、
|
||||||
|
|||||||
+22
-5
@@ -6,9 +6,19 @@ readme = "README.md"
|
|||||||
requires-python = ">=3.11"
|
requires-python = ">=3.11"
|
||||||
license = "MIT"
|
license = "MIT"
|
||||||
license-files = ["LICENSE"]
|
license-files = ["LICENSE"]
|
||||||
keywords = ["tdx", "trading", "stock", "kline", "quote", "通达信", "A股", "港股", "美股", "期货", "asyncio", "quant"]
|
keywords = [
|
||||||
authors = [
|
"tdx",
|
||||||
{ name = "openbot-coder", email = "openbot-coder@users.noreply.github.com" }
|
"trading",
|
||||||
|
"stock",
|
||||||
|
"kline",
|
||||||
|
"quote",
|
||||||
|
"通达信",
|
||||||
|
"A股",
|
||||||
|
"港股",
|
||||||
|
"美股",
|
||||||
|
"期货",
|
||||||
|
"asyncio",
|
||||||
|
"quant",
|
||||||
]
|
]
|
||||||
classifiers = [
|
classifiers = [
|
||||||
"Development Status :: 4 - Beta",
|
"Development Status :: 4 - Beta",
|
||||||
@@ -24,6 +34,10 @@ classifiers = [
|
|||||||
]
|
]
|
||||||
dependencies = []
|
dependencies = []
|
||||||
|
|
||||||
|
[[project.authors]]
|
||||||
|
name = "openbot-coder"
|
||||||
|
email = "openbot-coder@users.noreply.github.com"
|
||||||
|
|
||||||
[project.urls]
|
[project.urls]
|
||||||
Homepage = "https://github.com/openbot-coder/pytdxdata"
|
Homepage = "https://github.com/openbot-coder/pytdxdata"
|
||||||
Repository = "https://github.com/openbot-coder/pytdxdata"
|
Repository = "https://github.com/openbot-coder/pytdxdata"
|
||||||
@@ -31,7 +45,11 @@ Documentation = "https://openbot-coder.github.io/pytdxdata/"
|
|||||||
|
|
||||||
[project.optional-dependencies]
|
[project.optional-dependencies]
|
||||||
uvloop = ["uvloop>=0.21"]
|
uvloop = ["uvloop>=0.21"]
|
||||||
dev = ["pytest>=8.0", "pytest-asyncio>=0.24", "ruff>=0.6"]
|
dev = [
|
||||||
|
"pytest>=8.0",
|
||||||
|
"pytest-asyncio>=0.24",
|
||||||
|
"ruff>=0.6",
|
||||||
|
]
|
||||||
|
|
||||||
[project.scripts]
|
[project.scripts]
|
||||||
tdx = "pytdxdata.cli:main"
|
tdx = "pytdxdata.cli:main"
|
||||||
@@ -59,4 +77,3 @@ docs = [
|
|||||||
"ruff>=0.6",
|
"ruff>=0.6",
|
||||||
"jieba>=0.42",
|
"jieba>=0.42",
|
||||||
]
|
]
|
||||||
|
|
||||||
@@ -1,108 +0,0 @@
|
|||||||
"""可复现核查:指数成分逐笔汇总的口径是否与官方日线一致。
|
|
||||||
|
|
||||||
用法::
|
|
||||||
|
|
||||||
python scripts/verify_index_stats.py # 当日
|
|
||||||
python scripts/verify_index_stats.py --date 20261021 # 历史某日
|
|
||||||
python scripts/verify_index_stats.py --indices 000001 000300
|
|
||||||
|
|
||||||
两段校验:
|
|
||||||
|
|
||||||
1. **单股级**:``Σ(逐笔价 × 手 × 100)`` 对**当日日线 amount**。比值 1.0000~1.0002
|
|
||||||
说明逐笔没漏条、价格与单位都对(``bj`` 也行)。
|
|
||||||
2. **指数级**:成分股合计成交额对**该指数的日线 amount**。相等说明成分清单与
|
|
||||||
指数的量能口径一致;明显偏小则是成分表滞后(新上市未纳入)。
|
|
||||||
|
|
||||||
⚠️ **深市 `399xxx` 的指数 amount 是「全板块」口径**,不是样本股:实测
|
|
||||||
`sz399001` 5081.40 亿 = 深市 2908 只股票合计,`sz399006` 2568.60 亿 = 创业板
|
|
||||||
全部股票合计。所以这两个指数的比值天然远离 1(约 0.43),**不是数据错**。
|
|
||||||
|
|
||||||
为什么不用快照做基准:快照只有「此刻」,历史日期对不上。日线 amount 两者都能给。
|
|
||||||
|
|
||||||
注意 ``bj``(北交所)逐笔**没有笔数字段**(``trade_count`` 恒 0),脚本会打出
|
|
||||||
``有笔数`` 列便于识别。
|
|
||||||
"""
|
|
||||||
from __future__ import annotations
|
|
||||||
|
|
||||||
import argparse
|
|
||||||
import asyncio
|
|
||||||
from datetime import date as _date
|
|
||||||
|
|
||||||
|
|
||||||
def _ymd(bar) -> int:
|
|
||||||
return bar.year * 10000 + bar.month * 100 + bar.day
|
|
||||||
|
|
||||||
|
|
||||||
async def _daily_amount(td, symbol: str, ymd: int) -> float | None:
|
|
||||||
from pytdxdata import KlinePeriod
|
|
||||||
|
|
||||||
bars = await td.get_bars(symbol, KlinePeriod.DAY, count=10)
|
|
||||||
for b in bars:
|
|
||||||
if _ymd(b) == ymd:
|
|
||||||
return b.amount
|
|
||||||
return None
|
|
||||||
|
|
||||||
|
|
||||||
async def check_symbols(td, symbols: list[str], ymd: int) -> None:
|
|
||||||
print(f"## 单股级({ymd})\n")
|
|
||||||
print("| 标的 | Σ(p×手×100) / 日线amount | 笔数 |")
|
|
||||||
print("|---|---|---|")
|
|
||||||
for sym in symbols:
|
|
||||||
try:
|
|
||||||
ticks = await td.get_ticks(sym, date=ymd)
|
|
||||||
ref = await _daily_amount(td, sym, ymd)
|
|
||||||
except Exception as exc: # noqa: BLE001
|
|
||||||
print(f"| {sym} | ERR {type(exc).__name__} | - |")
|
|
||||||
continue
|
|
||||||
if not ticks:
|
|
||||||
print(f"| {sym} | 无逐笔(非交易日?) | - |")
|
|
||||||
continue
|
|
||||||
sa = sum(t.price * t.vol * 100 for t in ticks)
|
|
||||||
tc = sum(t.trade_count for t in ticks)
|
|
||||||
ratio = sa / ref if ref else 0.0
|
|
||||||
print(f"| {sym} | {ratio:.4f} | {tc:,} |")
|
|
||||||
print()
|
|
||||||
|
|
||||||
|
|
||||||
async def check_indices(td, indices: list[str], ymd: int, day: int | None) -> None:
|
|
||||||
print(f"## 指数级({ymd})\n")
|
|
||||||
print("| 指数 | 成分 | 有成交 | 有笔数 | 成分合计 | 日线amount | 比值 | 耗时 |")
|
|
||||||
print("|---|---|---|---|---|---|---|---|")
|
|
||||||
for idx in indices:
|
|
||||||
try:
|
|
||||||
st = await td.get_index_trade_stats(idx, day)
|
|
||||||
ref = await _daily_amount(td, st.index, ymd)
|
|
||||||
except Exception as exc: # noqa: BLE001
|
|
||||||
print(f"| {idx} | ERR {type(exc).__name__}: {exc} | - | - | - | - | - | - |")
|
|
||||||
continue
|
|
||||||
ratio = st.total_amount / ref if ref else 0.0
|
|
||||||
print(f"| {st.index} | {st.member_count} | {st.active_members} | "
|
|
||||||
f"{st.trade_count_members} | {st.total_amount / 1e8:,.2f} 亿 | "
|
|
||||||
f"{(ref or 0) / 1e8:,.2f} 亿 | {ratio:.4f} | {st.elapsed:.1f}s |")
|
|
||||||
print()
|
|
||||||
print("提示:`399xxx` 的比值天然远离 1 —— 深市指数的 amount 字段是全板块口径。")
|
|
||||||
print()
|
|
||||||
|
|
||||||
|
|
||||||
async def main() -> None:
|
|
||||||
ap = argparse.ArgumentParser(description=__doc__)
|
|
||||||
ap.add_argument("--symbols", nargs="*",
|
|
||||||
default=["sh600000", "sz000001", "sh601398"])
|
|
||||||
ap.add_argument("--indices", nargs="*", default=["000016", "000300"])
|
|
||||||
ap.add_argument("--date", default=None, help="YYYYMMDD(缺省=当日)")
|
|
||||||
ap.add_argument("--skip-symbols", action="store_true")
|
|
||||||
args = ap.parse_args()
|
|
||||||
|
|
||||||
from pytdxdata import TdxData
|
|
||||||
|
|
||||||
ymd = int(args.date) if args.date else int(_date.today().strftime("%Y%m%d"))
|
|
||||||
day = int(args.date) if args.date else None
|
|
||||||
async with TdxData(cache_dir=None, timeout=10.0) as td:
|
|
||||||
if not args.skip_symbols:
|
|
||||||
await check_symbols(td, args.symbols, ymd)
|
|
||||||
if args.indices:
|
|
||||||
await check_indices(td, args.indices, ymd, day)
|
|
||||||
|
|
||||||
|
|
||||||
if __name__ == "__main__":
|
|
||||||
asyncio.run(main())
|
|
||||||
@@ -1,22 +0,0 @@
|
|||||||
"""测试全局隔离。
|
|
||||||
|
|
||||||
默认关掉**权威小数位表的后台同步** —— 否则任何调用 ``TdxData.start()`` 的用例都会
|
|
||||||
顺手发起证券清单请求(26 + 25 个分页),测试会变慢且依赖网络。
|
|
||||||
需要验证同步行为本身的用例(``test_decimal_sync.py``)自己 ``delenv`` 后再测。
|
|
||||||
"""
|
|
||||||
from __future__ import annotations
|
|
||||||
|
|
||||||
import os
|
|
||||||
|
|
||||||
import pytest
|
|
||||||
|
|
||||||
|
|
||||||
@pytest.fixture(autouse=True, scope="session")
|
|
||||||
def _disable_decimal_sync():
|
|
||||||
old = os.environ.get("PYPYTDX_DATA_DISABLE_DECIMAL_SYNC")
|
|
||||||
os.environ["PYPYTDX_DATA_DISABLE_DECIMAL_SYNC"] = "1"
|
|
||||||
yield
|
|
||||||
if old is None:
|
|
||||||
os.environ.pop("PYPYTDX_DATA_DISABLE_DECIMAL_SYNC", None)
|
|
||||||
else:
|
|
||||||
os.environ["PYPYTDX_DATA_DISABLE_DECIMAL_SYNC"] = old
|
|
||||||
@@ -324,27 +324,6 @@ async def test_universe_and_quotes(td):
|
|||||||
assert len(qex) == 1
|
assert len(qex) == 1
|
||||||
|
|
||||||
|
|
||||||
async def test_decimal_point_sync(td, tmp_path, monkeypatch):
|
|
||||||
"""权威小数位表同步:把证券清单的 decimal_point 灌进价格标度表。"""
|
|
||||||
for name in ("sync_decimal_points", "decimal_point_status"):
|
|
||||||
_use(name)
|
|
||||||
from pytdxdata.protocol.commands.quotes import clear_decimal_map, price_decimal_digits
|
|
||||||
|
|
||||||
# 缓存目录指向临时目录,避免把 mock 数据写进用户真实缓存
|
|
||||||
monkeypatch.setenv("PYPYTDX_DATA_CACHE_DIR", str(tmp_path))
|
|
||||||
before = price_decimal_digits(1, "600000")
|
|
||||||
try:
|
|
||||||
st = await td.sync_decimal_points()
|
|
||||||
assert set(st) >= {"prefixes", "codes", "mixed_prefixes", "stock"}
|
|
||||||
assert st["stock"] >= 0
|
|
||||||
status = await td.decimal_point_status()
|
|
||||||
assert isinstance(status, dict) and "source" in status
|
|
||||||
finally:
|
|
||||||
clear_decimal_map()
|
|
||||||
# 清空后回到静态规则,不受本用例污染
|
|
||||||
assert price_decimal_digits(1, "600000") == before
|
|
||||||
|
|
||||||
|
|
||||||
async def test_snapshot_auction_flow(td):
|
async def test_snapshot_auction_flow(td):
|
||||||
for name in ("get_snapshot", "get_auction", "get_capital_flow"):
|
for name in ("get_snapshot", "get_auction", "get_capital_flow"):
|
||||||
_use(name)
|
_use(name)
|
||||||
@@ -478,24 +457,6 @@ async def test_boards(td):
|
|||||||
assert isinstance(chg, list)
|
assert isinstance(chg, list)
|
||||||
|
|
||||||
|
|
||||||
async def test_index_trade_stats(td):
|
|
||||||
"""指数成分成交汇总:成分 → 逐笔 → 每分钟量/笔数。"""
|
|
||||||
for name in ("get_index_members", "get_index_trade_stats",
|
|
||||||
"get_index_trade_stats_multi"):
|
|
||||||
_use(name)
|
|
||||||
mem = await td.get_index_members("000016")
|
|
||||||
assert isinstance(mem, list) and mem and mem[0].symbol
|
|
||||||
st = await td.get_index_trade_stats("000016")
|
|
||||||
assert st.index == "sh000016"
|
|
||||||
assert st.member_count >= 1
|
|
||||||
assert st.minutes and st.minutes[0].time == "09:30"
|
|
||||||
assert st.total_trade_count >= 1
|
|
||||||
assert st.cum_trade_count()[-1][1] == st.total_trade_count
|
|
||||||
multi = await td.get_index_trade_stats_multi("000016", [20261020, None])
|
|
||||||
assert len(multi) == 2
|
|
||||||
assert multi[0].date == 20261020 and multi[1].date is None
|
|
||||||
|
|
||||||
|
|
||||||
# --------------------------------------------------------------------------- #
|
# --------------------------------------------------------------------------- #
|
||||||
# 六、服务器文件
|
# 六、服务器文件
|
||||||
# --------------------------------------------------------------------------- #
|
# --------------------------------------------------------------------------- #
|
||||||
|
|||||||
+1
-211
@@ -8,13 +8,7 @@ import unittest.mock as mock
|
|||||||
import pytest
|
import pytest
|
||||||
|
|
||||||
from pytdxdata.api import TdxData
|
from pytdxdata.api import TdxData
|
||||||
from pytdxdata.models import (
|
from pytdxdata.models import KlinePeriod, Market, MinuteBar, SecurityBar
|
||||||
KlinePeriod,
|
|
||||||
Market,
|
|
||||||
MinuteBar,
|
|
||||||
SecurityBar,
|
|
||||||
TransactionRecord,
|
|
||||||
)
|
|
||||||
from pytdxdata.protocol.commands.mac_tick import MacTickChartCmd
|
from pytdxdata.protocol.commands.mac_tick import MacTickChartCmd
|
||||||
from pytdxdata.scheduler.paginator import PageSpec, Paginator
|
from pytdxdata.scheduler.paginator import PageSpec, Paginator
|
||||||
|
|
||||||
@@ -249,70 +243,6 @@ async def test_paginator_start_offset_default_zero():
|
|||||||
assert result[0].close == 10.0 # 从 offset 0 开始
|
assert result[0].close == 10.0 # 从 offset 0 开始
|
||||||
|
|
||||||
|
|
||||||
# ---------- Paginator 逆序偏移(服务端 start 从最新往回数) ----------
|
|
||||||
|
|
||||||
class NewestFirstConn:
|
|
||||||
"""模拟 0x122F 真实行为:start=0 返回**最新**的一页,start 越大越旧。
|
|
||||||
|
|
||||||
实测依据(2026-10-21,sh600000):
|
|
||||||
start=0 -> 14:07:48 .. 15:20:16(当天最新 1000 条)
|
|
||||||
start=4000 -> 09:15:03 .. 09:41:18(当天最早)
|
|
||||||
每页内部按时间升序,页与页之间是倒序。
|
|
||||||
"""
|
|
||||||
|
|
||||||
def __init__(self, total: int, page_size: int):
|
|
||||||
self.total = total
|
|
||||||
self.page_size = page_size
|
|
||||||
self.executed: list[tuple[int, int]] = []
|
|
||||||
|
|
||||||
async def execute(self, cmd):
|
|
||||||
start, count = cmd
|
|
||||||
self.executed.append((start, count))
|
|
||||||
# 服务端语义:偏移 start 是从"最新"往回数,所以取倒数区间
|
|
||||||
end_from_oldest = self.total - start
|
|
||||||
begin_from_oldest = max(0, end_from_oldest - count)
|
|
||||||
return [_make_bar(i) for i in range(begin_from_oldest, end_from_oldest)]
|
|
||||||
|
|
||||||
|
|
||||||
@pytest.mark.asyncio
|
|
||||||
async def test_paginator_newest_first_offset_returns_chronological():
|
|
||||||
"""服务端 start 从最新往回数时,交付列表必须仍是时间升序(BUG 回归)。"""
|
|
||||||
conns = [NewestFirstConn(3000, 1000) for _ in range(3)]
|
|
||||||
pool = FakePool(conns)
|
|
||||||
pag = Paginator(pool, concurrency=3) # type: ignore[arg-type]
|
|
||||||
|
|
||||||
def factory(s, c):
|
|
||||||
return (s, c)
|
|
||||||
|
|
||||||
result = await pag.fetch_all(
|
|
||||||
factory, PageSpec(page_size=1000, total=3000, newest_first=True))
|
|
||||||
assert len(result) == 3000
|
|
||||||
# 时间升序:close 随 index 单调递增
|
|
||||||
closes = [b.close for b in result]
|
|
||||||
assert closes == sorted(closes), "返回列表必须按时间升序拼接"
|
|
||||||
assert result[0].close == pytest.approx(10.0)
|
|
||||||
assert result[-1].close == pytest.approx(10.0 + 2999 * 0.01)
|
|
||||||
|
|
||||||
|
|
||||||
@pytest.mark.asyncio
|
|
||||||
async def test_paginator_newest_first_respects_start_offset():
|
|
||||||
"""newest_first + start_offset:只取最近 N 条里的后段。"""
|
|
||||||
conns = [NewestFirstConn(3000, 1000) for _ in range(3)]
|
|
||||||
pool = FakePool(conns)
|
|
||||||
pag = Paginator(pool, concurrency=3) # type: ignore[arg-type]
|
|
||||||
|
|
||||||
def factory(s, c):
|
|
||||||
return (s, c)
|
|
||||||
|
|
||||||
result = await pag.fetch_all(
|
|
||||||
factory,
|
|
||||||
PageSpec(page_size=1000, total=1000, newest_first=True, start_offset=0))
|
|
||||||
assert len(result) == 1000
|
|
||||||
# 只取了最新的 1000 条 → 是 2000..2999 这一段
|
|
||||||
assert result[0].close == pytest.approx(10.0 + 2000 * 0.01)
|
|
||||||
assert result[-1].close == pytest.approx(10.0 + 2999 * 0.01)
|
|
||||||
|
|
||||||
|
|
||||||
# ---------- get_kline 日期过滤 ----------
|
# ---------- get_kline 日期过滤 ----------
|
||||||
|
|
||||||
class DateBarApiConn(FakeApiConn):
|
class DateBarApiConn(FakeApiConn):
|
||||||
@@ -399,143 +329,3 @@ async def test_get_kline_since():
|
|||||||
assert bars[-1].year == 2027
|
assert bars[-1].year == 2027
|
||||||
finally:
|
finally:
|
||||||
await td.close()
|
await td.close()
|
||||||
|
|
||||||
# ---------- A股逐笔:b8 过滤 + 单连接串行游标(回归) ----------
|
|
||||||
|
|
||||||
class TickApiConn(FakeApiConn):
|
|
||||||
"""模拟 0x122F:服务端 start 从**最新**往回数,且可注入 bs_flag=8 委托记录。"""
|
|
||||||
|
|
||||||
# 类级:[(time, price, vol, trade_count, bs_flag), ...],时间升序(最早在前)
|
|
||||||
rows: list[tuple] = []
|
|
||||||
calls: list[tuple[int, int]] = []
|
|
||||||
|
|
||||||
async def execute(self, cmd):
|
|
||||||
if "MacTransactionCmd" not in type(cmd).__name__:
|
|
||||||
return await super().execute(cmd)
|
|
||||||
TickApiConn.calls.append((cmd.start, cmd.count))
|
|
||||||
# 从最新往回数:start 偏移落在末尾,往前取 count 条
|
|
||||||
end = len(TickApiConn.rows) - cmd.start
|
|
||||||
begin = max(0, end - cmd.count)
|
|
||||||
chunk = TickApiConn.rows[begin:end]
|
|
||||||
return [TransactionRecord(market=1, code="600000", time=t, price=p,
|
|
||||||
vol=v, trade_count=tc, bs_flag=bs)
|
|
||||||
for (t, p, v, tc, bs) in chunk]
|
|
||||||
|
|
||||||
|
|
||||||
def _build_tick_rows(n_trade: int = 25, n_b8: int = 7) -> list[tuple]:
|
|
||||||
"""构造 n_trade 条正常成交 + n_b8 条竞价委托(穿插在中间)。"""
|
|
||||||
rows: list[tuple] = []
|
|
||||||
for i in range(n_trade):
|
|
||||||
rows.append((f"09:{30 + i // 60:02d}:{i % 60:02d}", 10.0 + i * 0.01,
|
|
||||||
100.0 + i, 3 + i, 1 if i % 2 else 0))
|
|
||||||
if i % 4 == 0 and len([r for r in rows if r[4] == 8]) < n_b8:
|
|
||||||
# 竞价委托:(time, price, vol, tc, bs=8),vol 是累计值、不计入成交
|
|
||||||
rows.append((f"09:15:{i:02d}", 10.0, 9999.0, -1, 8))
|
|
||||||
return rows
|
|
||||||
|
|
||||||
|
|
||||||
@pytest.mark.asyncio
|
|
||||||
async def test_get_ticks_filters_auction_orders():
|
|
||||||
"""bs_flag=8 是竞价**委托**快照,不是成交 → 必须从 get_ticks 结果中剔除。
|
|
||||||
|
|
||||||
实测(2026-10-21 sh600000):b8 的 vol 是累计撮合量(可被覆盖),
|
|
||||||
计入后 Σvol 比快照 vol 虚高 20%~160%,且不同主机的 b8 集合不同。
|
|
||||||
"""
|
|
||||||
TickApiConn.rows = _build_tick_rows(n_trade=25, n_b8=7)
|
|
||||||
TickApiConn.calls = []
|
|
||||||
assert sum(1 for r in TickApiConn.rows if r[4] == 8) == 7
|
|
||||||
|
|
||||||
with mock.patch("pytdxdata.api.get_standard_hosts", return_value=["s1"]), \
|
|
||||||
mock.patch("pytdxdata.api.get_mac_hosts", return_value=["m1"]), \
|
|
||||||
mock.patch("pytdxdata.pool.pool.TdxConnection",
|
|
||||||
side_effect=lambda h, p=7709, t=10.0: TickApiConn(h)):
|
|
||||||
td = TdxData(cache_dir=None, pool_min=1, pool_max=2)
|
|
||||||
await td.start()
|
|
||||||
try:
|
|
||||||
out = await td.get_ticks("sh600000")
|
|
||||||
finally:
|
|
||||||
await td.close()
|
|
||||||
|
|
||||||
assert out, "应返回成交记录"
|
|
||||||
assert all(r.bs_flag != 8 for r in out), "bs_flag=8 竞价委托必须被剔除"
|
|
||||||
assert len(out) == 25
|
|
||||||
assert sum(r.vol for r in out) == sum(100.0 + i for i in range(25))
|
|
||||||
|
|
||||||
|
|
||||||
@pytest.mark.asyncio
|
|
||||||
async def test_get_ticks_pages_on_single_connection():
|
|
||||||
"""翻页必须走**同一连接**:并发多主机会让页边界错位(重叠 + 漏条)。"""
|
|
||||||
TickApiConn.rows = _build_tick_rows(n_trade=25, n_b8=0)
|
|
||||||
TickApiConn.calls = []
|
|
||||||
|
|
||||||
with mock.patch("pytdxdata.api.get_standard_hosts", return_value=["s1"]), \
|
|
||||||
mock.patch("pytdxdata.api.get_mac_hosts", return_value=["m1", "m2", "m3"]), \
|
|
||||||
mock.patch("pytdxdata.pool.pool.TdxConnection",
|
|
||||||
side_effect=lambda h, p=7709, t=10.0: TickApiConn(h)):
|
|
||||||
td = TdxData(cache_dir=None, pool_min=1, pool_max=4)
|
|
||||||
await td.start()
|
|
||||||
try:
|
|
||||||
out = await td.get_ticks("sh600000")
|
|
||||||
finally:
|
|
||||||
await td.close()
|
|
||||||
|
|
||||||
# 单页装得下 → 只发一次请求
|
|
||||||
assert len(TickApiConn.calls) == 1
|
|
||||||
assert len(out) == 25
|
|
||||||
# 时间升序
|
|
||||||
times = [r.time for r in out]
|
|
||||||
assert times == sorted(times)
|
|
||||||
|
|
||||||
@pytest.mark.asyncio
|
|
||||||
async def test_get_ticks_multi_page_uses_one_connection_and_no_overlap():
|
|
||||||
"""多页(>_TICK_PAGE):同一连接、游标按 len(rows) 推进、页间不重叠不漏条。
|
|
||||||
|
|
||||||
回归:并发分页时各页来自不同主机,而 0x122F 的 start 是「从最新往回数」的
|
|
||||||
相对锚点 —— 各主机对 bs_flag=8 收录不同,同一 start 落到不同真实成交上,
|
|
||||||
结果页边界既重叠又漏条(实测 sh600000 冗余 116 条、13:03 附近丢 59 条)。
|
|
||||||
"""
|
|
||||||
from pytdxdata.api import _TICK_PAGE
|
|
||||||
|
|
||||||
n = _TICK_PAGE * 2 + 137 # 3 页,末页短页 → 触发 stop_when_short
|
|
||||||
TickApiConn.rows = [
|
|
||||||
(f"{9 + i // 3600:02d}:{i // 60 % 60:02d}:{i % 60:02d}",
|
|
||||||
10.0 + i * 0.001, 1.0 + i, 1 + i, 1)
|
|
||||||
for i in range(n)
|
|
||||||
]
|
|
||||||
TickApiConn.calls = []
|
|
||||||
|
|
||||||
with mock.patch("pytdxdata.api.get_standard_hosts", return_value=["s1"]), \
|
|
||||||
mock.patch("pytdxdata.api.get_mac_hosts", return_value=["m1", "m2", "m3"]), \
|
|
||||||
mock.patch("pytdxdata.pool.pool.TdxConnection",
|
|
||||||
side_effect=lambda h, p=7709, t=10.0: TickApiConn(h)):
|
|
||||||
td = TdxData(cache_dir=None, pool_min=1, pool_max=4)
|
|
||||||
await td.start()
|
|
||||||
try:
|
|
||||||
out = await td.get_ticks("sh600000")
|
|
||||||
finally:
|
|
||||||
await td.close()
|
|
||||||
|
|
||||||
# 恰好 3 页:0 / 1000 / 2000,游标按实际返回条数推进
|
|
||||||
assert TickApiConn.calls == [(0, _TICK_PAGE),
|
|
||||||
(_TICK_PAGE, _TICK_PAGE),
|
|
||||||
(_TICK_PAGE * 2, _TICK_PAGE)]
|
|
||||||
assert len(out) == n, f"必须无重叠、无漏条:期望 {n},实得 {len(out)}"
|
|
||||||
vols = [r.vol for r in out]
|
|
||||||
assert len(set(vols)) == n, "vol 全唯一(无重复记录)"
|
|
||||||
assert vols == sorted(vols), "时间升序"
|
|
||||||
|
|
||||||
# count 参数:游标逐页扣减
|
|
||||||
TickApiConn.calls = []
|
|
||||||
with mock.patch("pytdxdata.api.get_standard_hosts", return_value=["s1"]), \
|
|
||||||
mock.patch("pytdxdata.api.get_mac_hosts", return_value=["m1", "m2", "m3"]), \
|
|
||||||
mock.patch("pytdxdata.pool.pool.TdxConnection",
|
|
||||||
side_effect=lambda h, p=7709, t=10.0: TickApiConn(h)):
|
|
||||||
td = TdxData(cache_dir=None, pool_min=1, pool_max=4)
|
|
||||||
await td.start()
|
|
||||||
try:
|
|
||||||
out2 = await td.get_ticks("sh600000", count=_TICK_PAGE + 50)
|
|
||||||
finally:
|
|
||||||
await td.close()
|
|
||||||
assert len(out2) == _TICK_PAGE + 50
|
|
||||||
assert TickApiConn.calls[1][1] == 50, "末页只补足剩余 50 条"
|
|
||||||
|
|
||||||
@@ -1,233 +0,0 @@
|
|||||||
"""权威价格小数位表(decimal_sync)单元测试。
|
|
||||||
|
|
||||||
覆盖点:
|
|
||||||
- 权威表(来自 ``SecurityInfo.decimal_point``)**优先于**静态前缀规则
|
|
||||||
- 某前缀出现混合小数位 → 自动退化为逐代码查表,不误伤同前缀其它代码
|
|
||||||
- 清空权威表 → 回到静态规则(与 0.6.5 行为一致)
|
|
||||||
- 磁盘缓存:写入 / 读取 / 跨日失效 / 损坏容错,均不回退到网络
|
|
||||||
- ``PYPYTDX_DATA_DISABLE_DECIMAL_SYNC=1`` → 完全不动作
|
|
||||||
- 证券清单里 ``decimal_point == 0`` 的脏条目被忽略
|
|
||||||
- 后台 task 可取消,且 ``close()`` 后不再改写表
|
|
||||||
(全部注入假 ``TdxData``,不连真实网络)
|
|
||||||
"""
|
|
||||||
from __future__ import annotations
|
|
||||||
|
|
||||||
import asyncio
|
|
||||||
import json
|
|
||||||
from types import SimpleNamespace
|
|
||||||
|
|
||||||
import pytest
|
|
||||||
|
|
||||||
from pytdxdata import decimal_sync
|
|
||||||
from pytdxdata.protocol.commands.quotes import (
|
|
||||||
clear_decimal_map,
|
|
||||||
decimal_map_stats,
|
|
||||||
install_decimal_map,
|
|
||||||
price_decimal_digits,
|
|
||||||
)
|
|
||||||
|
|
||||||
|
|
||||||
# ---------------------------------------------------------------------- #
|
|
||||||
# 夹具
|
|
||||||
# ---------------------------------------------------------------------- #
|
|
||||||
|
|
||||||
@pytest.fixture(autouse=True)
|
|
||||||
def _isolate(tmp_path, monkeypatch):
|
|
||||||
"""每个用例独立缓存目录 + 干净的内存状态。"""
|
|
||||||
monkeypatch.setenv("PYPYTDX_DATA_CACHE_DIR", str(tmp_path))
|
|
||||||
monkeypatch.delenv("PYPYTDX_DATA_DISABLE_DECIMAL_SYNC", raising=False)
|
|
||||||
decimal_sync.reset()
|
|
||||||
yield
|
|
||||||
decimal_sync.reset()
|
|
||||||
|
|
||||||
|
|
||||||
def _info(code: str, dp: int) -> SimpleNamespace:
|
|
||||||
return SimpleNamespace(code=code, decimal_point=dp, market=1)
|
|
||||||
|
|
||||||
|
|
||||||
class FakeTd:
|
|
||||||
"""只有 ``get_universe`` 的假客户端(记录调用次数,便于断言"没走网络")。"""
|
|
||||||
|
|
||||||
def __init__(self, tables: dict[str, list[tuple[str, int]]] | None = None) -> None:
|
|
||||||
self.tables = tables or {}
|
|
||||||
self.calls: list[str] = []
|
|
||||||
|
|
||||||
async def get_universe(self, market: str | None = None):
|
|
||||||
self.calls.append(market or "all")
|
|
||||||
return [_info(c, d) for c, d in self.tables.get(market, [])]
|
|
||||||
|
|
||||||
|
|
||||||
# ---------------------------------------------------------------------- #
|
|
||||||
# 权威表优先级
|
|
||||||
# ---------------------------------------------------------------------- #
|
|
||||||
|
|
||||||
def test_authoritative_map_overrides_static_rule():
|
|
||||||
# 静态规则说 sh019742 是 4 位;权威表说 3 位 → 必须听权威表的
|
|
||||||
assert price_decimal_digits(1, "019742") == 4
|
|
||||||
install_decimal_map([(1, "019742", 3)], source="test")
|
|
||||||
assert price_decimal_digits(1, "019742") == 3
|
|
||||||
|
|
||||||
|
|
||||||
def test_codes_outside_map_still_use_static_rule():
|
|
||||||
install_decimal_map([(1, "019742", 3)], source="test")
|
|
||||||
assert price_decimal_digits(1, "600000") == 2 # 股票
|
|
||||||
assert price_decimal_digits(1, "510300") == 3 # ETF
|
|
||||||
assert price_decimal_digits(0, "131810") == 4 # 深回购(表里没有)
|
|
||||||
|
|
||||||
|
|
||||||
def test_mixed_prefix_falls_back_to_per_code_lookup():
|
|
||||||
"""同一前缀出现两种小数位 → 该前缀不进前缀表,只把例外代码存进逐代码表。"""
|
|
||||||
stats = install_decimal_map(
|
|
||||||
[(1, "110001", 4), (1, "110002", 4), (1, "110003", 3)], source="test")
|
|
||||||
assert stats["mixed_prefixes"] == 1
|
|
||||||
assert stats["codes"] == 3 # 混合前缀下所有代码都进逐代码表
|
|
||||||
assert price_decimal_digits(1, "110001") == 4
|
|
||||||
assert price_decimal_digits(1, "110003") == 3
|
|
||||||
|
|
||||||
|
|
||||||
def test_clear_map_restores_static_rules():
|
|
||||||
install_decimal_map([(1, "019742", 3)], source="test")
|
|
||||||
assert price_decimal_digits(1, "019742") == 3
|
|
||||||
clear_decimal_map()
|
|
||||||
assert decimal_map_stats()["stock"] == 0
|
|
||||||
assert price_decimal_digits(1, "019742") == 4
|
|
||||||
|
|
||||||
|
|
||||||
def test_reinstall_replaces_previous_map():
|
|
||||||
install_decimal_map([(1, "019742", 3)], source="a")
|
|
||||||
install_decimal_map([(1, "019742", 4)], source="b")
|
|
||||||
assert price_decimal_digits(1, "019742") == 4
|
|
||||||
assert decimal_map_stats()["prefixes"] == 1
|
|
||||||
|
|
||||||
|
|
||||||
# ---------------------------------------------------------------------- #
|
|
||||||
# 同步
|
|
||||||
# ---------------------------------------------------------------------- #
|
|
||||||
|
|
||||||
def test_refresh_installs_and_writes_cache(tmp_path):
|
|
||||||
td = FakeTd({"sh": [("019742", 4), ("600000", 2)],
|
|
||||||
"sz": [("000001", 2), ("131810", 4)]})
|
|
||||||
stats = asyncio.run(decimal_sync.refresh(td))
|
|
||||||
|
|
||||||
assert td.calls == ["sh", "sz"]
|
|
||||||
assert stats["stock"] == 4
|
|
||||||
assert price_decimal_digits(1, "600000") == 2
|
|
||||||
assert price_decimal_digits(0, "131810") == 4
|
|
||||||
|
|
||||||
raw = json.loads((tmp_path / "decimal-points.json").read_text(encoding="utf-8"))
|
|
||||||
assert raw["markets"]["1"]["019742"] == 4
|
|
||||||
assert raw["markets"]["0"]["131810"] == 4
|
|
||||||
|
|
||||||
|
|
||||||
def test_refresh_skips_zero_decimal_point():
|
|
||||||
td = FakeTd({"sh": [("019742", 0), ("600000", 2)]})
|
|
||||||
stats = asyncio.run(decimal_sync.refresh(td, ("sh",)))
|
|
||||||
assert stats["stock"] == 1
|
|
||||||
|
|
||||||
|
|
||||||
def test_refresh_ignores_unknown_market():
|
|
||||||
td = FakeTd({"hk": [("00700", 3)]})
|
|
||||||
stats = asyncio.run(decimal_sync.refresh(td, ("hk",)))
|
|
||||||
assert stats["stock"] == 0
|
|
||||||
assert not (decimal_sync.cache_file()).exists()
|
|
||||||
|
|
||||||
|
|
||||||
def test_load_cached_roundtrip(tmp_path):
|
|
||||||
td = FakeTd({"sh": [("019742", 4)]})
|
|
||||||
asyncio.run(decimal_sync.refresh(td))
|
|
||||||
decimal_sync.reset()
|
|
||||||
assert decimal_map_stats()["stock"] == 0
|
|
||||||
|
|
||||||
assert decimal_sync.load_cached() == 1
|
|
||||||
assert price_decimal_digits(1, "019742") == 4
|
|
||||||
|
|
||||||
|
|
||||||
def test_cache_expires_across_days(tmp_path):
|
|
||||||
td = FakeTd({"sh": [("019742", 4)]})
|
|
||||||
asyncio.run(decimal_sync.refresh(td))
|
|
||||||
decimal_sync.reset()
|
|
||||||
|
|
||||||
path = tmp_path / "decimal-points.json"
|
|
||||||
payload = json.loads(path.read_text(encoding="utf-8"))
|
|
||||||
payload["date"] = "2000-01-01"
|
|
||||||
path.write_text(json.dumps(payload), encoding="utf-8")
|
|
||||||
|
|
||||||
assert decimal_sync.load_cached() == 0
|
|
||||||
|
|
||||||
|
|
||||||
def test_corrupt_cache_is_ignored(tmp_path):
|
|
||||||
path = tmp_path / "decimal-points.json"
|
|
||||||
path.write_text("{not json", encoding="utf-8")
|
|
||||||
assert decimal_sync.load_cached() == 0
|
|
||||||
|
|
||||||
|
|
||||||
# ---------------------------------------------------------------------- #
|
|
||||||
# 调度
|
|
||||||
# ---------------------------------------------------------------------- #
|
|
||||||
|
|
||||||
def test_schedule_disabled_by_env(monkeypatch):
|
|
||||||
monkeypatch.setenv("PYPYTDX_DATA_DISABLE_DECIMAL_SYNC", "1")
|
|
||||||
td = FakeTd({"sh": [("019742", 4)]})
|
|
||||||
|
|
||||||
async def run():
|
|
||||||
task = decimal_sync.schedule(td)
|
|
||||||
return task
|
|
||||||
|
|
||||||
assert asyncio.run(run()) is None
|
|
||||||
assert td.calls == []
|
|
||||||
|
|
||||||
|
|
||||||
def test_schedule_loads_cache_without_network(tmp_path):
|
|
||||||
td = FakeTd({"sh": [("019742", 4)]})
|
|
||||||
asyncio.run(decimal_sync.refresh(td))
|
|
||||||
decimal_sync.reset()
|
|
||||||
quiet = FakeTd({"sh": [("019742", 4)]})
|
|
||||||
|
|
||||||
async def run():
|
|
||||||
return decimal_sync.schedule(quiet)
|
|
||||||
|
|
||||||
assert asyncio.run(run()) is None # 缓存命中 → 不起 task
|
|
||||||
assert quiet.calls == [] # 也没走网络
|
|
||||||
assert price_decimal_digits(1, "019742") == 4
|
|
||||||
|
|
||||||
|
|
||||||
def test_schedule_runs_background_sync_without_cache():
|
|
||||||
td = FakeTd({"sh": [("019742", 4)]})
|
|
||||||
|
|
||||||
async def run():
|
|
||||||
task = decimal_sync.schedule(td)
|
|
||||||
assert task is not None
|
|
||||||
await task
|
|
||||||
return decimal_sync.status()
|
|
||||||
|
|
||||||
st = asyncio.run(run())
|
|
||||||
assert st["source"] == "universe"
|
|
||||||
assert st["syncing"] is False
|
|
||||||
assert td.calls == ["sh", "sz"] # 默认两市
|
|
||||||
|
|
||||||
|
|
||||||
def test_cancel_stops_background_task():
|
|
||||||
class SlowTd:
|
|
||||||
def __init__(self) -> None:
|
|
||||||
self.calls = 0
|
|
||||||
|
|
||||||
async def get_universe(self, market=None):
|
|
||||||
self.calls += 1
|
|
||||||
await asyncio.sleep(5)
|
|
||||||
return []
|
|
||||||
|
|
||||||
td = SlowTd()
|
|
||||||
|
|
||||||
async def run():
|
|
||||||
task = decimal_sync.schedule(td)
|
|
||||||
await asyncio.sleep(0.01)
|
|
||||||
await decimal_sync.cancel(task)
|
|
||||||
return task.done() or task.cancelled()
|
|
||||||
|
|
||||||
assert asyncio.run(run()) is True
|
|
||||||
|
|
||||||
|
|
||||||
def test_status_shape():
|
|
||||||
st = decimal_sync.status()
|
|
||||||
assert set(st) >= {"loaded", "source", "syncing", "prefixes", "codes",
|
|
||||||
"mixed_prefixes", "stock"}
|
|
||||||
@@ -1,303 +0,0 @@
|
|||||||
"""指数成分成交汇总(get_index_members / get_index_trade_stats)单元测试。
|
|
||||||
|
|
||||||
全部离线:成分与逐笔都用实例属性打补丁,不建立任何真实连接。
|
|
||||||
"""
|
|
||||||
from __future__ import annotations
|
|
||||||
|
|
||||||
from types import SimpleNamespace
|
|
||||||
|
|
||||||
import pytest
|
|
||||||
|
|
||||||
from pytdxdata import TdxData
|
|
||||||
from pytdxdata.models import (
|
|
||||||
IndexTradeStats,
|
|
||||||
MemberQuote,
|
|
||||||
MinuteTradeStat,
|
|
||||||
TransactionRecord,
|
|
||||||
)
|
|
||||||
|
|
||||||
# ---------- _index_pair:裸代码按指数语义解析 ----------
|
|
||||||
|
|
||||||
@pytest.mark.parametrize("text,expect", [
|
|
||||||
("000001", (1, "000001")), # 上证指数(不是平安银行!)
|
|
||||||
("sh000001", (1, "000001")),
|
|
||||||
("000300", (1, "000300")),
|
|
||||||
("sh000300", (1, "000300")),
|
|
||||||
("000905", (1, "000905")),
|
|
||||||
("999999", (1, "999999")),
|
|
||||||
("880305", (1, "880305")),
|
|
||||||
("399001", (0, "399001")), # 深证成指
|
|
||||||
("sz399006", (0, "399006")),
|
|
||||||
("899050", (2, "899050")), # 北证50
|
|
||||||
("bj899050", (2, "899050")),
|
|
||||||
("sh.000300", (1, "000300")), # 点号/冒号都容忍
|
|
||||||
("sz:399001", (0, "399001")),
|
|
||||||
])
|
|
||||||
def test_index_pair_parses(text, expect):
|
|
||||||
assert TdxData._index_pair(text) == expect
|
|
||||||
|
|
||||||
|
|
||||||
@pytest.mark.parametrize("text", [
|
|
||||||
"", "600000", "sz000001x", "sh12345", "12345", "abc", "zzz000001",
|
|
||||||
])
|
|
||||||
def test_index_pair_rejects(text):
|
|
||||||
with pytest.raises(ValueError):
|
|
||||||
TdxData._index_pair(text)
|
|
||||||
|
|
||||||
|
|
||||||
def test_index_pair_rejects_non_index_cn_code():
|
|
||||||
"""000001 之外的普通股票段(如 600xxx)不是指数,裸写必须报错。"""
|
|
||||||
with pytest.raises(ValueError):
|
|
||||||
TdxData._index_pair("600000")
|
|
||||||
|
|
||||||
|
|
||||||
# ---------- 模型:累计曲线 ----------
|
|
||||||
|
|
||||||
def test_index_trade_stats_cumulative():
|
|
||||||
st = IndexTradeStats(
|
|
||||||
index="sh000300", date=None, member_count=2, active_members=2,
|
|
||||||
trade_count_members=2,
|
|
||||||
minutes=[
|
|
||||||
MinuteTradeStat("09:30", 100.0, 10, 1000.0),
|
|
||||||
MinuteTradeStat("09:31", 200.0, 20, 2000.0),
|
|
||||||
MinuteTradeStat("09:32", 50.0, 5, 500.0),
|
|
||||||
],
|
|
||||||
total_volume=350.0, total_trade_count=35, total_amount=3500.0,
|
|
||||||
)
|
|
||||||
cum = st.cumulative()
|
|
||||||
assert [c.time for c in cum] == ["09:30", "09:31", "09:32"]
|
|
||||||
assert [c.volume for c in cum] == [100.0, 300.0, 350.0]
|
|
||||||
assert [c.trade_count for c in cum] == [10, 30, 35]
|
|
||||||
assert [c.amount for c in cum] == [1000.0, 3000.0, 3500.0]
|
|
||||||
# 累计必须是新对象,不污染原始增量
|
|
||||||
assert st.minutes[1].volume == 200.0
|
|
||||||
assert st.cum_trade_count() == [("09:30", 10), ("09:31", 30), ("09:32", 35)]
|
|
||||||
|
|
||||||
|
|
||||||
def test_index_trade_stats_trade_count_available():
|
|
||||||
ok = IndexTradeStats(index="sh000300", date=None, member_count=1,
|
|
||||||
active_members=1, trade_count_members=1)
|
|
||||||
assert ok.trade_count_available is True
|
|
||||||
bj = IndexTradeStats(index="bj899050", date=None, member_count=1,
|
|
||||||
active_members=1, trade_count_members=0)
|
|
||||||
assert bj.trade_count_available is False
|
|
||||||
|
|
||||||
|
|
||||||
# ---------- get_index_members:分页终止 ----------
|
|
||||||
|
|
||||||
def _member(market: int, code: str, name: str = "") -> MemberQuote:
|
|
||||||
return MemberQuote(market=market, code=code, name=name,
|
|
||||||
fields={"0x0": 9.9, "0x5": 1000.0, "0x7": 99000.0})
|
|
||||||
|
|
||||||
|
|
||||||
@pytest.mark.asyncio
|
|
||||||
async def test_get_index_members_pages_until_short_batch():
|
|
||||||
"""短页(不足 80 条)即视为最后一页,不再多发一次空请求。"""
|
|
||||||
calls: list[int] = []
|
|
||||||
|
|
||||||
async def fake_exec(cmd):
|
|
||||||
calls.append(cmd.start)
|
|
||||||
if cmd.start == 0:
|
|
||||||
return [_member(1, "600000"), _member(1, "600004")]
|
|
||||||
return []
|
|
||||||
|
|
||||||
td = TdxData(cache_dir=None)
|
|
||||||
td._execute_mac = fake_exec
|
|
||||||
members = await td.get_index_members("000016")
|
|
||||||
assert [m.symbol for m in members] == ["sh600000", "sh600004"]
|
|
||||||
assert calls == [0]
|
|
||||||
|
|
||||||
|
|
||||||
@pytest.mark.asyncio
|
|
||||||
async def test_get_index_members_continues_on_full_page():
|
|
||||||
"""满页(80 条)后继续翻页,直到空页。"""
|
|
||||||
calls: list[int] = []
|
|
||||||
|
|
||||||
async def fake_exec(cmd):
|
|
||||||
calls.append(cmd.start)
|
|
||||||
if cmd.start == 0:
|
|
||||||
return [_member(1, "600000")] * cmd.page_size
|
|
||||||
return []
|
|
||||||
|
|
||||||
td = TdxData(cache_dir=None)
|
|
||||||
td._execute_mac = fake_exec
|
|
||||||
members = await td.get_index_members("000016")
|
|
||||||
assert len(members) == 80
|
|
||||||
assert calls == [0, 80]
|
|
||||||
|
|
||||||
|
|
||||||
@pytest.mark.asyncio
|
|
||||||
async def test_get_index_members_respects_count_cap():
|
|
||||||
async def fake_exec(cmd):
|
|
||||||
# 永远返回满页,验证 count 能截断结果
|
|
||||||
return [_member(1, "600000")] * cmd.page_size
|
|
||||||
|
|
||||||
td = TdxData(cache_dir=None)
|
|
||||||
td._execute_mac = fake_exec
|
|
||||||
members = await td.get_index_members("000016", count=5)
|
|
||||||
assert len(members) == 5
|
|
||||||
|
|
||||||
|
|
||||||
# ---------- get_index_trade_stats:按分钟聚合 ----------
|
|
||||||
|
|
||||||
def _tick(sym: str, hhmm: str, price: float, vol: float, tc: int) -> TransactionRecord:
|
|
||||||
market, code = (1, sym[2:]) if sym.startswith("sh") else (0, sym[2:])
|
|
||||||
return TransactionRecord(market=market, code=code, time=f"{hhmm}:00",
|
|
||||||
price=price, vol=vol, trade_count=tc, bs_flag=1,
|
|
||||||
symbol=sym)
|
|
||||||
|
|
||||||
|
|
||||||
@pytest.mark.asyncio
|
|
||||||
async def test_get_index_trade_stats_aggregates_minutes():
|
|
||||||
async def fake_ticks(symbols, date=None, concurrency=6, **kw):
|
|
||||||
out = []
|
|
||||||
for s in symbols:
|
|
||||||
if s == "sh600000":
|
|
||||||
out += [_tick(s, "09:30", 10.0, 100.0, 10),
|
|
||||||
_tick(s, "09:30", 10.0, 50.0, 5),
|
|
||||||
_tick(s, "09:31", 11.0, 200.0, 20)]
|
|
||||||
else:
|
|
||||||
out += [_tick(s, "09:30", 5.0, 1000.0, 7)]
|
|
||||||
return out
|
|
||||||
|
|
||||||
td = TdxData(cache_dir=None)
|
|
||||||
td.get_ticks = fake_ticks
|
|
||||||
st = await td.get_index_trade_stats(
|
|
||||||
"000016", members=["sh600000", "sz000001"])
|
|
||||||
|
|
||||||
assert st.index == "sh000016"
|
|
||||||
assert st.member_count == 2
|
|
||||||
assert st.active_members == 2
|
|
||||||
assert st.trade_count_members == 2
|
|
||||||
assert st.trade_count_available is True
|
|
||||||
assert st.failed_members == 0
|
|
||||||
|
|
||||||
m = {x.time: x for x in st.minutes}
|
|
||||||
assert sorted(m) == ["09:30", "09:31"]
|
|
||||||
assert m["09:30"].volume == 1150.0 # 100 + 50 + 1000
|
|
||||||
assert m["09:30"].trade_count == 22 # 10 + 5 + 7
|
|
||||||
assert m["09:31"].volume == 200.0
|
|
||||||
# amount = Σ(price × 手 × 100)
|
|
||||||
assert m["09:30"].amount == pytest.approx(
|
|
||||||
10.0 * 100 * 100 + 10.0 * 50 * 100 + 5.0 * 1000 * 100)
|
|
||||||
assert st.total_volume == 1350.0
|
|
||||||
assert st.total_trade_count == 42
|
|
||||||
assert st.total_amount == pytest.approx(
|
|
||||||
10.0 * 100 * 100 + 10.0 * 50 * 100 + 5.0 * 1000 * 100 + 11.0 * 200 * 100)
|
|
||||||
assert st.cum_trade_count() == [("09:30", 22), ("09:31", 42)]
|
|
||||||
|
|
||||||
|
|
||||||
@pytest.mark.asyncio
|
|
||||||
async def test_get_index_trade_stats_bj_has_no_trade_count():
|
|
||||||
"""北交所成分返回 trade_count=0 → trade_count_available False。"""
|
|
||||||
async def fake_ticks(symbols, date=None, concurrency=6, **kw):
|
|
||||||
return [_tick("sh600000", "09:30", 10.0, 100.0, 0)]
|
|
||||||
|
|
||||||
td = TdxData(cache_dir=None)
|
|
||||||
td.get_ticks = fake_ticks
|
|
||||||
st = await td.get_index_trade_stats("899050", members=["sh600000"])
|
|
||||||
assert st.trade_count_members == 0
|
|
||||||
assert st.trade_count_available is False
|
|
||||||
assert st.total_volume == 100.0
|
|
||||||
|
|
||||||
|
|
||||||
@pytest.mark.asyncio
|
|
||||||
async def test_get_index_trade_stats_retries_per_symbol_on_batch_failure():
|
|
||||||
"""整批失败 → 退化为逐只重试,只有真正失败的计入 failed_members。"""
|
|
||||||
async def fake_ticks(symbols, date=None, concurrency=6, **kw):
|
|
||||||
single = isinstance(symbols, str)
|
|
||||||
if not single:
|
|
||||||
raise ConnectionError("批量炸了")
|
|
||||||
if symbols == "sh600004":
|
|
||||||
raise ConnectionError("这只也炸了")
|
|
||||||
return [_tick(symbols, "09:30", 10.0, 100.0, 3)]
|
|
||||||
|
|
||||||
td = TdxData(cache_dir=None)
|
|
||||||
td.get_ticks = fake_ticks
|
|
||||||
st = await td.get_index_trade_stats(
|
|
||||||
"000016", members=["sh600000", "sh600004", "sh600006"])
|
|
||||||
assert st.failed_members == 1
|
|
||||||
assert st.active_members == 2
|
|
||||||
assert st.total_trade_count == 6
|
|
||||||
|
|
||||||
|
|
||||||
@pytest.mark.asyncio
|
|
||||||
async def test_get_index_trade_stats_raises_when_not_skip_errors():
|
|
||||||
async def fake_ticks(symbols, date=None, concurrency=6, **kw):
|
|
||||||
raise ConnectionError("boom")
|
|
||||||
|
|
||||||
td = TdxData(cache_dir=None)
|
|
||||||
td.get_ticks = fake_ticks
|
|
||||||
with pytest.raises(ConnectionError):
|
|
||||||
await td.get_index_trade_stats(
|
|
||||||
"000016", members=["sh600000"], skip_errors=False)
|
|
||||||
|
|
||||||
|
|
||||||
@pytest.mark.asyncio
|
|
||||||
async def test_get_index_trade_stats_progress_callback():
|
|
||||||
seen: list[tuple[int, int]] = []
|
|
||||||
|
|
||||||
async def fake_ticks(symbols, date=None, concurrency=6, **kw):
|
|
||||||
return [_tick(s, "09:30", 10.0, 1.0, 1) for s in symbols]
|
|
||||||
|
|
||||||
td = TdxData(cache_dir=None)
|
|
||||||
td.get_ticks = fake_ticks
|
|
||||||
st = await td.get_index_trade_stats(
|
|
||||||
"000016", members=[f"sh60000{i}" for i in range(5)],
|
|
||||||
batch_size=2, on_progress=lambda d, t: seen.append((d, t)))
|
|
||||||
assert seen == [(2, 5), (4, 5), (5, 5)]
|
|
||||||
assert st.member_count == 5
|
|
||||||
|
|
||||||
|
|
||||||
@pytest.mark.asyncio
|
|
||||||
async def test_get_index_trade_stats_fetches_members_when_absent():
|
|
||||||
asked: list[str] = []
|
|
||||||
|
|
||||||
async def fake_members(code):
|
|
||||||
asked.append(code)
|
|
||||||
return [SimpleNamespace(symbol="sh600000")]
|
|
||||||
|
|
||||||
async def fake_ticks(symbols, date=None, concurrency=6, **kw):
|
|
||||||
return [_tick(s, "09:30", 10.0, 1.0, 1) for s in symbols]
|
|
||||||
|
|
||||||
td = TdxData(cache_dir=None)
|
|
||||||
td.get_index_members = fake_members
|
|
||||||
td.get_ticks = fake_ticks
|
|
||||||
await td.get_index_trade_stats("sh000300")
|
|
||||||
assert asked == ["000300"]
|
|
||||||
|
|
||||||
|
|
||||||
@pytest.mark.asyncio
|
|
||||||
async def test_get_index_trade_stats_rejects_empty_members():
|
|
||||||
td = TdxData(cache_dir=None)
|
|
||||||
|
|
||||||
async def fake_members(code):
|
|
||||||
return []
|
|
||||||
|
|
||||||
td.get_index_members = fake_members
|
|
||||||
with pytest.raises(ValueError, match="没有取到成分股"):
|
|
||||||
await td.get_index_trade_stats("000300")
|
|
||||||
|
|
||||||
|
|
||||||
@pytest.mark.asyncio
|
|
||||||
async def test_get_index_trade_stats_multi_reuses_members():
|
|
||||||
member_calls: list[str] = []
|
|
||||||
tick_dates: list[int | None] = []
|
|
||||||
|
|
||||||
async def fake_members(code):
|
|
||||||
member_calls.append(code)
|
|
||||||
return [SimpleNamespace(symbol="sh600000")]
|
|
||||||
|
|
||||||
async def fake_ticks(symbols, date=None, concurrency=6, **kw):
|
|
||||||
tick_dates.append(date)
|
|
||||||
return [_tick(s, "09:30", 10.0, 1.0, 2) for s in symbols]
|
|
||||||
|
|
||||||
td = TdxData(cache_dir=None)
|
|
||||||
td.get_index_members = fake_members
|
|
||||||
td.get_ticks = fake_ticks
|
|
||||||
out = await td.get_index_trade_stats_multi(
|
|
||||||
"000300", [20261020, 20261021, None])
|
|
||||||
assert len(out) == 3
|
|
||||||
assert member_calls == ["000300"] # 成分只取一次
|
|
||||||
assert tick_dates == [20261020, 20261021, None]
|
|
||||||
assert all(s.total_trade_count == 2 for s in out)
|
|
||||||
@@ -1,236 +0,0 @@
|
|||||||
"""单连接流水线(execute_pipeline)单元测试:不连真实网络。
|
|
||||||
|
|
||||||
关键防线:流水线把多条请求塞进同一条 TCP 流,一旦响应与请求错配就是
|
|
||||||
「价格张冠李戴」级别的灾难,所以这里逐项锁死顺序、长度与失败语义。
|
|
||||||
"""
|
|
||||||
from __future__ import annotations
|
|
||||||
|
|
||||||
import struct
|
|
||||||
import unittest.mock as mock
|
|
||||||
|
|
||||||
import pytest
|
|
||||||
|
|
||||||
from pytdxdata.pool.connection import TdxConnection
|
|
||||||
from pytdxdata.pool.pool import PooledConnection
|
|
||||||
from pytdxdata.protocol.commands.base import BaseCommand
|
|
||||||
|
|
||||||
|
|
||||||
class EchoCmd(BaseCommand[bytes]):
|
|
||||||
"""请求体即 tag,响应体原样带回,便于断言顺序。"""
|
|
||||||
|
|
||||||
def __init__(self, tag: bytes) -> None:
|
|
||||||
self.tag = tag
|
|
||||||
|
|
||||||
def build_request(self) -> bytes:
|
|
||||||
return b"REQ:" + self.tag
|
|
||||||
|
|
||||||
def parse_response(self, body: bytes) -> bytes:
|
|
||||||
return body
|
|
||||||
|
|
||||||
|
|
||||||
class FakeQuote:
|
|
||||||
"""最小报价替身:stamp() 会写 symbol,需要 market/code 是可 int/str 的真值。"""
|
|
||||||
|
|
||||||
def __init__(self) -> None:
|
|
||||||
self.market = 0
|
|
||||||
self.code = "000001"
|
|
||||||
self.symbol = ""
|
|
||||||
|
|
||||||
|
|
||||||
def frame(body: bytes) -> bytes:
|
|
||||||
"""构造一帧未压缩响应(zipsize == unzipsize)。"""
|
|
||||||
return struct.pack("<IIIHH", 7654321, 0, 0x053E, len(body), len(body)) + body
|
|
||||||
|
|
||||||
|
|
||||||
class FakeReader:
|
|
||||||
def __init__(self, data: bytes) -> None:
|
|
||||||
self.data = data
|
|
||||||
self.pos = 0
|
|
||||||
|
|
||||||
async def read(self, n: int) -> bytes:
|
|
||||||
chunk = self.data[self.pos:self.pos + n]
|
|
||||||
self.pos += len(chunk)
|
|
||||||
return chunk
|
|
||||||
|
|
||||||
|
|
||||||
class FakeWriter:
|
|
||||||
def __init__(self) -> None:
|
|
||||||
self.written = b""
|
|
||||||
self.closed = False
|
|
||||||
self.transport = FakeQuote()
|
|
||||||
|
|
||||||
def write(self, data: bytes) -> None:
|
|
||||||
self.written += data
|
|
||||||
|
|
||||||
async def drain(self) -> None:
|
|
||||||
pass
|
|
||||||
|
|
||||||
def is_closing(self) -> bool:
|
|
||||||
return self.closed
|
|
||||||
|
|
||||||
def close(self) -> None:
|
|
||||||
self.closed = True
|
|
||||||
|
|
||||||
async def wait_closed(self) -> None:
|
|
||||||
pass
|
|
||||||
|
|
||||||
|
|
||||||
def make_conn(payload: bytes, host: str = "1.2.3.4") -> TdxConnection:
|
|
||||||
conn = TdxConnection(host, 7709, 5.0)
|
|
||||||
conn._reader = FakeReader(payload) # type: ignore[assignment]
|
|
||||||
conn._writer = FakeWriter() # type: ignore[assignment]
|
|
||||||
return conn
|
|
||||||
|
|
||||||
|
|
||||||
# ---------- 基本语义 ----------
|
|
||||||
|
|
||||||
@pytest.mark.asyncio
|
|
||||||
async def test_empty_cmds_returns_empty():
|
|
||||||
conn = make_conn(b"")
|
|
||||||
assert await conn.execute_pipeline([]) == []
|
|
||||||
|
|
||||||
|
|
||||||
@pytest.mark.asyncio
|
|
||||||
async def test_responses_paired_in_order():
|
|
||||||
bodies = [b"AAA", b"BBB", b"CCC"]
|
|
||||||
conn = make_conn(b"".join(frame(b) for b in bodies))
|
|
||||||
cmds = [EchoCmd(t) for t in (b"1", b"2", b"3")]
|
|
||||||
got = await conn.execute_pipeline(cmds)
|
|
||||||
assert got == bodies # 顺序必须与 cmds 严格一致
|
|
||||||
|
|
||||||
|
|
||||||
@pytest.mark.asyncio
|
|
||||||
async def test_all_requests_sent_at_once():
|
|
||||||
conn = make_conn(b"".join(frame(b"X") for _ in range(3)))
|
|
||||||
cmds = [EchoCmd(t) for t in (b"a", b"b", b"c")]
|
|
||||||
await conn.execute_pipeline(cmds)
|
|
||||||
assert conn._writer.written == b"REQ:aREQ:bREQ:c"
|
|
||||||
|
|
||||||
|
|
||||||
@pytest.mark.asyncio
|
|
||||||
async def test_closed_connection_raises():
|
|
||||||
conn = make_conn(b"")
|
|
||||||
conn._writer = None
|
|
||||||
with pytest.raises(ConnectionError):
|
|
||||||
await conn.execute_pipeline([EchoCmd(b"1")])
|
|
||||||
|
|
||||||
|
|
||||||
# ---------- 失败语义:响应流错配后必须废连接 ----------
|
|
||||||
|
|
||||||
@pytest.mark.asyncio
|
|
||||||
async def test_truncated_stream_force_closes():
|
|
||||||
# 只给第一帧完整的、第二帧只有半个头 → 读不满,抛错且连接作废
|
|
||||||
conn = make_conn(frame(b"AAA") + b"\x00" * 5)
|
|
||||||
with pytest.raises(ConnectionError):
|
|
||||||
await conn.execute_pipeline([EchoCmd(b"1"), EchoCmd(b"2")])
|
|
||||||
assert conn._writer is None # _force_close 已清空 writer
|
|
||||||
|
|
||||||
|
|
||||||
@pytest.mark.asyncio
|
|
||||||
async def test_body_length_mismatch_propagates():
|
|
||||||
bad = struct.pack("<IIIHH", 7654321, 0, 0x053E, 99, 99) + b"short"
|
|
||||||
conn = make_conn(bad)
|
|
||||||
# 帧头自称 99 字节但流里没有 → _recv_exact 读空,连接作废
|
|
||||||
with pytest.raises(ConnectionError):
|
|
||||||
await conn.execute_pipeline([EchoCmd(b"1")])
|
|
||||||
assert conn._writer is None
|
|
||||||
|
|
||||||
|
|
||||||
# ---------- 池包装转发 ----------
|
|
||||||
|
|
||||||
@pytest.mark.asyncio
|
|
||||||
async def test_pooled_connection_forwards_pipeline():
|
|
||||||
inner = mock.AsyncMock()
|
|
||||||
inner.execute_pipeline = mock.AsyncMock(return_value=["r1", "r2"])
|
|
||||||
pc = PooledConnection(inner, "host1")
|
|
||||||
got = await pc.execute_pipeline([EchoCmd(b"1"), EchoCmd(b"2")])
|
|
||||||
assert got == ["r1", "r2"]
|
|
||||||
inner.execute_pipeline.assert_awaited_once()
|
|
||||||
|
|
||||||
|
|
||||||
# ---------- api 层:切批是否走流水线 ----------
|
|
||||||
|
|
||||||
def _api_with_fake_pool():
|
|
||||||
from pytdxdata.api import TdxData
|
|
||||||
from pytdxdata.symbols import CN, Symbol
|
|
||||||
|
|
||||||
td = TdxData.__new__(TdxData) # 跳过 __init__(不建网络池)
|
|
||||||
td._std_pool = FakeQuote()
|
|
||||||
td._std_pool.max_size = 24
|
|
||||||
td._std_pool.servers = [f"s{i}" for i in range(11)]
|
|
||||||
td._std_pool.acquire = mock.AsyncMock()
|
|
||||||
td._std_pool.release = mock.AsyncMock()
|
|
||||||
td._std_pool.warm = mock.AsyncMock() # 预建连接是网络动作,测试里空转
|
|
||||||
return td, Symbol, CN
|
|
||||||
|
|
||||||
|
|
||||||
@pytest.mark.asyncio
|
|
||||||
async def test_quotes_std_uses_pipeline_for_multi_page():
|
|
||||||
td, Symbol, CN = _api_with_fake_pool()
|
|
||||||
syms = [Symbol(0, f"{i:06d}", CN) for i in range(1, 401)] # 5 片
|
|
||||||
chunks = []
|
|
||||||
|
|
||||||
async def fake_pipeline(batch_group):
|
|
||||||
chunks.append(len(batch_group))
|
|
||||||
return [[FakeQuote()] * 80 for _ in batch_group]
|
|
||||||
|
|
||||||
td._execute_std_pipeline = fake_pipeline
|
|
||||||
out = await td._quotes_std(syms, pipeline=True)
|
|
||||||
assert len(out) == 5 * 80
|
|
||||||
assert sum(chunks) == 5 # 每片恰好被处理一次,不多不少
|
|
||||||
|
|
||||||
|
|
||||||
@pytest.mark.asyncio
|
|
||||||
async def test_quotes_std_single_page_skips_pipeline():
|
|
||||||
td, Symbol, CN = _api_with_fake_pool()
|
|
||||||
called = []
|
|
||||||
td._execute_std_pipeline = mock.AsyncMock(return_value=[])
|
|
||||||
|
|
||||||
async def fake_std(cmd):
|
|
||||||
called.append(1)
|
|
||||||
return []
|
|
||||||
|
|
||||||
td._execute_standard = fake_std
|
|
||||||
syms = [Symbol(0, f"{i:06d}", CN) for i in range(1, 51)] # 1 片
|
|
||||||
await td._quotes_std(syms, pipeline=True)
|
|
||||||
assert called == [1]
|
|
||||||
td._execute_std_pipeline.assert_not_awaited()
|
|
||||||
|
|
||||||
|
|
||||||
@pytest.mark.asyncio
|
|
||||||
async def test_quotes_std_no_pipeline_flag_uses_plain_path():
|
|
||||||
td, Symbol, CN = _api_with_fake_pool()
|
|
||||||
|
|
||||||
async def fake_std(cmd):
|
|
||||||
return [FakeQuote()] * 80
|
|
||||||
|
|
||||||
td._execute_standard = fake_std
|
|
||||||
td._execute_std_pipeline = mock.AsyncMock(return_value=[])
|
|
||||||
syms = [Symbol(0, f"{i:06d}", CN) for i in range(1, 401)]
|
|
||||||
out = await td._quotes_std(syms, pipeline=False)
|
|
||||||
assert len(out) == 5 * 80
|
|
||||||
td._execute_std_pipeline.assert_not_awaited()
|
|
||||||
|
|
||||||
|
|
||||||
@pytest.mark.asyncio
|
|
||||||
async def test_pipeline_failure_falls_back_to_per_page():
|
|
||||||
"""节点不支持流水线时,降级逐片,结果条数不变。"""
|
|
||||||
td, Symbol, CN = _api_with_fake_pool()
|
|
||||||
|
|
||||||
pool = td._std_pool
|
|
||||||
pool.acquire = mock.AsyncMock(return_value=mock.Mock(
|
|
||||||
execute_pipeline=mock.AsyncMock(side_effect=ConnectionError("boom"))))
|
|
||||||
pool.release = mock.AsyncMock()
|
|
||||||
|
|
||||||
calls = []
|
|
||||||
|
|
||||||
async def fake_std(cmd):
|
|
||||||
calls.append(1)
|
|
||||||
return [FakeQuote()] * 80
|
|
||||||
|
|
||||||
td._execute_standard = fake_std
|
|
||||||
syms = [Symbol(0, f"{i:06d}", CN) for i in range(1, 241)] # 3 片
|
|
||||||
out = await td._execute_std_pipeline(
|
|
||||||
[syms[i:i + 80] for i in range(0, len(syms), 80)])
|
|
||||||
assert len(out) == 3 and len(calls) == 3
|
|
||||||
assert pool.release.await_args.kwargs.get("broken") is True
|
|
||||||
@@ -12,7 +12,6 @@ from pytdxdata.protocol.commands.ex_proto import GetExInstrumentBarsCmd
|
|||||||
from pytdxdata.protocol.commands.kline import GetSecurityBarsCmd
|
from pytdxdata.protocol.commands.kline import GetSecurityBarsCmd
|
||||||
from pytdxdata.protocol.commands.mac import MacKlineCmd
|
from pytdxdata.protocol.commands.mac import MacKlineCmd
|
||||||
from pytdxdata.protocol.commands.minute import GetHistoryMinuteTimeDataCmd
|
from pytdxdata.protocol.commands.minute import GetHistoryMinuteTimeDataCmd
|
||||||
from pytdxdata.protocol.commands.quotes import price_decimal_digits
|
|
||||||
from pytdxdata.protocol.commands.transaction import MacTransactionCmd
|
from pytdxdata.protocol.commands.transaction import MacTransactionCmd
|
||||||
from pytdxdata.protocol.frame import FrameHeader, decompress_body, parse_header
|
from pytdxdata.protocol.frame import FrameHeader, decompress_body, parse_header
|
||||||
from pytdxdata.protocol.price import decode_ohlc_diffs, get_price, put_price
|
from pytdxdata.protocol.price import decode_ohlc_diffs, get_price, put_price
|
||||||
@@ -182,74 +181,6 @@ def test_mac_transaction_parse():
|
|||||||
assert recs[1].trade_count == 1
|
assert recs[1].trade_count == 1
|
||||||
|
|
||||||
|
|
||||||
def test_mac_transaction_parse_negative_trade_count_auction():
|
|
||||||
"""集合竞价段 trade_count 是有符号 int32,负数不能被读成 42 亿(BUG 回归)。
|
|
||||||
|
|
||||||
实测(2026-10-21,sh600000 09:15:03):18 字节为
|
|
||||||
17820000 0ad71b41 d9000000 96fcffff 0800
|
|
||||||
最后四字节前的 96fcffff = int32 -874,旧解析按 uint32 得 4294966422。
|
|
||||||
"""
|
|
||||||
body = bytearray(39 + 2 * 18)
|
|
||||||
struct.pack_into("<H", body, 29, 2)
|
|
||||||
# 第1条:集合竞价,trade_count = -874
|
|
||||||
struct.pack_into("<IfIiH", body, 39, 33303, 9.74, 217, -874, 8)
|
|
||||||
# 第2条:正常交易,trade_count = 3
|
|
||||||
struct.pack_into("<IfIiH", body, 39 + 18, 34200, 9.75, 100, 3, 1)
|
|
||||||
|
|
||||||
cmd = MacTransactionCmd(1, "600000", 20261021, 0, 100)
|
|
||||||
recs = cmd.parse_response(bytes(body))
|
|
||||||
assert len(recs) == 2
|
|
||||||
assert recs[0].trade_count == -874, "负值必须保留符号,不能变成 4294966422"
|
|
||||||
assert recs[0].bs_flag == 8
|
|
||||||
assert recs[1].trade_count == 3
|
|
||||||
# 正常交易段的量级不受影响
|
|
||||||
assert max(r.trade_count for r in recs) == 3
|
|
||||||
|
|
||||||
|
|
||||||
def test_mac_transaction_etf_trade_count_unavailable():
|
|
||||||
"""ETF/LOF 的 trade_count 是「价格×1000」占位,必须标记为不可用。
|
|
||||||
|
|
||||||
实测(2026-10-22 sh510310 15:27:35):价 3.989、原字段 3994;
|
|
||||||
旧行为把它当笔数打印成「3994笔」,是假的。
|
|
||||||
"""
|
|
||||||
body = bytearray(39 + 2 * 18)
|
|
||||||
struct.pack_into("<H", body, 29, 2)
|
|
||||||
struct.pack_into("<IfIiH", body, 39, 56000, 3.989, 15, 3994, 5)
|
|
||||||
struct.pack_into("<IfIiH", body, 39 + 18, 56003, 3.989, 4, 3994, 5)
|
|
||||||
|
|
||||||
for code, market, expect in (("510310", 1, False), ("159915", 0, False),
|
|
||||||
("600000", 1, True), ("501050", 1, True)):
|
|
||||||
cmd = MacTransactionCmd(market, code, 20261022, 0, 100)
|
|
||||||
recs = cmd.parse_response(bytes(body))
|
|
||||||
assert recs[0].trade_count_available is expect, code
|
|
||||||
if expect:
|
|
||||||
assert recs[0].trade_count == 3994
|
|
||||||
else:
|
|
||||||
assert recs[0].trade_count == 0
|
|
||||||
|
|
||||||
|
|
||||||
@pytest.mark.parametrize("market,code,expect", [
|
|
||||||
# 股票 / 可转债 / 回购:有笔数
|
|
||||||
(1, "600000", True), (1, "688111", True), (1, "689009", True),
|
|
||||||
(0, "000001", True), (0, "300750", True), (0, "128136", True),
|
|
||||||
(1, "204001", True),
|
|
||||||
# 沪市 LOF 50x:实测有真实笔数,不能一刀切
|
|
||||||
(1, "501050", True), (1, "501018", True), (1, "502000", True), (1, "506000", True),
|
|
||||||
# 沪市 ETF/LOF 51/52/56/58:无笔数
|
|
||||||
(1, "510310", False), (1, "511990", False), (1, "512880", False),
|
|
||||||
(1, "513050", False), (1, "515000", False), (1, "518880", False),
|
|
||||||
(1, "560010", False), (1, "562500", False), (1, "588000", False),
|
|
||||||
# 深市基金:无笔数
|
|
||||||
(0, "159915", False), (0, "159001", False),
|
|
||||||
(0, "161725", False), (0, "160119", False), (0, "165520", False),
|
|
||||||
# 指数:无笔数
|
|
||||||
(1, "000001", False), (0, "399001", False), (1, "880305", False),
|
|
||||||
])
|
|
||||||
def test_has_order_count(market, code, expect):
|
|
||||||
from pytdxdata.symbols import has_order_count
|
|
||||||
assert has_order_count(market, code) is expect
|
|
||||||
|
|
||||||
|
|
||||||
# ---------- 跨时区时间戳归一化(美股 EX 通道) ----------
|
# ---------- 跨时区时间戳归一化(美股 EX 通道) ----------
|
||||||
#
|
#
|
||||||
# 通达信 EX 通道对美股返回的时间戳把两个时区拼在一起:日期字段是**美东交易日**、
|
# 通达信 EX 通道对美股返回的时间戳把两个时区拼在一起:日期字段是**美东交易日**、
|
||||||
@@ -355,146 +286,3 @@ def test_finish_bars_sorts_us_session_chronologically():
|
|||||||
assert [b.datetime for b in out] == [datetime(2026, 10, 12, 21, 31),
|
assert [b.datetime for b in out] == [datetime(2026, 10, 12, 21, 31),
|
||||||
datetime(2026, 10, 13, 4, 0)]
|
datetime(2026, 10, 13, 4, 0)]
|
||||||
assert {b.symbol for b in out} == {"usAAPL"}
|
assert {b.symbol for b in out} == {"usAAPL"}
|
||||||
|
|
||||||
# ---------- 报价小数位:沪市指数必须 2 位(回归:曾整体少 10 倍) ----------
|
|
||||||
|
|
||||||
@pytest.mark.parametrize("market,code,expect", [
|
|
||||||
# 沪市指数:回归 bug —— 曾被判 3 位,导致价格少 10 倍
|
|
||||||
(1, "000001", 2), # 上证指数
|
|
||||||
(1, "000016", 2), # 上证50
|
|
||||||
(1, "000300", 2), # 沪深300
|
|
||||||
(1, "000688", 2), # 科创50
|
|
||||||
(1, "880001", 2), # 板块指数(8 开头,曾被判 3 位)
|
|
||||||
(1, "880305", 2),
|
|
||||||
# 沪市 ETF/基金:仍是 3 位
|
|
||||||
(1, "510300", 3),
|
|
||||||
(1, "588000", 3),
|
|
||||||
(1, "511010", 3),
|
|
||||||
(1, "501018", 3),
|
|
||||||
# 沪市股票:2 位
|
|
||||||
(1, "600000", 2),
|
|
||||||
(1, "601398", 2),
|
|
||||||
(1, "688111", 2), # 科创板
|
|
||||||
# 深市
|
|
||||||
(0, "399001", 2), # 深证成指
|
|
||||||
(0, "399006", 2), # 创业板指
|
|
||||||
(0, "000001", 2), # 平安银行(不是指数!)
|
|
||||||
(0, "300750", 2),
|
|
||||||
(0, "159915", 3), # 深市 ETF
|
|
||||||
# 债券/回购:2026-10-22 修正(沪市曾少 100 倍、深市曾少 10 倍)
|
|
||||||
(1, "019742", 4), # 沪市国债 24特国01(110.228,曾读成 11022.8)
|
|
||||||
(1, "019547", 4), # 沪市国债
|
|
||||||
(1, "010706", 4), # 沪市老国债 07国债06
|
|
||||||
(1, "018014", 4), # 沪市 018 段
|
|
||||||
(1, "020812", 4), # 沪市贴债
|
|
||||||
(1, "110077", 4), # 沪市可转债 洪城转债(199.279,曾读成 19927.9)
|
|
||||||
(1, "113616", 4), # 沪市可转债 韦尔转债
|
|
||||||
(1, "118031", 4), # 沪市可转债
|
|
||||||
(1, "111000", 4), # 沪市 111 段
|
|
||||||
(1, "132024", 4), # 沪市可交换债
|
|
||||||
(1, "184832", 4), # 沪市 184 段
|
|
||||||
(1, "204001", 4), # 沪市国债逆回购 GC001(1.385,曾读成 138.5)
|
|
||||||
(1, "204028", 4),
|
|
||||||
(0, "123107", 4), # 深市可转债 温氏转债(112.189,曾读成 1121.89)
|
|
||||||
(0, "128136", 4), # 深市可转债 立讯转债
|
|
||||||
(0, "127025", 4), # 深市可转债
|
|
||||||
(0, "131810", 4), # 深市国债逆回购 R-001(1.38,曾读成 13.8)
|
|
||||||
(0, "148004", 4), # 深市 148 段
|
|
||||||
(0, "112001", 4), # 深市公司债
|
|
||||||
(0, "101917", 4), # 深市国债
|
|
||||||
(0, "520261", 4), # 深市 520 段
|
|
||||||
# 沪市 B 股:3 位(2026-10-22 修正,曾按 2 位少 10 倍)
|
|
||||||
(1, "900901", 3), # 云赛B股
|
|
||||||
(1, "900948", 3),
|
|
||||||
# 深市 B 股:2 位(与沪市不同!)
|
|
||||||
(0, "200011", 2), # 深物业B
|
|
||||||
(0, "200488", 2),
|
|
||||||
# 边界:999xxx 是「指数」,不能被 9 开头当成 B 股
|
|
||||||
(1, "999999", 2), # 上证指数
|
|
||||||
(1, "999998", 2), # A股指数
|
|
||||||
])
|
|
||||||
def test_price_decimal_digits(market, code, expect):
|
|
||||||
assert price_decimal_digits(market, code) == expect
|
|
||||||
|
|
||||||
|
|
||||||
def test_price_decimal_digits_strips_nul():
|
|
||||||
assert price_decimal_digits(1, "000016\x00\x00") == 2
|
|
||||||
|
|
||||||
|
|
||||||
# ---------- 美股分时跨日:hour 必须是合法时钟值(回归:曾出现 hour=27) ----------
|
|
||||||
|
|
||||||
def _us_minutes(n: int = 390) -> list:
|
|
||||||
"""构造 usAAPL 的 390 条分时:从北京 21:30 起连续 n 分钟。"""
|
|
||||||
from pytdxdata.models import MinuteBar
|
|
||||||
|
|
||||||
start = 21 * 60 + 30
|
|
||||||
return [
|
|
||||||
MinuteBar(price=100.0 + i * 0.01, vol=1.0,
|
|
||||||
hour=(start + i) // 60, minute=(start + i) % 60,
|
|
||||||
market=74, code="AAPL", date=20261022)
|
|
||||||
for i in range(n)
|
|
||||||
]
|
|
||||||
|
|
||||||
|
|
||||||
def test_minute_bar_us_hour_is_valid_clock_value():
|
|
||||||
"""EX 分时的 minutes 是「自开盘起的连续分钟数」,直接 //60 会得到 hour=27。"""
|
|
||||||
bars = _us_minutes()
|
|
||||||
assert all(0 <= b.hour < 24 for b in bars)
|
|
||||||
# 归一化前的原始值确实越界(21:30 + 390min = 28:00)
|
|
||||||
assert max(b.hour + b.day_offset * 24 for b in bars) > 23
|
|
||||||
|
|
||||||
|
|
||||||
def test_minute_bar_us_day_offset_marks_next_day():
|
|
||||||
bars = _us_minutes()
|
|
||||||
assert bars[0].day_offset == 0 # 21:30 当晚
|
|
||||||
assert bars[-1].day_offset == 1 # 03:59 次日
|
|
||||||
assert (bars[-1].hour, bars[-1].minute) == (3, 59)
|
|
||||||
|
|
||||||
|
|
||||||
def test_minute_bar_us_datetime_is_monotonic_across_midnight():
|
|
||||||
bars = _us_minutes()
|
|
||||||
dts = [b.datetime for b in bars]
|
|
||||||
assert dts == sorted(dts)
|
|
||||||
assert dts[0] == datetime(2026, 10, 22, 21, 30)
|
|
||||||
assert dts[-1] == datetime(2026, 10, 23, 3, 59)
|
|
||||||
|
|
||||||
|
|
||||||
def test_minute_bar_us_trading_date_spans_two_calendar_days():
|
|
||||||
"""一个美股交易日的分时横跨两个北京自然日,trading_date 必须都是同一天。"""
|
|
||||||
bars = _us_minutes()
|
|
||||||
tds = {b.trading_date for b in bars}
|
|
||||||
assert tds == {"2026-10-22"}
|
|
||||||
# 而 datetime.date() 会给出两天 —— 这正是不能用它的原因
|
|
||||||
assert len({b.datetime.date() for b in bars}) == 2
|
|
||||||
|
|
||||||
|
|
||||||
def test_minute_bar_cn_unchanged():
|
|
||||||
"""A股/港股分时 hour 本就合法,归一化必须零行为变化。"""
|
|
||||||
from pytdxdata.models import MinuteBar
|
|
||||||
|
|
||||||
for hour, minute in ((9, 30), (11, 29), (13, 0), (14, 59)):
|
|
||||||
b = MinuteBar(price=10.0, vol=1.0, hour=hour, minute=minute,
|
|
||||||
market=1, code="600000", date=20261022)
|
|
||||||
assert (b.hour, b.minute) == (hour, minute)
|
|
||||||
assert b.day_offset == 0
|
|
||||||
assert b.datetime == datetime(2026, 10, 22, hour, minute)
|
|
||||||
assert b.trading_date == "2026-10-22"
|
|
||||||
|
|
||||||
|
|
||||||
def test_minute_bar_cn_datetime_monotonic_full_session():
|
|
||||||
"""A股全天 240 条(09:30~11:29 + 13:00~14:59)时间轴严格递增。"""
|
|
||||||
from pytdxdata.models import MinuteBar
|
|
||||||
|
|
||||||
bars = []
|
|
||||||
for idx in range(240):
|
|
||||||
if idx < 120:
|
|
||||||
hour, minute = 9 + (30 + idx) // 60, (30 + idx) % 60
|
|
||||||
else:
|
|
||||||
hour, minute = 13 + (idx - 120) // 60, (idx - 120) % 60
|
|
||||||
bars.append(MinuteBar(price=10.0, vol=1.0, hour=hour, minute=minute,
|
|
||||||
market=1, code="600000", date=20261022))
|
|
||||||
dts = [b.datetime for b in bars]
|
|
||||||
assert dts == sorted(dts)
|
|
||||||
assert dts[0] == datetime(2026, 10, 22, 9, 30)
|
|
||||||
assert dts[-1] == datetime(2026, 10, 22, 14, 59)
|
|
||||||
assert {b.trading_date for b in bars} == {"2026-10-22"}
|
|
||||||
Reference in new issue
Block a user