sophhub 0.4.70 → 0.4.71

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "sophhub",
-  "version": "0.4.70",
+  "version": "0.4.71",
   "description": "SophHub CLI - Manage and download AI Agent skills and agents",
   "type": "module",
   "bin": {

package/skills/flight-booking/src/scripts/flight_booking.py

@@ -9,6 +9,7 @@ import json
 import os
 import sys
 import time
+from datetime import datetime, timedelta
 
 import requests
 
@@ -355,6 +356,157 @@ def pick_flight_and_cabin(
 
 # ---------- 创建订单（常规） ----------
 
+def merge_verified_prices(
+    flight_detail: dict,
+    cabin: dict,
+    vdata: dict,
+    sale_price: float,
+    departure_tax: float,
+    fuel_tax: float,
+) -> tuple[dict, dict]:
+    """把验价得到的实时价格覆盖到 flight/cabin 的副本上，供创单使用。
+
+    创单的 productInfo 由这两个对象构造。若不覆盖，priceInfos/segmentInfos 写的是搜索
+    缓存的旧价格，而同一个请求里的 estimatedTotal 与 shoppingCode 用的是验价后的新值——
+    验价返回 10301（票价变动）或 isUpdatePrice=true 时，这种自相矛盾会让供应商拒单，
+    订单留痕也会与实际成交价不符。
+
+    只改价格相关字段，其余字段（cabinCode、flightNo、subCabinCode 等）原样保留；
+    入参对象不被修改。
+    """
+    merged_flight = dict(flight_detail)
+    merged_flight["departureTax"] = departure_tax
+    merged_flight["fuelTax"] = fuel_tax
+
+    merged_cabin = dict(cabin)
+    merged_cabin["salePrice"] = sale_price
+    face_price = vdata.get("facePrice")
+    if face_price is not None:
+        merged_cabin["facePrice"] = face_price
+    return merged_flight, merged_cabin
+
+
+# 接口文档 6.4：SegmentInfo / RefundChangeDetail 的字段。缺失的取值一律不传，
+# 不用 null 顶替——那会把"没有这个数据"变成"这个字段是空的"。
+_FULL_PRICE_FIELD_BY_GRADE = {"Y": "yPrice", "C": "cPrice", "F": "fPrice"}
+_REFUND_CHANGE_FIELDS = (
+    "baggageNum", "baggageKg", "baggage", "changeAmountList", "endorseRule",
+    "refundHeaders", "changeHeaders", "refundAmountList", "remark",
+    "changeRule", "refundRule",
+)
+
+
+def _text_or_none(value):
+    """只接受非空字符串；其它类型（含对象）一律视为无值。"""
+    if isinstance(value, str):
+        value = value.strip()
+        return value or None
+    return None
+
+
+def _stop_city_code(flight_detail: dict):
+    """经停城市三字码。
+
+    供应商把经停信息放在对象里（文档 6.1 `flightStopOver: FlightStopOver`，实测形如
+    ``{"cityName": "成都", "stopCityCode": "CTU", "stopDuration": "03:30"}``），非经停航班
+    为 null；这里兼容"直接给字符串"的写法，两者取不到值就返回 None（不传该字段）。
+    """
+    stop_over = flight_detail.get("flightStopOver")
+    if isinstance(stop_over, dict):
+        return _text_or_none(stop_over.get("stopCityCode"))
+    return _text_or_none(stop_over)
+
+
+def _full_price_of(flight_detail: dict, cabin: dict):
+    """舱位全价：供应商在 fullPriceCabin 里按舱位等级给出（Y→yPrice / C→cPrice / F→fPrice）。"""
+    full = flight_detail.get("fullPriceCabin") or {}
+    return full.get(_FULL_PRICE_FIELD_BY_GRADE.get((cabin.get("grade") or "").upper(), ""))
+
+
+def _refund_change_detail(refund_change: dict):
+    """退改规则：按文档 6.4 的 RefundChangeDetail 结构取字段。"""
+    if not isinstance(refund_change, dict):
+        return None
+    detail = {k: refund_change.get(k) for k in _REFUND_CHANGE_FIELDS
+              if refund_change.get(k) is not None}
+    return detail or None
+
+
+def _arrival_date(from_date: str, cross_day) -> str:
+    """到达日期：跨天航班算次日，否则与起飞同一天（文档要求必填）。"""
+    if not from_date or not cross_day:
+        return from_date
+    try:
+        return (datetime.strptime(from_date, "%Y-%m-%d") + timedelta(days=1)).strftime("%Y-%m-%d")
+    except ValueError:
+        return from_date
+
+
+def build_product_info(
+    flight_detail: dict,
+    cabin: dict,
+    from_city: str,
+    to_city: str,
+    from_date: str,
+    passenger_type: str = "ADU",
+) -> dict:
+    """构造创单 productInfo（接口文档 6.4）。
+
+    字段覆盖文档里 SegmentInfo / RefundChangeDetail / PriceInfo 的必填项；供应商未返回的
+    取值直接不传（例如经停城市、到达航站楼在非经停/无数据时为空），不用 null 顶替。
+
+    供应商用它记录订单的产品信息；网关侧也据此判定订单的价格类型并写入订单留痕
+    （price_type / price_type_reason）。不带这段时留痕只能记 UNKNOWN——服务端
+    没有别的可信来源。
+    """
+    segment = {
+        "aircraftType": (flight_detail.get("aircraft") or {}).get("code"),
+        "cabinClass": cabin.get("grade"),
+        "cabinCode": cabin.get("code"),
+        "cabinFullPrice": _full_price_of(flight_detail, cabin),
+        "cabinType": cabin.get("type"),
+        "carrierName": (flight_detail.get("carrier") or {}).get("name"),
+        "departureTax": flight_detail.get("departureTax"),
+        "facePrice": cabin.get("facePrice"),
+        "flightDuration": flight_detail.get("flightDuration"),
+        "flightNo": flight_detail.get("flightNo"),
+        "fromAirportCode": flight_detail.get("fromAirportCode"),
+        "fromAirportName": flight_detail.get("fromAirportName"),
+        "fromAirportNameEn": flight_detail.get("fromAirportEn"),
+        "fromCityCode": from_city,
+        "fromCityName": flight_detail.get("fromCityCN"),
+        "fromDate": from_date,
+        "fromTerminal": flight_detail.get("fromTerminal"),
+        "fromTime": flight_detail.get("fromTime"),
+        "fuelTax": flight_detail.get("fuelTax"),
+        "productType": cabin.get("productType"),
+        "refundChangeDetail": _refund_change_detail(cabin.get("refundChange")),
+        "stopCityCode": _stop_city_code(flight_detail),
+        "toAirportCode": flight_detail.get("toAirportCode"),
+        "toAirportName": flight_detail.get("toAirportName"),
+        "toAirportNameEn": flight_detail.get("toAirportEn"),
+        "toCityCode": to_city,
+        "toCityName": flight_detail.get("toCityCN"),
+        "toDate": _arrival_date(from_date, flight_detail.get("crossDay")),
+        "toTerminal": flight_detail.get("toTerminal"),
+        "toTime": flight_detail.get("toTime"),
+        "yprice": (flight_detail.get("fullPriceCabin") or {}).get("yPrice"),
+    }
+    if flight_detail.get("isShareFlight") and flight_detail.get("realFlightNo"):
+        segment["realFlightNo"] = flight_detail["realFlightNo"]
+    price = {
+        "passengerType": passenger_type,
+        "salePrice": cabin.get("salePrice"),
+        "departureTax": flight_detail.get("departureTax"),
+        "fuelTax": flight_detail.get("fuelTax"),
+        "rescheduledPrice": 0,
+    }
+    return {
+        "segmentInfos": [{k: v for k, v in segment.items() if v is not None}],
+        "priceInfos": [{k: v for k, v in price.items() if v is not None}],
+    }
+
+
 def create_order(
     flight_detail: dict,
     cabin: dict,
@@ -389,6 +541,10 @@ def create_order(
         "estimatedTotal": estimated_total,
         "travelBusiness": True,
         "passengerInfo": encrypted_passenger,
+        "productInfo": build_product_info(
+            flight_detail, cabin, from_city, to_city, from_date,
+            passenger.get("passengerType") or "ADU",
+        ),
     }
     if price_info:
         order_data["priceInfo"] = price_info
@@ -843,9 +999,15 @@ def cmd_create_order(args: argparse.Namespace) -> int:
             "message": verify_res.get("msg", ""),
         }
 
+    # 把验价后的实时价格覆盖到传入创单的对象上：productInfo 由它构造，
+    # 否则会出现 estimatedTotal/shoppingCode 用新值、productInfo 用缓存旧值的矛盾
+    order_flight, order_cabin = merge_verified_prices(
+        flight, cabin, vdata, sale_price, dep_tax, fuel_tax
+    )
+
     order_res = create_order(
-        flight_detail=flight,
-        cabin=cabin,
+        flight_detail=order_flight,
+        cabin=order_cabin,
         from_city=from_city,
         to_city=to_city,
         from_date=from_date,

package/skills/flight-booking/src/scripts/test_flight_booking.py

@@ -0,0 +1,277 @@
+#!/usr/bin/env python3
+"""flight_booking 创单 productInfo 的单测（不触网、不需要密钥）。
+
+覆盖两类问题：
+1. 验价返回 10301（票价变动）或 isUpdatePrice=true 时，productInfo 必须用**验价后的
+   实时价格与税费**，与同一请求里的 estimatedTotal / shoppingCode 保持一致；
+2. productInfo 必须包含接口文档 6.4 规定的必填字段（SegmentInfo / RefundChangeDetail /
+   PriceInfo）。
+
+用法::
+
+    python3 skills/flight-booking/src/scripts/test_flight_booking.py
+
+依赖：脚本自身依赖 ``requests``（业务脚本在导入时即引入），运行前需已安装。
+"""
+from __future__ import annotations
+
+import os
+import sys
+import tempfile
+from pathlib import Path
+
+# 先隔离运行环境，再导入被测模块：
+# 模块导入时要求 SOPH_API_KEY（或 ~/.openclaw/openclaw.json）且会创建数据目录，
+# 单测不应依赖密钥、也不该写真实用户目录。
+_TMP_HOME = tempfile.mkdtemp(prefix="flight-booking-test-")
+os.environ["HOME"] = _TMP_HOME
+os.environ["USERPROFILE"] = _TMP_HOME
+os.environ.setdefault("SOPH_API_KEY", "unit-test-key-not-used")
+
+HERE = Path(__file__).resolve().parent
+if str(HERE) not in sys.path:
+    sys.path.insert(0, str(HERE))
+
+import flight_booking as fb  # noqa: E402
+
+# 接口文档 6.4 SegmentInfo 的必填字段
+REQUIRED_SEGMENT_FIELDS = (
+    "aircraftType", "cabinClass", "cabinCode", "cabinFullPrice", "cabinType",
+    "carrierName", "departureTax", "facePrice", "flightDuration", "flightNo",
+    "fromAirportCode", "fromAirportName", "fromAirportNameEn", "fromCityCode",
+    "fromCityName", "fromDate", "fromTerminal", "fromTime", "fuelTax",
+    "productType", "refundChangeDetail", "stopCityCode",
+    "toAirportCode", "toAirportName", "toAirportNameEn", "toCityCode",
+    "toCityName", "toDate", "toTerminal", "toTime", "yprice",
+)
+
+# 接口文档 6.4 RefundChangeDetail 的必填字段
+REQUIRED_REFUND_CHANGE_FIELDS = (
+    "baggageNum", "baggageKg", "baggage", "changeAmountList", "endorseRule",
+    "refundHeaders", "changeHeaders", "refundAmountList", "remark",
+    "changeRule", "refundRule",
+)
+
+
+def _cached_flight() -> dict:
+    """搜索缓存里的航班对象（字段取自 Dev2 实测响应）。"""
+    return {
+        "flightNo": "MU5123",
+        "aircraft": {"code": "32N", "name": "空客A320"},
+        "carrier": {"code": "MU", "name": "东方航空"},
+        "departureTax": 50,
+        "fuelTax": 70,
+        "flightDuration": "02h15m",
+        "fromAirportCode": "SHA",
+        "fromAirportName": "虹桥国际机场",
+        "fromAirportEn": "Hongqiao International Airport",
+        "fromCityCode": "SHA",
+        "fromCityCN": "上海",
+        "fromTerminal": "T2",
+        "fromTime": "2026-10-01 19:00:00",
+        "toAirportCode": "PKX",
+        "toAirportName": "大兴国际机场",
+        "toAirportEn": "Daxing International Airport",
+        "toCityCode": "BJS",
+        "toCityCN": "北京",
+        "toTerminal": "T2",
+        "toTime": "2026-10-01 21:15:00",
+        "crossDay": False,
+        "flightStopOver": None,
+        "fullPriceCabin": {"yPrice": 3230, "cPrice": 3870, "fPrice": 8390},
+    }
+
+
+def _cached_cabin() -> dict:
+    """搜索缓存里的舱位对象（字段取自 Dev2 实测响应）。"""
+    return {
+        "code": "V",
+        "grade": "Y",
+        "type": "-1",
+        "salePrice": 700,
+        "facePrice": 700,
+        "productType": "STANDARD_REFUND",
+        "shoppingCode": "SC-CACHED",
+        "refundChange": {
+            "baggageNum": 1,
+            "baggageKg": 20.0,
+            "baggage": "免费托运行李额20KG",
+            "changeAmountList": [65, 194],
+            "endorseRule": "不可签转",
+            "refundHeaders": ["起飞前7天前", "起飞前2小时前"],
+            "changeHeaders": ["起飞前7天前", "起飞前2小时前"],
+            "refundAmountList": [129, 258],
+            "remark": "以航司最新规定为准",
+            "changeRule": "65-168-194-48",
+            "refundRule": "129-168-258-48",
+            # 供应商会额外返回这些字段；文档未要求，不应出现在 payload 里
+            "cabinCode": "V",
+            "cabinName": "经济舱",
+            "salePrice": 700,
+        },
+    }
+
+
+def _product_info(flight_detail: dict, cabin: dict, vdata: dict,
+                  sale_price: float, departure_tax: float, fuel_tax: float) -> dict:
+    """模拟 cmd_create_order 的取值路径：验价 → 覆盖价格 → 构造 productInfo。"""
+    merged_flight, merged_cabin = fb.merge_verified_prices(
+        flight_detail, cabin, vdata, sale_price, departure_tax, fuel_tax
+    )
+    return fb.build_product_info(merged_flight, merged_cabin, "SHA", "BJS", "2026-10-01")
+
+
+def test_product_info_uses_search_prices_when_unchanged() -> None:
+    """场景 1：验价价格不变 → productInfo 与搜索结果一致。"""
+    flight, cabin = _cached_flight(), _cached_cabin()
+    vdata = {"salePrice": 700, "departureTax": 50, "fuelTax": 70, "shoppingCode": "SC-LIVE"}
+
+    product_info = _product_info(flight, cabin, vdata, 700.0, 50.0, 70.0)
+
+    price = product_info["priceInfos"][0]
+    segment = product_info["segmentInfos"][0]
+    assert price["salePrice"] == 700, f"priceInfos.salePrice 应等于搜索结果 700，实际 {price['salePrice']}"
+    assert price["departureTax"] == 50 and price["fuelTax"] == 70, "税费应与搜索结果一致"
+    assert segment["facePrice"] == 700, "segmentInfos.facePrice 应等于搜索缓存票面价"
+
+
+def test_product_info_follows_verified_prices_when_price_changed() -> None:
+    """场景 2：验价返回 10301/isUpdatePrice → productInfo 必须用验价后的价格与税费。"""
+    flight, cabin = _cached_flight(), _cached_cabin()
+    # 搜索缓存：700 / 机建 50 / 燃油 70；验价后：750 / 60 / 80，票面价 800
+    vdata = {
+        "salePrice": 750, "departureTax": 60, "fuelTax": 80, "facePrice": 800,
+        "isUpdatePrice": True, "shoppingCode": "SC-LIVE",
+    }
+    sale_price, dep_tax, fuel_tax = 750.0, 60.0, 80.0
+
+    product_info = _product_info(flight, cabin, vdata, sale_price, dep_tax, fuel_tax)
+
+    price = product_info["priceInfos"][0]
+    segment = product_info["segmentInfos"][0]
+    assert price["salePrice"] == 750, f"priceInfos.salePrice 应为验价后的 750，实际 {price['salePrice']}"
+    assert price["departureTax"] == 60 and price["fuelTax"] == 80, "税费应为验价后的值"
+    assert segment["departureTax"] == 60 and segment["fuelTax"] == 80, "segmentInfos 的税费也应为验价后的值"
+    assert segment["facePrice"] == 800, "票面价应取验价响应里的 facePrice"
+
+    # 与同一请求里的 estimatedTotal 保持一致
+    estimated_total = sale_price + dep_tax + fuel_tax
+    assert price["salePrice"] + price["departureTax"] + price["fuelTax"] == estimated_total, \
+        "productInfo 的价格合计必须与 estimatedTotal 一致"
+
+
+def test_product_info_has_all_required_doc_fields() -> None:
+    """productInfo 必须满足文档 6.4 的必填字段（本轮 review 的问题点）。
+
+    夹具取"字段齐全"的航班（含经停城市）——经停城市是文档必填项，但只有经停航班才有值；
+    非经停航班上供应商返回 null，此时不传该字段（见 test_missing_fields_are_omitted_not_null）。
+    """
+    flight, cabin = _cached_flight(), _cached_cabin()
+    flight["flightStopOver"] = {"cityName": "成都", "stopCityCode": "CTU", "stopDuration": "03:30"}
+    product_info = _product_info(flight, cabin, {}, 700.0, 50.0, 70.0)
+
+    assert set(product_info) == {"segmentInfos", "priceInfos"}
+    assert len(product_info["segmentInfos"]) == 1 and len(product_info["priceInfos"]) == 1
+
+    segment = product_info["segmentInfos"][0]
+    missing = [f for f in REQUIRED_SEGMENT_FIELDS if f not in segment]
+    assert not missing, f"segmentInfos 缺少文档必填字段: {missing}"
+
+    refund = segment["refundChangeDetail"]
+    missing_refund = [f for f in REQUIRED_REFUND_CHANGE_FIELDS if f not in refund]
+    assert not missing_refund, f"refundChangeDetail 缺少文档必填字段: {missing_refund}"
+    assert "cabinName" not in refund, "文档未要求的供应商字段不应带进请求"
+
+    price = product_info["priceInfos"][0]
+    missing_price = [f for f in ("passengerType", "salePrice", "departureTax", "fuelTax",
+                                 "rescheduledPrice") if f not in price]
+    assert not missing_price, f"priceInfos 缺少必填字段: {missing_price}"
+
+
+def test_full_price_comes_from_full_price_cabin() -> None:
+    """cabinFullPrice / yprice 取供应商的 fullPriceCabin，而不是票面价。"""
+    flight, cabin = _cached_flight(), _cached_cabin()
+    segment = _product_info(flight, cabin, {}, 700.0, 50.0, 70.0)["segmentInfos"][0]
+
+    assert segment["cabinFullPrice"] == 3230, "Y 舱应取 fullPriceCabin.yPrice"
+    assert segment["yprice"] == 3230, "yprice 为经济舱全价"
+
+
+def test_arrival_date_follows_cross_day() -> None:
+    """到达日期：跨天航班为次日，否则与起飞同一天（文档必填）。"""
+    flight, cabin = _cached_flight(), _cached_cabin()
+
+    same_day = _product_info(flight, cabin, {}, 700.0, 50.0, 70.0)["segmentInfos"][0]
+    assert same_day["toDate"] == "2026-10-01"
+
+    flight["crossDay"] = True
+    next_day = _product_info(flight, cabin, {}, 700.0, 50.0, 70.0)["segmentInfos"][0]
+    assert next_day["toDate"] == "2026-10-02", "跨天航班到达日期应为次日"
+
+
+def test_stop_city_code_read_from_nested_object() -> None:
+    """经停城市要从 flightStopOver 对象里取（真实响应形如 {"cityName":…, "stopCityCode":"CTU"}）。
+
+    回归护栏：曾经用 _text_or_none() 直接读该字段，遇到对象一律返回 None，
+    结果**恰恰在有经停的航班上**把文档必填的 stopCityCode 丢掉。
+    """
+    flight, cabin = _cached_flight(), _cached_cabin()
+
+    flight["flightStopOver"] = {"cityName": "成都", "stopCityCode": "CTU", "stopDuration": "03:30"}
+    segment = _product_info(flight, cabin, {}, 700.0, 50.0, 70.0)["segmentInfos"][0]
+    assert segment.get("stopCityCode") == "CTU", "有经停时必须从对象里取出 stopCityCode"
+
+    # 非经停航班：字段为 null → 不传该字段
+    flight["flightStopOver"] = None
+    segment = _product_info(flight, cabin, {}, 700.0, 50.0, 70.0)["segmentInfos"][0]
+    assert "stopCityCode" not in segment, "非经停航班不应传空的经停城市"
+
+    # 兼容供应商直接给字符串的写法
+    flight["flightStopOver"] = "CTU"
+    segment = _product_info(flight, cabin, {}, 700.0, 50.0, 70.0)["segmentInfos"][0]
+    assert segment.get("stopCityCode") == "CTU", "字符串写法也应兼容"
+
+    # 对象里没有 stopCityCode → 不传
+    flight["flightStopOver"] = {"cityName": "成都"}
+    segment = _product_info(flight, cabin, {}, 700.0, 50.0, 70.0)["segmentInfos"][0]
+    assert "stopCityCode" not in segment
+
+
+def test_missing_fields_are_omitted_not_null() -> None:
+    """源数据缺失的字段直接不传，而不是传 null。"""
+    flight, cabin = _cached_flight(), _cached_cabin()
+    flight.pop("flightDuration")
+    flight.pop("toTerminal")
+    cabin.pop("type")
+    cabin.pop("refundChange")
+
+    segment = _product_info(flight, cabin, {}, 700.0, 50.0, 70.0)["segmentInfos"][0]
+
+    for absent in ("flightDuration", "toTerminal", "cabinType", "refundChangeDetail", "stopCityCode"):
+        assert absent not in segment, f"{absent} 无数据时不应出现在请求里"
+
+
+def test_merge_does_not_mutate_inputs() -> None:
+    """覆盖价格时不能改到搜索缓存对象本身（后续逻辑仍要用原值算价差）。"""
+    flight, cabin = _cached_flight(), _cached_cabin()
+    vdata = {"salePrice": 750, "facePrice": 800, "departureTax": 60, "fuelTax": 80}
+
+    fb.merge_verified_prices(flight, cabin, vdata, 750.0, 60.0, 80.0)
+
+    assert cabin["salePrice"] == 700 and cabin["facePrice"] == 700, "原始 cabin 不应被修改"
+    assert flight["departureTax"] == 50 and flight["fuelTax"] == 70, "原始 flight 不应被修改"
+
+
+if __name__ == "__main__":
+    tests = [(name, fn) for name, fn in sorted(globals().items())
+             if name.startswith("test_") and callable(fn)]
+    failed = 0
+    for name, fn in tests:
+        try:
+            fn()
+            print(f"PASS  {name}")
+        except AssertionError as exc:
+            failed += 1
+            print(f"FAIL  {name}: {exc}")
+    print(f"\n{len(tests) - failed}/{len(tests)} passed")
+    sys.exit(1 if failed else 0)