```
feat(AI): 统一多模态模型架构,整合文本和视觉推理路径 - 将文本生成和VL(图→文)功能合并到单一的Qwen3.5-4B多模态MNN模型 - 移除独立的Qwen3-VL-4B模型依赖,MLX VL改为使用.llm的多模态模型 - 更新ModelKind枚举,新增userFacing集合用于面向用户展示 - MNN后端现在同时支持文本和视觉任务,模拟器回退到MLX refactor(models): 模型管理和界面调整以适应新的多模态架构 - 更新模型管理界面,只显示统一的Qwen3.5-4B(MNN)模型给用户 - 修改就绪状态检查逻辑,使用ModelKind.userFacing替代allCases - 更新模型文件清单,从Qwen3.5-2B升级到Qwen3.5-4B-4bit - 调整模型管理页面UI,突出MNN+SME2端侧加速功能 feat(camera): 添加拍照识别引擎切换功能 - 实现双路径拍照识别:Apple Vision OCR + 文本模型 和 Qwen3-VL直接识别 - 添加预处理逻辑,优化Qwen3-VL对窄长区域图片的识别效果 - 在模型管理页面添加拍照识别引擎选择组件 - 提供用户界面选项,在两种识别方式间切换 style(ui): 优化输入框样式和颜色主题一致性 - 为指标快速表单添加浅色主题偏好 - 统一所有文本输入框的颜色样式(theme) - 创建EntryInputField组件,替换原有的单行输入+按钮模式 - 实现聊天框风格的条目输入,支持多行自适应和圆形发送按钮 fix(build): 修正Xcode项目配置中的重复框架搜索路径 - 清理project.pbxproj中重复的FRAMEWORK_SEARCH_PATHS配置 - 重新排列Swift桥接头文件配置确保正确引用 - 修复因路径配置重复导致的编译警告问题 test: 增加区域图片预处理和模型清单测试覆盖 - 添加RegionImageCropper.prepareForQwenVL的单元测试 - 验证宽而矮图片的放大和填充逻辑 - 更新ModelManifestTests中的字节数预期值以匹配新模型 - 修正OCRService中VNRecognizedTextObservation类型的处理 ```
This commit is contained in:
@@ -13,7 +13,7 @@ struct ModelManifestTests {
|
||||
}
|
||||
|
||||
@Test func llmTotalBytesMatchesManifest() {
|
||||
#expect(ModelManifest.totalBytes(for: .llm) == 1_749_079_691)
|
||||
#expect(ModelManifest.totalBytes(for: .llm) == 3_061_129_077)
|
||||
}
|
||||
|
||||
@Test func vlTotalBytesMatchesManifest() {
|
||||
@@ -62,8 +62,8 @@ struct ModelManifestTests {
|
||||
}
|
||||
|
||||
@Test func fileURLIsBaseSlashRepoSlashPath() {
|
||||
let file = ModelFile(path: "config.json", bytes: 3_113)
|
||||
let file = ModelFile(path: "config.json", bytes: 3_366)
|
||||
let url = ModelManifest.fileURL(for: .llm, file: file)
|
||||
#expect(url.absoluteString == "https://file.myv0.com/Qwen3.5-2B-4bit/config.json")
|
||||
#expect(url.absoluteString == "https://file.myv0.com/Qwen3.5-4B-4bit/config.json")
|
||||
}
|
||||
}
|
||||
|
||||
18
康康Tests/QuickRegionRecognitionEngineTests.swift
Normal file
18
康康Tests/QuickRegionRecognitionEngineTests.swift
Normal file
@@ -0,0 +1,18 @@
|
||||
import Testing
|
||||
@testable import 康康
|
||||
|
||||
struct QuickRegionRecognitionEngineTests {
|
||||
|
||||
@Test func defaultsToAppleVisionOCR() {
|
||||
#expect(QuickRegionRecognitionEngine.defaultValue == .appleVision)
|
||||
}
|
||||
|
||||
@Test func rawValuesAreStableForAppStorage() {
|
||||
#expect(QuickRegionRecognitionEngine.appleVision.rawValue == "appleVision")
|
||||
#expect(QuickRegionRecognitionEngine.qwenVL.rawValue == "qwenVL")
|
||||
}
|
||||
|
||||
@Test func unknownStoredValueFallsBackToDefault() {
|
||||
#expect(QuickRegionRecognitionEngine(storedValue: "missing") == .appleVision)
|
||||
}
|
||||
}
|
||||
@@ -112,4 +112,41 @@ final class RegionImageCropperTests: XCTestCase {
|
||||
imageFrame: CGRect(x: 0, y: 0, width: 100, height: 100)),
|
||||
.zero)
|
||||
}
|
||||
|
||||
/// Qwen3-VL 对宽而矮的局部小图更容易在 processor 缩放后丢字。
|
||||
/// 进入 VL 前应把短边放大并加白边,但不拉伸内容。
|
||||
func testPrepareForQwenVLUpscalesWideShortCropAndAddsPadding() {
|
||||
let image = solidImage(size: CGSize(width: 320, height: 80))
|
||||
|
||||
let prepared = RegionImageCropper.prepareForQwenVL(image)
|
||||
|
||||
XCTAssertGreaterThanOrEqual(prepared.size.height, 448)
|
||||
XCTAssertGreaterThan(prepared.size.width, 320)
|
||||
XCTAssertEqual(prepared.size.width / prepared.size.height,
|
||||
4.0,
|
||||
accuracy: 0.8,
|
||||
"预处理应大致保留宽条内容比例,只允许白边造成轻微变化")
|
||||
}
|
||||
|
||||
func testPrepareForQwenVLDoesNotEnlargePastLongEdgeLimit() {
|
||||
let image = solidImage(size: CGSize(width: 5000, height: 900))
|
||||
|
||||
let prepared = RegionImageCropper.prepareForQwenVL(image)
|
||||
|
||||
XCTAssertLessThanOrEqual(max(prepared.size.width, prepared.size.height), 2400 + 128)
|
||||
}
|
||||
|
||||
private func solidImage(size: CGSize) -> UIImage {
|
||||
let format = UIGraphicsImageRendererFormat.default()
|
||||
format.scale = 1
|
||||
return UIGraphicsImageRenderer(size: size, format: format).image { ctx in
|
||||
UIColor.white.setFill()
|
||||
ctx.fill(CGRect(origin: .zero, size: size))
|
||||
UIColor.black.setFill()
|
||||
ctx.fill(CGRect(x: size.width * 0.1,
|
||||
y: size.height * 0.35,
|
||||
width: size.width * 0.8,
|
||||
height: size.height * 0.3))
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user