mopr 0.0.57__tar.gz → 0.0.57.dev1__tar.gz

{mopr-0.0.57 → mopr-0.0.57.dev1}/CHANGELOG.md

@@ -3,30 +3,6 @@ All notable changes to this project will be documented in this file.
 
 ## [Unreleased]
 
-## [0.0.57] - 2026-09-08
-### Changed
-- chore[java]：包名统一回 mopr.distributed.id；vscode 移除 chat autoApprove 并加入 Java 诊断过滤
-- fix[java]: deploy改为自动发布
-- refactor[python]: 泛型 T 收敛到 base.types 单一来源
-  - base/types.py 定义仓库唯一 TypeVar T; base/__init__.py 导出 T
-  - runtime/ringbuffer.py 改为 from ..base.types import T, 消除本地自建 T
-  - 新增 base/dataclass_utils.py (get_field_names 等泛型字段工具)
-  - 全仓库泛型 T 引用方统一到 base.types.T, 杜绝类型变量漂移
-- feat[python]: finance/forex 汇率缓存模块与 storage 存储抽象
-  - storage: FileStorage/MetaFileStorage + CSV 存储 (供缓存生命周期复用)
-  - finance/forex: ExchangeRateCache 多源汇率缓存
-    * frankfurter(ECB): 默认, 1999 起日频历史区间
-    * exchangerate(er-api): 免费层当日快照逐日累积
-    * yahoo: GHS 等 ECB 篮子外货币, Yahoo chart 一次回填历史段 +
-      er-api 当日定盘覆盖 (含离线自检)
-  - pyproject 注册 mopr.storage / mopr.finance 子包
-- feat[base]: 新增 affinity/filesystem/closer 多语言基础模块
-  - c++: base/affinity (CPU 亲和) 纳入 mopr_core; base/strings.h 入编译
-  - go: base/filesystem + closer (gocsv 依赖)
-  - rust: base/filesystem 模块接线 mod.rs; storage 模块注册 lib.rs
-  - Cargo/CMake/go 依赖与锁文件同步; .githooks 补版权头
-- release version 0.0.57
-
 ## [0.0.56] - 2026-09-07
 ### Changed
 - docs[java]：新增 Maven Central 发布指南文档
@@ -816,8 +792,7 @@ All notable changes to this project will be documented in this file.
 - release version 0.0.1
 
 
-[Unreleased]: https://gitee.com/quant1x/mopr/compare/v0.0.57...HEAD
-[0.0.57]: https://gitee.com/quant1x/mopr/compare/v0.0.56...v0.0.57
+[Unreleased]: https://gitee.com/quant1x/mopr/compare/v0.0.56...HEAD
 [0.0.56]: https://gitee.com/quant1x/mopr/compare/v0.0.55...v0.0.56
 [0.0.55]: https://gitee.com/quant1x/mopr/compare/v0.0.54...v0.0.55
 [0.0.54]: https://gitee.com/quant1x/mopr/compare/v0.0.53...v0.0.54

{mopr-0.0.57/mopr.egg-info → mopr-0.0.57.dev1}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: mopr
-Version: 0.0.57
+Version: 0.0.57.dev1
 Summary: Monorepo Optimal Portable Runtime
 Author: Quant1X
 Author-email: Quant1X <wangfengxy@sina.cn>

{mopr-0.0.57 → mopr-0.0.57.dev1}/base/__init__.py

@@ -11,10 +11,8 @@ base 各单文件模块的公共函数与类型经 __init__ 直接导出, 业务
 """
 
 # 模块对象保留为包属性; environment 依赖 filesystem, 故 filesystem 在前
-from . import dataclass_utils, environment, filesystem, region, strings, time, timestamp
+from . import environment, filesystem, region, strings, time, timestamp
 
-# dataclass_utils
-from .dataclass_utils import get_field_names
 # filesystem
 from .filesystem import expand_user, homedir, mkdirs, touch, update_file_mtime
 # environment
@@ -27,12 +25,8 @@ from .timestamp import Timestamp
 from .strings import str_to_bool, to_snake_case
 # region
 from .region import Region, is_offshore, is_onshore
-# types
-from .types import T
 
 __all__ = [
-    # dataclass_utils
-    "get_field_names",
     # filesystem
     "expand_user", "homedir", "mkdirs", "touch", "update_file_mtime",
     # environment
@@ -45,6 +39,4 @@ __all__ = [
     "str_to_bool", "to_snake_case",
     # region
     "Region", "is_offshore", "is_onshore",
-    # types
-    "T",
 ]

{mopr-0.0.57 → mopr-0.0.57.dev1/mopr.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: mopr
-Version: 0.0.57
+Version: 0.0.57.dev1
 Summary: Monorepo Optimal Portable Runtime
 Author: Quant1X
 Author-email: Quant1X <wangfengxy@sina.cn>

{mopr-0.0.57 → mopr-0.0.57.dev1}/mopr.egg-info/SOURCES.txt

@@ -18,7 +18,6 @@ pyproject.toml
 .vscode/settings.json
 .vscode/tasks.json
 base/__init__.py
-base/dataclass_utils.py
 base/environment.py
 base/filesystem.py
 base/region.md
@@ -28,7 +27,6 @@ base/strings.py
 base/time.py
 base/timestamp.md
 base/timestamp.py
-base/types.py
 distributed/__init__.py
 distributed/id/FileStateStore.java
 distributed/id/Generator.java
@@ -46,23 +44,10 @@ distributed/id/option.py
 distributed/id/queue.py
 distributed/id/state_store.py
 distributed/id/tests.py
-finance/__init__.py
 finance/forex/DESIGN.md
 finance/forex/README.md
-finance/forex/__init__.py
-finance/forex/demo.py
-finance/forex/engine.py
-finance/forex/exchange_rate_api.py
-finance/forex/forex.py
-finance/forex/ingest.py
-finance/forex/models.py
-finance/forex/scheduler.py
-finance/forex/seed.py
 finance/forex/seed_rates.csv
 finance/forex/seed_rates_hkd.csv
-finance/forex/test_engine.py
-finance/forex/yahoo.py
-finance/forex/人民币汇率中间价（1994-2025）.xlsx
 finance/rates/DESIGN.md
 finance/rates/README.md
 log/__init__.py
@@ -83,10 +68,6 @@ runtime/__init__.py
 runtime/ringbuffer.md
 runtime/ringbuffer.py
 runtime/ringbuffer_test.py
-storage/__init__.py
-storage/csv.py
-storage/storage.md
-storage/storage.py
 tools/__init__.py
 tools/__main__.py
 tools/run_module.py

{mopr-0.0.57 → mopr-0.0.57.dev1}/mopr.egg-info/scm_file_list.json

@@ -28,9 +28,6 @@
     "base\\cache\\mmap_windows.go",
     "base\\cache\\pool.go",
     "base\\cache\\pool_test.go",
-    "base\\closer.go",
-    "base\\filesystem.go",
-    "base\\filesystem_test.go",
     "base\\mem\\page.go",
     "base\\mem\\page_test.go",
     "base\\mem\\size.go",
@@ -79,7 +76,6 @@
     "finance\\forex\\README.md",
     "finance\\forex\\seed_rates.csv",
     "finance\\forex\\seed_rates_hkd.csv",
-    "finance\\forex\\\u4eba\u6c11\u5e01\u6c47\u7387\u4e2d\u95f4\u4ef7\uff081994-2025\uff09.xlsx",
     "finance\\rates\\DESIGN.md",
     "finance\\rates\\README.md",
     "go.mod",
@@ -87,9 +83,6 @@
     "runtime\\ringbuffer.go",
     "runtime\\ringbuffer.md",
     "runtime\\ringbuffer_test.go",
-    "storage\\csv.go",
-    "storage\\storage.go",
-    "storage\\storage.md",
     "tests\\runtime\\LMAXDisruptorBenchmark.java"
   ]
 }

mopr-0.0.57.dev1/mopr.egg-info/scm_version.json

@@ -0,0 +1,8 @@
+{
+  "tag": "0.0.56",
+  "distance": 1,
+  "node": "g29062dc6192fd8e2321dbc78944708597086927e",
+  "dirty": false,
+  "branch": "0.0.x",
+  "node_date": "2026-09-08"
+}

{mopr-0.0.57 → mopr-0.0.57.dev1}/pyproject.toml

@@ -55,9 +55,6 @@ packages = [
     "mopr.distributed.id",
     "mopr.machine",
     "mopr.log",
-    "mopr.storage",
-    "mopr.finance",
-    "mopr.finance.forex",
     # 内置工具集合 (仓库根 tools/, 每个工具一个子包): mopr 的功能模块仅
     # base/distributed/runtime/machine, 其余辅助工具一律归集于此, 保持一级命名空间干净
     "mopr.tools",
@@ -75,9 +72,6 @@ mopr = "python"
 "mopr.distributed.id" = "distributed/id"
 "mopr.machine" = "machine"
 "mopr.log" = "log"
-"mopr.storage" = "storage"
-"mopr.finance" = "finance"
-"mopr.finance.forex" = "finance/forex"
 "mopr.tools" = "tools"
 "mopr.tools.license_header" = "tools/license_header"
 "mopr.tools.license_header.handlers" = "tools/license_header/handlers"

{mopr-0.0.57 → mopr-0.0.57.dev1}/python/_version.py

@@ -18,7 +18,7 @@ version_tuple: tuple[int | str, ...]
 commit_id: str | None
 __commit_id__: str | None
 
-__version__ = version = '0.0.57'
-__version_tuple__ = version_tuple = (0, 0, 57)
+__version__ = version = '0.0.57.dev1'
+__version_tuple__ = version_tuple = (0, 0, 57, 'dev1')
 
-__commit_id__ = commit_id = 'gf2bab630a'
+__commit_id__ = commit_id = 'g29062dc61'

{mopr-0.0.57 → mopr-0.0.57.dev1}/runtime/ringbuffer.py

@@ -16,9 +16,9 @@
 from __future__ import annotations
 
 import threading
-from typing import Generic
+from typing import Generic, TypeVar
 
-from ..base.types import T
+T = TypeVar("T")
 
 
 class QueueError(RuntimeError):

mopr-0.0.57/base/dataclass_utils.py

@@ -1,36 +0,0 @@
-# -*- coding: UTF-8 -*-
-# Copyright (C) 2026 Quant1X <wangfengxy@sina.cn>
-# SPDX-License-Identifier: AGPL-3.0-only
-
-"""Dataclass 反射/序列化工具 (Python spec, 对齐 quant1x.base.dataclass_utils).
-
-提供 dataclass 字段元信息提取 (get_field_names), 支撑 mopr.storage/csv 的
-dataclass <-> CSV 双向转换.
-"""
-from dataclasses import fields, is_dataclass
-from typing import List, Type
-
-from .types import T
-from . import strings
-
-
-def get_field_names(cls: Type[T]) -> List[str]:
-    """获取 dataclass 类的所有字段名称列表 (snake_case 化).
-
-    Args:
-        cls (Type[T]): 需要获取字段名的 dataclass 类
-
-    Returns:
-        List[str]: 包含所有字段名称的列表
-
-    Raises:
-        TypeError: 如果传入的类不是 dataclass 类型
-    """
-    if not is_dataclass(cls):
-        raise TypeError(
-            f"Expected a dataclass type, but got {cls!r}. "
-            "Please decorate your class with @dataclass."
-        )
-    cls_fields = fields(cls)
-    field_names = [strings.to_snake_case(f.name) for f in cls_fields]
-    return field_names

mopr-0.0.57/base/types.py

@@ -1,8 +0,0 @@
-# -*- coding: utf-8 -*-
-# Copyright (C) 2026 Quant1X <wangfengxy@sina.cn>
-# SPDX-License-Identifier: AGPL-3.0-only
-
-from typing import TypeVar
-
-T = TypeVar('T')
-"""定义全局泛型变量"""

mopr-0.0.57/finance/forex/demo.py

@@ -1,109 +0,0 @@
-# -*- coding: UTF-8 -*-
-# Copyright (C) 2026 Quant1X <wangfengxy@sina.cn>
-# SPDX-License-Identifier: AGPL-3.0-only
-
-"""
-端到端演示
-==========
-流程：初始化锚点 -> 灌入演示汇率 -> 派生全量币种对 -> 折算 -> 自洽性校验
-含双轨基准与记账时刻语义演示：
-  - CN 锚(CFETS)：人行 9:15 发布，09:13 记账 -> 以前一交易日(9/3)定盘
-  - HK 锚(HKMA)：金管局 19:00 发布，18:00 记账 -> 以前一交易日(9/3)定盘
-  - 约定汇率(contractual)优先于官方定盘
-"""
-import os, sys, datetime as dt
-from zoneinfo import ZoneInfo
-sys.path.insert(0, os.path.dirname(__file__))
-try:
-    sys.stdout.reconfigure(encoding="utf-8")  # type: ignore[attr-defined]  # Windows GBK 控制台
-except Exception:
-    pass
-
-# 必须在 import models 之前设置（models 在 import 时读取 DB_PATH）
-os.environ["FX_DB_PATH"] = "/tmp/fx_module/demo.db"
-if os.path.exists("/tmp/fx_module/demo.db"):
-    os.remove("/tmp/fx_module/demo.db")
-
-from models import make_engine, session_factory, Base, FxRate, FxPair
-import seed, ingest, engine
-from ingest import demo_csv_path, demo_csv_hkd_path
-
-engine_db = make_engine()
-Base.metadata.create_all(engine_db)
-SessionLocal = session_factory()
-
-seed.init_anchors()
-seed.write_seed_csv()
-seed.write_seed_hkd_csv()
-
-SH = ZoneInfo("Asia/Shanghai")
-HK = ZoneInfo("Asia/Hong_Kong")
-
-with SessionLocal() as s:
-    # 1) 灌入演示数据（生产环境替换为 ingest_official / HKMA 接入）
-    d = ingest.ingest_from_csv(s, demo_csv_path(), anchor_ccy="CNY")
-    print(f"[1] CN锚 灌入 CNY 在 {d} 的汇率 (CFETS口径)")
-    d2 = ingest.ingest_from_csv(s, demo_csv_hkd_path(), anchor_ccy="HKD", source="HKMA-csv")
-    print(f"[1] HK锚 灌入 HKD 在 {d2} 的汇率 (HKMA口径)")
-
-    # 2) 派生全量币种对（三角套算）
-    n = engine.build_and_persist_pairs(s, "CNY", d)
-    n2 = engine.build_and_persist_pairs(s, "HKD", d2)
-    print(f"[2] 派生全量币种对 CNY×{n} / HKD×{n2} 对")
-
-    # 3) 折算：100 美元 -> 欧元 (CN锚, 9/4 定盘)
-    r1 = engine.convert(s, 100, "USD", "EUR", d, "CNY")
-    print(f"[3] CN锚 100 USD -> EUR = {r1:.4f}  (校验: 7.0980/8.16 = {7.0980/8.16:.6f})")
-
-    # 4) 记账时刻语义：人行 9:15 发布当日，09:13 记账 -> 用前一交易日(9/3)定盘
-    as_of_0913 = dt.datetime(2026, 9, 4, 9, 13, tzinfo=SH)
-    rd_0913 = engine.resolve_rate_date(s, "CNY", as_of_0913)
-    r2 = engine.convert(s, 100, "USD", "CNY", d, "CNY", as_of=as_of_0913)
-    print(f"[4] CN锚 09/04 09:13 记账: 定盘日={rd_0913} "
-          f"100 USD -> CNY = {r2:.4f} (9/3中间价7.1100, 非当日7.0980)")
-
-    # 5) 同一天 09:30（已过 9:15 发布）-> 取当日 9/4 定盘
-    as_of_0930 = dt.datetime(2026, 9, 4, 9, 30, tzinfo=SH)
-    rd_0930 = engine.resolve_rate_date(s, "CNY", as_of_0930)
-    r3 = engine.convert(s, 100, "USD", "CNY", d, "CNY", as_of=as_of_0930)
-    print(f"[5] CN锚 09/04 09:30 记账: 定盘日={rd_0930} "
-          f"100 USD -> CNY = {r3:.4f} (当日7.0980)")
-
-    # 6) HK锚 金管局口径：19:00 发布，18:00 记账 -> 用前一交易日(9/3)
-    as_of_hk = dt.datetime(2026, 9, 4, 18, 0, tzinfo=HK)
-    rd_hk = engine.resolve_rate_date(s, "HKD", as_of_hk)
-    r4 = engine.convert(s, 100, "USD", "CNY", d2, "HKD", as_of=as_of_hk)
-    print(f"[6] HK锚 09/04 18:00 记账: 定盘日={rd_hk} "
-          f"100 USD -> CNY = {r4:.4f} (按HKMA 9/3: 7.7950/1.0960)")
-
-    # 7) HK锚 19:30（已过 19:00 发布）-> 取当日 9/4
-    as_of_hk2 = dt.datetime(2026, 9, 4, 19, 30, tzinfo=HK)
-    rd_hk2 = engine.resolve_rate_date(s, "HKD", as_of_hk2)
-    r5 = engine.convert(s, 100, "USD", "CNY", d2, "HKD", as_of=as_of_hk2)
-    print(f"[7] HK锚 09/04 19:30 记账: 定盘日={rd_hk2} "
-          f"100 USD -> CNY = {r5:.4f} (按HKMA当日: 7.7900/1.0970)")
-
-    # 8) 交易双方约定汇率优先：单据约定 1 USD = 7.20 CNY，不再走官方定盘
-    r6 = engine.convert(s, 100, "USD", "CNY", d, "CNY", contractual_rate=7.20)
-    print(f"[8] 约定汇率 1 USD = 7.20 CNY: 100 USD -> CNY = {r6:.4f} (绕过官方定盘)")
-
-    # 9) 反向折算自洽: 100 EUR -> USD 再 -> EUR 应还原
-    usd = engine.convert(s, 100, "EUR", "USD", d, "CNY")
-    eur_back = engine.convert(s, usd, "USD", "EUR", d, "CNY")
-    print(f"[9] 100 EUR -> USD = {usd:.4f}, 再折回 EUR = {eur_back:.4f} (应≈100)")
-
-    # 10) 自洽性校验：遍历所有币种对，a->b->a 误差应 < 1e-6
-    pairs = s.query(FxPair).filter_by(anchor_ccy="CNY", rate_date=d).all()
-    ccies = sorted({str(p.base) for p in pairs})
-    max_err = 0
-    for a in ccies:
-        for b in ccies:
-            if a == b:
-                continue
-            ab = engine.get_rate_on(s, a, b, d, "CNY")
-            ba = engine.get_rate_on(s, b, a, d, "CNY")
-            err = abs(ab * ba - 1.0)
-            max_err = max(max_err, err)
-    print(f"[10] 三角套算自洽性校验: 最大 |rate(a,b)*rate(b,a)-1| = {max_err:.2e} (应 < 1e-6)")
-
-print("\n演示完成")

mopr-0.0.57/finance/forex/engine.py

@@ -1,144 +0,0 @@
-# -*- coding: UTF-8 -*-
-# Copyright (C) 2026 Quant1X <wangfengxy@sina.cn>
-# SPDX-License-Identifier: AGPL-3.0-only
-
-"""
-折算引擎
-========
-核心：全量币种对 = 锚点中间价 + 三角套算。
-规则（以 CNY 为中心枢纽）：
-  - 官方直接提供: foreign/CNY (1 foreign = ? CNY)
-  - 任意两外币:   A/B = (A/CNY) / (B/CNY)     # 三角套算
-  - 锚币本身:     CNY/CNY = 1
-
-"各自锚点"体现：每个主体以自身本币为锚，且绑定官方基准源（provider）。
-  例如 CN 主体锚 CNY 按人行(CFETS 9:15)，HK 主体锚 HKD 按金管局(19:00)。
-  锚币 = 中心枢纽，套算逻辑完全一致 —— 这就是"各自锚点"的工程实现。
-
-记账时点语义（重要）：
-  官方定盘在每日固定时刻发布（人行 9:15 / 金管局 19:00），若记账时刻早于发布，
-  当日定盘尚不可用，须取"最近一个已发布的定盘日"（通常为前一交易日）；
-  若交易双方在单据中约定了汇率（contractual_rate），约定价优先，不再查官方表。
-"""
-import datetime as dt
-from zoneinfo import ZoneInfo
-from typing import Dict, Optional
-from sqlalchemy.orm import Session
-from models import Anchor, FxRate, FxPair
-
-
-def resolve_rate_date(session: Session, anchor_ccy: str, as_of: dt.datetime) -> dt.date:
-    """记账时刻 as_of 下，该锚点"最近一个已发布定盘"的日期。
-
-    规则：
-      - 查锚点注册的 provider 发布时点 publish_time / publish_tz；
-      - as_of 换算到发布时区后，若已过发布时点则当日定盘可用，否则以前一日起算；
-      - 从候选日起向前找最近一个真实存在数据(fx_rate)的日期
-        （跳过周末/节假日等无发布日，天然兼容交易日历）。
-    """
-    anchor = session.query(Anchor).filter_by(anchor_currency=anchor_ccy).first()
-    if anchor is None:
-        raise ValueError(f"锚点 {anchor_ccy} 未注册(anchor 表)，请先 seed.init_anchors()")
-    tz = ZoneInfo(anchor.publish_tz or "UTC")
-    publish = dt.time.fromisoformat(anchor.publish_time or "09:15")
-    local = as_of.astimezone(tz)
-    pub_dt = dt.datetime.combine(local.date(), publish, tzinfo=tz)
-    if local >= pub_dt:
-        candidate = local.date()
-    else:
-        candidate = local.date() - dt.timedelta(days=1)
-    # 向前找最近有数据的定盘日（幂等：数据已入库即视为已发布）
-    rows = (session.query(FxRate.rate_date)
-            .filter(FxRate.anchor_ccy == anchor_ccy, FxRate.rate_date <= candidate)
-            .order_by(FxRate.rate_date.desc())
-            .all())
-    if not rows:
-        raise ValueError(f"锚点 {anchor_ccy} 在 {as_of} 前无任何已发布定盘数据")
-    return rows[0][0]
-
-
-def build_cross_rates(rates_against_anchor: Dict[str, float], anchor_ccy: str) -> Dict[str, Dict[str, float]]:
-    """
-    由 {外币: 1外币=?锚币} 派生全量币种对矩阵 {base: {quote: rate}}。
-    rate = base_amount 折算成 quote 时的系数 (1 base = rate quote)。
-    注：rates_against_anchor 均应为正向口径 "1 foreign = ? anchor"。
-    """
-    all_ccy = list(rates_against_anchor.keys()) + [anchor_ccy]
-    matrix: Dict[str, Dict[str, float]] = {c: {} for c in all_ccy}
-    # 锚币自身
-    matrix[anchor_ccy][anchor_ccy] = 1.0
-    for c in rates_against_anchor:
-        matrix[c][anchor_ccy] = rates_against_anchor[c]          # c -> anchor
-        matrix[anchor_ccy][c] = 1.0 / rates_against_anchor[c]   # anchor -> c
-    # 三角套算：c1/c2 = (c1/anchor) / (c2/anchor)
-    for c1 in all_ccy:
-        for c2 in all_ccy:
-            if c1 in matrix and c2 in matrix and matrix[c1].get(anchor_ccy) and matrix[c2].get(anchor_ccy):
-                matrix[c1][c2] = matrix[c1][anchor_ccy] / matrix[c2][anchor_ccy]
-    return matrix
-
-
-def build_and_persist_pairs(session: Session, anchor_ccy: str, date) -> int:
-    """把某日全量币种对套算结果写入 fx_pair 表，返回对数。"""
-    rows = session.query(FxRate).filter_by(anchor_ccy=anchor_ccy, rate_date=date).all()
-    if not rows:
-        raise ValueError(f"无 {anchor_ccy} 锚点在 {date} 的汇率数据，请先 ingest")
-    rates = {r.foreign_ccy: r.rate for r in rows}
-    matrix = build_cross_rates(rates, anchor_ccy)
-    count = 0
-    for base, quotes in matrix.items():
-        for quote, rate in quotes.items():
-            existing = session.query(FxPair).filter_by(
-                anchor_ccy=anchor_ccy, base=base, quote=quote, rate_date=date).first()
-            if existing:
-                existing.rate = rate
-            else:
-                session.add(FxPair(anchor_ccy=anchor_ccy, base=base, quote=quote,
-                                   rate_date=date, rate=rate, source="cross"))
-            count += 1
-    session.commit()
-    return count
-
-
-def get_rate_on(session: Session, base: str, quote: str, date, anchor_ccy: str,
-                as_of: Optional[dt.datetime] = None) -> float:
-    """查询某定盘日币种对汇率（优先 fx_pair，缺失则实时套算）。
-
-    传 as_of 时按记账时刻解析"最近已发布定盘日"，忽略 date。
-    """
-    if as_of is not None:
-        date = resolve_rate_date(session, anchor_ccy, as_of)
-    p = session.query(FxPair).filter_by(anchor_ccy=anchor_ccy, base=base, quote=quote,
-                                        rate_date=date).first()
-    if p:
-        return p.rate
-    # 实时套算兜底（锚币自身对锚币恒为 1，fx_rate 不落锚币自身行）
-    def _rate_vs_anchor(ccy: str) -> float:
-        if ccy == anchor_ccy:
-            return 1.0
-        r = session.query(FxRate).filter_by(anchor_ccy=anchor_ccy, foreign_ccy=ccy, rate_date=date).first()
-        if not r:
-            raise ValueError(f"缺少 {ccy} 在 {date} 对 {anchor_ccy} 的汇率")
-        return r.rate
-    return _rate_vs_anchor(base) / _rate_vs_anchor(quote)
-
-
-def convert(session: Session, amount: float, from_ccy: str, to_ccy: str, date,
-            anchor_ccy: str, contractual_rate: Optional[float] = None,
-            as_of: Optional[dt.datetime] = None) -> float:
-    """折算：amount (from_ccy) -> to_ccy。
-
-    汇率来源优先级（从高到低）：
-      1. 交易双方约定汇率 contractual_rate（单据/合同载明，直接使用）；
-      2. 官方已发布定盘：as_of 记账时刻最近已发布日（as_of 缺省用 date 当日）。
-    注意：约定汇率口径应与 from_ccy/to_ccy 对应（1 from_ccy = ? to_ccy）。
-    """
-    if date is None and as_of is None and contractual_rate is None:
-        raise ValueError("date / as_of / contractual_rate 三者至少提供一个")
-    if from_ccy == to_ccy:
-        return amount
-    if contractual_rate is not None:
-        return amount * contractual_rate
-    if as_of is not None:
-        date = resolve_rate_date(session, anchor_ccy, as_of)
-    return amount * get_rate_on(session, from_ccy, to_ccy, date, anchor_ccy)