pytdxdata 0.2.0__tar.gz → 0.2.2__tar.gz

{pytdxdata-0.2.0 → pytdxdata-0.2.2}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: pytdxdata
-Version: 0.2.0
+Version: 0.2.2
 Summary: 通达信(TongDaXin)行情数据客户端：动态连接池 + 双层TTL缓存 + 3连接并发分页，纯asyncio零运行时依赖，支持A股/港股/美股/期货/期权
 Keywords: tdx,trading,stock,kline,quote,通达信,A股,港股,美股,期货,asyncio,quant
 Author: vex1023
@@ -11,8 +11,9 @@ Classifier: Development Status :: 4 - Beta
 Classifier: Intended Audience :: Developers
 Classifier: Intended Audience :: Financial and Insurance Industry
 Classifier: Topic :: Office/Business :: Financial :: Investment
-Classifier: Programming Language :: Python :: 3.13
+Classifier: Programming Language :: Python :: 3.11
 Classifier: Programming Language :: Python :: 3.12
+Classifier: Programming Language :: Python :: 3.13
 Classifier: Operating System :: OS Independent
 Classifier: Framework :: AsyncIO
 Classifier: Typing :: Typed
@@ -20,7 +21,7 @@ Requires-Dist: pytest>=8.0 ; extra == 'dev'
 Requires-Dist: pytest-asyncio>=0.24 ; extra == 'dev'
 Requires-Dist: ruff>=0.6 ; extra == 'dev'
 Requires-Dist: uvloop>=0.21 ; extra == 'uvloop'
-Requires-Python: >=3.13
+Requires-Python: >=3.11
 Project-URL: Homepage, https://github.com/vex1023/pytdxdata
 Project-URL: Repository, https://github.com/vex1023/pytdxdata
 Project-URL: Documentation, https://github.com/vex1023/pytdxdata#readme

{pytdxdata-0.2.0 → pytdxdata-0.2.2}/pyproject.toml

@@ -1,9 +1,9 @@
 [project]
 name = "pytdxdata"
-version = "0.2.0"
+version = "0.2.2"
 description = "通达信(TongDaXin)行情数据客户端：动态连接池 + 双层TTL缓存 + 3连接并发分页，纯asyncio零运行时依赖，支持A股/港股/美股/期货/期权"
 readme = "README.md"
-requires-python = ">=3.13"
+requires-python = ">=3.11"
 license = "MIT"
 license-files = ["LICENSE"]
 keywords = ["tdx", "trading", "stock", "kline", "quote", "通达信", "A股", "港股", "美股", "期货", "asyncio", "quant"]
@@ -15,8 +15,9 @@ classifiers = [
     "Intended Audience :: Developers",
     "Intended Audience :: Financial and Insurance Industry",
     "Topic :: Office/Business :: Financial :: Investment",
-    "Programming Language :: Python :: 3.13",
+    "Programming Language :: Python :: 3.11",
     "Programming Language :: Python :: 3.12",
+    "Programming Language :: Python :: 3.13",
     "Operating System :: OS Independent",
     "Framework :: AsyncIO",
     "Typing :: Typed",
@@ -45,6 +46,7 @@ target-version = "py313"
 
 [tool.pytest.ini_options]
 asyncio_mode = "auto"
+testpaths = ["tests"]
 
 [dependency-groups]
 dev = [

{pytdxdata-0.2.0 → pytdxdata-0.2.2}/src/pytdxdata/__init__.py

@@ -16,7 +16,7 @@ from .models import (
     XdxrRecord,
 )
 
-__version__ = "0.2.0"
+__version__ = "0.2.2"
 __all__ = [
     "TdxData",
     "Market",

{pytdxdata-0.2.0 → pytdxdata-0.2.2}/src/pytdxdata/api.py

@@ -3,6 +3,7 @@ from __future__ import annotations
 
 import asyncio
 import logging
+from datetime import date as _date
 from pathlib import Path
 from typing import Sequence
 
@@ -32,7 +33,6 @@ from .protocol.commands import (
     GetFinanceInfoCmd,
     GetHistoryMinuteTimeDataCmd,
     GetIndexBarsCmd,
-    GetMinuteTimeDataCmd,
     GetSecurityBarsCmd,
     GetSecurityCountCmd,
     GetSecurityListCmd,
@@ -145,27 +145,30 @@ class TdxData:
         adj = self.default_adjust if adjust is None else adjust
         # EX扩展市场（港股/期货）：market为ExMarket值，走ex池
         if isinstance(market, ExMarket) or int(market) not in (0, 1, 2):
-            # EX通道统一用pytdx EX协议(0x23FF, 3台服务器均支持): category=0日线
+            # EX通道统一用pytdx EX协议(0x23FF): category=K线周期(与TDXParams一致, DAY=4)
             from .protocol.commands.ex_proto import GetExInstrumentBarsCmd
+            cat = int(period)
             fetch_count = max(700, start + count)
-            key = CacheKey("kline", int(market), code, period.name, start, fetch_count, adj.name)
+            key = CacheKey("kline", int(market), code, period.name, start, fetch_count,
+                           f"{adj.name}@{cat}")
             async def fetch() -> bytes:
                 result = await self._fetch_paginated_ex(
-                    lambda s2, c2: GetExInstrumentBarsCmd(int(market), code, 0, s2, c2),
+                    lambda s2, c2: GetExInstrumentBarsCmd(int(market), code, cat, s2, c2),
                     PageSpec(page_size=700, total=fetch_count, min_page=100))
                 bars = []
                 for d in result:
                     bars.append(SecurityBar(
                         market=int(market), code=code,
                         year=d["year"], month=d["month"], day=d["day"],
-                        hour=0, minute=0,
+                        hour=d.get("hour", 0), minute=d.get("minute", 0),
                         open=d["open"], high=d["high"], low=d["low"], close=d["close"],
                         vol=float(d.get("trade", 0) or 0), amount=0.0,
                     ))
                 return pack_payload(bars)
             bars = unpack_payload(await self._cache.get_or_fetch(key, fetch))
-            if start == 0 and count < fetch_count:
-                return bars[:count]
+            # EX 0x23FF 按时间升序返回(老→新)：start=0 取最新 count 根
+            if count < len(bars):
+                return bars[-count:] if start == 0 else bars[start:start + count]
             return bars
 
         route = route_for("kline", adjust=adj)
@@ -295,10 +298,12 @@ class TdxData:
 
     async def get_minute(self, market: Market, code: str, *,
                          date: int | None = None) -> list[MinuteBar]:
-        key = CacheKey("minute", int(market), code, "", 0, 0,
-                       "" if date is None else str(date))
-        cmd = (GetHistoryMinuteTimeDataCmd(int(market), code, date)
-               if date is not None else GetMinuteTimeDataCmd(int(market), code))
+        """获取分时（date=None=今天；0x1b08当日分时在当前服务器格式已变，统一走历史命令0x0130）。"""
+        if date is None:
+            d = _date.today()
+            date = d.year * 10000 + d.month * 100 + d.day
+        key = CacheKey("minute", int(market), code, "", 0, 0, str(date))
+        cmd = GetHistoryMinuteTimeDataCmd(int(market), code, date)
         payload = await self._cache.get_or_fetch(
             key, lambda: self._fetch_minute(cmd)
         )

{pytdxdata-0.2.0 → pytdxdata-0.2.2}/src/pytdxdata/protocol/commands/__init__.py

@@ -5,7 +5,7 @@ from .base import BaseCommand, TdxDecodeError, build_standard_request
 from .finance import GetFinanceInfoCmd
 from .kline import GetIndexBarsCmd, GetSecurityBarsCmd, PAGE_SIZE as KLINE_PAGE
 from .mac import MacKlineCmd, MAC_KLINE_PAGE
-from .minute import GetHistoryMinuteTimeDataCmd, GetMinuteTimeDataCmd
+from .minute import GetHistoryMinuteTimeDataCmd
 from .quotes import GetSecurityQuotesCmd, MAX_QUOTES
 from .security_list import GetSecurityCountCmd, GetSecurityListCmd, PAGE_SIZE as LIST_PAGE
 from .transaction import (
@@ -23,7 +23,7 @@ __all__ = [
     "GetSecurityCountCmd", "GetSecurityListCmd", "LIST_PAGE",
     "GetTransactionDataCmd", "GetHistoryTransactionDataCmd", "MacTransactionCmd",
     "STD_PAGE_SIZE", "MAC_PAGE_SIZE",
-    "GetMinuteTimeDataCmd", "GetHistoryMinuteTimeDataCmd",
+    "GetHistoryMinuteTimeDataCmd",
     "GetXdxrInfoCmd", "GetFinanceInfoCmd",
     "MacKlineCmd", "MAC_KLINE_PAGE",
 ]

{pytdxdata-0.2.0 → pytdxdata-0.2.2}/src/pytdxdata/protocol/commands/ex_proto.py

@@ -4,6 +4,7 @@ from __future__ import annotations
 import struct
 
 from ..._binary import unpack_from
+from ..datetime_ import get_datetime
 from .base import BaseCommand
 
 # pytdx EX setup 握手命令（完整84B: 12B帧头+72B body, 0x2454）—— 与MAC EX login同ID不同body
@@ -80,11 +81,13 @@ class GetExInstrumentBarsCmd(BaseCommand[list[dict]]):
         for _ in range(ret_count):
             if off + 32 > len(body):
                 break
-            (ymd,) = unpack_from("<I", body, off, "ex bar date")
+            # 时间4字节按category分格式：分钟级=2B zipday+2B tminutes；日线及以上=YYYYMMDD
+            year, month, day, hour, minute, _ = get_datetime(self.category, body, off)
             open_, high, low, close, position, trade, _ = struct.unpack(
                 "<ffffIIf", body[off + 4: off + 32])
             items.append({
-                "year": ymd // 10000, "month": (ymd % 10000) // 100, "day": ymd % 100,
+                "year": year, "month": month, "day": day,
+                "hour": hour, "minute": minute,
                 "open": open_, "high": high, "low": low, "close": close,
                 "position": position, "trade": trade,
             })

{pytdxdata-0.2.0 → pytdxdata-0.2.2}/src/pytdxdata/protocol/commands/minute.py

@@ -1,4 +1,4 @@
-"""分时命令（标准通道 今日0x1B0800 / 历史0x013000）"""
+"""分时命令（标准通道 0x013000；0x1b08 当日分时在当前服务器格式已变，统一用历史命令传当天）"""
 from __future__ import annotations
 
 import struct
@@ -9,23 +9,8 @@ from ..price import get_price
 from .base import BaseCommand
 
 
-class GetMinuteTimeDataCmd(BaseCommand[list[MinuteBar]]):
-    """今日分时（全天约240条）。"""
-
-    def __init__(self, market: int, code: str) -> None:
-        self.market = market
-        self.code = code.encode("utf-8")
-
-    def build_request(self) -> bytes:
-        header = bytes.fromhex("0c1b080001010e000e001d05".replace(" ", ""))
-        return header + struct.pack("<H6sI", self.market, self.code, 0)
-
-    def parse_response(self, body: bytes) -> list[MinuteBar]:
-        return _parse_minute_body(body, skip=4)
-
-
 class GetHistoryMinuteTimeDataCmd(BaseCommand[list[MinuteBar]]):
-    """历史某日分时（date=YYYYMMDD）。"""
+    """某日分时（date=YYYYMMDD；当日分时也用它，date 传当天）。"""
 
     def __init__(self, market: int, code: str, date: int) -> None:
         self.market = market