接入本地订单测试表并替换模拟查单
This commit is contained in:
@@ -3,3 +3,5 @@
|
||||
# The process environment takes precedence, including an explicitly empty value.
|
||||
# Keep real credentials in .env; never put them in this example or source files.
|
||||
DEEPSEEK_API_KEY=
|
||||
# Optional fixed tenant scope for the internal order test dataset. Empty = all imported test rows.
|
||||
ORDER_DATA_TENANT_ID=
|
||||
|
||||
@@ -10,6 +10,7 @@ Use `am.py` for CLI/WSGI, `logistics_chat/` for business code, and `static/css/`
|
||||
| Knowledge | `logistics_chat/knowledge.py`: `knowledge_list`, `search_knowledge`; `docs/knowledge.md` |
|
||||
| Pricing | `logistics_chat/pricing.py`: `RATES`, `calc_freight`; `logistics_chat/rates_extra.py` |
|
||||
| Tracking | `logistics_chat/tracking.py`: `extract_tracking_no`, `build_track`, `CARD_PREFIX` |
|
||||
| Order test data | `logistics_chat/order_data.py`: `lookup_order`, `answer_query`, `import_records`; `scripts/import_order_test_data.py` |
|
||||
| Persistence | `logistics_chat/db.py`: `init_db`, `save_message`; `logistics_chat/history_service.py` |
|
||||
| Human support | `logistics_chat/human_service.py`: lifecycle, transfer, notes, recall; `logistics_chat/routes/human.py` |
|
||||
| Business / files | `logistics_chat/business_service.py`, `logistics_chat/file_service.py`; `logistics_chat/routes/` |
|
||||
|
||||
@@ -8,7 +8,7 @@
|
||||
- **知识库优先**：优先使用本地知识库回答，减少模型编造
|
||||
- **追问兜底**：当前问题没命中关键词时，用上一句提问去检索
|
||||
- **运费试算**：识别重量/尺寸/渠道，按报价表阶梯单价计算并展示完整明细
|
||||
- **运单号查询**：发送 8~20 位运单号，返回轨迹卡片；先展示最近节点，可展开全部轨迹
|
||||
- **订单查询**：按订单号、入仓码、Shipment ID 查询本地订单测试表；展示概要、申报重量/体积和业务状态历史，不生成模拟运输轨迹
|
||||
- **历史会话**：会话保存到 SQLite，支持打开、搜索、删除
|
||||
- **交互**：停止生成、复制（纯文本）、重答、多行输入、回到底部
|
||||
- **中英文切换**：右上角「中/EN」按钮或快捷键 `Ctrl + L`
|
||||
@@ -132,7 +132,8 @@ baiyue-logistics-chat/
|
||||
│ ├── knowledge.py 知识与关键词检索
|
||||
│ ├── pricing.py 运费解析与计算
|
||||
│ ├── rates_extra.py 扩展报价唯一数据源
|
||||
│ ├── tracking.py 模拟轨迹与卡片协议
|
||||
│ ├── tracking.py 卡片协议与旧演示函数兼容
|
||||
│ ├── order_data.py 本地订单测试表、精确查询与快照导入
|
||||
│ ├── ai_client.py 模型 HTTP、压缩和追问
|
||||
│ ├── chat_service.py 问答与 SSE 编排
|
||||
│ ├── history_service.py 会话 CRUD
|
||||
@@ -238,13 +239,23 @@ data: {"d": 1}
|
||||
|
||||
## 数据库与运行数据
|
||||
|
||||
首次启动会自动创建 `chat_history`、`messages`、`feedback`、`human_sessions`、`human_messages`、`ratings`、`agents`、`orders` 和 `tickets` 九张表，并兼容已有数据，不预置账号或演示数据。本地入口使用根目录 `history.db`，Linux 部署工厂另存至专用数据目录。客服账号需由管理员在实际环境中配置。会话备注保存在 `human_sessions.note`；消息撤回事件通过 `human_messages.recalled_id` 指向原消息，轮询客户端按编号更新。运单卡片以 `__CARD__{json}` 形式保存，前端据此恢复展示。
|
||||
订单测试数据保存在聊天服务运行时 SQLite 的 `order_test_data` 表中，与灰度业务库独立，可直接通过 SQLite 工具新增或修改。聊天每次重新查表；这份副本不会自动同步灰度业务库。没有新增管理页面和增删改接口。内部验收可查询已导入的测试样本；配置 `ORDER_DATA_TENANT_ID` 可以在服务器侧固定租户范围，不能将其视为客户登录授权。
|
||||
|
||||
快照 JSON 放仓库外的私有 artifacts 目录，使用明确路径导入：
|
||||
|
||||
```powershell
|
||||
.\.venv\Scripts\python.exe scripts/import_order_test_data.py --snapshot "D:\private\orders.snapshot.json" --db "D:\data\history.db"
|
||||
```
|
||||
|
||||
脚本默认保留已有记录，避免覆盖手工调整；确需覆盖时显式加 `--replace`。`order_no` 与 `tenant_id` 组成唯一键；`gross_weight_kg`、`volume_cbm`、`package_count` 是申报汇总，`history_json` 是形如 `[{"time":"2026-10-29 10:00","status":"SUBMITTED"}]` 的业务状态列表。子订单未提供独立货物数据时保持空值。快照、运行数据库和凭据不提交 Git。后续 MCP 接口开放后替换 `order_data.lookup_order` 的取数实现即可保留聊天契约。
|
||||
|
||||
首次启动会自动创建 `chat_history`、`messages`、`feedback`、`human_sessions`、`human_messages`、`ratings`、`agents`、`orders`、`tickets` 和 `order_test_data` 十张表，并兼容已有数据，不预置账号或订单数据。本地入口使用根目录 `history.db`，Linux 部署工厂另存至专用数据目录。客服账号需由管理员在实际环境中配置。会话备注保存在 `human_sessions.note`；消息撤回事件通过 `human_messages.recalled_id` 指向原消息，轮询客户端按编号更新。订单卡片以 `__CARD__{json}` 形式保存，前端据此恢复展示。
|
||||
|
||||
普通导入 `am.py` 或 `logistics_chat` 不创建运行数据。显式调用 `create_app()` 或访问 WSGI 兼容入口 `am.app` 时，默认初始化 SQLite、创建正常运行日志、备份数据库并清理修改时间超过 7 天的上传文件。测试须事先配置临时数据库、附件、日志和备份目录；`INITIALIZE_RUNTIME=False` 可禁止自动初始化，此时调用方负责准备 schema。历史会话的自动清理仍已关闭。
|
||||
|
||||
## 当前限制
|
||||
|
||||
- 运单轨迹为模拟数据，尚未接入真实物流查询接口。
|
||||
- 订单查询使用可编辑测试副本，尚未接入实时承运商物流轨迹或 MCP；旧历史中的模拟轨迹保留演示标识。
|
||||
- 不预置客服账号；应用内客服登录仍沿用旧账号校验逻辑。公网自用验收可按部署指南使用全站访问密码进入工作台。
|
||||
- 后台登录尚未建立完整会话鉴权，管理页面和接口缺少登录校验。
|
||||
- 运费数字由 Python 计算后交给模型组织说明；附加费是否适用仍需结合具体货物和地址核对。
|
||||
|
||||
@@ -26,7 +26,8 @@ PowerShell 下把目录和 `-g '*.py'` 分开传给 `rg`。报价字典可能整
|
||||
| 历史接口 | `logistics_chat/history_service.py`：`new_chat`、`get_history`、`get_messages`、`del_history`、`clear_all`；对应 `routes/history.py` | `static/js/chat.js`：`ensureConv`、`loadHistory`、`openConversation` |
|
||||
| 知识检索 | `logistics_chat/knowledge.py`：`knowledge_list`、`search_knowledge` | [knowledge.md](knowledge.md) 与代码同步，程序不读取该文档 |
|
||||
| 运费与附加费 | `logistics_chat/pricing.py`：`RATES`、`parse_shipping_intent`、`dims_to_cm`、`pick_rate`、`calc_freight`、`freight_reply`、`calc_warehouse_card`、`detect_surcharge`、`check_island` | `logistics_chat/rates_extra.py` 为唯一扩展数据源，根目录同名文件仅兼容转发 |
|
||||
| 运单轨迹 | `logistics_chat/tracking.py`：`extract_tracking_no`、`build_track`、`CARD_PREFIX`、`card_to_text` | `static/js/chat.js`：`fillTrackCard`、`addTrackCard`；模拟节点时间取当前时刻，回归对照需固定时钟 |
|
||||
| 卡片协议 | `logistics_chat/tracking.py`：`CARD_PREFIX`、`card_to_text`；旧 `extract_tracking_no`、`build_track` 仅兼容旧导入 | `static/js/chat.js`：`fillTrackCard`、`addTrackCard`；新订单卡片由 `order_data.py` 提供，历史模拟轨迹标为演示数据 |
|
||||
| 订单测试表 | `logistics_chat/order_data.py`：`init_order_table`、`import_records`、`lookup_order`、`answer_query` | SQLite `order_test_data` 为可编辑快照；按订单号、入仓码、Shipment ID 精确查表。将来 MCP 在取数层替换 `lookup_order`，不让模型拼 SQL |
|
||||
| AI 与 SSE | `logistics_chat/chat_service.py`：`create_chat_stream`、`sse`；`ai_client.py`：`post_completion`、`compress_answer`、`gen_followups` | `routes/chat.py`：`stream_chat`；客户端 `doSend`、`renderError`、`renderFollowups` |
|
||||
| 人工会话 | `logistics_chat/human_service.py`：`human_*`（含转接、备注、撤回）；对应 `routes/human.py` | 输入状态在 `app.extensions['human_typing']`；客户 `startHumanPoll`；客服 `loadQueue`、`poll`、`sendReply`；人工申请每天 8:00–22:00 |
|
||||
| 附件 | `logistics_chat/file_service.py`：`upload_file`、`cleanup_uploads`；`routes/files.py`：`uploaded_file` | 扩展名/大小/目录由配置提供；客户端 `addMsg`，客服端 `appendMsg` |
|
||||
@@ -49,6 +50,7 @@ logistics_chat/
|
||||
├── pricing.py # 运费规则、解析、换算、附加费说明
|
||||
├── rates_extra.py # 扩展报价数据
|
||||
├── tracking.py # 单号识别、模拟轨迹、卡片协议
|
||||
├── order_data.py # 可编辑订单测试表、精确查询、快照导入与卡片事实
|
||||
├── ai_client.py # 模型 HTTP、压缩与追问
|
||||
├── chat_service.py # 问答编排与 SSE 帧
|
||||
├── history_service.py # 历史会话 CRUD
|
||||
@@ -103,14 +105,16 @@ tests/ # 按业务模块组织的回归
|
||||
## 必须保留的接口与数据约定
|
||||
|
||||
- SSE 字段为 `t`、`e`、`card`、`replace`、`suggest`、`d`，保留流式输出、停止、异常及中断保存。
|
||||
- `chat_service.create_chat_stream` 在识别运单号时忽略 `[图片]/uploads/...` 和 `[文件]/uploads/...` 路径，避免附件文件名中的时间戳误触发查询；存储与请求仍保留原始附件标记和 URL。
|
||||
- `chat_service.create_chat_stream` 的订单查询使用本地 `order_test_data`；忽略附件路径和重量/日期，保留标识中的后缀，不再调用 `build_track` 生成模拟轨迹。旧模拟函数仅兼容旧导入，不进入聊天查询路径。未知单号、多条匹配和查表失败明确说明，禁止回退模型编造状态。
|
||||
- `CARD_PREFIX` 新增 `kind=order`：仅包含白名单概要、申报货物汇总和订单业务状态历史，不包含姓名、地址、内部备注或操作人。子单没有独立货物数据时不继承父单总重量；COMPLETED 只表示头程订单完成，不表示快递签收。订单追问只在同一 `conv_id` 内复用最近单号，并重新查表取得手工修改后的值。
|
||||
- 订单数据仅为内部验收副本：`ORDER_DATA_TENANT_ID` 可固定服务器端租户范围，空值允许查询内部已导入样本。它不代替将来客户登录授权。没有管理页面或对外增删改接口；表数据在运行时 SQLite 内维护，导入脚本默认保留已有记录，只有显式 `--replace` 覆盖。源库连接凭据和快照文件均在仓库外，业务库只读，不随服务查询访问源库。
|
||||
- 历史卡片以 `__CARD__{json}` 保存；原 SQLite 表、字段、角色值和历史记录继续可读。
|
||||
- 人工申请使用 `conv_id`，返回 `session_id`，后续用 `sid`。状态为 `waiting/active/closed`，消息方向为 `customer/agent/system`。转接将 active 改为 waiting，列表只允许主动接入。备注保存在 `human_sessions.note`；撤回将原客服消息改为系统提示并追加带 `recalled_id` 的系统事件，轮询按原消息编号更新，重复撤回不追加事件。
|
||||
- 新建会话保存一条 assistant 欢迎语并返回 `welcome`，前端在首次用户消息之前显示。首次提问判定只统计 user 消息。服务评价用 `ratings` 保存，并汇总到管理统计。Excel 导出依赖 `openpyxl`，原 CSV 可用 `?format=csv` 访问。
|
||||
- 计费档位、单位换算和舍入保持原样。`calc_freight.total` 仅含基础运费；附加费尚未统一并入。知识文档与 `knowledge_list` 同步维护。
|
||||
- 上传 URL 保留 `/uploads/`，默认 10MB，扩展名配置保持不变。原附件保留本地、继续忽略，目录迁移不另建一份数据。
|
||||
- `agents`、`orders`、`tickets` 在应用初始化时建空表；兼容已有独立 id 列的 agents 表，不预置账号或演示数据。
|
||||
- 后台鉴权和会话隔离仍不完整，轨迹为模拟数据。Linux 公网验收用 Nginx 全站密码隔离访问，不代表已修复面向客户开放所需的应用权限。
|
||||
- 后台鉴权和会话隔离仍不完整，订单表为内部测试副本，不提供实时物流轨迹。Linux 公网验收用 Nginx 全站密码隔离访问，不代表已修复面向客户开放所需的应用权限。
|
||||
|
||||
## 验证与维护
|
||||
|
||||
|
||||
@@ -10,7 +10,8 @@ from .db import connect, last_user_question, load_context, save_message
|
||||
from .knowledge import search_knowledge
|
||||
from .pricing import (parse_shipping_intent, detect_dim_unit, freight_reply,
|
||||
calc_warehouse_card, detect_surcharge, surcharge_reply, check_island)
|
||||
from .tracking import CARD_PREFIX, extract_tracking_no, build_track
|
||||
from .tracking import CARD_PREFIX
|
||||
from .order_data import answer_query
|
||||
|
||||
|
||||
|
||||
@@ -25,14 +26,15 @@ def create_chat_stream(msg, conv_id):
|
||||
return (sse({'e': '问题不能为空'}), {})
|
||||
if '[图片]' in msg and len(msg) < 300:
|
||||
return (sse({'t': '收到您的图片，请描述一下您的问题。'}) + sse({'d': 1}), {})
|
||||
track_no = extract_tracking_no(re.sub(r'\[(?:图片|文件)\]/uploads/\S+', '', msg))
|
||||
if track_no:
|
||||
card = build_track(track_no)
|
||||
order_answer = answer_query(msg, conv_id)
|
||||
if order_answer is not None:
|
||||
|
||||
def track_stream():
|
||||
save_message(conv_id, 'user', msg)
|
||||
yield sse({'card': card})
|
||||
save_message(conv_id, 'assistant', CARD_PREFIX + json.dumps(card, ensure_ascii=False))
|
||||
yield sse(order_answer)
|
||||
content = (CARD_PREFIX + json.dumps(order_answer['card'], ensure_ascii=False)
|
||||
if 'card' in order_answer else order_answer['t'])
|
||||
save_message(conv_id, 'assistant', content)
|
||||
yield sse({'d': 1})
|
||||
return (track_stream(), {'Cache-Control': 'no-cache', 'X-Accel-Buffering': 'no'})
|
||||
if not get_setting('DEEPSEEK_API_KEY'):
|
||||
|
||||
@@ -20,6 +20,7 @@ def default_config():
|
||||
'BACKUP_DIR': ROOT_DIR / 'backups',
|
||||
'LOG_DIR': ROOT_DIR / 'logs',
|
||||
'DEEPSEEK_API_KEY': (api_key or '').strip(),
|
||||
'ORDER_DATA_TENANT_ID': str(os.environ.get('ORDER_DATA_TENANT_ID', local_config.get('ORDER_DATA_TENANT_ID')) or '').strip(),
|
||||
'MODEL_URL': 'https://api.deepseek.com/v1/chat/completions',
|
||||
'MODEL_NAME': 'deepseek-chat',
|
||||
'MAX_CONTEXT': 4,
|
||||
|
||||
@@ -126,6 +126,8 @@ def init_db():
|
||||
status TEXT
|
||||
)
|
||||
''')
|
||||
from .order_data import init_order_table
|
||||
init_order_table(conn)
|
||||
old = cur.execute('SELECT id, title FROM chat_history WHERE id NOT IN (SELECT DISTINCT conv_id FROM messages)').fetchall()
|
||||
for cid, title in old:
|
||||
cur.execute('INSERT INTO messages(conv_id, role, content, ctime) VALUES (?,?,?,?)', (cid, 'user', title, now_str()))
|
||||
|
||||
@@ -3,7 +3,7 @@
|
||||
from .db import connect, now_str
|
||||
|
||||
|
||||
WELCOME_TEXT = '您好！欢迎咨询柏悦物流智能客服，请问有什么可以帮您？输入运单号可查轨迹，或点击下方快捷选项。'
|
||||
WELCOME_TEXT = '您好！欢迎咨询柏悦物流智能客服，请问有什么可以帮您？输入订单号、入仓码或 Shipment ID 可查订单，或点击下方快捷选项。'
|
||||
|
||||
|
||||
def new_chat():
|
||||
|
||||
@@ -0,0 +1,181 @@
|
||||
"""Local, editable order test data. This repository can later be replaced by MCP."""
|
||||
|
||||
import json
|
||||
import re
|
||||
import sqlite3
|
||||
from datetime import datetime
|
||||
|
||||
from .config import get_setting
|
||||
|
||||
|
||||
FIELDS = ('source_order_id', 'tenant_id', 'order_no', 'inbound_code', 'shipment_id',
|
||||
'status', 'country_code', 'transport_mode', 'warehouse_code', 'order_role',
|
||||
'parent_order_no', 'package_count', 'gross_weight_kg', 'volume_cbm',
|
||||
'history_json', 'data_note', 'source_updated_at', 'snapshot_at')
|
||||
STATUS_LABELS = {'DRAFT': '草稿', 'SUBMITTED': '已提交', 'APPROVED': '审核通过',
|
||||
'ACCEPTED': '已接单', 'REJECTED': '审核驳回', 'PROCESSING': '履约中',
|
||||
'COMPLETED': '头程订单已完成', 'CANCELLED': '已取消'}
|
||||
FIELD_LABELS = {'inbound':'入仓码', 'shipment':'Shipment ID', 'country':'目的国',
|
||||
'warehouse':'目的仓', 'transport':'运输方式', 'packages':'件数',
|
||||
'weight':'申报毛重', 'volume':'申报体积', 'role':'订单层级',
|
||||
'parent':'父订单号', 'updated':'来源更新时间'}
|
||||
IDENTIFIER = re.compile(r'(?<![A-Za-z0-9_-])[A-Za-z0-9][A-Za-z0-9_-]{5,63}(?![A-Za-z0-9_-])')
|
||||
|
||||
|
||||
class OrderDataUnavailable(Exception):
|
||||
pass
|
||||
|
||||
|
||||
def init_order_table(connection):
|
||||
connection.execute('''CREATE TABLE IF NOT EXISTS order_test_data (
|
||||
id INTEGER PRIMARY KEY AUTOINCREMENT,
|
||||
source_order_id TEXT, tenant_id TEXT NOT NULL DEFAULT 'test',
|
||||
order_no TEXT NOT NULL COLLATE NOCASE,
|
||||
inbound_code TEXT COLLATE NOCASE, shipment_id TEXT COLLATE NOCASE,
|
||||
status TEXT NOT NULL, country_code TEXT, transport_mode TEXT, warehouse_code TEXT,
|
||||
order_role TEXT, parent_order_no TEXT,
|
||||
package_count INTEGER, gross_weight_kg TEXT, volume_cbm TEXT,
|
||||
history_json TEXT NOT NULL DEFAULT '[]', data_note TEXT,
|
||||
source_updated_at TEXT, snapshot_at TEXT,
|
||||
UNIQUE(tenant_id, order_no)
|
||||
)''')
|
||||
connection.execute('CREATE INDEX IF NOT EXISTS idx_order_test_inbound ON order_test_data(inbound_code)')
|
||||
connection.execute('CREATE INDEX IF NOT EXISTS idx_order_test_shipment ON order_test_data(shipment_id)')
|
||||
|
||||
|
||||
def import_records(connection, records, replace=False):
|
||||
"""Import an explicitly supplied snapshot; preserve manual edits unless requested."""
|
||||
init_order_table(connection)
|
||||
inserted = skipped = 0
|
||||
for source in records:
|
||||
if not isinstance(source, dict) or not str(source.get('order_no') or '').strip():
|
||||
raise ValueError('Each record requires an order_no')
|
||||
row = {key: source.get(key) for key in FIELDS}
|
||||
row['tenant_id'] = str(row['tenant_id'] or 'test')
|
||||
row['source_order_id'] = str(row['source_order_id']) if row['source_order_id'] is not None else None
|
||||
row['order_no'] = str(row['order_no']).strip()
|
||||
row['status'] = str(row['status'] or 'DRAFT')
|
||||
history = row['history_json'] or []
|
||||
if isinstance(history, str): history = json.loads(history)
|
||||
if not isinstance(history, list): raise ValueError('history_json must contain a list')
|
||||
row['history_json'] = json.dumps(history, ensure_ascii=False)
|
||||
row['snapshot_at'] = row['snapshot_at'] or datetime.now().isoformat(timespec='seconds')
|
||||
exists = connection.execute('SELECT 1 FROM order_test_data WHERE tenant_id=? AND order_no=?',
|
||||
(row['tenant_id'], row['order_no'])).fetchone()
|
||||
if exists and not replace:
|
||||
skipped += 1
|
||||
continue
|
||||
columns = ','.join(FIELDS)
|
||||
placeholders = ','.join('?' for _ in FIELDS)
|
||||
updates = ','.join(key+'=excluded.'+key for key in FIELDS if key not in ('tenant_id', 'order_no'))
|
||||
connection.execute(f'INSERT INTO order_test_data ({columns}) VALUES ({placeholders}) '
|
||||
f'ON CONFLICT(tenant_id,order_no) DO UPDATE SET {updates}', [row[key] for key in FIELDS])
|
||||
inserted += 1
|
||||
return {'imported': inserted, 'preserved': skipped}
|
||||
|
||||
|
||||
def lookup_order(reference):
|
||||
"""Exact, bounded lookup; scope comes from server configuration, never model SQL."""
|
||||
from .db import connect
|
||||
|
||||
connection = connect()
|
||||
connection.row_factory = sqlite3.Row
|
||||
try:
|
||||
query = 'SELECT * FROM order_test_data WHERE (order_no=? OR inbound_code=? OR shipment_id=?)'
|
||||
values = [reference] * 3
|
||||
tenant = get_setting('ORDER_DATA_TENANT_ID')
|
||||
if tenant:
|
||||
query += ' AND tenant_id=?'
|
||||
values.append(str(tenant))
|
||||
return [dict(row) for row in connection.execute(query+' ORDER BY id LIMIT 2', values)]
|
||||
except sqlite3.Error:
|
||||
raise OrderDataUnavailable from None
|
||||
finally:
|
||||
connection.close()
|
||||
|
||||
|
||||
def extract_reference(message):
|
||||
message = re.sub(r'\[(?:图片|文件)\]/uploads/\S+|https?://\S+', '', message)
|
||||
references = []
|
||||
for token in IDENTIFIER.findall(message):
|
||||
if sum(character.isdigit() for character in token) < 3:
|
||||
continue
|
||||
if re.fullmatch(r'\d{4}[-_]\d{2}[-_]\d{2}|\d+(?:KG|LBS?|CBM|CM|MM)', token, re.I):
|
||||
continue
|
||||
if token.casefold() not in [value.casefold() for value in references]:
|
||||
references.append(token)
|
||||
return references
|
||||
|
||||
|
||||
def build_card(row):
|
||||
fields = []
|
||||
def field(key, value):
|
||||
if value is not None and str(value).strip(): fields.append({'key': key, 'value': str(value)})
|
||||
field('inbound', row['inbound_code'])
|
||||
field('shipment', row['shipment_id'])
|
||||
field('country', row['country_code'])
|
||||
field('warehouse', row['warehouse_code'])
|
||||
field('transport', {'SEA':'海运', 'AIR':'空运', 'RAIL':'铁路', 'TRUCK':'卡航'}.get(row['transport_mode'], row['transport_mode']))
|
||||
field('packages', row['package_count'])
|
||||
field('weight', str(row['gross_weight_kg'])+' kg' if row['gross_weight_kg'] is not None else None)
|
||||
field('volume', str(row['volume_cbm'])+' m³' if row['volume_cbm'] is not None else None)
|
||||
field('role', {'CHILD':'子订单', 'MASTER':'主订单'}.get(row['order_role']))
|
||||
field('parent', row['parent_order_no'])
|
||||
field('updated', row['source_updated_at'])
|
||||
try:
|
||||
history = json.loads(row['history_json'])
|
||||
except (ValueError, TypeError):
|
||||
history = []
|
||||
nodes = [{'time': str(event.get('time') or ''),
|
||||
'text': STATUS_LABELS.get(str(event.get('status')), str(event.get('status') or '状态更新')), 'place': ''}
|
||||
for event in history[-50:] if isinstance(event, dict)] if isinstance(history, list) else []
|
||||
nodes.reverse()
|
||||
status = STATUS_LABELS.get(row['status'], row['status'])
|
||||
summary = f"订单号 {row['order_no']}，业务状态：{status}。"
|
||||
summary += '；'.join(FIELD_LABELS[item['key']]+'：'+item['value'] for item in fields)
|
||||
return {'kind':'order', 'no':row['order_no'], 'status':status, 'fields':fields,
|
||||
'nodes':nodes, 'summary':summary, 'snapshot_at':row['snapshot_at'],
|
||||
'notice':row['data_note'] or '', 'source':'editable_test_table'}
|
||||
|
||||
|
||||
def answer_query(message, conv_id):
|
||||
references = extract_reference(message)
|
||||
if len(references) > 1:
|
||||
return {'t':'请一次提供一个订单号、入仓码或 Shipment ID，避免查错订单。'}
|
||||
reference = references[0] if references else None
|
||||
if not reference and conv_id and re.search(r'这(?:个|票|单)|刚才|状态|重量|几件|体积|目的地|运费|费用', message):
|
||||
from .db import connect
|
||||
connection = connect()
|
||||
try:
|
||||
recent = connection.execute('SELECT role,content FROM messages WHERE conv_id=? ORDER BY id DESC LIMIT 12', (conv_id,)).fetchall()
|
||||
finally:
|
||||
connection.close()
|
||||
for role, content in recent:
|
||||
if role == 'user':
|
||||
earlier_references = extract_reference(content)
|
||||
if earlier_references:
|
||||
reference = earlier_references[0] if len(earlier_references) == 1 else None
|
||||
break
|
||||
if role == 'assistant' and content.startswith('__CARD__'):
|
||||
try:
|
||||
previous = json.loads(content[8:])
|
||||
if previous.get('kind') == 'order':
|
||||
reference = previous['no']
|
||||
break
|
||||
except (ValueError, KeyError, TypeError):
|
||||
pass
|
||||
if not reference:
|
||||
if re.search(r'查.*(?:订单|运单|物流轨迹)|订单状态|shipment\s*id|(?:列出|搜索|所有|全部|多少).*(?:订单|入仓)|订单.*(?:多少|列表)', message, re.I):
|
||||
return {'t':'请提供订单号、入仓码或 Shipment ID，我会查询本地订单测试表中的记录。'}
|
||||
return None
|
||||
try:
|
||||
matches = lookup_order(reference)
|
||||
except OrderDataUnavailable:
|
||||
return {'t':'订单测试表暂时无法读取，请稍后重试；当前无法确认该订单状态。'}
|
||||
if not matches:
|
||||
return {'t':f'订单测试表中未找到“{reference}”。请核对订单号、入仓码或 Shipment ID，或联系人工客服。'}
|
||||
if len(matches) > 1:
|
||||
return {'t':'该标识匹配到多个订单，请提供该订单唯一的订单号或入仓码。'}
|
||||
if not references and re.search(r'运费|费用|多少钱|价格', message):
|
||||
return {'t':'这份订单测试数据没有实际运费字段，无法据此确认该订单费用，请联系人工客服核实。'}
|
||||
return {'card': build_card(matches[0])}
|
||||
@@ -13,7 +13,9 @@ def card_to_text(content):
|
||||
return content
|
||||
try:
|
||||
card = json.loads(content[len(CARD_PREFIX):])
|
||||
return f"（已为运单 {card.get('no', '')} 查询过轨迹，当前状态：{card.get('status', '')}）"
|
||||
if card.get('kind') == 'order':
|
||||
return '（订单测试数据副本，非实时运输轨迹）' + card.get('summary', '')
|
||||
return f"（历史演示轨迹，非真实物流信息：单号 {card.get('no', '')}，演示状态：{card.get('status', '')}）"
|
||||
except Exception:
|
||||
return "（已为该运单查询过轨迹）"
|
||||
|
||||
@@ -57,7 +59,7 @@ def extract_tracking_no(text):
|
||||
return best
|
||||
|
||||
def build_track(no):
|
||||
"""生成固定的模拟轨迹：同一个单号每次查都一样"""
|
||||
"""Legacy demo helper for old imports; chat queries use order_test_data."""
|
||||
rnd = random.Random(no)
|
||||
steps = [
|
||||
("已揽收", "义乌仓"),
|
||||
|
||||
@@ -0,0 +1,32 @@
|
||||
"""Import an explicit, private order snapshot into the chat SQLite database."""
|
||||
|
||||
import argparse
|
||||
import json
|
||||
from pathlib import Path
|
||||
import sqlite3
|
||||
import sys
|
||||
|
||||
sys.path.insert(0, str(Path(__file__).resolve().parents[1]))
|
||||
from logistics_chat.order_data import import_records
|
||||
|
||||
|
||||
def main():
|
||||
parser = argparse.ArgumentParser(description=__doc__)
|
||||
parser.add_argument('--snapshot', type=Path, required=True)
|
||||
parser.add_argument('--db', type=Path, required=True)
|
||||
parser.add_argument('--replace', action='store_true', help='Replace existing rows, including manual edits')
|
||||
args = parser.parse_args()
|
||||
if not args.snapshot.is_file() or args.snapshot.stat().st_size > 10*1024*1024:
|
||||
parser.error('Snapshot must be an existing JSON file smaller than 10 MB')
|
||||
records = json.loads(args.snapshot.read_text(encoding='utf-8-sig'))
|
||||
if isinstance(records, dict): records = records.get('orders')
|
||||
if not isinstance(records, list) or len(records) > 3000:
|
||||
parser.error('Snapshot must contain a list of at most 3000 orders')
|
||||
if not args.db.parent.is_dir(): parser.error('Database parent directory must exist')
|
||||
with sqlite3.connect(args.db) as connection:
|
||||
result = import_records(connection, records, replace=args.replace)
|
||||
print(json.dumps(result))
|
||||
|
||||
|
||||
if __name__ == '__main__':
|
||||
main()
|
||||
@@ -151,6 +151,12 @@ body { padding: 20px; height: 100dvh; overflow: hidden; }
|
||||
.track-expand { width: 100%; margin-top: 3px; padding: 7px 10px; border: 0; border-radius: 7px; background: var(--surface-soft); color: var(--brand-text); font-size: 12px; }
|
||||
.track-expand:hover { background: var(--brand-soft); }
|
||||
.track-card .msg-actions { margin-top: 8px; padding-top: 8px; }
|
||||
.order-data-notice { margin: 12px 0; padding: 10px; border-radius: 7px; background: var(--brand-soft); color: var(--secondary); font-size: 12px; line-height: 1.8; }
|
||||
.order-data-fields { display: grid; grid-template-columns: minmax(90px, auto) minmax(0, 1fr); gap: 7px 16px; margin: 14px 0; font-size: 13px; }
|
||||
.order-data-fields dt { color: var(--muted); }
|
||||
.order-data-fields dd { margin: 0; overflow-wrap: anywhere; }
|
||||
.order-snapshot-time { color: var(--muted); font-size: 11px; margin: 10px 0; }
|
||||
.order-history-title { margin: 18px 0 10px; font-size: 13px; font-weight: 600; }
|
||||
.to-bottom { display: none; position: absolute; right: 24px; bottom: calc(var(--composer-height, 150px) + 12px); z-index: 4; width: 38px; height: 38px; border-radius: 50%; border: 1px solid var(--border); background: var(--surface); color: var(--secondary); box-shadow: var(--shadow); }
|
||||
.to-bottom.show { display: block; }
|
||||
.to-bottom:hover { color: var(--brand-text); border-color: var(--brand); }
|
||||
|
||||
+78
-11
@@ -178,7 +178,7 @@ const I18N = {
|
||||
thinking: "正在思考中...",
|
||||
busyRetry: "服务繁忙，请稍后重试",
|
||||
sessionFail: "会话创建失败，请确认服务已启动",
|
||||
autoWelcome: "您好！欢迎咨询柏悦物流智能客服，请问有什么可以帮您？输入运单号可查轨迹，或点击下方快捷选项。",
|
||||
autoWelcome: "您好！欢迎咨询柏悦物流智能客服，请问有什么可以帮您？输入订单号、入仓码或 Shipment ID 可查订单，或点击下方快捷选项。",
|
||||
humanHours: "人工客服工作时间：每天 8:00-22:00。当前为非工作时间，请留言，工作时间会尽快回复您。",
|
||||
offlinePrompt: "请输入您的留言：",
|
||||
offlineSaved: "留言已提交，工作时间（8:00-22:00）会尽快回复您。",
|
||||
@@ -202,7 +202,7 @@ const I18N = {
|
||||
networkFail: "网络连接中断，请检查网络后重试",
|
||||
stopped: "已停止生成",
|
||||
stoppedMark: "（已停止生成）",
|
||||
inputPh: "请输入您的问题或运单号...（Enter 发送，Shift+Enter 换行）",
|
||||
inputPh: "请输入问题、订单号或入仓码…（Enter 发送，Shift+Enter 换行）",
|
||||
send: "发送",
|
||||
stop: "停止",
|
||||
copy: "复制",
|
||||
@@ -210,18 +210,18 @@ const I18N = {
|
||||
retry: "重答",
|
||||
clickRetry: "点击重试",
|
||||
welcomeTitle: "物流问题，随时为您解答",
|
||||
welcomeSub: "查询物流轨迹、了解专线报价，或联系人工客服。",
|
||||
welcomeSub: "查询订单状态、了解专线报价，或联系人工客服。",
|
||||
welcomeEyebrow: "中欧 · 英国物流服务",
|
||||
serviceScope: "中欧与英国专线咨询",
|
||||
serviceTag: "物流咨询服务",
|
||||
quickLabel: "快捷咨询",
|
||||
footerTrack: "查运单",
|
||||
footerTrack: "查订单",
|
||||
footerQuote: "专线报价",
|
||||
footerException: "异常处理",
|
||||
footerHuman: "联系人工",
|
||||
disclaimer: "报价与时效仅供参考，请以客服最终确认为准",
|
||||
keyboardHint: "Enter 发送 · Shift + Enter 换行",
|
||||
inputShort: "输入问题或运单号…",
|
||||
inputShort: "输入问题、订单号或入仓码…",
|
||||
uploading: "附件正在上传，请稍候…",
|
||||
uploadFailed: "附件上传失败，请重新选择文件",
|
||||
serviceUnavailable: "服务暂时不可用，请稍后重试，或联系人工客服。",
|
||||
@@ -231,9 +231,19 @@ const I18N = {
|
||||
assistant: "柏悦物流助手",
|
||||
humanAgent: "人工客服",
|
||||
trackingNo: "运单号",
|
||||
orderNo: "订单号",
|
||||
orderDataNotice: "本地订单测试数据副本。业务状态不代表快递签收，未提供的运输节点不作推断。",
|
||||
orderHistory: "订单业务状态历史",
|
||||
noOrderHistory: "未提供订单状态历史",
|
||||
legacyTrackingNotice: "历史模拟轨迹，仅供演示，不代表真实订单。",
|
||||
orderSnapshot: "数据导入时间",
|
||||
order_inbound: "入仓码", order_shipment: "Shipment ID", order_country: "目的国",
|
||||
order_warehouse: "目的仓", order_transport: "运输方式", order_packages: "件数",
|
||||
order_weight: "申报毛重", order_volume: "申报体积", order_role: "订单层级",
|
||||
order_parent: "父订单号", order_updated: "来源更新时间",
|
||||
moreTracking: "展开全部轨迹",
|
||||
lessTracking: "收起较早轨迹",
|
||||
quickSubs: ["输入运单号，查看运输进度", "了解线路、费用与预计时效", "咨询延误、签收或理赔问题", "进一步沟通您的物流需求"],
|
||||
quickSubs: ["输入订单号、入仓码或 Shipment ID", "了解线路、费用与预计时效", "咨询延误、签收或理赔问题", "进一步沟通您的物流需求"],
|
||||
welcomeTip: "您可以直接输入问题，也可以点击下面选项快速提问。",
|
||||
hot: "热点问题",
|
||||
recent: "最近对话记录",
|
||||
@@ -243,7 +253,7 @@ const I18N = {
|
||||
langTip: "中英文切换（Ctrl+L）",
|
||||
toBottom: "回到底部",
|
||||
quick: [
|
||||
"帮我查询物流轨迹", "欧洲海运专线报价", "包裹异常处理", "转接人工客服"
|
||||
"查询订单状态", "欧洲海运专线报价", "包裹异常处理", "转接人工客服"
|
||||
],
|
||||
hotList: [
|
||||
"如何查询物流轨迹？", "欧洲海运时效是多久？", "包裹显示异常签收怎么办？", "如何申请理赔？"
|
||||
@@ -262,7 +272,7 @@ const I18N = {
|
||||
thinking: "Thinking...",
|
||||
busyRetry: "Service busy, please try again later",
|
||||
sessionFail: "Failed to create session, please check the service is running",
|
||||
autoWelcome: "Welcome to Baiyue Logistics. How can we help? Enter a tracking number or choose a quick option below.",
|
||||
autoWelcome: "Welcome to Baiyue Logistics. Enter an order number, inbound code or Shipment ID, or choose a quick option below.",
|
||||
humanHours: "Our team is available daily, 08:00–22:00. Please leave a message and we will reply during service hours.",
|
||||
offlinePrompt: "Please leave your message:",
|
||||
offlineSaved: "Message submitted. Our team will reply during service hours (08:00–22:00).",
|
||||
@@ -299,7 +309,7 @@ const I18N = {
|
||||
serviceScope: "Europe & UK freight support",
|
||||
serviceTag: "Logistics support",
|
||||
quickLabel: "Quick help",
|
||||
footerTrack: "Tracking",
|
||||
footerTrack: "Order lookup",
|
||||
footerQuote: "Get a quote",
|
||||
footerException: "Parcel issue",
|
||||
footerHuman: "Human support",
|
||||
@@ -315,6 +325,16 @@ const I18N = {
|
||||
assistant: "Baiyue Assistant",
|
||||
humanAgent: "Support agent",
|
||||
trackingNo: "Tracking number",
|
||||
orderNo: "Order number",
|
||||
orderDataNotice: "Editable local test data. Order workflow status does not confirm delivery. Missing transport events are not inferred.",
|
||||
orderHistory: "Order workflow history",
|
||||
noOrderHistory: "No order status history provided",
|
||||
legacyTrackingNotice: "Historical simulated tracking for demonstration only; this is not a real order record.",
|
||||
orderSnapshot: "Snapshot imported",
|
||||
order_inbound: "Inbound code", order_shipment: "Shipment ID", order_country: "Destination country",
|
||||
order_warehouse: "Warehouse", order_transport: "Transport", order_packages: "Packages",
|
||||
order_weight: "Declared gross weight", order_volume: "Declared volume", order_role: "Order level",
|
||||
order_parent: "Parent order", order_updated: "Source updated",
|
||||
moreTracking: "View full tracking history",
|
||||
lessTracking: "Show recent updates",
|
||||
quickSubs: ["Check the latest shipment progress", "Explore routes, rates and transit times", "Get help with delays, delivery or claims", "Discuss your shipping requirements"],
|
||||
@@ -765,11 +785,13 @@ const CARD_PREFIX = "__CARD__";
|
||||
// 把轨迹数据画成时间轴
|
||||
function fillTrackCard(el, card){
|
||||
el.innerHTML = "";
|
||||
const isOrder = card.kind === 'order';
|
||||
const head = document.createElement("div");
|
||||
head.className = "track-head";
|
||||
const no = document.createElement("div");
|
||||
no.className = "track-no";
|
||||
no.innerHTML = '<span data-i18n="trackingNo">' + t("trackingNo") + "</span>" + escHtml(card.no);
|
||||
const numberLabel = isOrder ? 'orderNo' : 'trackingNo';
|
||||
no.innerHTML = '<span data-i18n="'+numberLabel+'">' + t(numberLabel) + "</span>" + escHtml(card.no);
|
||||
const st = document.createElement("div");
|
||||
st.className = "track-status";
|
||||
st.textContent = card.status;
|
||||
@@ -777,6 +799,50 @@ function fillTrackCard(el, card){
|
||||
head.appendChild(st);
|
||||
el.appendChild(head);
|
||||
|
||||
if(!isOrder){
|
||||
const legacyNotice = document.createElement('p');
|
||||
legacyNotice.className = 'order-data-notice';
|
||||
legacyNotice.dataset.i18n = 'legacyTrackingNotice';
|
||||
legacyNotice.textContent = t('legacyTrackingNotice');
|
||||
el.appendChild(legacyNotice);
|
||||
}
|
||||
|
||||
if(isOrder){
|
||||
const notice = document.createElement('p');
|
||||
notice.className = 'order-data-notice';
|
||||
notice.textContent = t('orderDataNotice') + (card.notice ? ' ' + card.notice : '');
|
||||
el.appendChild(notice);
|
||||
const fields = document.createElement('dl');
|
||||
fields.className = 'order-data-fields';
|
||||
(card.fields || []).forEach(function(field){
|
||||
const label = document.createElement('dt');
|
||||
label.dataset.i18n = 'order_'+field.key;
|
||||
label.textContent = t('order_'+field.key) || field.key;
|
||||
const value = document.createElement('dd');
|
||||
value.textContent = field.value;
|
||||
fields.append(label, value);
|
||||
});
|
||||
el.appendChild(fields);
|
||||
if(card.snapshot_at){
|
||||
const snapshot = document.createElement('p');
|
||||
snapshot.className = 'order-snapshot-time';
|
||||
snapshot.textContent = t('orderSnapshot')+'：'+card.snapshot_at;
|
||||
el.appendChild(snapshot);
|
||||
}
|
||||
const title = document.createElement('p');
|
||||
title.className = 'order-history-title';
|
||||
title.dataset.i18n = 'orderHistory';
|
||||
title.textContent = t('orderHistory');
|
||||
el.appendChild(title);
|
||||
if(!(card.nodes || []).length){
|
||||
const empty = document.createElement('p');
|
||||
empty.className = 'order-snapshot-time';
|
||||
empty.dataset.i18n = 'noOrderHistory';
|
||||
empty.textContent = t('noOrderHistory');
|
||||
el.appendChild(empty);
|
||||
}
|
||||
}
|
||||
|
||||
const timeline = document.createElement("div");
|
||||
timeline.className = "track-timeline";
|
||||
el.appendChild(timeline);
|
||||
@@ -1179,6 +1245,7 @@ function mdToPlain(md){
|
||||
if(md.indexOf(CARD_PREFIX) === 0){
|
||||
try{
|
||||
const card = JSON.parse(md.slice(CARD_PREFIX.length));
|
||||
if(card.kind === 'order') return card.summary || card.no;
|
||||
const lines = ["运单号 " + card.no + "（" + (card.status || "") + "）"];
|
||||
(card.nodes || []).forEach(function(n){
|
||||
lines.push(n.time + " " + n.text + (n.place ? " " + n.place : ""));
|
||||
@@ -1428,7 +1495,7 @@ async function doSend(retryText){
|
||||
if(obj.card){
|
||||
aiBubble.classList.add("track-card");
|
||||
fillTrackCard(aiBubble, obj.card);
|
||||
aiBubble.dataset.raw = "运单号 " + obj.card.no + "（" + (obj.card.status || "") + "）\n" +
|
||||
aiBubble.dataset.raw = obj.card.kind === 'order' ? obj.card.summary : "运单号 " + obj.card.no + "（" + (obj.card.status || "") + "）\n" +
|
||||
(obj.card.nodes || []).map(function(n){ return n.time + " " + n.text + " " + (n.place || ""); }).join("\n");
|
||||
firstChunk = false;
|
||||
scrollChatToEnd();
|
||||
|
||||
@@ -44,7 +44,7 @@
|
||||
<div class="ai-avatar"><svg viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="1.6" stroke-linecap="round" stroke-linejoin="round" aria-hidden="true"><path d="m4 7 8-4 8 4v10l-8 4-8-4Z"/><path d="m4 7 8 4 8-4M12 11v10M8 5l8 4"/></svg></div>
|
||||
<div class="welcome-eyebrow">中欧 · 英国物流服务</div>
|
||||
<h3>物流问题，随时为您解答</h3>
|
||||
<p>查询物流轨迹、了解专线报价，或联系人工客服。<br>从这里开始您的物流咨询。</p>
|
||||
<p>查询订单状态、了解专线报价，或联系人工客服。<br>从这里开始您的物流咨询。</p>
|
||||
</div>
|
||||
</section>
|
||||
</div>
|
||||
|
||||
@@ -137,7 +137,7 @@ test('all three footer questions leave the human queue and send to separate AI c
|
||||
const requests = app.calls.filter(call => call.url === '/stream_chat');
|
||||
assert.equal(requests.length, 3);
|
||||
assert.equal(new Set(requests.map(call => call.body.conv_id)).size, 3);
|
||||
assert.deepEqual(requests.map(call => call.body.msg), ['帮我查询物流轨迹', '欧洲海运专线报价', '包裹异常处理']);
|
||||
assert.deepEqual(requests.map(call => call.body.msg), ['查询订单状态', '欧洲海运专线报价', '包裹异常处理']);
|
||||
assert.equal(app.calls.filter(call => call.url === '/api/human/send').length, 0);
|
||||
assert.equal(app.context.window.humanSid, 0);
|
||||
assert.equal(app.element('human-session').hidden, true);
|
||||
@@ -309,3 +309,28 @@ test('human poll failures are visible and clear after the connection recovers',
|
||||
await app.tick();
|
||||
assert.equal(app.element('composer-status').hidden, true);
|
||||
});
|
||||
|
||||
test('order cards show copied facts and render data fields as text', async () => {
|
||||
const app = await customerPage({human:false});
|
||||
const card = {kind:'order', no:'FL202610290001', status:'履约中',
|
||||
fields:[{key:'weight',value:'30.000 kg'},{key:'warehouse',value:'<img src=x onerror=bad()>'}],
|
||||
nodes:[{time:'2026-10-29 10:00',text:'已提交',place:''}],
|
||||
summary:'订单 FL202610290001，申报毛重30.000 kg', snapshot_at:'2026-10-29 10:30', notice:''};
|
||||
app.hooks['/stream_chat'] = () => {
|
||||
let read = false;
|
||||
return {ok:true, body:{getReader:() => ({read:async () => {
|
||||
if(read) return {done:true};
|
||||
read = true;
|
||||
return {done:false,value:new TextEncoder().encode('data: '+JSON.stringify({card})+'\n\ndata: {"d":1}\n\n')};
|
||||
}})}};
|
||||
};
|
||||
await app.context.window.fillInput('FL202610290001');
|
||||
await flush();
|
||||
const log = app.element('chatDom');
|
||||
const fields = log.querySelector('.order-data-fields');
|
||||
assert.ok(fields);
|
||||
assert.equal(fields.children[1].textContent, '30.000 kg');
|
||||
assert.equal(fields.children[3].innerHTML, '');
|
||||
assert.match(log.querySelector('.order-data-notice').textContent, /测试数据副本/);
|
||||
assert.equal(app.context.window.__busy, false);
|
||||
});
|
||||
|
||||
@@ -45,6 +45,14 @@ class ApiTests(unittest.TestCase):
|
||||
self.root = Path(self.directory.name)
|
||||
self.app = self.application(self.root)
|
||||
self.client = self.app.test_client()
|
||||
from logistics_chat.order_data import import_records
|
||||
with self.app.app_context():
|
||||
connection = db.connect()
|
||||
import_records(connection, [{'tenant_id':'fixture', 'order_no':'15252125',
|
||||
'status':'PROCESSING', 'country_code':'US', 'gross_weight_kg':'30',
|
||||
'history_json':[{'time':'2026-10-28 10:00', 'status':'SUBMITTED'}]}])
|
||||
connection.commit()
|
||||
connection.close()
|
||||
|
||||
def application(self, root):
|
||||
return create_app({'TESTING': True, 'DATABASE': root/'history.db',
|
||||
|
||||
@@ -91,6 +91,13 @@ class ConfigurationTests(unittest.TestCase):
|
||||
self.assertIs(response, sentinel.response)
|
||||
self.assertEqual(post.call_args.kwargs['headers']['Authorization'], 'Bearer file-key')
|
||||
|
||||
def test_order_scope_is_fixed_by_server_file_or_environment(self):
|
||||
self.write_env('ORDER_DATA_TENANT_ID=tenant-file\n')
|
||||
os.environ.pop('ORDER_DATA_TENANT_ID', None)
|
||||
self.assertEqual(self.application().config['ORDER_DATA_TENANT_ID'], 'tenant-file')
|
||||
os.environ['ORDER_DATA_TENANT_ID'] = 'tenant-environment'
|
||||
self.assertEqual(self.application().config['ORDER_DATA_TENANT_ID'], 'tenant-environment')
|
||||
|
||||
|
||||
if __name__ == '__main__':
|
||||
unittest.main()
|
||||
|
||||
@@ -0,0 +1,157 @@
|
||||
"""Local order snapshots, exact lookup and conversational order queries."""
|
||||
|
||||
import json
|
||||
from pathlib import Path
|
||||
import tempfile
|
||||
import unittest
|
||||
from unittest.mock import patch
|
||||
|
||||
from logistics_chat import create_app, db, order_data
|
||||
from logistics_chat.tracking import CARD_PREFIX, card_to_text
|
||||
|
||||
|
||||
class OrderDataTests(unittest.TestCase):
|
||||
def setUp(self):
|
||||
folder = tempfile.TemporaryDirectory()
|
||||
self.addCleanup(folder.cleanup)
|
||||
root = Path(folder.name)
|
||||
self.app = create_app({'TESTING':True, 'DATABASE':root/'history.db',
|
||||
'UPLOAD_DIR':root/'uploads', 'BACKUP_DIR':root/'backups', 'LOG_DIR':root/'logs',
|
||||
'DEEPSEEK_API_KEY':'', 'ORDER_DATA_TENANT_ID':'', 'RATE_LIMIT_PER_MIN':1000})
|
||||
self.client = self.app.test_client()
|
||||
self.context = self.app.app_context()
|
||||
self.context.push()
|
||||
self.addCleanup(self.context.pop)
|
||||
self.record = {'source_order_id':'999999999999999999', 'tenant_id':'tenant-a',
|
||||
'order_no':'FL202610290001', 'inbound_code':'INB20261029001-01', 'shipment_id':'shipment00208',
|
||||
'status':'PROCESSING', 'country_code':'US', 'transport_mode':'SEA', 'warehouse_code':'TEST1',
|
||||
'order_role':'MASTER', 'package_count':3, 'gross_weight_kg':'30.000', 'volume_cbm':'0.2500',
|
||||
'history_json':[{'time':'2026-10-28 10:00', 'status':'SUBMITTED'},
|
||||
{'time':'2026-10-29 10:00', 'status':'PROCESSING'}]}
|
||||
self.import_rows([self.record])
|
||||
|
||||
def import_rows(self, rows, replace=False):
|
||||
connection = db.connect()
|
||||
try:
|
||||
with connection:
|
||||
return order_data.import_records(connection, rows, replace=replace)
|
||||
finally:
|
||||
connection.close()
|
||||
|
||||
def events(self, message, cid=None):
|
||||
response = self.client.post('/stream_chat', json={'msg':message, 'conv_id':cid})
|
||||
self.assertEqual(response.status_code, 200)
|
||||
return [json.loads(frame[6:]) for frame in response.get_data(as_text=True).split('\n\n') if frame.startswith('data: ')]
|
||||
|
||||
def test_identifiers_are_exact_case_insensitive_and_preserve_suffixes(self):
|
||||
for value in ('fl202610290001', 'INB20261029001-01', 'shipment00208'):
|
||||
self.assertEqual(order_data.lookup_order(value)[0]['order_no'], self.record['order_no'])
|
||||
self.assertEqual(self.events('查询 '+value)[0]['card']['no'], self.record['order_no'])
|
||||
self.assertEqual(order_data.lookup_order('FL20261029000'), [])
|
||||
self.assertEqual(order_data.extract_reference('查询 INB20261029001-01'), ['INB20261029001-01'])
|
||||
|
||||
def test_weight_dates_and_attachment_urls_are_not_order_identifiers(self):
|
||||
for text in ('2000KG海运报价', '2026-10-29', '[文件]/uploads/20261029100145_6787.txt'):
|
||||
self.assertEqual(order_data.extract_reference(text), [])
|
||||
events = self.events('帮我查询物流轨迹')
|
||||
self.assertIn('订单号', events[0]['t'])
|
||||
self.assertEqual(events[-1], {'d':1})
|
||||
|
||||
def test_unknown_orders_never_produce_fake_tracking_or_call_model(self):
|
||||
with patch('logistics_chat.ai_client.post_completion') as model:
|
||||
events = self.events('查询 UNKNOWN20260001')
|
||||
self.assertIn('未找到', events[0]['t'])
|
||||
self.assertFalse(any('card' in event for event in events))
|
||||
self.assertEqual(events[-1], {'d':1})
|
||||
model.assert_not_called()
|
||||
|
||||
def test_unimplemented_bulk_queries_ask_for_identifier_instead_of_inventing_records(self):
|
||||
with patch('logistics_chat.ai_client.post_completion') as model:
|
||||
events = self.events('列出所有订单')
|
||||
self.assertIn('请提供订单号', events[0]['t'])
|
||||
model.assert_not_called()
|
||||
|
||||
def test_server_tenant_scope_and_ambiguous_identifiers(self):
|
||||
self.import_rows([{**self.record, 'tenant_id':'tenant-b', 'gross_weight_kg':'99'}])
|
||||
self.assertIn('多个订单', self.events(self.record['order_no'])[0]['t'])
|
||||
self.app.config['ORDER_DATA_TENANT_ID'] = 'tenant-a'
|
||||
rows = order_data.lookup_order(self.record['order_no'])
|
||||
self.assertEqual(len(rows), 1)
|
||||
self.assertEqual(rows[0]['gross_weight_kg'], '30.000')
|
||||
self.app.config['ORDER_DATA_TENANT_ID'] = 'unknown-tenant'
|
||||
self.assertEqual(order_data.lookup_order(self.record['order_no']), [])
|
||||
|
||||
def test_manual_changes_are_visible_and_reimport_preserves_them_by_default(self):
|
||||
connection = db.connect()
|
||||
connection.execute("UPDATE order_test_data SET gross_weight_kg='42.000' WHERE order_no=?", (self.record['order_no'],))
|
||||
connection.commit()
|
||||
connection.close()
|
||||
self.assertEqual(self.import_rows([self.record]), {'imported':0, 'preserved':1})
|
||||
fields = self.events(self.record['order_no'])[0]['card']['fields']
|
||||
self.assertEqual(next(field['value'] for field in fields if field['key']=='weight'), '42.000 kg')
|
||||
self.import_rows([self.record], replace=True)
|
||||
self.assertEqual(order_data.lookup_order(self.record['order_no'])[0]['gross_weight_kg'], '30.000')
|
||||
|
||||
def test_new_table_records_can_be_added_without_touching_source_database(self):
|
||||
self.import_rows([{**self.record, 'order_no':'LOCAL20260002', 'shipment_id':'localship002'}])
|
||||
self.assertEqual(self.events('查询 LOCAL20260002')[0]['card']['no'], 'LOCAL20260002')
|
||||
|
||||
def test_business_status_history_does_not_claim_delivery_or_invent_transport_events(self):
|
||||
self.import_rows([{**self.record, 'status':'COMPLETED'}], replace=True)
|
||||
card = self.events(self.record['order_no'])[0]['card']
|
||||
self.assertEqual(card['status'], '头程订单已完成')
|
||||
self.assertNotIn('已签收', json.dumps(card, ensure_ascii=False))
|
||||
self.assertEqual([node['time'] for node in card['nodes']], ['2026-10-29 10:00','2026-10-28 10:00'])
|
||||
self.assertTrue(all(not node['place'] for node in card['nodes']))
|
||||
|
||||
def test_children_do_not_reuse_parent_total_weight(self):
|
||||
self.import_rows([{**self.record, 'order_no':'CHILD20260001-01', 'order_role':'CHILD',
|
||||
'gross_weight_kg':None, 'package_count':None, 'volume_cbm':None,
|
||||
'parent_order_no':self.record['order_no'], 'data_note':'子单独立货物数据未提供'}])
|
||||
card = self.events('CHILD20260001-01')[0]['card']
|
||||
self.assertFalse(any(field['key']=='weight' for field in card['fields']))
|
||||
self.assertIn('未提供', card['notice'])
|
||||
|
||||
def test_followups_refresh_local_data_and_remain_within_conversation(self):
|
||||
cid = self.client.post('/api/new_chat').json['id']
|
||||
self.events(self.record['order_no'], cid)
|
||||
connection = db.connect()
|
||||
connection.execute("UPDATE order_test_data SET gross_weight_kg='45.000' WHERE order_no=?", (self.record['order_no'],))
|
||||
connection.commit()
|
||||
connection.close()
|
||||
card = self.events('这票重量是多少？',cid)[0]['card']
|
||||
self.assertEqual(card['no'], self.record['order_no'])
|
||||
self.assertEqual(next(field['value'] for field in card['fields'] if field['key']=='weight'), '45.000 kg')
|
||||
self.assertIn('没有实际运费', self.events('这票运费多少钱？',cid)[0]['t'])
|
||||
self.assertEqual(self.events('那状态呢？',cid)[0]['card']['no'], self.record['order_no'])
|
||||
self.events('查询 UNKNOWN20260001',cid)
|
||||
self.assertIn('未找到', self.events('这票重量呢？',cid)[0]['t'])
|
||||
other_cid = self.client.post('/api/new_chat').json['id']
|
||||
self.assertIsNone(order_data.answer_query('这票重量是多少？', other_cid))
|
||||
|
||||
def test_card_storage_and_model_context_contain_only_selected_facts(self):
|
||||
card = self.events(self.record['order_no'])[0]['card']
|
||||
text = card_to_text(CARD_PREFIX+json.dumps(card))
|
||||
self.assertIn('30.000', text)
|
||||
self.assertIn('US', text)
|
||||
self.assertNotIn('tenant_id', text)
|
||||
self.assertNotIn('customer_name', json.dumps(card))
|
||||
|
||||
def test_invalid_history_is_safe_and_read_failure_is_explicit(self):
|
||||
connection = db.connect()
|
||||
connection.execute("UPDATE order_test_data SET history_json='invalid'")
|
||||
connection.commit()
|
||||
self.assertEqual(self.events(self.record['order_no'])[0]['card']['nodes'], [])
|
||||
connection.execute('DROP TABLE order_test_data')
|
||||
connection.commit()
|
||||
connection.close()
|
||||
self.assertIn('暂时无法读取', self.events(self.record['order_no'])[0]['t'])
|
||||
|
||||
def test_import_failure_rolls_back_partial_rows(self):
|
||||
with self.assertRaises(ValueError):
|
||||
self.import_rows([{**self.record,'order_no':'ROLLBACK20260001'}, {'order_no':''}])
|
||||
self.assertEqual(order_data.lookup_order('ROLLBACK20260001'), [])
|
||||
|
||||
|
||||
if __name__ == '__main__':
|
||||
unittest.main()
|
||||
Reference in New Issue
Block a user