fix(cli): 价格按品种小数位显示 + 分时时间列改真实时钟 (0.6.8) (#10)
* fix(cli): price decimals per instrument + minute time column 1) 价格按品种小数位显示:可转债 128.892 原被 %8.2f 截成 128.89; 新增 _price_fmt/_display_dp,宽度随小数位走(%8.2f -> %9.3f)不破坏对齐。 可转债(沪 110/111/113/118、深 123/127/128)解码是 4 位但报价步长 0.001, 显示降到 3 位;ETF 3 位、国债/回购 4 位、股票/指数 2 位沿用 price_decimal_digits。 2) tdx minute 时间列原按序号推算(i//60, i%60)打印成 00:00~03:59, 改用 MinuteBar.hour/minute。 3) cmd_transactions/cmd_minute 改调 get_ticks/get_minutes,消掉 DeprecationWarning。 新增 tests/test_cli_format.py(8 项);全量 354 passed。 * chore: release 0.6.8(CLI 价格小数位 + 分时时间列修复) - 版本号 0.6.7 -> 0.6.8(pyproject / __init__.py / uv.lock / CHANGELOG 四处对齐) - CHANGELOG:`[未发布]` -> `[0.6.8] - 2026-10-23` - docs/cli.md:补「价格小数位按品种适配」对照表 + `tdx minute` 时间列说明 功能改动见 cd8227f(CLI 价格按品种小数位显示、分时时间列改真实时钟、 cmd_transactions/cmd_minute 改调 get_ticks/get_minutes 消 DeprecationWarning)。 实测 `tdx minute sh113708` -> 时间 09:30 起、价格 127.631(3 位); `tdx transactions sh113708` -> 11:29:47 / 127.141 / 44 手 / 买(4笔)。 测试 354 全通过(310 + 16 + 23 + 5)。 --------- Co-authored-by: openbot-coder <openbot-coder@users.noreply.github.com>
This commit is contained in:
1 parent
8a78156145
commit
dc78d81be8
7 files changed
+168
-6
No files matched your search
@@ -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