陆运选项不全时改为复制填空清单,方便销售按编号回填。
停发填写样例图,同群只跟当前工单,重量体积统一为 KG/CBM。 Co-authored-by: Cursor <cursoragent@cursor.com>
This commit is contained in:
@@ -17,7 +17,10 @@ os.environ.setdefault("YTD_ENV", "test")
|
||||
from agent.ledger.memory_ledger import MemoryLedger
|
||||
from agent.policy import inquiry_copy as copy
|
||||
from agent.policy.air_text_flow import AirTextInquiryFlow
|
||||
from agent.schema.field_validate import validate_required_fields
|
||||
from agent.schema.field_validate import (
|
||||
air_general_cargo_collab_defaults,
|
||||
validate_required_fields,
|
||||
)
|
||||
from agent.schema.tms_air_query import assemble_air_query
|
||||
|
||||
|
||||
@@ -164,6 +167,23 @@ class AirFieldContractTests(unittest.TestCase):
|
||||
self.assertFalse(out["ok"])
|
||||
self.assertIn("目的港", out["missing"])
|
||||
|
||||
def test_general_cargo_defaults_battery_and_magnet(self) -> None:
|
||||
"""品名正好是普货,含电含磁还空着才默认否。"""
|
||||
self.assertEqual(
|
||||
air_general_cargo_collab_defaults({"品名": "普货"}),
|
||||
{"是否含电": "否", "是否含磁": "否"},
|
||||
)
|
||||
self.assertEqual(
|
||||
air_general_cargo_collab_defaults({"货物品名": "普货"}),
|
||||
{"是否含电": "否", "是否含磁": "否"},
|
||||
)
|
||||
self.assertEqual(
|
||||
air_general_cargo_collab_defaults({"品名": "普货", "是否含电": "是"}),
|
||||
{"是否含磁": "否"},
|
||||
)
|
||||
self.assertEqual(air_general_cargo_collab_defaults({"品名": "配件"}), {})
|
||||
self.assertEqual(air_general_cargo_collab_defaults({"品名": "普货纸箱"}), {})
|
||||
|
||||
|
||||
if __name__ == "__main__":
|
||||
unittest.main()
|
||||
|
||||
@@ -167,6 +167,20 @@ class AirGroupCollabTests(unittest.TestCase):
|
||||
self.assertIn("起运地:ZUH", text)
|
||||
self.assertIn("\n\n协同补充字段:\n是否含电:-", text)
|
||||
self.assertIn("是否含磁:-", text)
|
||||
general = copy.air_group_brief(
|
||||
work_order_no="WO202609230017",
|
||||
facts={
|
||||
"起运地": "上海",
|
||||
"目的地": "洛杉矶",
|
||||
"品名": "普货",
|
||||
},
|
||||
quote=None,
|
||||
collab_facts={},
|
||||
has_price=False,
|
||||
)
|
||||
self.assertIn("是否含电:否", general)
|
||||
self.assertIn("是否含磁:否", general)
|
||||
self.assertNotIn("是否含电:-", general)
|
||||
self.assertIn("\n\nTMS报价:\nTMS 暂无匹配报价", text)
|
||||
self.assertNotIn("当前工单:", text)
|
||||
self.assertNotIn("贸易条款", text)
|
||||
@@ -402,6 +416,78 @@ class AirGroupCollabTests(unittest.TestCase):
|
||||
self.assertIn("是否含磁:是", joined)
|
||||
self.assertIn("是否含电:-", joined)
|
||||
|
||||
def test_activate_general_cargo_defaults_battery_and_magnet(self) -> None:
|
||||
"""品名是普货:群内激活后含电、含磁都是否,报价单也带上。"""
|
||||
created = self.ledger.create_ticket(
|
||||
sender_id="sales1",
|
||||
business_line="AIR",
|
||||
facts={
|
||||
"起运地": "上海",
|
||||
"目的地": "洛杉矶",
|
||||
"品名": "普货",
|
||||
"件数": "3",
|
||||
"毛重": "100",
|
||||
"体积": "2",
|
||||
"包装类型": "纸箱",
|
||||
"报价日期": "2026-09-16",
|
||||
},
|
||||
)
|
||||
wo = created["work_order_no"]
|
||||
self.ledger.upsert_quote(
|
||||
work_order_no=wo,
|
||||
quote={"total": "USD 800", "source": "TMS", "quoteId": "QT-AIR-1"},
|
||||
to_status="已报价",
|
||||
)
|
||||
handle_air_group(
|
||||
self._msg(sender="sales1", text=wo, chat="wr_air_1", mid="gc1"),
|
||||
flow=self.flow,
|
||||
ledger=self.ledger,
|
||||
)
|
||||
ticket = self.ledger.get_ticket(work_order_no=wo)
|
||||
self.assertEqual(ticket.collab_facts.get("是否含电"), "否")
|
||||
self.assertEqual(ticket.collab_facts.get("是否含磁"), "否")
|
||||
joined = "\n".join(self._texts())
|
||||
self.assertIn("是否含电:否", joined)
|
||||
self.assertIn("是否含磁:否", joined)
|
||||
fill = dict(getattr(self.ledger, "last_render", {}).get("facts") or {})
|
||||
self.assertEqual(fill.get("是否含电") or fill.get("has_battery"), "否")
|
||||
self.assertEqual(fill.get("是否含磁") or fill.get("has_magnet"), "否")
|
||||
|
||||
def test_activate_general_cargo_keeps_explicit_battery(self) -> None:
|
||||
"""普货只补空着的项;私聊已经说含电,激活不能改成否。"""
|
||||
created = self.ledger.create_ticket(
|
||||
sender_id="sales1",
|
||||
business_line="AIR",
|
||||
facts={
|
||||
"起运地": "上海",
|
||||
"目的地": "洛杉矶",
|
||||
"品名": "普货",
|
||||
"件数": "3",
|
||||
"毛重": "100",
|
||||
"体积": "2",
|
||||
"包装类型": "纸箱",
|
||||
"报价日期": "2026-09-16",
|
||||
"是否含电": "是",
|
||||
},
|
||||
)
|
||||
wo = created["work_order_no"]
|
||||
self.ledger.upsert_quote(
|
||||
work_order_no=wo,
|
||||
quote={"total": "USD 800", "source": "TMS", "quoteId": "QT-AIR-1"},
|
||||
to_status="已报价",
|
||||
)
|
||||
handle_air_group(
|
||||
self._msg(sender="sales1", text=wo, chat="wr_air_1", mid="gc2"),
|
||||
flow=self.flow,
|
||||
ledger=self.ledger,
|
||||
)
|
||||
ticket = self.ledger.get_ticket(work_order_no=wo)
|
||||
self.assertEqual(ticket.collab_facts.get("是否含电"), "是")
|
||||
self.assertEqual(ticket.collab_facts.get("是否含磁"), "否")
|
||||
joined = "\n".join(self._texts())
|
||||
self.assertIn("是否含电:是", joined)
|
||||
self.assertIn("是否含磁:否", joined)
|
||||
|
||||
def test_second_group_occupied(self) -> None:
|
||||
wo = self._create_air()
|
||||
handle_air_group(
|
||||
@@ -460,6 +546,57 @@ class AirGroupCollabTests(unittest.TestCase):
|
||||
self.assertLess(texts[-1], files[-1])
|
||||
self.assertEqual(len(files), 2)
|
||||
|
||||
def test_collab_after_activate_does_not_use_old_land_ticket(self) -> None:
|
||||
"""
|
||||
测服 WO202609230023:空运进原群激活后补含电含磁,
|
||||
不能写到同群更早的陆运单 WO202609230007,摘要也不能变成空字段。
|
||||
"""
|
||||
land = self.ledger.create_ticket(
|
||||
sender_id="sales1",
|
||||
business_line="LAND",
|
||||
facts={
|
||||
"运输类型": "国内运输整车",
|
||||
"始发站": "深圳",
|
||||
"目的站": "上海",
|
||||
"品名": "配件",
|
||||
},
|
||||
)["work_order_no"]
|
||||
self.ledger.bind_collab_group(
|
||||
work_order_no=land,
|
||||
chat_id="wr_air_1",
|
||||
member_ids=["sales1"],
|
||||
)
|
||||
air = self._create_air()
|
||||
handle_air_group(
|
||||
self._msg(sender="sales1", text=air, chat="wr_air_1", mid="mix0"),
|
||||
flow=self.flow,
|
||||
ledger=self.ledger,
|
||||
)
|
||||
self.assertEqual(self.ledger.find_by_collab_chat(chat_id="wr_air_1").work_order_no, air)
|
||||
self.assertEqual(
|
||||
str(self.ledger.get_ticket(work_order_no=land).collab_chat_id or ""),
|
||||
"",
|
||||
)
|
||||
self.groups.sent.clear()
|
||||
phase = handle_air_group(
|
||||
self._msg(sender="sales1", text="含电 不含磁", chat="wr_air_1", mid="mix1"),
|
||||
flow=self.flow,
|
||||
ledger=self.ledger,
|
||||
injected_intent="collab_fields",
|
||||
)
|
||||
self.assertEqual(phase, "fields_saved")
|
||||
air_ticket = self.ledger.get_ticket(work_order_no=air)
|
||||
land_ticket = self.ledger.get_ticket(work_order_no=land)
|
||||
self.assertEqual(air_ticket.collab_facts.get("是否含电"), "是")
|
||||
self.assertEqual(air_ticket.collab_facts.get("是否含磁"), "否")
|
||||
self.assertFalse(land_ticket.collab_facts.get("是否含电"))
|
||||
joined = "\n".join(self._texts())
|
||||
self.assertIn(f"工单号:{air}", joined)
|
||||
self.assertNotIn(f"工单号:{land}", joined)
|
||||
self.assertIn("起运地:上海", joined)
|
||||
self.assertIn("重量(KG):100", joined)
|
||||
self.assertNotIn("起运地:-", joined)
|
||||
|
||||
def test_sales_quote_rejected(self) -> None:
|
||||
wo = self._create_air()
|
||||
handle_air_group(
|
||||
|
||||
@@ -96,11 +96,13 @@ class AirTextInquiryTests(unittest.TestCase):
|
||||
self.assertIn("目的地:克拉克", text)
|
||||
self.assertIn("品名:茶叶", text)
|
||||
self.assertIn("件数:10件", text)
|
||||
self.assertIn("待补充:", text)
|
||||
self.assertIn("重量:(如:100KGS)", text)
|
||||
self.assertIn("体积:(如:2CBM)", text)
|
||||
self.assertIn("包装类型:(如:托盘)", text)
|
||||
self.assertIn("货源地(非必填)", text)
|
||||
self.assertIn(copy.CLARIFY_PASTE_HINT, text)
|
||||
self.assertNotIn("待补充:", text)
|
||||
self.assertIn("1.重量(KG)(必填):\n(如:100)", text)
|
||||
self.assertIn("2.体积(CBM)(必填):\n(如:2)", text)
|
||||
self.assertIn("3.包装类型(必填):\n(如:托盘、散货)", text)
|
||||
self.assertNotIn("重量:(如:", text)
|
||||
self.assertIn("货源地(非必填):\n(如:东莞)", text)
|
||||
|
||||
def test_inquiry_card_matches_sales_format(self) -> None:
|
||||
text = copy.inquiry_card(
|
||||
@@ -128,8 +130,8 @@ class AirTextInquiryTests(unittest.TestCase):
|
||||
"目的地:克拉克",
|
||||
"品名:茶叶",
|
||||
"件数:10件",
|
||||
"重量:1",
|
||||
"体积:8",
|
||||
"重量(KG):1",
|
||||
"体积(CBM):8",
|
||||
"包装类型:托盘",
|
||||
"报价日期:2026-09-12",
|
||||
"工单已创建,正在查询TMS报价。",
|
||||
@@ -199,7 +201,33 @@ class AirTextInquiryTests(unittest.TestCase):
|
||||
injected_mode="",
|
||||
)
|
||||
self.assertEqual(phase, "need_mode")
|
||||
self.assertIn("运输方式", self.replies[-1])
|
||||
self.assertIn(copy.ASK_TRANSPORT, self.replies[-1])
|
||||
self.assertIn("1.陆运", self.replies[-1])
|
||||
self.assertIn("2.海运", self.replies[-1])
|
||||
self.assertIn("3.空运", self.replies[-1])
|
||||
|
||||
def test_missing_mode_accepts_number_or_word(self) -> None:
|
||||
"""未定运输方式时,回 3 或「空运」都走空运。"""
|
||||
self.flow.on_text(
|
||||
sender_id="u_mode_num",
|
||||
text="帮我看看价格",
|
||||
reply=self._reply,
|
||||
injected_facts={},
|
||||
injected_mode="",
|
||||
)
|
||||
phase = self.flow.on_text(sender_id="u_mode_num", text="3", reply=self._reply)
|
||||
self.assertNotEqual(phase, "need_mode")
|
||||
self.assertEqual(self.flow.session_of("u_mode_num").business_line, "AIR")
|
||||
self.flow.on_text(
|
||||
sender_id="u_mode_word",
|
||||
text="帮我看看价格",
|
||||
reply=self._reply,
|
||||
injected_facts={},
|
||||
injected_mode="",
|
||||
)
|
||||
phase = self.flow.on_text(sender_id="u_mode_word", text="空运", reply=self._reply)
|
||||
self.assertNotEqual(phase, "need_mode")
|
||||
self.assertEqual(self.flow.session_of("u_mode_word").business_line, "AIR")
|
||||
|
||||
def test_pack_bulk_cargo_accepted_as_user_said(self) -> None:
|
||||
facts = dict(COMPLETE_AIR)
|
||||
@@ -251,13 +279,48 @@ class AirTextInquiryTests(unittest.TestCase):
|
||||
self.assertIn("请确认并补充以下信息", last)
|
||||
self.assertIn("运输方式:空运", last)
|
||||
self.assertIn("起运地:上海", last)
|
||||
self.assertIn("待补充:", last)
|
||||
self.assertIn(copy.CLARIFY_PASTE_HINT, last)
|
||||
self.assertIn("目的地", last)
|
||||
self.assertIn("件数", last)
|
||||
self.assertIn("如:", last)
|
||||
self.assertIn("报价日期:", last)
|
||||
self.assertNotIn("报价日期:(如", last)
|
||||
|
||||
def test_clarify_paste_reply_fills_missing_required(self) -> None:
|
||||
"""销售复制清单只填冒号后的值,空着的包装类型继续补问。"""
|
||||
phase = self.flow.on_text(
|
||||
sender_id="paste1",
|
||||
text="空运询价",
|
||||
reply=self._reply,
|
||||
injected_facts={
|
||||
"起运港": "南京",
|
||||
"目的港": "吉隆坡",
|
||||
"品名": "茶叶",
|
||||
"报价日期": "2026-09-17",
|
||||
},
|
||||
injected_mode="AIR",
|
||||
)
|
||||
self.assertEqual(phase, "clarify")
|
||||
phase = self.flow.on_text(
|
||||
sender_id="paste1",
|
||||
text=(
|
||||
"1.件数(必填):10\n"
|
||||
"(如:10)\n"
|
||||
"2.重量(KG)(必填):10\n"
|
||||
"(如:100)\n"
|
||||
"3.体积(CBM)(必填):10\n"
|
||||
"(如:2)\n"
|
||||
"4.包装类型(必填):\n"
|
||||
"(如:托盘、散货)"
|
||||
),
|
||||
reply=self._reply,
|
||||
)
|
||||
self.assertEqual(phase, "clarify")
|
||||
last = self.replies[-1]
|
||||
self.assertIn("件数:10件", last)
|
||||
self.assertIn("包装类型(必填)", last)
|
||||
self.assertNotIn("包装类型:托盘、散货", last)
|
||||
|
||||
def test_complete_air_hit_then_skip_adopt_excel_deal(self) -> None:
|
||||
phase = self._on_text(
|
||||
sender_id="u1",
|
||||
@@ -272,7 +335,7 @@ class AirTextInquiryTests(unittest.TestCase):
|
||||
self.assertIn("运输方式:空运", joined)
|
||||
self.assertIn("起运地:上海", joined)
|
||||
self.assertIn("目的地:洛杉矶", joined)
|
||||
self.assertIn("重量:", joined)
|
||||
self.assertIn("重量(KG):", joined)
|
||||
self.assertIn("正在查询TMS报价", joined)
|
||||
self.assertNotIn("【询价卡片】", joined)
|
||||
self.assertNotIn("[test]", joined)
|
||||
@@ -400,8 +463,8 @@ class AirTextInquiryTests(unittest.TestCase):
|
||||
joined = "\n".join(self.replies)
|
||||
self.assertIn("起运地:南京", joined)
|
||||
self.assertIn("目的地:吉隆坡", joined)
|
||||
self.assertIn("重量:", joined)
|
||||
self.assertIn("体积:", joined)
|
||||
self.assertIn("重量(KG):", joined)
|
||||
self.assertIn("体积(CBM):", joined)
|
||||
self.assertIn("包装类型:散货", joined)
|
||||
self.assertIn("报价日期:2026-09-16", joined)
|
||||
self.assertNotIn("重量(KG)", joined)
|
||||
@@ -985,7 +1048,7 @@ class AirTextInquiryTests(unittest.TestCase):
|
||||
self.assertIn("【WO202609140001报价方案】", text)
|
||||
self.assertIn("工单号:WO202609140001", text)
|
||||
self.assertIn("起运地:上海", text)
|
||||
self.assertIn("体积:2.5", text)
|
||||
self.assertIn("体积(CBM):2.5", text)
|
||||
self.assertIn("空运费:USD 1,200", text)
|
||||
self.assertNotIn("时效", text)
|
||||
self.assertIn("报价有效期:2026-09-20", text)
|
||||
|
||||
@@ -15,7 +15,12 @@ if ROOT not in sys.path:
|
||||
|
||||
os.environ.setdefault("LEDGER_BACKEND", "memory")
|
||||
|
||||
from agent.llm.extract_text import extract_inquiry_snapshot, parse_labeled_facts
|
||||
from agent.llm.extract_text import (
|
||||
detect_transport_mode,
|
||||
extract_inquiry_snapshot,
|
||||
parse_labeled_facts,
|
||||
)
|
||||
from agent.schema.field_validate import normalize_facts
|
||||
from agent.llm.mode_extract_fields import invoke_shell, parse_extract_payload
|
||||
from agent.policy.air_text_flow import AirTextInquiryFlow
|
||||
from agent.ledger.memory_ledger import MemoryLedger
|
||||
@@ -260,7 +265,7 @@ class OralExtractTests(unittest.TestCase):
|
||||
work_order_no="WO1",
|
||||
facts={**facts, "起运港": "南京", "目的港": "吉隆坡", "品名": "茶叶", "件数": "10"},
|
||||
)
|
||||
self.assertIn("重量:1.5KG", shown)
|
||||
self.assertIn("重量(KG):1.5KG", shown)
|
||||
self.assertNotIn("1.5KGS", shown)
|
||||
|
||||
def test_oral_units_fill_weight_volume_without_b(self) -> None:
|
||||
@@ -326,6 +331,36 @@ class OralExtractTests(unittest.TestCase):
|
||||
self.assertIn("目的地:洛杉矶", joined)
|
||||
self.assertNotIn("【询价卡片】", joined)
|
||||
|
||||
def test_mode_index_maps_land_sea_air(self) -> None:
|
||||
self.assertEqual(detect_transport_mode("1"), "LAND")
|
||||
self.assertEqual(detect_transport_mode("2"), "SEA")
|
||||
self.assertEqual(detect_transport_mode("3"), "AIR")
|
||||
self.assertEqual(detect_transport_mode("1.陆运"), "LAND")
|
||||
self.assertEqual(detect_transport_mode("空运"), "AIR")
|
||||
self.assertEqual(detect_transport_mode("10件"), "")
|
||||
self.assertEqual(detect_transport_mode("1.件数(必填):10"), "")
|
||||
|
||||
|
||||
class ClarifyPasteTests(unittest.TestCase):
|
||||
def test_paste_numbered_required_lines_and_skip_examples(self) -> None:
|
||||
"""复制补问清单:只收冒号后的值,示例行和空项都不算填了。"""
|
||||
text = """
|
||||
1.件数(必填):10
|
||||
(如:10)
|
||||
2.重量(KG)(必填):10
|
||||
(如:100)
|
||||
3.体积(CBM)(必填):10
|
||||
(如:2)
|
||||
4.包装类型(必填):
|
||||
(如:托盘、散货)
|
||||
"""
|
||||
facts = normalize_facts(parse_labeled_facts(text))
|
||||
self.assertEqual(facts.get("件数"), "10")
|
||||
self.assertEqual(facts.get("毛重"), "10")
|
||||
self.assertEqual(facts.get("体积"), "10")
|
||||
self.assertNotIn("包装方式", facts)
|
||||
self.assertNotEqual(facts.get("包装方式"), "托盘、散货")
|
||||
|
||||
|
||||
class ImageOptionalClipTests(unittest.TestCase):
|
||||
def test_numbered_extra_lines_do_not_enter_fields(self) -> None:
|
||||
@@ -361,7 +396,7 @@ class ImageOptionalClipTests(unittest.TestCase):
|
||||
transport_mode="空运",
|
||||
)
|
||||
self.assertNotIn("希望送到", card)
|
||||
self.assertNotIn("4.", card)
|
||||
self.assertNotIn("4. 希望送到", card)
|
||||
self.assertIn("收货地址", card)
|
||||
|
||||
|
||||
@@ -435,6 +470,32 @@ class SeaSheetHeaderClipTests(unittest.TestCase):
|
||||
self.assertNotIn("送货地址", facts.get("整柜或拼柜") or "")
|
||||
self.assertNotIn("抵达", facts.get("箱型箱量") or "")
|
||||
|
||||
def test_quote_date_synonyms_for_sea_land_air(self) -> None:
|
||||
"""询价/走货/发货/出货/提货的日期或时间,海运陆运空运都记成报价日期。"""
|
||||
from agent.schema.field_validate import QUOTE_DATE_SYNONYMS, normalize_facts
|
||||
|
||||
modes = (("海运", "SEA"), ("陆运", "LAND"), ("空运", "AIR"))
|
||||
for label in QUOTE_DATE_SYNONYMS:
|
||||
self.assertEqual(normalize_facts({label: "2026-09-23"})["报价日期"], "2026-09-23")
|
||||
for word, mode in modes:
|
||||
snap = extract_inquiry_snapshot(f"{word}\n{label}:2026-09-23", allow_b=False)
|
||||
self.assertEqual(snap["business_line"], mode, label)
|
||||
self.assertEqual(snap["facts"].get("报价日期"), "2026-09-23", label)
|
||||
self.assertNotIn(label, snap["facts"])
|
||||
|
||||
def test_quote_date_synonym_does_not_steal_ready_or_pickup(self) -> None:
|
||||
"""货好时间、提货地址仍是原字段;同义词日期不被前面的日期抢走。"""
|
||||
snap = extract_inquiry_snapshot(
|
||||
"海运\n货好时间:9月20日\n提货地址:上海仓库\n询价日期:2026-09-15",
|
||||
allow_b=False,
|
||||
)
|
||||
facts = snap["facts"]
|
||||
self.assertEqual(facts.get("报价日期"), "2026-09-15")
|
||||
self.assertEqual(facts.get("货好时间"), "9月20日")
|
||||
self.assertEqual(facts.get("提货地址"), "上海仓库")
|
||||
oral = extract_inquiry_snapshot("空运 发货日期9月15日", allow_b=False)
|
||||
self.assertEqual(oral["facts"].get("报价日期"), "2026-09-15")
|
||||
|
||||
|
||||
if __name__ == "__main__":
|
||||
unittest.main()
|
||||
|
||||
@@ -121,9 +121,10 @@ class LandCopyTest(unittest.TestCase):
|
||||
land_subtype="跨境集拼",
|
||||
)
|
||||
self.assertIn("始发站(必填):广州", text)
|
||||
self.assertIn("待补充:", text)
|
||||
self.assertIn("体积(必填)", text)
|
||||
self.assertIn("通关口岸(非必填)", text)
|
||||
self.assertIn(copy.CLARIFY_PASTE_HINT, text)
|
||||
self.assertIn("1.体积(CBM)(必填):\n(如:100CBM)", text)
|
||||
self.assertIn("2.通关口岸(非必填):\n(如:皇岗)", text)
|
||||
self.assertNotIn("体积(必填):(如:", text)
|
||||
self.assertNotIn(copy.LAND_CONFIRM_TAIL, text)
|
||||
|
||||
def test_ask_land_fields_domestic_has_no_customs(self):
|
||||
@@ -138,7 +139,7 @@ class LandCopyTest(unittest.TestCase):
|
||||
missing_keys=["体积"],
|
||||
land_subtype="国内运输拼车",
|
||||
)
|
||||
self.assertIn("体积(必填)", text)
|
||||
self.assertIn("1.体积(CBM)(必填):\n(如:100CBM)", text)
|
||||
self.assertNotIn("通关口岸", text)
|
||||
|
||||
def test_ask_land_fields_filled_customs_not_pending(self):
|
||||
@@ -154,7 +155,7 @@ class LandCopyTest(unittest.TestCase):
|
||||
land_subtype="中港整车",
|
||||
)
|
||||
self.assertIn("通关口岸(非必填):皇岗", text)
|
||||
pending = text.split("待补充:", 1)[1]
|
||||
pending = text.split(copy.CLARIFY_PASTE_HINT, 1)[1]
|
||||
self.assertNotIn("通关口岸", pending)
|
||||
|
||||
def test_inquiry_card_lists_land_fields_and_wo(self):
|
||||
@@ -205,7 +206,7 @@ class LandCopyTest(unittest.TestCase):
|
||||
self.assertIn("运输类型:国内运输拼车", text)
|
||||
self.assertIn("始发站:泉州市", text)
|
||||
self.assertIn("货物品名:通信机柜及线缆配件", text)
|
||||
self.assertIn("体积:10CBM", text)
|
||||
self.assertIn("体积(CBM):10CBM", text)
|
||||
self.assertNotIn("整柜或拼柜", text)
|
||||
self.assertNotIn("箱型箱量", text)
|
||||
self.assertNotIn("件数:", text)
|
||||
|
||||
@@ -1,5 +1,5 @@
|
||||
"""
|
||||
陆运选项单测:三项各自必填、不联动;中港拆进运输类型;样例表跟类型/线路缺项走。
|
||||
陆运选项单测:三项各自必填、不联动;中港拆进运输类型;补问只发复制清单,不再发填写样例图。
|
||||
|
||||
不连企微、主账、TMS。
|
||||
"""
|
||||
@@ -108,48 +108,49 @@ class LandOptionsTest(unittest.TestCase):
|
||||
|
||||
def test_full_prompt_when_empty(self):
|
||||
text = option_prompt(current={})
|
||||
self.assertIn("请一次选择:运输类型、线路类别、运输分类", text)
|
||||
self.assertIn("运输类型(必填):可选择回复,", text)
|
||||
self.assertIn("中港整车", text)
|
||||
self.assertIn("中港零担/集拼", text)
|
||||
self.assertIn("线路类别(必填):可选择回复,", text)
|
||||
self.assertIn("国内长途/零担", text)
|
||||
self.assertIn("1.普件(东南亚、中港常用线路/常规车型)", text)
|
||||
self.assertIn("填写样例见图", text)
|
||||
self.assertIn("Step1: 请复制以下内容,粘贴到输入框;", text)
|
||||
self.assertIn("Step2:在粘贴内容的每个字段的冒号后,回复数字或文字,告诉我对应字段的值:", text)
|
||||
self.assertIn("---请复制以下内容---\n运输类型(必填):", text)
|
||||
self.assertIn("运输类型(必填):\n1.国内运输拼车", text)
|
||||
self.assertIn("6.中港零担/集拼", text)
|
||||
self.assertIn("线路类别(必填):\n1.1国内长途/零担", text)
|
||||
self.assertIn("6.1中港/中亚/中欧", text)
|
||||
self.assertIn("运输分类(必填):\n1.普件(东南亚、中港常用线路/常规车型)", text)
|
||||
self.assertIn("4.急件", text)
|
||||
self.assertNotIn("请一次选择:运输类型", text)
|
||||
self.assertNotIn("可选择回复", text)
|
||||
self.assertNotIn("填写样例见图", text)
|
||||
self.assertNotIn("国内运输整车 + 国内城配/拖车/打包", text)
|
||||
self.assertNotIn("┌", text)
|
||||
self.assertNotIn("| 国内运输整车 |", text)
|
||||
self.assertNotIn("仅供参考", text)
|
||||
self.assertNotIn("中港装载方式", text)
|
||||
self.assertNotIn("跟运输类型联动", text)
|
||||
|
||||
def test_copy_alias_lists_new_types(self):
|
||||
from agent.policy import inquiry_copy as copy
|
||||
|
||||
text = copy.ASK_LAND_SUBTYPE
|
||||
self.assertIn("中港整车", text)
|
||||
self.assertIn("填写样例", text)
|
||||
self.assertIn("Step1: 请复制以下内容,粘贴到输入框;", text)
|
||||
self.assertIn("---请复制以下内容---", text)
|
||||
self.assertNotIn("请补充陆运类型:国内运输拼车", text)
|
||||
|
||||
def test_sample_table_when_route_missing(self):
|
||||
text = option_prompt(current={"运输类型": "国内运输拼车"})
|
||||
self.assertIn("线路类别(必填)", text)
|
||||
self.assertIn("填写样例见图", text)
|
||||
self.assertTrue(option_prompt_needs_sample(current={"运输类型": "国内运输拼车"}))
|
||||
self.assertIn("Step1: 请复制以下内容,粘贴到输入框;", text)
|
||||
self.assertIn("---请复制以下内容---\n线路类别(必填):", text)
|
||||
self.assertIn("线路类别(必填):\n1.1国内长途/零担", text)
|
||||
self.assertIn("运输分类(必填):\n1.普件", text)
|
||||
self.assertFalse(option_prompt_needs_sample(current={"运输类型": "国内运输拼车"}))
|
||||
self.assertFalse(option_prompt_needs_sample(current={}))
|
||||
self.assertNotIn("国内运输拼车 + 国内长途/零担", text)
|
||||
self.assertNotIn("请一次选择:运输类型", text)
|
||||
self.assertNotIn("运输类型(必填)", text)
|
||||
|
||||
def test_sample_pairs_go_to_image_not_text(self):
|
||||
from agent.policy import inquiry_copy as copy
|
||||
|
||||
text = option_prompt(current={})
|
||||
self.assertIn("填写样例见图", text)
|
||||
self.assertIn("Step1: 请复制以下内容,粘贴到输入框;", text)
|
||||
self.assertIn("---请复制以下内容---", text)
|
||||
self.assertNotIn("填写样例见图", text)
|
||||
self.assertNotIn("填写样例", text)
|
||||
self.assertNotIn("国内运输拼车 + 国内长途/零担", text)
|
||||
extra = copy.land_sample_image_payload()
|
||||
self.assertEqual(extra.get("msgtype"), "image")
|
||||
self.assertTrue(os.path.isfile(str(extra.get("filepath") or "")))
|
||||
self.assertGreater(os.path.getsize(str(extra["filepath"])), 1000)
|
||||
|
||||
def test_no_sample_when_only_class_missing(self):
|
||||
text = option_prompt(
|
||||
@@ -179,6 +180,30 @@ class LandOptionsTest(unittest.TestCase):
|
||||
self.assertNotIn("目的港", out)
|
||||
self.assertEqual(out.get("品名"), "衣服")
|
||||
|
||||
def test_paste_numbers_and_codes(self):
|
||||
"""复制清单后在冒号后填数字/编号,要收到标准项。"""
|
||||
pasted = (
|
||||
"运输类型(必填):2\n"
|
||||
"线路类别(必填):2.1\n"
|
||||
"运输分类(必填):4"
|
||||
)
|
||||
got = harvest_land_options(pasted)
|
||||
self.assertEqual(got.get("运输类型"), "国内运输整车")
|
||||
self.assertEqual(got.get("线路类别"), "国内长途/零担")
|
||||
self.assertEqual(got.get("运输分类"), "急件")
|
||||
|
||||
def test_route_code_infers_type_when_empty(self):
|
||||
got = harvest_land_options("1.1")
|
||||
self.assertEqual(got.get("运输类型"), "国内运输拼车")
|
||||
self.assertEqual(got.get("线路类别"), "国内长途/零担")
|
||||
|
||||
def test_unfilled_prompt_does_not_eat_menu(self):
|
||||
"""原样粘贴未填的清单,不能把选项名当成已选。"""
|
||||
got = harvest_land_options(option_prompt(current={}))
|
||||
self.assertFalse(got.get("运输类型"))
|
||||
self.assertFalse(got.get("线路类别"))
|
||||
self.assertFalse(got.get("运输分类"))
|
||||
|
||||
def test_confirm_intent(self):
|
||||
self.assertTrue(looks_like_confirm("确认"))
|
||||
self.assertTrue(looks_like_confirm("可以查了"))
|
||||
|
||||
@@ -73,11 +73,10 @@ class LandTextInquiryFrontTests(unittest.TestCase):
|
||||
self.assertIn("线路类别", text)
|
||||
self.assertIn("运输分类", text)
|
||||
self.assertIn("中港整车", text)
|
||||
self.assertIn("填写样例见图", text)
|
||||
self.assertIn("Step1: 请复制以下内容,粘贴到输入框;", text)
|
||||
self.assertIn("---请复制以下内容---", text)
|
||||
self.assertNotIn("请补充陆运类型:", text)
|
||||
img = [x for x in self.extras if x.get("msgtype") == "image"]
|
||||
self.assertEqual(len(img), 1)
|
||||
self.assertTrue(os.path.isfile(str(img[0].get("filepath") or "")))
|
||||
self.assertFalse(any(x.get("msgtype") == "image" for x in self.extras))
|
||||
|
||||
def test_known_type_does_not_reask_type(self) -> None:
|
||||
phase = self.flow.on_text(
|
||||
@@ -90,8 +89,9 @@ class LandTextInquiryFrontTests(unittest.TestCase):
|
||||
self.assertEqual(phase, "need_land_options")
|
||||
self.assertNotIn("请选择运输类型", self._joined())
|
||||
self.assertIn("国内长途/零担", self._joined())
|
||||
self.assertIn("填写样例见图", self._joined())
|
||||
self.assertTrue(any(x.get("msgtype") == "image" for x in self.extras))
|
||||
self.assertIn("Step1: 请复制以下内容,粘贴到输入框;", self._joined())
|
||||
self.assertIn("---请复制以下内容---", self._joined())
|
||||
self.assertFalse(any(x.get("msgtype") == "image" for x in self.extras))
|
||||
|
||||
def test_unlinked_route_still_keeps_type(self) -> None:
|
||||
phase = self.flow.on_text(
|
||||
@@ -247,7 +247,7 @@ class LandTextInquiryFrontTests(unittest.TestCase):
|
||||
)
|
||||
self.assertEqual(phase, "clarify")
|
||||
self.assertNotIn(copy.LAND_CONFIRM_TAIL, self._joined())
|
||||
self.assertIn("体积(必填)", self._joined())
|
||||
self.assertIn("体积(CBM)(必填)", self._joined())
|
||||
self.assertNotIn("通关口岸", self._joined())
|
||||
|
||||
|
||||
|
||||
@@ -11,6 +11,7 @@ if ROOT not in sys.path:
|
||||
sys.path.insert(0, ROOT)
|
||||
|
||||
from agent.ledger.memory_ledger import MemoryLedger
|
||||
from agent.policy import inquiry_copy as copy
|
||||
from agent.policy.multi_segments import (
|
||||
Segment,
|
||||
classify_multi_text,
|
||||
@@ -130,10 +131,11 @@ class SplitTests(unittest.TestCase):
|
||||
ready, _, text = refresh_segments(outcome.segments)
|
||||
self.assertFalse(ready)
|
||||
self.assertIn("请确认并补充以下信息:", text)
|
||||
self.assertIn("待补充:", text)
|
||||
self.assertIn("品名:(如:茶叶)", text)
|
||||
self.assertIn("货源地(非必填):(如:东莞)", text)
|
||||
self.assertIn("贸易条款(非必填):(如:FOB)", text)
|
||||
self.assertIn(copy.CLARIFY_PASTE_HINT, text)
|
||||
self.assertIn("品名(必填):\n(如:茶叶)", text)
|
||||
self.assertIn("货源地(非必填):\n(如:东莞)", text)
|
||||
self.assertIn("贸易条款(非必填):\n(如:DDP、DAP、CIF、CIP)", text)
|
||||
self.assertNotIn("品名:(如:茶叶)", text)
|
||||
|
||||
def test_port_to_port_fills_sea_class(self) -> None:
|
||||
"""海运只缺运输分类时,回复 Port to Port 要写进该段,和单聊一样。"""
|
||||
@@ -226,10 +228,10 @@ class SplitTests(unittest.TestCase):
|
||||
]
|
||||
ready, updated, text = refresh_segments(segs)
|
||||
self.assertFalse(ready)
|
||||
self.assertIn("线路类别(必填):可选择回复", text)
|
||||
self.assertIn("国内长途/零担", text)
|
||||
self.assertIn("线路类别(必填):", text)
|
||||
self.assertIn("1.1国内长途/零担", text)
|
||||
self.assertIn("国内城配/拖车/打包", text)
|
||||
self.assertIn("运输分类(必填):可选择回复", text)
|
||||
self.assertIn("运输分类(必填):", text)
|
||||
self.assertIn("1.普件", text)
|
||||
self.assertNotIn("始发站", text)
|
||||
self.assertNotIn("请回复「确定」创建工单", text)
|
||||
@@ -301,9 +303,9 @@ class FlowTests(unittest.TestCase):
|
||||
return "ok"
|
||||
|
||||
def last_prompt(self) -> str:
|
||||
"""样例图兜底会后发,取带段号或可选择回复的那条补问。"""
|
||||
"""取带段号或复制填空清单的那条补问。"""
|
||||
for text in reversed(self.replies):
|
||||
if "段1" in text or "可选择回复" in text or "请回复「确定」" in text or "待补充" in text:
|
||||
if "段1" in text or "Step1:" in text or "请回复「确定」" in text or "待补充" in text:
|
||||
return text
|
||||
return self.replies[-1] if self.replies else ""
|
||||
|
||||
@@ -313,8 +315,8 @@ class FlowTests(unittest.TestCase):
|
||||
card = self.replies[-1]
|
||||
self.assertIn("请确认并补充以下信息:", card)
|
||||
self.assertIn("段2:空运", card)
|
||||
self.assertIn("待补充:", card)
|
||||
self.assertIn("包装类型:(如:", card)
|
||||
self.assertIn(copy.CLARIFY_PASTE_HINT, card)
|
||||
self.assertIn("包装类型(必填):\n(如:", card)
|
||||
self.assertNotIn("TMS", card)
|
||||
|
||||
def test_clarify_reply_gets_a_followup(self) -> None:
|
||||
@@ -377,7 +379,7 @@ class FlowTests(unittest.TestCase):
|
||||
)
|
||||
card = self.last_prompt()
|
||||
self.assertEqual(phase, "clarify")
|
||||
self.assertIn("线路类别(必填):可选择回复", card)
|
||||
self.assertIn("线路类别(必填):", card)
|
||||
self.assertIn("纽约港", card)
|
||||
self.assertIn("巴生西港", card)
|
||||
self.assertIn("机器设备", card)
|
||||
@@ -393,8 +395,8 @@ class FlowTests(unittest.TestCase):
|
||||
phase = self.flow.on_text(sender_id="sales", text=start, reply=self.reply)
|
||||
self.assertEqual(phase, "clarify")
|
||||
first = self.last_prompt()
|
||||
self.assertIn("线路类别(必填):可选择回复", first)
|
||||
self.assertIn("运输分类(必填):可选择回复", first)
|
||||
self.assertIn("线路类别(必填):", first)
|
||||
self.assertIn("运输分类(必填):", first)
|
||||
self.assertNotIn("始发站", first)
|
||||
phase = self.flow.on_text(
|
||||
sender_id="sales",
|
||||
@@ -411,7 +413,7 @@ class FlowTests(unittest.TestCase):
|
||||
)
|
||||
card = self.last_prompt()
|
||||
self.assertEqual(phase, "clarify")
|
||||
self.assertIn("线路类别(必填):可选择回复", card)
|
||||
self.assertIn("线路类别(必填):", card)
|
||||
self.assertNotIn("始发站", card)
|
||||
self.assertNotIn("请回复「确定」创建工单", card)
|
||||
|
||||
@@ -466,8 +468,8 @@ class FlowTests(unittest.TestCase):
|
||||
phase = self.flow.on_text(sender_id="sales", text=text, reply=self.reply)
|
||||
self.assertEqual(phase, "clarify")
|
||||
card = self.last_prompt()
|
||||
self.assertIn("线路类别(必填):可选择回复", card)
|
||||
self.assertIn("运输分类(必填):可选择回复", card)
|
||||
self.assertIn("线路类别(必填):", card)
|
||||
self.assertIn("运输分类(必填):", card)
|
||||
self.assertNotIn("始发站", card)
|
||||
self.assertNotIn("请回复「确定」创建工单", card)
|
||||
|
||||
|
||||
@@ -167,7 +167,8 @@ class SeaTextInquiryTests(unittest.TestCase):
|
||||
self.assertIn("运输方式:海运", text)
|
||||
self.assertIn("起运港:上海", text)
|
||||
self.assertIn("货物数量:20吨", text)
|
||||
self.assertIn("箱型箱量:(如", text)
|
||||
self.assertIn("1.箱型箱量(必填):\n(如:1x40HQ)", text)
|
||||
self.assertNotIn("箱型箱量:(如", text)
|
||||
self.assertNotIn("件数", text)
|
||||
self.assertNotIn("重量", text)
|
||||
self.assertNotIn("报价日期:(如", text)
|
||||
@@ -256,8 +257,7 @@ class SeaTextInquiryTests(unittest.TestCase):
|
||||
missing_keys=["运输分类"],
|
||||
transport_mode="海运",
|
||||
)
|
||||
self.assertIn("Port to Port", text)
|
||||
self.assertIn("其他", text)
|
||||
self.assertIn("1.运输分类(必填):\n(如:Port to Port、其他)", text)
|
||||
self.assertIn("贸易条款:FOB", text)
|
||||
|
||||
def test_incomplete_without_trade_terms_does_not_create_ticket(self) -> None:
|
||||
|
||||
Reference in New Issue
Block a user