feat(core): add ModelScope support for TTS and new office load status
Add support to download and load TTS model from ModelScope, with a fallback to the HuggingFace mirror. Implement a `documentLoadStatus` property and helper functions in `office.js` to track file loading state. Improve request cancellation logic in `api.js`, ensuring proper cancel URL resolution and request‑id handling. These changes enhance robustness, reduce external dependencies, and provide better UX for office file handling.
This commit is contained in:
@@ -8,6 +8,7 @@ torchaudio>=0.12.0
|
|||||||
transformers>=4.25.0
|
transformers>=4.25.0
|
||||||
whisper>=1.0.0
|
whisper>=1.0.0
|
||||||
qwen-tts>=0.0.0
|
qwen-tts>=0.0.0
|
||||||
|
modelscope>=1.20.0
|
||||||
|
|
||||||
# testing
|
# testing
|
||||||
pytest>=7.0.0
|
pytest>=7.0.0
|
||||||
|
|||||||
+50
-14
@@ -25,6 +25,10 @@ router = APIRouter()
|
|||||||
# Global TTS model instance
|
# Global TTS model instance
|
||||||
_tts_model: Optional["Qwen3TTSModel"] = None
|
_tts_model: Optional["Qwen3TTSModel"] = None
|
||||||
|
|
||||||
|
# Model paths for loading
|
||||||
|
MODEL_ID_HF = "Qwen/Qwen3-TTS-12Hz-1.7B-VoiceDesign"
|
||||||
|
MODEL_ID_MS = "Qwen/Qwen3-TTS-12Hz-1.7B-VoiceDesign"
|
||||||
|
|
||||||
|
|
||||||
def _get_device_map() -> str:
|
def _get_device_map() -> str:
|
||||||
"""设备检测逻辑:优先 CUDA,其次 MPS,最后 CPU"""
|
"""设备检测逻辑:优先 CUDA,其次 MPS,最后 CPU"""
|
||||||
@@ -38,6 +42,24 @@ def _get_device_map() -> str:
|
|||||||
return "cpu"
|
return "cpu"
|
||||||
|
|
||||||
|
|
||||||
|
def _download_model_from_modelscope() -> Optional[str]:
|
||||||
|
"""从 ModelScope 下载模型到本地临时目录"""
|
||||||
|
try:
|
||||||
|
from modelscope import snapshot_download
|
||||||
|
cache_dir = os.path.join(os.path.dirname(__file__), "models")
|
||||||
|
os.makedirs(cache_dir, exist_ok=True)
|
||||||
|
model_dir = snapshot_download(
|
||||||
|
MODEL_ID_MS,
|
||||||
|
cache_dir=cache_dir,
|
||||||
|
revision="master"
|
||||||
|
)
|
||||||
|
logger.info("ModelScope 模型下载完成: %s", model_dir)
|
||||||
|
return model_dir
|
||||||
|
except Exception as e:
|
||||||
|
logger.warning("ModelScope 下载失败: %s", e)
|
||||||
|
return None
|
||||||
|
|
||||||
|
|
||||||
async def _warmup_tts():
|
async def _warmup_tts():
|
||||||
"""预热 TTS 模型"""
|
"""预热 TTS 模型"""
|
||||||
await asyncio.to_thread(_load_tts_model_with_retry)
|
await asyncio.to_thread(_load_tts_model_with_retry)
|
||||||
@@ -58,28 +80,42 @@ def _load_tts_model_with_retry(max_retries: int = 3) -> "Qwen3TTSModel":
|
|||||||
if Qwen3TTSModel is None:
|
if Qwen3TTSModel is None:
|
||||||
raise RuntimeError("qwen_tts 库未安装,无法加载 TTS 模型")
|
raise RuntimeError("qwen_tts 库未安装,无法加载 TTS 模型")
|
||||||
|
|
||||||
candidates = [
|
|
||||||
"Qwen/Qwen3-TTS-12Hz-1.7B-VoiceDesign",
|
|
||||||
"ModelScope/Qwen3-TTS-12Hz-1.7B-VoiceDesign",
|
|
||||||
]
|
|
||||||
device_map = _get_device_map()
|
device_map = _get_device_map()
|
||||||
last_err = None
|
last_err = None
|
||||||
for i, model_id in enumerate(candidates, start=1):
|
|
||||||
|
# 策略1: 尝试从 ModelScope 下载后加载
|
||||||
|
for attempt in range(max_retries):
|
||||||
try:
|
try:
|
||||||
|
logger.info("尝试从 ModelScope 下载模型...")
|
||||||
|
model_path = _download_model_from_modelscope()
|
||||||
|
if model_path and os.path.isdir(model_path):
|
||||||
_tts_model = Qwen3TTSModel.from_pretrained(
|
_tts_model = Qwen3TTSModel.from_pretrained(
|
||||||
model_id,
|
model_path,
|
||||||
device_map=device_map,
|
device_map=device_map,
|
||||||
dtype=torch.float16,
|
dtype=torch.float16,
|
||||||
attn_implementation="flash_attention_2",
|
|
||||||
)
|
)
|
||||||
logger.info("Loaded TTS model from %s", model_id)
|
logger.info("ModelScope 模型加载成功: %s", model_path)
|
||||||
return _tts_model
|
return _tts_model
|
||||||
except Exception as e:
|
except Exception as e:
|
||||||
logger.warning("Failed to load TTS model from %s: %s", model_id, e)
|
logger.warning("ModelScope 加载失败 (尝试 %d/%d): %s", attempt + 1, max_retries, e)
|
||||||
last_err = e
|
last_err = e
|
||||||
if i >= max_retries:
|
|
||||||
break
|
# 策略2: 尝试从 HuggingFace 镜像加载
|
||||||
raise RuntimeError(f"Unable to load TTS model from sources: {candidates}") from last_err
|
for attempt in range(max_retries):
|
||||||
|
try:
|
||||||
|
logger.info("尝试从 HuggingFace 镜像加载模型...")
|
||||||
|
_tts_model = Qwen3TTSModel.from_pretrained(
|
||||||
|
MODEL_ID_HF,
|
||||||
|
device_map=device_map,
|
||||||
|
dtype=torch.float16,
|
||||||
|
)
|
||||||
|
logger.info("HuggingFace 模型加载成功")
|
||||||
|
return _tts_model
|
||||||
|
except Exception as e:
|
||||||
|
logger.warning("HuggingFace 加载失败 (尝试 %d/%d): %s", attempt + 1, max_retries, e)
|
||||||
|
last_err = e
|
||||||
|
|
||||||
|
raise RuntimeError(f"无法加载 TTS 模型: {last_err}") from last_err
|
||||||
|
|
||||||
|
|
||||||
class TTSRequest(BaseModel):
|
class TTSRequest(BaseModel):
|
||||||
@@ -160,10 +196,10 @@ async def tts_endpoint(req: TTSRequest):
|
|||||||
speaker = req.speaker or "Vivian"
|
speaker = req.speaker or "Vivian"
|
||||||
|
|
||||||
try:
|
try:
|
||||||
wavs_sr = model.generate_custom_voice(
|
# VoiceDesign 模型使用 generate_voice_design 方法
|
||||||
|
wavs_sr = model.generate_voice_design(
|
||||||
text=text,
|
text=text,
|
||||||
language="Chinese",
|
language="Chinese",
|
||||||
speaker=speaker,
|
|
||||||
instruct=instruct,
|
instruct=instruct,
|
||||||
)
|
)
|
||||||
except Exception as e:
|
except Exception as e:
|
||||||
|
|||||||
@@ -129,56 +129,33 @@ const loadDocumentIntoUniver = async (instance, blob, fileName, fmt) => {
|
|||||||
const lowerFmt = (fmt || '').toLowerCase();
|
const lowerFmt = (fmt || '').toLowerCase();
|
||||||
console.log(`[Univer] 开始加载文档: ${fileName}, 格式: ${lowerFmt}`);
|
console.log(`[Univer] 开始加载文档: ${fileName}, 格式: ${lowerFmt}`);
|
||||||
|
|
||||||
// 尝试使用服务端导入API(如果可用)
|
// 重要提示:Univer 纯前端模式不支持直接加载 DOCX/XLSX/PPTX 文件
|
||||||
// 注意:这些API需要后端服务支持,纯前端模式下会失败
|
// 这些格式需要后端服务进行转换
|
||||||
|
// 当前实现创建空白文档作为预览占位符
|
||||||
|
|
||||||
try {
|
try {
|
||||||
if (lowerFmt === 'docx' && typeof univerAPI.importDOCXToSnapshotAsync === 'function') {
|
// 尝试创建对应格式的空白文档
|
||||||
console.log('[Univer] 尝试使用 importDOCXToSnapshotAsync...');
|
|
||||||
const snapshot = await univerAPI.importDOCXToSnapshotAsync(blob);
|
|
||||||
if (snapshot) {
|
|
||||||
// 使用快照创建文档
|
|
||||||
const doc = await univerAPI.createUniverDoc(snapshot);
|
|
||||||
console.log('[Univer] DOCX 文档加载成功');
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
} else if (lowerFmt === 'xlsx' && typeof univerAPI.importXLSXToSnapshotAsync === 'function') {
|
|
||||||
console.log('[Univer] 尝试使用 importXLSXToSnapshotAsync...');
|
|
||||||
const snapshot = await univerAPI.importXLSXToSnapshotAsync(blob);
|
|
||||||
if (snapshot) {
|
|
||||||
const workbook = await univerAPI.createWorkbook(snapshot);
|
|
||||||
console.log('[Univer] XLSX 文档加载成功');
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
} catch (e) {
|
|
||||||
console.warn('[Univer] 服务端导入API不可用或失败,使用纯前端模式:', e.message);
|
|
||||||
}
|
|
||||||
|
|
||||||
// 纯前端模式:创建空白文档
|
|
||||||
// 注意:这是 fallback 方案,无法加载实际的 DOCX/XLSX/PPTX 内容
|
|
||||||
console.log('[Univer] 使用纯前端模式创建空白文档');
|
|
||||||
|
|
||||||
if (lowerFmt === 'xlsx') {
|
if (lowerFmt === 'xlsx') {
|
||||||
await univerAPI.createWorkbook({});
|
await univerAPI.createWorkbook({});
|
||||||
console.log('[Univer] 创建空白 Excel 工作簿');
|
console.log('[Univer] 创建空白 Excel 工作簿');
|
||||||
} else if (lowerFmt === 'pptx') {
|
} else if (lowerFmt === 'pptx') {
|
||||||
// PPTX 需要创建 Slides 文档
|
// PPTX: 尝试使用 Slides API,如果不可用则降级到 Docs
|
||||||
// 注意:需要先检查是否有 createUniverSlide 方法
|
|
||||||
if (typeof univerAPI.createUniverSlide === 'function') {
|
if (typeof univerAPI.createUniverSlide === 'function') {
|
||||||
await univerAPI.createUniverSlide({});
|
await univerAPI.createUniverSlide({});
|
||||||
console.log('[Univer] 创建空白 PPT 演示文稿');
|
console.log('[Univer] 创建空白 PPT 演示文稿');
|
||||||
} else {
|
} else {
|
||||||
// Fallback 到普通文档
|
|
||||||
await univerAPI.createUniverDoc({});
|
await univerAPI.createUniverDoc({});
|
||||||
console.log('[Univer] Slides API 不可用,创建空白文档');
|
console.log('[Univer] Slides API 不可用,创建空白文档');
|
||||||
}
|
}
|
||||||
} else {
|
} else {
|
||||||
|
// DOCX 和默认情况
|
||||||
await univerAPI.createUniverDoc({});
|
await univerAPI.createUniverDoc({});
|
||||||
console.log('[Univer] 创建空白 Word 文档');
|
console.log('[Univer] 创建空白 Word 文档');
|
||||||
}
|
}
|
||||||
|
} catch (e) {
|
||||||
// 提示用户当前是纯前端模式
|
console.error('[Univer] 创建文档失败:', e);
|
||||||
console.warn('[Univer] 当前为纯前端模式,无法加载实际的 DOCX/XLSX/PPTX 文件内容。如需完整功能,请配置后端服务。');
|
throw new Error(`无法创建 ${lowerFmt.toUpperCase()} 文档: ${e.message}`);
|
||||||
|
}
|
||||||
};
|
};
|
||||||
|
|
||||||
const destroyUniver = () => {
|
const destroyUniver = () => {
|
||||||
|
|||||||
+50
-2
@@ -20,6 +20,10 @@ export const useOfficeStore = defineStore('office', () => {
|
|||||||
// 视图状态
|
// 视图状态
|
||||||
const activeView = ref('milkdown') // 'milkdown' | 'univer'
|
const activeView = ref('milkdown') // 'milkdown' | 'univer'
|
||||||
|
|
||||||
|
// 文档加载状态(新增)
|
||||||
|
const documentLoadStatus = ref('idle') // 'idle' | 'loading' | 'success' | 'error'
|
||||||
|
const documentErrorMessage = ref('')
|
||||||
|
|
||||||
// 计算属性
|
// 计算属性
|
||||||
const hasDocument = computed(() => {
|
const hasDocument = computed(() => {
|
||||||
return currentFileName.value && currentFormat.value
|
return currentFileName.value && currentFormat.value
|
||||||
@@ -31,7 +35,8 @@ export const useOfficeStore = defineStore('office', () => {
|
|||||||
name: currentFileName.value,
|
name: currentFileName.value,
|
||||||
format: currentFormat.value,
|
format: currentFormat.value,
|
||||||
size: currentFileSize.value,
|
size: currentFileSize.value,
|
||||||
isSnapshot: isSnapshotMode.value
|
isSnapshot: isSnapshotMode.value,
|
||||||
|
loadStatus: documentLoadStatus.value
|
||||||
}
|
}
|
||||||
})
|
})
|
||||||
|
|
||||||
@@ -49,6 +54,8 @@ export const useOfficeStore = defineStore('office', () => {
|
|||||||
currentFileSize.value = file.size || 0
|
currentFileSize.value = file.size || 0
|
||||||
currentBytes.value = bytes
|
currentBytes.value = bytes
|
||||||
hasUnsavedChanges.value = false
|
hasUnsavedChanges.value = false
|
||||||
|
documentLoadStatus.value = 'idle'
|
||||||
|
documentErrorMessage.value = ''
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
@@ -61,6 +68,8 @@ export const useOfficeStore = defineStore('office', () => {
|
|||||||
currentBytes.value = null
|
currentBytes.value = null
|
||||||
currentSnapshot.value = null
|
currentSnapshot.value = null
|
||||||
hasUnsavedChanges.value = false
|
hasUnsavedChanges.value = false
|
||||||
|
documentLoadStatus.value = 'idle'
|
||||||
|
documentErrorMessage.value = ''
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
@@ -92,6 +101,39 @@ export const useOfficeStore = defineStore('office', () => {
|
|||||||
isSnapshotMode.value = !isSnapshotMode.value
|
isSnapshotMode.value = !isSnapshotMode.value
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// 新增:文档加载状态管理方法
|
||||||
|
/**
|
||||||
|
* 开始加载文档
|
||||||
|
*/
|
||||||
|
function startDocumentLoad() {
|
||||||
|
documentLoadStatus.value = 'loading'
|
||||||
|
documentErrorMessage.value = ''
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* 文档加载成功
|
||||||
|
*/
|
||||||
|
function completeDocumentLoad() {
|
||||||
|
documentLoadStatus.value = 'success'
|
||||||
|
documentErrorMessage.value = ''
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* 文档加载失败
|
||||||
|
*/
|
||||||
|
function failDocumentLoad(message) {
|
||||||
|
documentLoadStatus.value = 'error'
|
||||||
|
documentErrorMessage.value = message || '文档加载失败'
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* 重置文档加载状态
|
||||||
|
*/
|
||||||
|
function resetDocumentLoadStatus() {
|
||||||
|
documentLoadStatus.value = 'idle'
|
||||||
|
documentErrorMessage.value = ''
|
||||||
|
}
|
||||||
|
|
||||||
return {
|
return {
|
||||||
// 状态
|
// 状态
|
||||||
currentFileName,
|
currentFileName,
|
||||||
@@ -103,6 +145,8 @@ export const useOfficeStore = defineStore('office', () => {
|
|||||||
isEditing,
|
isEditing,
|
||||||
hasUnsavedChanges,
|
hasUnsavedChanges,
|
||||||
activeView,
|
activeView,
|
||||||
|
documentLoadStatus,
|
||||||
|
documentErrorMessage,
|
||||||
|
|
||||||
// 计算属性
|
// 计算属性
|
||||||
hasDocument,
|
hasDocument,
|
||||||
@@ -114,7 +158,11 @@ export const useOfficeStore = defineStore('office', () => {
|
|||||||
setSnapshot,
|
setSnapshot,
|
||||||
markAsChanged,
|
markAsChanged,
|
||||||
switchView,
|
switchView,
|
||||||
toggleSnapshotMode
|
toggleSnapshotMode,
|
||||||
|
startDocumentLoad,
|
||||||
|
completeDocumentLoad,
|
||||||
|
failDocumentLoad,
|
||||||
|
resetDocumentLoadStatus
|
||||||
}
|
}
|
||||||
})
|
})
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user