trading 新增 4 条购物车接口(POST /api/cart/{add,status,clear,remove}),
全部 Bearer 鉴权、走 SiteInteractor(Playwright + storage_state)。同步把
SiteInteractor 从 gateway URL 解耦——lifespan 总是构造与启停,container
字段 worker_site → site,加 asyncio.Lock 让 HTTP 与 worker 共用同一把锁
(同账号串行硬约束)。clear/remove 用 UI 点击 button[aria-label="削除"],
探针回报这是稳定 selector;真账号实测前先用此路径。
抽 ichiba 加购字段解析到 app/shared/purchase_contract.py(常量 +
inventory_flag_for + basket_domain_of + base_form_fields),原本 scraping
与 trading 重复实现同一段 __INITIAL_STATE__.purchase 解析。进一步发现
README 写的「purchase 块是两服务契约」实际未落地——trading 必须 Playwright
开页(httpx 被 TLS 指纹拦死),本地抽比再调 /api/item_detail 更快更新鲜。
删除 scraping 端 PurchaseInfo/PurchaseOption/PurchaseOptionValue 模型、
各站 _purchase_info 函数、tests/test_purchase.py。ItemDetailData 保留
purchase_condition / is_sold_out / purchase_unit / sku 等商品状态字段。
README「加购与下单」段重写。
328 测试全绿(含架构测试守住三方互不 import)。
Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com>
171 lines
6.5 KiB
Python
171 lines
6.5 KiB
Python
"""交易服务入口:FastAPI 应用创建与生命周期管理
|
|
|
|
与抓取服务(app/scraping/main.py)分成两个进程运行,理由不是「要不要登录」
|
|
这一条,而是运行特性根本不同:
|
|
|
|
- 抓取无状态、可重试、可多开实例;这里的写操作**不可逆**,重复提交就是重复下单。
|
|
- 登录态 cookie 全局唯一,订单监控是常驻轮询;多开实例会让同一个账号被多个
|
|
进程并发操作,也会让轮询重复触发。
|
|
- 抓取被限速最多是慢,账号被风控是封号;两者不该共用出口 IP 与请求节奏。
|
|
|
|
因此本服务只能单实例运行(或按账号分片),扩容靠抓取服务那一侧。
|
|
|
|
SiteInteractor 始终启动:HTTP /api/auth/* 与 /api/cart/* 都要靠它持账号 cookie
|
|
做站点交互(加购、校验、清空、删除)。worker 启动条件:RAKUTEN_ORDER_GATEWAY_URL
|
|
非空。留空时不构造 worker 子组件(本地 DB / 证据目录 / 出站客户端都不创建),
|
|
但 SiteInteractor 与 Playwright 仍会启动。
|
|
"""
|
|
from __future__ import annotations
|
|
|
|
import asyncio
|
|
import logging
|
|
from contextlib import asynccontextmanager
|
|
|
|
from fastapi import FastAPI
|
|
|
|
from app.shared.api import register_exception_handlers
|
|
from app.shared.config import get_settings
|
|
from app.shared.logging_setup import configure_logging
|
|
from app.shared.telemetry import instrument_app, setup_telemetry, shutdown_telemetry
|
|
from app.trading.api.routes.auth import router as auth_router
|
|
from app.trading.api.routes.cart import router as cart_router
|
|
from app.trading.api.routes.health import router as health_router
|
|
from app.trading.container import TradingContainer
|
|
from app.trading.services.auth_session import AuthSession
|
|
|
|
logger = logging.getLogger(__name__)
|
|
|
|
|
|
def build_container() -> TradingContainer:
|
|
"""构建交易服务容器
|
|
|
|
- 登录态会话与站点交互器始终构造(HTTP /api/cart/* 与 /api/auth/* 都依赖)
|
|
- worker 仅在配置了网关 URL 时构造(依赖 httpx 客户端、本地 DB、证据目录)
|
|
"""
|
|
settings = get_settings()
|
|
container = TradingContainer(settings=settings, auth_session=AuthSession(settings))
|
|
|
|
# SiteInteractor 总是构造:HTTP 接口需要它,worker(如果配置了)也需要。
|
|
# 延迟 import 让没装 Playwright 的环境能起服务做基本配置检查。
|
|
from app.trading.worker.site_interact import SiteInteractor
|
|
|
|
container.site = SiteInteractor(auth_session=container.auth_session, settings=settings)
|
|
|
|
if settings.order_gateway_url:
|
|
# 延迟 import:未配置网关 URL 时不加载 worker 模块(也就不会拉起 aiosqlite 等)
|
|
from app.trading.worker.client import GatewayClient
|
|
from app.trading.worker.evidence import EvidenceStore
|
|
from app.trading.worker.local_db import LocalDB
|
|
from app.trading.worker.runner import WorkerRunner
|
|
|
|
client = GatewayClient(
|
|
settings.order_gateway_url,
|
|
settings.bearer_token,
|
|
timeout=max(60.0, settings.lease_max_wait_seconds + 10),
|
|
)
|
|
local_db = LocalDB(settings.trading_db_path_resolved)
|
|
evidence = EvidenceStore(settings.evidence_path)
|
|
runner = WorkerRunner(
|
|
settings=settings,
|
|
gateway_client=client,
|
|
local_db=local_db,
|
|
evidence=evidence,
|
|
site=container.site,
|
|
)
|
|
container.worker_client = client
|
|
container.worker_local_db = local_db
|
|
container.worker_evidence = evidence
|
|
container.worker_runner = runner
|
|
|
|
return container
|
|
|
|
|
|
@asynccontextmanager
|
|
async def lifespan(app: FastAPI):
|
|
"""应用生命周期管理:登录态会话 + 站点交互器(必起)+ 可选 worker"""
|
|
container = build_container()
|
|
app.state.container = container
|
|
|
|
configure_logging(container.settings)
|
|
# 与抓取侧同样:必须在创建 httpx 客户端之前 setup。
|
|
setup_telemetry(container.settings, service_name="rakuten-trading")
|
|
logger.info(
|
|
"交易服务启动:%s:%s",
|
|
container.settings.trading_host,
|
|
container.settings.trading_port,
|
|
)
|
|
logger.info("当前环境:%s", container.settings.app_env)
|
|
|
|
await container.auth_session.start()
|
|
# SiteInteractor 总是启动:HTTP /api/cart/* 接口要靠它发请求
|
|
assert container.site is not None
|
|
await container.site.start() # type: ignore[union-attr]
|
|
|
|
worker_task: asyncio.Task | None = None
|
|
if container.worker_runner is not None:
|
|
# 顺序:本地 DB 在 worker 写证据前先就绪;SiteInteractor 已在外层启动
|
|
assert container.worker_local_db is not None
|
|
assert container.worker_client is not None
|
|
await container.worker_local_db.start()
|
|
worker_task = asyncio.create_task(
|
|
container.worker_runner.run(), name="trading-worker"
|
|
)
|
|
logger.info(
|
|
"下单 worker 已启动:worker_id=%s gateway=%s",
|
|
container.settings.worker_id_effective,
|
|
container.settings.order_gateway_url,
|
|
)
|
|
else:
|
|
logger.info(
|
|
"未配置 RAKUTEN_ORDER_GATEWAY_URL,下单 worker 不启动(仅登录态与购物车接口)"
|
|
)
|
|
|
|
try:
|
|
yield
|
|
finally:
|
|
if worker_task is not None:
|
|
container.worker_runner.stop() # type: ignore[union-attr]
|
|
worker_task.cancel()
|
|
try:
|
|
await worker_task
|
|
except asyncio.CancelledError:
|
|
pass
|
|
if container.site is not None:
|
|
await container.site.close() # type: ignore[union-attr]
|
|
if container.worker_local_db is not None:
|
|
await container.worker_local_db.close()
|
|
if container.worker_client is not None:
|
|
await container.worker_client.aclose()
|
|
await container.auth_session.close()
|
|
shutdown_telemetry()
|
|
|
|
|
|
def create_app() -> FastAPI:
|
|
"""创建 FastAPI 应用实例,注册路由和异常处理器"""
|
|
app = FastAPI(title="Rakuten Trading Service", lifespan=lifespan)
|
|
app.include_router(health_router)
|
|
app.include_router(auth_router)
|
|
app.include_router(cart_router)
|
|
register_exception_handlers(app)
|
|
instrument_app(app)
|
|
return app
|
|
|
|
|
|
app = create_app()
|
|
|
|
|
|
if __name__ == "__main__":
|
|
import uvicorn
|
|
|
|
settings = get_settings()
|
|
configure_logging(settings)
|
|
uvicorn.run(
|
|
"app.trading.main:app",
|
|
host=settings.trading_host,
|
|
port=settings.trading_port,
|
|
log_config=None,
|
|
timeout_keep_alive=120,
|
|
# 单进程:登录态与后续的订单监控都不能有第二份
|
|
workers=1,
|
|
)
|