deeptrade-quant 0.3.0__tar.gz → 0.3.1__tar.gz

{deeptrade_quant-0.3.0 → deeptrade_quant-0.3.1}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: deeptrade-quant
-Version: 0.3.0
+Version: 0.3.1
 Summary: LLM-driven A-share (Shanghai/Shenzhen main board) stock screening CLI
 Project-URL: Homepage, https://github.com/ty19880929/deeptrade
 Project-URL: Repository, https://github.com/ty19880929/deeptrade

{deeptrade_quant-0.3.0 → deeptrade_quant-0.3.1}/deeptrade/__init__.py

@@ -2,5 +2,5 @@
 
 from __future__ import annotations
 
-__version__ = "0.3.0"
+__version__ = "0.3.1"
 __all__ = ["__version__"]

{deeptrade_quant-0.3.0 → deeptrade_quant-0.3.1}/deeptrade/cli.py

@@ -103,8 +103,7 @@ def _build_plugin_command(plugin_id: str) -> click.Command | None:
         )
         def _disabled() -> None:
             typer.echo(
-                f"✘ plugin {plugin_id!r} is disabled; "
-                f"run `deeptrade plugin enable {plugin_id}`"
+                f"✘ plugin {plugin_id!r} is disabled; run `deeptrade plugin enable {plugin_id}`"
             )
             raise typer.Exit(2)
 
@@ -204,15 +203,16 @@ def init(
         cmd_set_llm()
 
 
-
 @app.command(name="db", context_settings={"ignore_unknown_options": True, "allow_extra_args": True})
 def db_cmd(ctx: click.Context) -> None:
     """Database migration and management commands (legacy stub; use `deeptrade db init` via group if added)."""
     pass
 
+
 db_app = typer.Typer(name="db", help="Database migration and management commands.")
 app.add_typer(db_app, name="db")
 
+
 @db_app.command("init")
 def db_init() -> None:
     """Initialize the core database tables and apply migrations."""
@@ -232,10 +232,12 @@ def db_init() -> None:
     finally:
         db.close()
 
+
 @db_app.command("upgrade")
 def db_upgrade() -> None:
     """Apply any pending core migrations."""
     db_init()
 
+
 if __name__ == "__main__":
     app()

{deeptrade_quant-0.3.0 → deeptrade_quant-0.3.1}/deeptrade/cli_config.py

@@ -156,10 +156,12 @@ def cmd_set_llm() -> None:
         existing = sorted(cfg.llm_providers.keys())
 
         if existing:
-            choices = ["[+] Add new provider"] + [f"[~] {n}" for n in existing] + ["[x] Delete a provider"]
-            picked = questionary.select(
-                "Pick action:", choices=choices
-            ).ask()
+            choices = (
+                ["[+] Add new provider"]
+                + [f"[~] {n}" for n in existing]
+                + ["[x] Delete a provider"]
+            )
+            picked = questionary.select("Pick action:", choices=choices).ask()
             if picked is None:
                 raise typer.Exit(1)
             if picked.startswith("[+]"):
@@ -177,9 +179,7 @@ def cmd_set_llm() -> None:
 
 
 def _set_llm_new(svc: ConfigService) -> None:
-    name = questionary.text(
-        "Provider name (e.g. deepseek, qwen-plus, kimi):"
-    ).ask()
+    name = questionary.text("Provider name (e.g. deepseek, qwen-plus, kimi):").ask()
     if not name:
         raise typer.Exit(1)
     name = name.strip()
@@ -259,9 +259,7 @@ def _prompt_and_save_provider(
         raise typer.Exit(2) from e
 
     api_key_prompt = (
-        "API key (leave empty to keep existing):"
-        if defaults is not None
-        else "API key:"
+        "API key (leave empty to keep existing):" if defaults is not None else "API key:"
     )
     api_key = questionary.password(api_key_prompt).ask()
     if api_key is None:

{deeptrade_quant-0.3.0 → deeptrade_quant-0.3.1}/deeptrade/cli_plugin.py

@@ -58,9 +58,7 @@ def _format_origin(resolved: ResolvedSource) -> str:
     if resolved.origin == "local":
         return f"本地路径 ({d.get('local_path', resolved.path)})"
     if resolved.origin == "github_registry":
-        return (
-            f"GitHub 注册表 ({d['repo']}@{d['ref']}, subdir={d['subdir']})"
-        )
+        return f"GitHub 注册表 ({d['repo']}@{d['ref']}, subdir={d['subdir']})"
     if resolved.origin == "github_url":
         return f"GitHub URL ({d['repo']}@{d['ref']})"
     return resolved.origin
@@ -68,9 +66,7 @@ def _format_origin(resolved: ResolvedSource) -> str:
 
 @app.command("install")
 def cmd_install(
-    source: str = typer.Argument(
-        ..., help="短名（注册表）/ 本地路径 / GitHub URL"
-    ),
+    source: str = typer.Argument(..., help="短名（注册表）/ 本地路径 / GitHub URL"),
     ref: str | None = typer.Option(
         None, "--ref", help="Tag / branch / sha (默认 = 该插件最新 release)"
     ),
@@ -150,9 +146,7 @@ def cmd_info(plugin_id: str = typer.Argument(...)) -> None:
     try:
         try:
             rec = mgr.info(plugin_id)
-            typer.echo(
-                yaml.safe_dump(rec.metadata.model_dump(mode="json"), allow_unicode=True)
-            )
+            typer.echo(yaml.safe_dump(rec.metadata.model_dump(mode="json"), allow_unicode=True))
             return
         except PluginNotFoundError:
             pass  # fall through to registry lookup
@@ -237,9 +231,7 @@ def cmd_uninstall(
 
 @app.command("upgrade")
 def cmd_upgrade(
-    source: str = typer.Argument(
-        ..., help="短名（注册表）/ 本地路径 / GitHub URL"
-    ),
+    source: str = typer.Argument(..., help="短名（注册表）/ 本地路径 / GitHub URL"),
     ref: str | None = typer.Option(
         None, "--ref", help="Tag / branch / sha (默认 = 该插件最新 release)"
     ),
@@ -269,9 +261,7 @@ def cmd_upgrade(
                     pid = meta.plugin_id
                 except PluginInstallError:
                     pid = source
-                typer.echo(
-                    f'✘ 插件 "{pid}" 未安装，请先执行 deeptrade plugin install'
-                )
+                typer.echo(f'✘ 插件 "{pid}" 未安装，请先执行 deeptrade plugin install')
                 raise typer.Exit(2) from e
             except PluginInstallError as e:
                 typer.echo(f"✘ Upgrade failed: {e}")
@@ -293,9 +283,7 @@ def cmd_search(
     keyword: str | None = typer.Argument(
         None, help="可选过滤关键词（匹配 plugin_id / name / description）"
     ),
-    no_cache: bool = typer.Option(
-        False, "--no-cache", help="强制刷新注册表（旁路 ETag 缓存）"
-    ),
+    no_cache: bool = typer.Option(False, "--no-cache", help="强制刷新注册表（旁路 ETag 缓存）"),
 ) -> None:
     """List plugins available in the official registry."""
     try:

{deeptrade_quant-0.3.0 → deeptrade_quant-0.3.1}/deeptrade/core/config.py

@@ -87,6 +87,11 @@ class AppConfig(BaseModel):
     # tushare.*  (token lives in secret_store)
     tushare_rps: float = Field(default=6.0, gt=0)
     tushare_timeout: int = Field(default=30, ge=1)
+    # Tenacity stop_after_attempt for transient errors (rate limit / server /
+    # transport). Default 7 keeps worst-case wait around one minute of
+    # jittered exponential backoff. Each attempt re-enters the token bucket,
+    # so retries never bypass rate limiting.
+    tushare_max_retries: int = Field(default=7, ge=1, le=20)
 
     # Global preset name. v0.7 — renamed from ``deepseek.profile``; semantics
     # are vendor-agnostic. Per-stage tuning is resolved by each plugin's
@@ -134,6 +139,7 @@ _DOT_TO_FIELD: dict[str, str] = {
     "app.close_after": "app_close_after",
     "tushare.rps": "tushare_rps",
     "tushare.timeout": "tushare_timeout",
+    "tushare.max_retries": "tushare_max_retries",
     "app.profile": "app_profile",
     "llm.providers": "llm_providers",
     "llm.audit_full_payload": "llm_audit_full_payload",
@@ -365,8 +371,7 @@ class ConfigService:
             # already default; otherwise we'd leave the dict with no
             # default at all. Preserve prior_default in that case.
             other_has_default = any(
-                k != name and bool((v or {}).get("is_default"))
-                for k, v in current.items()
+                k != name and bool((v or {}).get("is_default")) for k, v in current.items()
             )
             new_default = prior_default if not other_has_default else False
 
@@ -374,7 +379,11 @@ class ConfigService:
         # the invariant "at most one default" holds.
         if new_default:
             for other_name, other_cfg in current.items():
-                if other_name != name and isinstance(other_cfg, dict) and other_cfg.get("is_default"):
+                if (
+                    other_name != name
+                    and isinstance(other_cfg, dict)
+                    and other_cfg.get("is_default")
+                ):
                     current[other_name] = {**other_cfg, "is_default": False}
 
         current[name] = {

{deeptrade_quant-0.3.0 → deeptrade_quant-0.3.1}/deeptrade/core/github_fetch.py

@@ -95,20 +95,14 @@ def latest_release_tag(repo: str, tag_prefix: str = "", *, timeout: float = 15.0
                 payload = resp.read()
                 link_header = resp.headers.get("Link")
         except HTTPError as e:
-            raise GitHubFetchError(
-                f"HTTP {e.code} listing releases for {repo}: {e}"
-            ) from e
+            raise GitHubFetchError(f"HTTP {e.code} listing releases for {repo}: {e}") from e
         except URLError as e:
-            raise GitHubFetchError(
-                f"network error listing releases for {repo}: {e}"
-            ) from e
+            raise GitHubFetchError(f"network error listing releases for {repo}: {e}") from e
 
         try:
             data = json.loads(payload.decode("utf-8"))
         except (UnicodeDecodeError, json.JSONDecodeError) as e:
-            raise GitHubFetchError(
-                f"invalid JSON in releases response for {repo}: {e}"
-            ) from e
+            raise GitHubFetchError(f"invalid JSON in releases response for {repo}: {e}") from e
 
         if not isinstance(data, list):
             raise GitHubFetchError(
@@ -125,7 +119,7 @@ def latest_release_tag(repo: str, tag_prefix: str = "", *, timeout: float = 15.0
                 continue
             if tag_prefix and not tag.startswith(tag_prefix):
                 continue
-            ver_str = tag[len(tag_prefix):] if tag_prefix else tag
+            ver_str = tag[len(tag_prefix) :] if tag_prefix else tag
             ver_str = ver_str.lstrip("v")
             try:
                 candidates.append((Version(ver_str), tag))
@@ -142,9 +136,7 @@ def latest_release_tag(repo: str, tag_prefix: str = "", *, timeout: float = 15.0
     return candidates[0][1]
 
 
-def fetch_tarball(
-    repo: str, ref: str, dest_dir: Path, *, timeout: float = 60.0
-) -> Path:
+def fetch_tarball(repo: str, ref: str, dest_dir: Path, *, timeout: float = 60.0) -> Path:
     """Download ``repo`` at ``ref`` from the GitHub tarball API and extract.
 
     Returns the unique top-level directory created inside ``dest_dir``
@@ -157,9 +149,7 @@ def fetch_tarball(
 
     tmp_path: Path | None = None
     try:
-        with tempfile.NamedTemporaryFile(
-            suffix=".tar.gz", delete=False
-        ) as tmp:
+        with tempfile.NamedTemporaryFile(suffix=".tar.gz", delete=False) as tmp:
             tmp_path = Path(tmp.name)
 
         req = _build_request(url, accept="application/vnd.github+json")
@@ -167,13 +157,9 @@ def fetch_tarball(
             with urlopen(req, timeout=timeout) as resp, tmp_path.open("wb") as fout:
                 shutil.copyfileobj(resp, fout)
         except HTTPError as e:
-            raise TarballFetchError(
-                f"HTTP {e.code} downloading tarball {repo}@{ref}: {e}"
-            ) from e
+            raise TarballFetchError(f"HTTP {e.code} downloading tarball {repo}@{ref}: {e}") from e
         except URLError as e:
-            raise TarballFetchError(
-                f"network error downloading tarball {repo}@{ref}: {e}"
-            ) from e
+            raise TarballFetchError(f"network error downloading tarball {repo}@{ref}: {e}") from e
 
         try:
             with tarfile.open(tmp_path, mode="r:gz") as tf:
@@ -208,9 +194,7 @@ def _safe_extract(tf: tarfile.TarFile, dest: Path) -> None:
         try:
             member_path.relative_to(dest_resolved)
         except ValueError as e:
-            raise tarfile.TarError(
-                f"unsafe path in tarball (would escape dest): {m.name!r}"
-            ) from e
+            raise tarfile.TarError(f"unsafe path in tarball (would escape dest): {m.name!r}") from e
 
     try:
         tf.extractall(dest, filter="data")

{deeptrade_quant-0.3.0 → deeptrade_quant-0.3.1}/deeptrade/core/llm_manager.py

@@ -111,8 +111,7 @@ class LLMManager:
         provider = cfg.llm_providers.get(name)
         if provider is None:
             raise LLMNotConfiguredError(
-                f"LLM provider {name!r} is not configured; "
-                "run `deeptrade config set-llm` to add it"
+                f"LLM provider {name!r} is not configured; run `deeptrade config set-llm` to add it"
             )
         return LLMProviderInfo(name=name, model=provider.model, base_url=provider.base_url)
 
@@ -160,8 +159,7 @@ class LLMManager:
         provider = cfg.llm_providers.get(name)
         if provider is None:
             raise LLMNotConfiguredError(
-                f"LLM provider {name!r} is not configured; "
-                "run `deeptrade config set-llm` to add it"
+                f"LLM provider {name!r} is not configured; run `deeptrade config set-llm` to add it"
             )
         api_key = self._config.get(f"llm.{name}.api_key")
         if not api_key:

{deeptrade_quant-0.3.0 → deeptrade_quant-0.3.1}/deeptrade/core/plugin_manager.py

@@ -373,9 +373,7 @@ class PluginManager:
             new_ver = Version(meta.version)
             cur_ver = Version(existing.version)
         except InvalidVersion as e:
-            raise PluginInstallError(
-                f"invalid version on {meta.plugin_id}: {e}"
-            ) from e
+            raise PluginInstallError(f"invalid version on {meta.plugin_id}: {e}") from e
 
         if new_ver == cur_ver:
             return UpgradeNoop(plugin_id=meta.plugin_id, version=existing.version)

{deeptrade_quant-0.3.0 → deeptrade_quant-0.3.1}/deeptrade/core/plugin_source.py

@@ -68,9 +68,7 @@ def _is_git_url(s: str) -> bool:
 def _parse_github_url(url: str) -> tuple[str, str]:
     m = _GITHUB_URL_RE.match(url)
     if not m:
-        raise SourceResolveError(
-            f"unsupported URL form (only github.com is supported): {url!r}"
-        )
+        raise SourceResolveError(f"unsupported URL form (only github.com is supported): {url!r}")
     return m.group(1), m.group(2)
 
 
@@ -121,14 +119,11 @@ class SourceResolver:
             top = fetch_tarball(entry.repo, ref, Path(tmp.name))
             plugin_path = top / entry.subdir
             if not plugin_path.is_dir():
-                raise SourceResolveError(
-                    f"subdir {entry.subdir!r} not found in {entry.repo}@{ref}"
-                )
+                raise SourceResolveError(f"subdir {entry.subdir!r} not found in {entry.repo}@{ref}")
             yaml_path = plugin_path / "deeptrade_plugin.yaml"
             if not yaml_path.is_file():
                 raise SourceResolveError(
-                    f"no deeptrade_plugin.yaml in {entry.repo}@{ref} "
-                    f"under {entry.subdir!r}"
+                    f"no deeptrade_plugin.yaml in {entry.repo}@{ref} under {entry.subdir!r}"
                 )
         except Exception:
             tmp.cleanup()

{deeptrade_quant-0.3.0 → deeptrade_quant-0.3.1}/deeptrade/core/registry.py

@@ -22,8 +22,7 @@ from deeptrade.core import paths
 logger = logging.getLogger(__name__)
 
 REGISTRY_URL = (
-    "https://raw.githubusercontent.com/ty19880929/"
-    "DeepTradePluginOfficial/main/registry/index.json"
+    "https://raw.githubusercontent.com/ty19880929/DeepTradePluginOfficial/main/registry/index.json"
 )
 
 _REQUIRED_FIELDS = frozenset(
@@ -81,9 +80,7 @@ def _parse_registry(data: Any) -> Registry:
 
     schema_version = data.get("schema_version")
     if schema_version != 1:
-        raise RegistrySchemaError(
-            f"schema_version must be 1, got {schema_version!r}"
-        )
+        raise RegistrySchemaError(f"schema_version must be 1, got {schema_version!r}")
 
     plugins_raw = data.get("plugins")
     if not isinstance(plugins_raw, dict):
@@ -95,9 +92,7 @@ def _parse_registry(data: Any) -> Registry:
             raise RegistrySchemaError(f"plugins.{plugin_id} must be an object")
         missing = _REQUIRED_FIELDS - set(raw)
         if missing:
-            raise RegistrySchemaError(
-                f"plugins.{plugin_id} missing fields: {sorted(missing)}"
-            )
+            raise RegistrySchemaError(f"plugins.{plugin_id} missing fields: {sorted(missing)}")
         entries[plugin_id] = RegistryEntry(
             plugin_id=plugin_id,
             **{k: raw[k] for k in _REQUIRED_FIELDS},
@@ -144,18 +139,12 @@ class RegistryClient:
             if e.code == 304 and cached is not None:
                 logger.debug("registry: 304 Not Modified, using cache")
                 return _parse_registry(cached["body"])
-            raise RegistryFetchError(
-                f"HTTP {e.code} fetching registry: {e}"
-            ) from e
+            raise RegistryFetchError(f"HTTP {e.code} fetching registry: {e}") from e
         except URLError as e:
             if cached is not None:
-                logger.warning(
-                    "registry: network error %s, falling back to cache", e
-                )
+                logger.warning("registry: network error %s, falling back to cache", e)
                 return _parse_registry(cached["body"])
-            raise RegistryFetchError(
-                f"network error fetching registry: {e}"
-            ) from e
+            raise RegistryFetchError(f"network error fetching registry: {e}") from e
 
         try:
             body = json.loads(raw_bytes.decode("utf-8"))
@@ -171,8 +160,7 @@ class RegistryClient:
         registry = self.fetch()
         if plugin_id not in registry.plugins:
             raise RegistryNotFoundError(
-                f"plugin {plugin_id!r} not in registry. "
-                f"Available: {sorted(registry.plugins)}"
+                f"plugin {plugin_id!r} not in registry. Available: {sorted(registry.plugins)}"
             )
         return registry.plugins[plugin_id]
 
@@ -186,6 +174,4 @@ class RegistryClient:
 
     def _write_cache(self, payload: dict) -> None:
         self.cache_path.parent.mkdir(parents=True, exist_ok=True)
-        self.cache_path.write_text(
-            json.dumps(payload, ensure_ascii=False), encoding="utf-8"
-        )
+        self.cache_path.write_text(json.dumps(payload, ensure_ascii=False), encoding="utf-8")

{deeptrade_quant-0.3.0 → deeptrade_quant-0.3.1}/deeptrade/core/tushare_client.py

@@ -32,10 +32,10 @@ from typing import Any, Literal
 
 import pandas as pd
 from tenacity import (
-    retry,
+    Retrying,
     retry_if_exception_type,
     stop_after_attempt,
-    wait_exponential,
+    wait_exponential_jitter,
 )
 
 from deeptrade.core.db import Database
@@ -133,6 +133,154 @@ class TushareServerError(TushareError):
     """5xx / transient transport error — eligible for retry."""
 
 
+class TushareTransportError(TushareServerError):
+    """Transport-layer transient failure — protocol error, connection reset,
+    response ended prematurely, read timeout, etc.
+
+    Subclass of ``TushareServerError`` so the existing retry whitelist
+    (`retry_if_exception_type((TushareRateLimitError, TushareServerError))`)
+    and the 5xx → cache fallback path (`_fetch_and_store`) both pick it up
+    automatically. New callers don't need any code change.
+    """
+
+
+# ---------------------------------------------------------------------------
+# Exception classifier — type-first, status-code-second, string-last,
+# unknown-defaults-to-transient (so we retry rather than terminate).
+# ---------------------------------------------------------------------------
+
+
+_TRANSIENT_TYPE_KEYWORDS: tuple[str, ...] = (
+    # httpx / h11
+    "RemoteProtocolError",
+    # http.client / requests / stdlib
+    "RemoteDisconnected",
+    "ConnectionError",
+    "ConnectionResetError",
+    "ConnectionAbortedError",
+    # http.client / urllib3
+    "IncompleteRead",
+    # requests
+    "ChunkedEncodingError",
+    # urllib3
+    "ProtocolError",
+    # httpx / requests / urllib3
+    "ReadTimeout",
+    "ReadTimeoutError",
+    "ConnectTimeout",
+    "ConnectTimeoutError",
+    # stdlib / asyncio
+    "TimeoutError",
+    # SSL handshake interruption — most are transient
+    "SSLError",
+)
+
+_TRANSIENT_MSG_KEYWORDS: tuple[str, ...] = (
+    # the original symptom that motivated this classifier
+    "premature",
+    "remote protocol",
+    "remote disconnect",
+    "incomplete read",
+    "chunked",
+    "connection reset",
+    "connection aborted",
+    "connection refused",
+    "connection error",
+    "broken pipe",
+    "timeout",
+    "timed out",
+    "eof occurred",
+)
+
+
+def _is_transient_transport_error(e: BaseException, type_name: str) -> bool:
+    """True if ``e`` is a transport-layer transient failure across httpx /
+    requests / urllib3 / stdlib.
+
+    Type-name match is preferred (fully qualified ``module.QualName`` lets
+    one keyword cover multiple stacks). Message-keyword fallback handles
+    the case where the tushare SDK swallows the original exception type
+    and re-raises a plain ``Exception(str)``.
+    """
+    if any(k in type_name for k in _TRANSIENT_TYPE_KEYWORDS):
+        return True
+    msg = str(e).lower()
+    return any(k in msg for k in _TRANSIENT_MSG_KEYWORDS)
+
+
+def _extract_http_status(e: BaseException) -> int | None:
+    """Best-effort HTTP status extraction.
+
+    Looks at ``e.response.status_code`` (httpx / requests) or the leading
+    three digits of ``str(e)`` (some SDK wrappers prefix the code).
+    """
+    response = getattr(e, "response", None)
+    if response is not None:
+        status = getattr(response, "status_code", None)
+        if status is None:
+            status = getattr(response, "status", None)
+        if isinstance(status, int):
+            return status
+    msg = str(e)
+    if len(msg) >= 3 and msg[:3].isdigit():
+        try:
+            return int(msg[:3])
+        except ValueError:
+            return None
+    return None
+
+
+def _classify_tushare_exception(e: BaseException) -> TushareError:
+    """Map an arbitrary upstream exception to the right TushareError subclass.
+
+    Order matters:
+        1. Exception type — the most reliable signal.
+        2. HTTP status code if present on the exception.
+        3. Tushare business-layer keywords (Chinese / English).
+        4. Default to TushareTransportError (retryable). Inverting the
+           default from "unknown → fatal" to "unknown → transient" is the
+           central design change: a remote network service's unknown
+           errors are far more likely transient than permanent. Worst case
+           we waste a few retries; best case we ride out an outage that
+           used to terminate hours of work.
+    """
+    type_name = f"{type(e).__module__}.{type(e).__qualname__}"
+
+    # 1. Type-based — covers RemoteProtocolError / ChunkedEncodingError / ...
+    if _is_transient_transport_error(e, type_name):
+        return TushareTransportError(str(e))
+
+    # 2. HTTP status code, if available
+    status = _extract_http_status(e)
+    if status is not None:
+        if status == 429:
+            return TushareRateLimitError(str(e))
+        if 500 <= status < 600:
+            return TushareServerError(str(e))
+        if status in (401, 403):
+            return TushareUnauthorizedError(str(e))
+
+    # 3. Tushare business-layer text matching
+    msg = str(e)
+    low = msg.lower()
+    if "权限" in msg or "未开通" in msg or "permission" in low or "no permission" in low:
+        return TushareUnauthorizedError(msg)
+    # Tushare's actual rate-limit response is the long-form
+    # "抱歉，您每分钟最多访问该接口500次" — match the "每分钟" + "次" pair so
+    # those, plus the shorter "频率"/"限流" variants, all funnel here.
+    if (
+        "频率" in msg
+        or "限流" in msg
+        or ("每分钟" in msg and "次" in msg)
+        or "rate" in low
+        or "429" in msg
+    ):
+        return TushareRateLimitError(msg)
+
+    # 4. Default-inverted: unknown is treated as transient, not fatal.
+    return TushareTransportError(f"unclassified: {msg}")
+
+
 # ---------------------------------------------------------------------------
 # Transport abstraction
 # ---------------------------------------------------------------------------
@@ -166,15 +314,7 @@ class TushareSDKTransport(TushareTransport):
         try:
             df = method(**kwargs)
         except Exception as e:  # noqa: BLE001 — translate SDK errors uniformly
-            msg = str(e)
-            low = msg.lower()
-            if "权限" in msg or "permission" in low or "未开通" in msg or "no permission" in low:
-                raise TushareUnauthorizedError(msg) from e
-            if "频率" in msg or "rate" in low or "429" in msg:
-                raise TushareRateLimitError(msg) from e
-            if "5" in msg[:3] or "timeout" in low or "connection" in low:
-                raise TushareServerError(msg) from e
-            raise TushareError(msg) from e
+            raise _classify_tushare_exception(e) from e
         if df is None:
             return pd.DataFrame()
         return df
@@ -296,6 +436,9 @@ class TushareClient:
         intraday: if True, all writes for INTRADAY_SENSITIVE_APIS get
                   data_completeness='intraday'; reads will only accept matching
                   completeness.
+        max_retries: tenacity stop_after_attempt for transient errors
+                     (rate limit + server + transport). Default 7 → worst-case
+                     wait ≈ (1+2+4+8+16+30) ≈ 60s of jittered backoff.
         event_cb: optional callback for surfacing operationally-relevant
                   tushare events (5xx fallback, etc.) to the caller. Signature
                   ``event_cb(event_type, message, payload_dict)``. Kept as
@@ -310,6 +453,7 @@ class TushareClient:
         plugin_id: str,
         rps: float = 6.0,
         intraday: bool = False,
+        max_retries: int = 7,
         event_cb: Callable[[str, str, dict[str, Any]], None] | None = None,
     ) -> None:
         self._db = db
@@ -318,6 +462,18 @@ class TushareClient:
         self._bucket = _TokenBucket(rps)
         self._intraday = intraday
         self._event_cb = event_cb
+        # R1 (HARD CONSTRAINT): the Retrying object wraps `_do_fetch`, whose
+        # FIRST line is `self._bucket.acquire()`. Every retry attempt re-enters
+        # `_do_fetch`, so the token bucket is honored on every attempt — the
+        # tenacity backoff and the bucket throttle compose, never bypass.
+        # Don't move bucket.acquire() out of `_do_fetch` without updating
+        # `tests/core/test_tushare_retry_r1.py`.
+        self._retrying = Retrying(
+            retry=retry_if_exception_type((TushareRateLimitError, TushareServerError)),
+            stop=stop_after_attempt(max_retries),
+            wait=wait_exponential_jitter(initial=1, max=30, jitter=2),
+            reraise=True,
+        )
 
     @property
     def plugin_id(self) -> str:
@@ -614,13 +770,11 @@ class TushareClient:
             self._write_cached(api_name, cache_key_date, params, df)
         return df
 
-    @retry(
-        retry=retry_if_exception_type((TushareRateLimitError, TushareServerError)),
-        stop=stop_after_attempt(5),
-        wait=wait_exponential(multiplier=1, min=1, max=15),
-        reraise=True,
-    )
     def _fetch_with_retries(self, api_name: str, params: dict[str, Any]) -> pd.DataFrame:
+        """Fetch with tenacity retry around `_do_fetch`. See R1 in __init__."""
+        return self._retrying(self._do_fetch, api_name, params)
+
+    def _do_fetch(self, api_name: str, params: dict[str, Any]) -> pd.DataFrame:
         """Fetch the widest payload we'd ever want for this API.
 
         For most APIs tushare returns every column when ``fields`` is omitted,
@@ -628,6 +782,8 @@ class TushareClient:
         ``WIDE_FIELDS`` overrides ``fields=`` per-API so the cache row contains
         every column downstream callers need; ``call()``'s ``_project_fields``
         narrows it back at READ time.
+
+        First line is `self._bucket.acquire()` — see R1 in `__init__`.
         """
         self._bucket.acquire()
         t0 = time.monotonic()

{deeptrade_quant-0.3.0 → deeptrade_quant-0.3.1}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "hatchling.build"
 
 [project]
 name = "deeptrade-quant"
-version = "0.3.0"
+version = "0.3.1"
 description = "LLM-driven A-share (Shanghai/Shenzhen main board) stock screening CLI"
 readme = "README.md"
 requires-python = ">=3.11"