加 /api/cart/* 接口;加购链路完全归 trading
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>
This commit is contained in:
+26
-14
@@ -10,8 +10,10 @@
|
||||
|
||||
因此本服务只能单实例运行(或按账号分片),扩容靠抓取服务那一侧。
|
||||
|
||||
worker 启动条件:RAKUTEN_ORDER_GATEWAY_URL 非空。留空时本服务只跑登录态接口,
|
||||
不构造任何 worker 子组件(本地 DB / 证据目录 / 出站客户端都不创建)。
|
||||
SiteInteractor 始终启动:HTTP /api/auth/* 与 /api/cart/* 都要靠它持账号 cookie
|
||||
做站点交互(加购、校验、清空、删除)。worker 启动条件:RAKUTEN_ORDER_GATEWAY_URL
|
||||
非空。留空时不构造 worker 子组件(本地 DB / 证据目录 / 出站客户端都不创建),
|
||||
但 SiteInteractor 与 Playwright 仍会启动。
|
||||
"""
|
||||
from __future__ import annotations
|
||||
|
||||
@@ -26,6 +28,7 @@ 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
|
||||
@@ -34,17 +37,26 @@ logger = logging.getLogger(__name__)
|
||||
|
||||
|
||||
def build_container() -> TradingContainer:
|
||||
"""构建交易服务容器:登录态会话始终构造,worker 仅在配置了网关 URL 时构造"""
|
||||
"""构建交易服务容器
|
||||
|
||||
- 登录态会话与站点交互器始终构造(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
|
||||
from app.trading.worker.site_interact import SiteInteractor
|
||||
|
||||
client = GatewayClient(
|
||||
settings.order_gateway_url,
|
||||
@@ -53,18 +65,16 @@ def build_container() -> TradingContainer:
|
||||
)
|
||||
local_db = LocalDB(settings.trading_db_path_resolved)
|
||||
evidence = EvidenceStore(settings.evidence_path)
|
||||
site = SiteInteractor(auth_session=container.auth_session, settings=settings)
|
||||
runner = WorkerRunner(
|
||||
settings=settings,
|
||||
gateway_client=client,
|
||||
local_db=local_db,
|
||||
evidence=evidence,
|
||||
site=site,
|
||||
site=container.site,
|
||||
)
|
||||
container.worker_client = client
|
||||
container.worker_local_db = local_db
|
||||
container.worker_evidence = evidence
|
||||
container.worker_site = site
|
||||
container.worker_runner = runner
|
||||
|
||||
return container
|
||||
@@ -72,7 +82,7 @@ def build_container() -> TradingContainer:
|
||||
|
||||
@asynccontextmanager
|
||||
async def lifespan(app: FastAPI):
|
||||
"""应用生命周期管理:登录态会话 + 可选 worker"""
|
||||
"""应用生命周期管理:登录态会话 + 站点交互器(必起)+ 可选 worker"""
|
||||
container = build_container()
|
||||
app.state.container = container
|
||||
|
||||
@@ -87,15 +97,16 @@ async def lifespan(app: FastAPI):
|
||||
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 与 SiteInteractor(worker 写证据/发请求前要先就绪),再起后台任务
|
||||
# 顺序:本地 DB 在 worker 写证据前先就绪;SiteInteractor 已在外层启动
|
||||
assert container.worker_local_db is not None
|
||||
assert container.worker_client is not None
|
||||
assert container.worker_site is not None
|
||||
await container.worker_local_db.start()
|
||||
await container.worker_site.start() # type: ignore[union-attr]
|
||||
worker_task = asyncio.create_task(
|
||||
container.worker_runner.run(), name="trading-worker"
|
||||
)
|
||||
@@ -106,7 +117,7 @@ async def lifespan(app: FastAPI):
|
||||
)
|
||||
else:
|
||||
logger.info(
|
||||
"未配置 RAKUTEN_ORDER_GATEWAY_URL,下单 worker 不启动(仅登录态接口)"
|
||||
"未配置 RAKUTEN_ORDER_GATEWAY_URL,下单 worker 不启动(仅登录态与购物车接口)"
|
||||
)
|
||||
|
||||
try:
|
||||
@@ -119,8 +130,8 @@ async def lifespan(app: FastAPI):
|
||||
await worker_task
|
||||
except asyncio.CancelledError:
|
||||
pass
|
||||
if container.worker_site is not None:
|
||||
await container.worker_site.close() # type: ignore[union-attr]
|
||||
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:
|
||||
@@ -134,6 +145,7 @@ def create_app() -> 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
|
||||
|
||||
Reference in New Issue
Block a user