sheet-edit 首战复盘两改进:① 内层动作键 op→action(run.py 兼容旧键 op 缺省 inspect),消除与 skill 工具外层 op=run 的撞名——AI 照抄示例漏外层参数、或把内层值填进外层枚举的根因;SKILL.md 顶部新增「调用形式」章节给出完整外层调用并声明下文均为 input_args。② 表头行不再靠 AI 自觉:locate.detect_header_row 扫描前 10 行(候选=非空全字符串且互不重复取最多列),inspect 每 sheet 返回 suggested_header_row;build_col_map 只解析出 1 列(典型:横跨全行的合并标题被当表头)且检测到不同行时直接报错给出 header_row=N 建议——跳过 inspect 直接 apply 也能一次报错自愈,正是「标题行+表头行」中文表格翻车现场的兜底
This commit is contained in:
@@ -6,6 +6,32 @@ def is_formula(v) -> bool:
|
||||
return isinstance(v, str) and v.startswith('=')
|
||||
|
||||
|
||||
def detect_header_row(ws, scan=10, col_cap=200) -> int:
|
||||
"""扫描前 scan 行猜表头行(只读不写,纯建议用)。
|
||||
|
||||
候选条件:行内非空值 ≥ 2 且全部是普通字符串(排掉单值标题行和含数字/公式的数据行),行内不重复。
|
||||
取非空格数最多的最早候选行;找不到则回退 1。"""
|
||||
best_row, best_cnt = 1, 0
|
||||
max_c = min(ws.max_column, col_cap)
|
||||
for r in range(1, min(scan, ws.max_row) + 1):
|
||||
vals = []
|
||||
ok = True
|
||||
for c in range(1, max_c + 1):
|
||||
v = ws.cell(r, c).value
|
||||
if v is None or v == '':
|
||||
continue
|
||||
if isinstance(v, str) and not v.startswith('='):
|
||||
vals.append(v.strip())
|
||||
else:
|
||||
ok = False
|
||||
break
|
||||
if not ok or len(vals) < 2 or len(set(vals)) != len(vals):
|
||||
continue
|
||||
if len(vals) > best_cnt:
|
||||
best_row, best_cnt = r, len(vals)
|
||||
return best_row
|
||||
|
||||
|
||||
def value_eq(a, b) -> bool:
|
||||
if a is None and b is None:
|
||||
return True
|
||||
@@ -34,7 +60,17 @@ def build_col_map(ws, header_row: int) -> dict:
|
||||
raise UserError(f"表头行 {header_row} 存在重复列名: '{name}'")
|
||||
col_map[name] = c
|
||||
if not col_map:
|
||||
raise UserError(f"表头行 {header_row} 为空,无法识别列名")
|
||||
suggest = detect_header_row(ws)
|
||||
extra = f";疑似真实表头在第 {suggest} 行,请传 header_row={suggest} 重试" if suggest != header_row else ''
|
||||
raise UserError(f"表头行 {header_row} 为空,无法识别列名{extra}")
|
||||
if len(col_map) == 1:
|
||||
# 典型现场:第 1 行是横跨全行的合并标题,单值被当成唯一列名
|
||||
suggest = detect_header_row(ws)
|
||||
if suggest != header_row:
|
||||
raise UserError(
|
||||
f"表头行 {header_row} 只解析出 1 列('{next(iter(col_map))}'),像标题行;"
|
||||
f"疑似真实表头在第 {suggest} 行,请传 header_row={suggest} 重试"
|
||||
)
|
||||
return col_map
|
||||
|
||||
|
||||
|
||||
Reference in New Issue
Block a user