refactor(load,tract):将 ModelMetadata JSON 加载逻辑解耦至 ddddocr-tract, 优化 Error 枚举结构与错误透传
- 在 load 模块中精简 Error 与 Result 别名定义 - 增加 ParseError 子类型区分路径与字节流加载失败 - 支持通过 #[from] 自动转换 Tract 引擎底层错误 - 移出 core 中的 serde 依赖,保持核心库纯洁 - 在 tract 中实现 TractModelMetadata 扩展 trait 加载解析配置
This commit is contained in:
93
ddddocr-tract/src/loader/metadata.rs
Normal file
93
ddddocr-tract/src/loader/metadata.rs
Normal file
@@ -0,0 +1,93 @@
|
||||
use crate::loader::error::{Error, Result};
|
||||
|
||||
pub use ddddocr_core::ModelMetadata;
|
||||
use ddddocr_core::ocr::Resize;
|
||||
use ddddocr_core::{Charset, Normalization};
|
||||
use serde::Deserialize;
|
||||
use std::borrow::Cow;
|
||||
|
||||
#[derive(Deserialize)]
|
||||
#[serde(rename_all = "snake_case")] // 支持 json 中写 "zero_to_one" 或 "minus_one_to_one"
|
||||
enum NormalizationDto {
|
||||
/// 映射到 [0.0, 1.0] -> pixel / 255.0
|
||||
ZeroToOne,
|
||||
/// 映射到 [-1.0, 1.0] -> (pixel / 255.0 - 0.5) / 0.5
|
||||
MinusOneToOne,
|
||||
}
|
||||
|
||||
impl From<NormalizationDto> for Normalization {
|
||||
fn from(dto: NormalizationDto) -> Self {
|
||||
match dto {
|
||||
NormalizationDto::ZeroToOne => Normalization::ZeroToOne,
|
||||
NormalizationDto::MinusOneToOne => Normalization::MinusOneToOne,
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
/// 仅用于反序列化 JSON 的中间临时结构体(DTO)
|
||||
#[derive(Deserialize)]
|
||||
struct ModelMetadataDto {
|
||||
charset: Vec<String>,
|
||||
word: bool,
|
||||
#[serde(alias = "image")]
|
||||
resize: Vec<i32>,
|
||||
channel: u8,
|
||||
/// 新增:允许在配置文件中指定归一化策略。
|
||||
/// 使用 serde(default) 可以在不配置时提供一个默认值(比如默认 ZeroToOne)
|
||||
#[serde(default = "default_normalization")]
|
||||
normalization: NormalizationDto,
|
||||
}
|
||||
fn default_normalization() -> NormalizationDto {
|
||||
NormalizationDto::ZeroToOne
|
||||
}
|
||||
|
||||
/// Tract 专属扩展trait 或 工具函数
|
||||
pub trait TractModelMetadata: Sized {
|
||||
fn from_json_str(json_str: &str) -> Result<Self>;
|
||||
/// 机制 2:从内存字节流加载(极大地方便 include_bytes! 或网络下载)
|
||||
fn from_json_bytes(bytes: &[u8]) -> Result<Self> {
|
||||
let json_str = std::str::from_utf8(bytes)?;
|
||||
Self::from_json_str(json_str)
|
||||
}
|
||||
}
|
||||
impl TractModelMetadata for ModelMetadata {
|
||||
// --- 优雅的工厂模式构造器 ---
|
||||
fn from_json_str(json_str: &str) -> Result<ModelMetadata> {
|
||||
let dto: ModelMetadataDto = serde_json::from_str(json_str)?;
|
||||
|
||||
// 1. 将 DTO 的字符串数组转化为强类型的 Charset
|
||||
let tokens: Vec<Cow<'static, str>> =
|
||||
dto.charset.into_iter().map(|s| Cow::Owned(s)).collect();
|
||||
let charset = Charset::new(tokens);
|
||||
|
||||
// 2. 解析 resize 策略(重现 Python 的复杂条件判断)
|
||||
if dto.resize.len() != 2 {
|
||||
return Err(Error::MetadataParse(
|
||||
"'resize (or image)' 字段必须是包含两个元素的数组,例如 [-1, 64]".to_string(),
|
||||
));
|
||||
}
|
||||
let r0 = dto.resize[0];
|
||||
let r1 = dto.resize[1];
|
||||
|
||||
let resize = if r0 == -1 {
|
||||
if dto.word {
|
||||
// 如果 word 为 true,且包含 -1,Python 里是 resize 为 (r1, r1) 的正方形
|
||||
Resize::Square(r1 as u32)
|
||||
} else {
|
||||
// 如果 word 为 false,且包含 -1,Python 里是高度固定为 r1,宽度按原图比例缩放
|
||||
Resize::DynamicWidth(r1 as u32)
|
||||
}
|
||||
} else {
|
||||
// 正常的固定宽高
|
||||
Resize::Fixed(r0 as u32, r1 as u32)
|
||||
};
|
||||
|
||||
Ok(ModelMetadata::new(
|
||||
charset,
|
||||
dto.word,
|
||||
resize,
|
||||
dto.channel,
|
||||
dto.normalization.into(),
|
||||
))
|
||||
}
|
||||
}
|
||||
Reference in New Issue
Block a user