minicpmo-utils 0.1.0__py3-none-any.whl → 0.1.1__py3-none-any.whl

cosyvoice/cli/cosyvoice.py

@@ -16,7 +16,6 @@ import time
 from typing import Generator
 from tqdm import tqdm
 from hyperpyyaml import load_hyperpyyaml
-from modelscope import snapshot_download
 import torch
 from cosyvoice.cli.frontend import CosyVoiceFrontEnd
 from cosyvoice.cli.model import CosyVoiceModel, CosyVoice2Model
@@ -30,8 +29,6 @@ class CosyVoice:
         self.instruct = True if '-Instruct' in model_dir else False
         self.model_dir = model_dir
         self.fp16 = fp16
-        if not os.path.exists(model_dir):
-            model_dir = snapshot_download(model_dir)
         hyper_yaml_path = '{}/cosyvoice.yaml'.format(model_dir)
         if not os.path.exists(hyper_yaml_path):
             raise ValueError('{} not found!'.format(hyper_yaml_path))
@@ -154,8 +151,6 @@ class CosyVoice2(CosyVoice):
         self.instruct = True if '-Instruct' in model_dir else False
         self.model_dir = model_dir
         self.fp16 = fp16
-        if not os.path.exists(model_dir):
-            model_dir = snapshot_download(model_dir)
         
         if config_path is None:
             config_path = f'{model_dir}/cosyvoice2.yaml'

{minicpmo_utils-0.1.0.dist-info → minicpmo_utils-0.1.1.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: minicpmo-utils
-Version: 0.1.0
+Version: 0.1.1
 Summary: Unified utilities package for MiniCPM-o: includes cosyvoice + stepaudio2 and extensible utils.
 Author: MiniCPM-o Utils Maintainers
 License: Apache-2.0
@@ -14,23 +14,29 @@ Classifier: Programming Language :: Python :: 3.11
 Classifier: Programming Language :: Python :: 3.12
 Requires-Python: >=3.10
 Description-Content-Type: text/markdown
-Requires-Dist: torch>=2.3.0
-Requires-Dist: torchaudio>=2.3.0
-Requires-Dist: transformers>=4.49.0
 Requires-Dist: numpy
-Requires-Dist: hyperpyyaml
-Requires-Dist: modelscope
-Requires-Dist: openai-whisper
-Requires-Dist: tqdm
-Requires-Dist: tiktoken
-Requires-Dist: inflect
-Requires-Dist: omegaconf
-Requires-Dist: einops
+Requires-Dist: pillow
 Requires-Dist: librosa
-Requires-Dist: onnxruntime>=1.18.0
-Requires-Dist: diffusers
+Requires-Dist: decord
+Provides-Extra: tts
+Requires-Dist: torch>=2.3.0; extra == "tts"
+Requires-Dist: torchaudio>=2.3.0; extra == "tts"
+Requires-Dist: transformers>=4.49.0; extra == "tts"
+Requires-Dist: hyperpyyaml; extra == "tts"
+Requires-Dist: openai-whisper; extra == "tts"
+Requires-Dist: tqdm; extra == "tts"
+Requires-Dist: tiktoken; extra == "tts"
+Requires-Dist: inflect; extra == "tts"
+Requires-Dist: omegaconf; extra == "tts"
+Requires-Dist: einops; extra == "tts"
+Provides-Extra: streaming
+Requires-Dist: minicpmo-utils[tts]; extra == "streaming"
+Requires-Dist: onnxruntime>=1.18.0; extra == "streaming"
+Requires-Dist: diffusers; extra == "streaming"
 Provides-Extra: gpu
 Requires-Dist: onnxruntime-gpu>=1.18.0; sys_platform == "linux" and extra == "gpu"
+Provides-Extra: all
+Requires-Dist: minicpmo-utils[gpu,streaming,tts]; extra == "all"
 
 ## minicpmo-utils
 
@@ -38,17 +44,32 @@ Requires-Dist: onnxruntime-gpu>=1.18.0; sys_platform == "linux" and extra == "gp
 
 ### 安装方式
 
-- 从源码本地安装（开发态，可编辑）：
+- 从源码本地安装（开发态，可编辑，默认只装公共依赖）：
 ```bash
 cd minicpmo-utils
 pip install -e .
 ```
 
+- 如果只想安装 cosyvoice 相关依赖（TTS）：
+```bash
+pip install -e .[tts]
+```
+
+- 如果只想安装 stepaudio2 / streaming 相关依赖：
+```bash
+pip install -e .[streaming]
+```
+
+- 同时安装 cosyvoice + stepaudio2 相关依赖：
+```bash
+pip install -e .[tts,streaming]
+```
+
 - 构建并安装 wheel（推荐分发）：
 ```bash
 cd minicpmo-utils
 python -m build        # 生成 dist/*.whl
-pip install dist/minicpmo_utils-0.1.0-py3-none-any.whl
+pip install \"dist/minicpmo_utils-0.1.0-py3-none-any.whl[tts,streaming]\"
 ```
 
 ### 导入方式

{minicpmo_utils-0.1.0.dist-info → minicpmo_utils-0.1.1.dist-info}/RECORD

@@ -5,7 +5,7 @@ cosyvoice/bin/export_onnx.py,sha256=nUHWmNTkGMowvHuXI92OR7R6v1doVsDxvxEzP5GWiQk,
 cosyvoice/bin/inference_deprecated.py,sha256=d4x-8eER00VwuOEHnObd9kd7cOriv_xbXZOAEXG60fk,6126
 cosyvoice/bin/train.py,sha256=1bpuU0d8fwc5ygrY65FbT9kfWpdZkfsXX83NBkNAMLc,8071
 cosyvoice/cli/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-cosyvoice/cli/cosyvoice.py,sha256=WCNOWg-_CJ-y9HDxL1tFrCirnB2a030jyN5EaELke6s,12808
+cosyvoice/cli/cosyvoice.py,sha256=8PSF5BY30zOwz7yqDNEggryjBqJB-FFM2SKADSYQ8-8,12577
 cosyvoice/cli/frontend.py,sha256=8z3yYsmjTpi8olTD2DNooPuW0nFnwDKSJIzPETvqv4c,13827
 cosyvoice/cli/model.py,sha256=X3Za8Ak5LEeRUldLalztoSnu6UsCP9WcYQFvu9MDacQ,24008
 cosyvoice/dataset/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
@@ -96,7 +96,7 @@ s3tokenizer/assets/BAC009S0764W0122.wav,sha256=V2DHrOCSOkmfYF03MBHHqvZY4wSgmZpJP
 s3tokenizer/assets/mel_filters.npz,sha256=dFCucHI6XvnTQePO5ijHywF382zkLES37SvzMl8PbUw,4271
 stepaudio2/__init__.py,sha256=ahfLETm7fp_A320ERK6j2xT4nTyecy8OA8Z-syVLuQQ,1547
 stepaudio2/stepaudio2.py,sha256=hf1EZl5odF8wFqs0VqC-B_DBioHrfpzWgZN501o1-YA,9265
-stepaudio2/token2wav.py,sha256=eAhDCCXjf9R7F5TsNfbNP5Se256Kqq9gKIrKFh0I5qE,11642
+stepaudio2/token2wav.py,sha256=BZjCWtmIP3XW1coeknbAOtv6A1eilEIWQZjqaTGgbvs,11616
 stepaudio2/utils.py,sha256=p83TqxnLAu2OyAq3eCnESlkbU9kkNdH5Tnh1Da-J7Fg,3384
 stepaudio2/cosyvoice2/__init__.py,sha256=VFv7gYSAXPuP6d6arx-EqTy8W1WbPM4lGmdmPENMWT8,44
 stepaudio2/cosyvoice2/flow/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
@@ -142,7 +142,7 @@ stepaudio2/flashcosyvoice/utils/audio.py,sha256=afxVAIkV_QliIzAwyOW1QygyjZxBUXjL
 stepaudio2/flashcosyvoice/utils/context.py,sha256=y_u92r100Wp7xjs4tQd70eB00iaqUOa92qkb5sw-8ho,821
 stepaudio2/flashcosyvoice/utils/loader.py,sha256=ETQwg7E6HxndH-hWSwTcSg2Q2MWrPDTEZtb2ebZaxS0,6030
 stepaudio2/flashcosyvoice/utils/memory.py,sha256=ciip3CEUfiSGe6qOFOfsYsGi6yYFcNcZVoAjnABVp28,597
-minicpmo_utils-0.1.0.dist-info/METADATA,sha256=dVIxQpW56luyHDeDXMrGMnyKNgUo9VBEo61Zi1a5YCA,2120
-minicpmo_utils-0.1.0.dist-info/WHEEL,sha256=wUyA8OaulRlbfwMtmQsvNngGrxQHAvkKcvRmdizlJi0,92
-minicpmo_utils-0.1.0.dist-info/top_level.txt,sha256=yIeAnGCB_ihapVKakC0wqRtAwCjezcDPCC-z6Vjlt0s,49
-minicpmo_utils-0.1.0.dist-info/RECORD,,
+minicpmo_utils-0.1.1.dist-info/METADATA,sha256=yE6QDqsXo1CD7aj13bEidVx1j9fM0w1GL4JLTIHmxpw,2867
+minicpmo_utils-0.1.1.dist-info/WHEEL,sha256=wUyA8OaulRlbfwMtmQsvNngGrxQHAvkKcvRmdizlJi0,92
+minicpmo_utils-0.1.1.dist-info/top_level.txt,sha256=yIeAnGCB_ihapVKakC0wqRtAwCjezcDPCC-z6Vjlt0s,49
+minicpmo_utils-0.1.1.dist-info/RECORD,,

stepaudio2/token2wav.py

@@ -7,7 +7,6 @@ import torchaudio
 import s3tokenizer
 import onnxruntime
 import numpy as np
-from copy import deepcopy
 
 import torchaudio.compliance.kaldi as kaldi
 from stepaudio2.flashcosyvoice.modules.hifigan import HiFTGenerator