Compare commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
dc78d81be8 |
No files matched your search
@@ -2,6 +2,32 @@
|
||||
|
||||
本项目遵循 [语义化版本](https://semver.org/lang/zh-CN/)。
|
||||
|
||||
## [0.6.8] - 2026-10-23
|
||||
|
||||
### 修复
|
||||
|
||||
- **CLI 价格按品种小数位显示;`tdx minute` 时间列改回真实时钟**。
|
||||
|
||||
两处纯显示层缺陷,数据本身没问题(分时/逐笔数值见 0.6.7 的核对结论):
|
||||
|
||||
| 现象 | 原因 |
|
||||
|---|---|
|
||||
| `tdx transactions sh113708` 打印 `128.89` | 价格写死 `%8.2f`;可转债报价步长 0.001 元,末位被截掉 |
|
||||
| `tdx minute sh113708` 时间列 `00:00~03:59` | 按序号推算 `i // 60, i % 60`,与 bar 自带时间无关 |
|
||||
| `tdx quotes sh113708` 打印 `128.8920` | `price_decimal_digits` 是**解码位数**(原始整数 / 10⁴),第 4 位恒为 0 |
|
||||
|
||||
| 位置 | 变化 |
|
||||
|---|---|
|
||||
| `_price_fmt(dp)`(新) | 宽度随小数位走(`%8.2f` → `%9.3f`),不破坏表格对齐 |
|
||||
| `_display_dp(market, code)`(新) | 可转债(沪 `110/111/113/118`、深 `123/127/128`)由解码 4 位降到显示 3 位;其余沿用 `price_decimal_digits`(ETF 3 位、国债/回购 4 位、股票/指数 2 位) |
|
||||
| `cmd_kline` / `cmd_transactions` / `cmd_minute` / `_print_quote` | 统一改用上面的格式串 |
|
||||
| `cmd_minute` | 时间取 `MinuteBar.hour/minute`,不再用序号推算 |
|
||||
| `cmd_transactions` / `cmd_minute` | 改调 `get_ticks` / `get_minutes`,消掉 `get_transactions` / `get_minute` 的 DeprecationWarning |
|
||||
|
||||
新增回归测试 8 项(`tests/test_cli_format.py`)。
|
||||
|
||||
文档:`docs/cli.md` 补「价格小数位按品种适配」对照表与 `tdx minute` 时间列说明。
|
||||
|
||||
## [0.6.7] - 2026-10-22
|
||||
|
||||
### 性能
|
||||
|
||||
+11
@@ -56,6 +56,17 @@ tdx minute sz000001 # 今日分时
|
||||
tdx minute sz000001 --date 20260811 # 历史分时
|
||||
```
|
||||
|
||||
价格列的小数位**按品种自动适配**,不用自己换算:
|
||||
|
||||
| 品种 | 显示小数位 | 示例 |
|
||||
|---|---|---|
|
||||
| 股票 / 指数 | 2 | `12.34` |
|
||||
| ETF / LOF / 沪市 B 股 / 可转债 | 3 | `128.892`(可转债报价步长 0.001 元) |
|
||||
| 债券 / 回购 | 4 | `100.0100` |
|
||||
|
||||
> 可转债的**解码位数**是 4 位(原始整数 / 10⁴),但第 4 位恒为 0,所以显示按 3 位。
|
||||
> `tdx minute` 的时间列是该 bar 的**真实时钟**(`09:31` / `14:57`),不是序号推算。
|
||||
|
||||
## 板块
|
||||
|
||||
```bash
|
||||
|
||||
+1
-1
@@ -1,6 +1,6 @@
|
||||
[project]
|
||||
name = "pytdxdata"
|
||||
version = "0.6.7"
|
||||
version = "0.6.8"
|
||||
description = "通达信(TongDaXin)行情数据客户端:动态连接池 + 双层TTL缓存 + 3连接并发分页,纯asyncio零运行时依赖,支持A股/港股/美股/期货/期权"
|
||||
readme = "README.md"
|
||||
requires-python = ">=3.11"
|
||||
|
||||
@@ -18,7 +18,7 @@ from .models import (
|
||||
XdxrRecord,
|
||||
)
|
||||
|
||||
__version__ = "0.6.7"
|
||||
__version__ = "0.6.8"
|
||||
__all__ = [
|
||||
"TdxData",
|
||||
"Market",
|
||||
|
||||
@@ -162,9 +162,9 @@ def _print_quote(q) -> None:
|
||||
print("=" * 58)
|
||||
label = "%s %s" % (mkt, q.code) if mkt else "%s %s" % (q.code, q.server_time or datetime.now().strftime("%H:%M:%S"))
|
||||
print(" %s" % label)
|
||||
print((" 最新 %-10.*f 涨跌 %+8.*f (%+.2f%%)" % (dp, q.price, dp, q.price - q.pre_close, pct)))
|
||||
print((" 今开 %-10.*f 最高 %.*f 最低 %.*f" % (dp, q.open, dp, q.high, dp, q.low)))
|
||||
print((" 昨收 %-10.*f 成交量 %s 成交额 %s" % (dp, q.pre_close, _fmt_num(q.vol), _fmt_num(q.amount))))
|
||||
print(" 最新 %-10.*f 涨跌 %+8.*f (%+.2f%%)" % (dp, q.price, dp, q.price - q.pre_close, pct))
|
||||
print(" 今开 %-10.*f 最高 %.*f 最低 %.*f" % (dp, q.open, dp, q.high, dp, q.low))
|
||||
print(" 昨收 %-10.*f 成交量 %s 成交额 %s" % (dp, q.pre_close, _fmt_num(q.vol), _fmt_num(q.amount)))
|
||||
if q.bid and q.ask:
|
||||
print(" " + "-" * 56)
|
||||
pf = _price_fmt(dp)
|
||||
|
||||
@@ -0,0 +1,125 @@
|
||||
"""CLI 价格小数位 / 分时时间列的显示回归。
|
||||
|
||||
覆盖两个曾经出错的地方:
|
||||
|
||||
1. ``tdx minute`` 的时间列按序号推算(``i // 60, i % 60``),240 根分时被打印成
|
||||
``00:00~03:59``,与真实交易时间无关。
|
||||
2. 价格固定写死 ``%8.2f``,可转债(报价步长 0.001 元)会被截成 2 位
|
||||
——``128.892`` 打成 ``128.89``。
|
||||
|
||||
注意 ``price_decimal_digits`` 返回的是**解码位数**(原始整数 / 10**dp),可转债
|
||||
是 4 位,但第 4 位恒为 0,显示层只该给 3 位(见 ``_display_dp``)。
|
||||
"""
|
||||
from __future__ import annotations
|
||||
|
||||
from pytdxdata.cli import (
|
||||
_display_dp,
|
||||
_dp_of,
|
||||
_price_fmt,
|
||||
cmd_minute,
|
||||
cmd_transactions,
|
||||
parse_symbol,
|
||||
)
|
||||
from pytdxdata.models import MinuteBar, TransactionRecord
|
||||
|
||||
|
||||
class FakeTD:
|
||||
"""只实现 minute / transactions 需要的两个接口。"""
|
||||
|
||||
def __init__(self, minutes=None, ticks=None):
|
||||
self._minutes = minutes or []
|
||||
self._ticks = ticks or []
|
||||
|
||||
async def get_minutes(self, sym, date=None):
|
||||
return self._minutes
|
||||
|
||||
async def get_ticks(self, sym, date=None, count=None):
|
||||
return self._ticks
|
||||
|
||||
|
||||
def _bar(price, hour, minute, vol=100.0, avg=0.0):
|
||||
return MinuteBar(price=price, vol=vol, avg_price=avg or price,
|
||||
hour=hour, minute=minute, fields={})
|
||||
|
||||
|
||||
def _tick(price, vol, trade_count=1, available=True, time="14:59:54"):
|
||||
return TransactionRecord(market=1, code="113708", time=time, price=price, vol=vol,
|
||||
trade_count=trade_count, bs_flag=0, fields={},
|
||||
trade_count_available=available)
|
||||
|
||||
|
||||
# --------------------------------------------------------------------------- #
|
||||
# 小数位判定
|
||||
# --------------------------------------------------------------------------- #
|
||||
|
||||
def test_price_fmt_width_tracks_decimals():
|
||||
assert _price_fmt(2) == "%8.2f" # 股票:保持原宽度,不破坏对齐
|
||||
assert _price_fmt(3) == "%9.3f"
|
||||
assert _price_fmt(4) == "%10.4f"
|
||||
assert _price_fmt(None) == "%8.2f" # 缺省当 2 位
|
||||
|
||||
|
||||
def test_display_dp_by_instrument():
|
||||
assert _display_dp(1, "600000") == 2 # 沪股票
|
||||
assert _display_dp(0, "000001") == 2 # 深股票
|
||||
assert _display_dp(1, "000001") == 2 # 指数
|
||||
assert _display_dp(1, "113708") == 3 # 沪可转债(解码 4 位,显示 3 位)
|
||||
assert _display_dp(1, "110102") == 3
|
||||
assert _display_dp(0, "123235") == 3 # 深可转债
|
||||
assert _display_dp(0, "128136") == 3
|
||||
assert _display_dp(1, "510310") == 3 # ETF
|
||||
assert _display_dp(1, "019547") == 4 # 国债:4 位是真实报价精度
|
||||
|
||||
|
||||
def test_dp_of_uses_cn_only():
|
||||
assert _dp_of(parse_symbol("sh113708")) == 3
|
||||
assert _dp_of(parse_symbol("sh600000")) == 2
|
||||
assert _dp_of(parse_symbol("hk00700")) == 2 # 非 A 股固定 2 位
|
||||
|
||||
|
||||
# --------------------------------------------------------------------------- #
|
||||
# tdx minute
|
||||
# --------------------------------------------------------------------------- #
|
||||
|
||||
async def test_cmd_minute_prints_real_clock(capsys):
|
||||
bars = [_bar(129.271, 9, 30), _bar(129.270, 9, 31), _bar(128.892, 14, 59)]
|
||||
await cmd_minute(FakeTD(minutes=bars), "sh113708", None)
|
||||
out = capsys.readouterr().out
|
||||
assert "09:30" in out and "09:31" in out and "14:59" in out
|
||||
assert "00:00" not in out and "03:59" not in out
|
||||
|
||||
|
||||
async def test_cmd_minute_cb_keeps_three_decimals(capsys):
|
||||
await cmd_minute(FakeTD(minutes=[_bar(128.892, 14, 59)]), "sh113708", None)
|
||||
out = capsys.readouterr().out
|
||||
assert "128.892" in out
|
||||
assert "128.89 " not in out
|
||||
|
||||
|
||||
async def test_cmd_minute_stock_two_decimals(capsys):
|
||||
await cmd_minute(FakeTD(minutes=[_bar(9.62, 15, 0)]), "sh600000", None)
|
||||
out = capsys.readouterr().out
|
||||
assert "9.62" in out and "9.620" not in out
|
||||
|
||||
|
||||
# --------------------------------------------------------------------------- #
|
||||
# tdx transactions
|
||||
# --------------------------------------------------------------------------- #
|
||||
|
||||
async def test_cmd_transactions_cb_price_and_count(capsys):
|
||||
await cmd_transactions(FakeTD(ticks=[_tick(128.892, 3, trade_count=4)]),
|
||||
"sh113708", 50, None)
|
||||
out = capsys.readouterr().out
|
||||
assert "128.892" in out
|
||||
assert "(4笔)" in out
|
||||
|
||||
|
||||
async def test_cmd_transactions_etf_marks_missing_count(capsys):
|
||||
tick = TransactionRecord(market=1, code="510310", time="15:27:35", price=3.989,
|
||||
vol=15, trade_count=0, bs_flag=0, fields={},
|
||||
trade_count_available=False)
|
||||
await cmd_transactions(FakeTD(ticks=[tick]), "sh510310", 50, None)
|
||||
out = capsys.readouterr().out
|
||||
assert "3.989" in out # ETF 也是 3 位
|
||||
assert "(-)" in out # 不打印假笔数
|
||||
assert "笔)" not in out
|
||||
Reference in new issue
Block a user