feat: 新增 bat/sh 版 API 客户端,修复 bat 吞退出码与 CRLF 问题
新增 scripts/api-client.bat 与 api-client.sh:上传图片 -> 轮询 -> 打印识别文本与 抽取字段。自动挑解释器(优先 .venv,退回系统 Python);api_client.py 只用标准库, 所以一台只装 Python、不装本项目依赖的机器也能当客户端用。 修掉两个 bat 上的真 bug(都是实测出来的,不是看代码看出来的): 1. 退出码被吞。`if exist ... ( ... exit /b %errorlevel% )` 里的 %errorlevel% 是**解析时**展开的,取到的是启动程序之前的值,于是失败也返回 0。 start.bat 同样中招(启动失败会被吞成成功)。两处都改成 goto 结构。 2. .bat 必须 CRLF。同一份内容,CRLF 正常跑完;LF 会让 cmd 解析挂住—— 无任何输出、也不退出,看起来像服务卡死。download-models.bat 原本也是 LF, 一并修正;新增 .gitattributes 钉死 *.bat=eol:crlf、*.sh=eol:lf。 另:参数校验挪到探活之前,参数写错时不会因为连不上服务报出误导性错误; stdout 加 flush,重定向到文件时输出顺序不再错乱。 测试:新增两条回归用例(bat 必须 CRLF;Windows 上 bat 能被 cmd 跑通,带超时 以免坏掉时把测试卡死)。99 passed。 Co-Authored-By: Claude Code <noreply@anthropic.com>
This commit is contained in:
@@ -1,15 +1,19 @@
|
||||
"""打包辅助脚本的回归测试(config 改写与 paddle 变体探测)。"""
|
||||
|
||||
import os
|
||||
import subprocess
|
||||
import sys
|
||||
from pathlib import Path
|
||||
|
||||
import pytest
|
||||
|
||||
PROJECT_ROOT = Path(__file__).resolve().parents[1]
|
||||
PREPARE_CONFIG = PROJECT_ROOT / "scripts" / "prepare_release_config.py"
|
||||
PADDLE_ENV = PROJECT_ROOT / "scripts" / "paddle_env.py"
|
||||
INSTALL_PADDLE = PROJECT_ROOT / "scripts" / "install_paddle.py"
|
||||
SWITCH_ENV = PROJECT_ROOT / "scripts" / "switch_env.py"
|
||||
API_CLIENT = PROJECT_ROOT / "scripts" / "api_client.py"
|
||||
API_CLIENT_BAT = PROJECT_ROOT / "scripts" / "api-client.bat"
|
||||
|
||||
SAMPLE = """\
|
||||
# 中文注释必须原样保留
|
||||
@@ -102,6 +106,34 @@ def test_install_paddle_rejects_unknown_cuda_channel() -> None:
|
||||
assert result.returncode == 2
|
||||
|
||||
|
||||
def test_windows_batch_files_use_crlf() -> None:
|
||||
""".bat 必须是 CRLF 换行。
|
||||
|
||||
实测:同一份内容,CRLF 的 bat 正常跑完;LF 的会让 cmd 解析挂住——无任何输出、
|
||||
也不退出。这个坑很难查(看起来像服务或脚本卡死),所以用测试钉住。
|
||||
"""
|
||||
for bat in sorted((PROJECT_ROOT / "scripts").glob("*.bat")):
|
||||
raw = bat.read_bytes()
|
||||
assert b"\r\n" in raw, f"{bat.name} 没有 CRLF 换行"
|
||||
assert raw.replace(b"\r\n", b"").count(b"\n") == 0, f"{bat.name} 里混有 LF 换行"
|
||||
|
||||
|
||||
@pytest.mark.skipif(os.name != "nt", reason=".bat 只能在 Windows 上执行")
|
||||
def test_api_client_bat_parses_and_runs() -> None:
|
||||
"""bat 能被 cmd 正常解析并透传参数。带超时,坏掉时报失败而不是把测试卡死。"""
|
||||
result = subprocess.run(
|
||||
["cmd", "/c", str(API_CLIENT_BAT), "--help"],
|
||||
capture_output=True,
|
||||
text=True,
|
||||
encoding="utf-8",
|
||||
cwd=PROJECT_ROOT,
|
||||
check=False,
|
||||
timeout=60,
|
||||
)
|
||||
assert result.returncode == 0, result.stderr
|
||||
assert "api_client.py" in result.stdout
|
||||
|
||||
|
||||
def test_api_client_help_and_missing_args() -> None:
|
||||
assert run_script(API_CLIENT, "--help").returncode == 0
|
||||
# 不给图片又不带 --health:argparse 应该报错退出(2)
|
||||
|
||||
Reference in New Issue
Block a user