Fix: asset download models

Author: jianchang512

.gitignore

@@ -21,4 +21,5 @@ poetry.lock
 docs
 static/wavs/*
 examples
-ffmpeg/ffmpeg.exe
+ffmpeg/ffmpeg.exe
+asset/

ChatTTS/utils/dl.py

@@ -130,12 +130,14 @@ def download_all_assets(tmpdir: str, version="0.2.6"):
         suffix = "zip" if is_win else "tar.gz"
         RVCMD_URL = BASE_URL + f"v{version}/rvcmd_{system_type}_{architecture}.{suffix}"
         cmdfile = os.path.join(tmpdir, "rvcmd")
+        print(f'{RVCMD_URL=},{tmpdir=}')
         if is_win:
             download_and_extract_zip(RVCMD_URL, tmpdir)
             cmdfile += ".exe"
         else:
             download_and_extract_tar_gz(RVCMD_URL, tmpdir)
             os.chmod(cmdfile, 0o755)
+        print(f'{cmdfile=}')
         subprocess.run([cmdfile, "-notui", "-w", "0", "assets/chtts"])
     except Exception:
         BASE_URL = "https://raw.gitcode.com/u011570312/RVC-Models-Downloader/assets/"

app.py

@@ -50,41 +50,12 @@
     print('请先安装ffmpeg')
     time.sleep(60)
     exit()    
-CHATTTS_DIR= MODEL_DIR+'/pzc163/chatTTS'
-# 默认从 modelscope 下载模型
-# 如果已存在则不再下载和检测更新，便于离线内网使用
-if not os.path.exists(CHATTTS_DIR+"/config/path.yaml") and not os.path.exists(MODEL_DIR+'/models--2Noise--ChatTTS'):
-    # 可连接modelscope
-    if modelscope_status():
-        print('modelscope ok')
-        snapshot_download('pzc163/chatTTS',cache_dir=MODEL_DIR)
-    else:
-        print('from huggingface')
-        CHATTTS_DIR=MODEL_DIR+'/models--2Noise--ChatTTS'
-        import huggingface_hub
-        os.environ['HF_HUB_CACHE']=MODEL_DIR
-        os.environ['HF_ASSETS_CACHE']=MODEL_DIR
-        huggingface_hub.snapshot_download(cache_dir=MODEL_DIR,repo_id="2Noise/ChatTTS", allow_patterns=["*.pt", "*.yaml"])
-  
+
 
 chat = ChatTTS.Chat()
 device=os.getenv('device','default')
-chat.load(source="custom",custom_path=CHATTTS_DIR, device=None if device=='default' else device,compile=True if os.getenv('compile','true').lower()!='false' else False)
-
-
-
-
 
-# 如果希望从 huggingface.co下载模型，将以下注释删掉。将上方3行内容注释掉
-# 如果已存在则不再下载和检测更新，便于离线内网使用
-#CHATTTS_DIR=MODEL_DIR+'/models--2Noise--ChatTTS'
-#if not os.path.exists(CHATTTS_DIR):
-    #import huggingface_hub
-    #os.environ['HF_HUB_CACHE']=MODEL_DIR
-    #os.environ['HF_ASSETS_CACHE']=MODEL_DIR
-    #huggingface_hub.snapshot_download(cache_dir=MODEL_DIR,repo_id="2Noise/ChatTTS", allow_patterns=["*.pt", "*.yaml"])
-    # chat = ChatTTS.Chat()
-    # chat.load(source="local",local_path=CHATTTS_DIR, compile=True if os.getenv('compile','true').lower()!='false' else False)
+chat.load(source="local" if not os.path.exists(MODEL_DIR+"/DVAE_full.pt") else 'custom',custom_path=ROOT_DIR, device=None if device=='default' else device,compile=True if os.getenv('compile','true').lower()!='false' else False)
 
 
 # 配置日志

speaker/seed_2193_restored_emb.pt

@@ -1 +1 @@
-VERSION='0.99'
+VERSION='1.0'

uilib/__init__.py

@@ -12,7 +12,7 @@ def get_executable_path():
 
 ROOT_DIR=get_executable_path()
 
-MODEL_DIR_PATH=Path(ROOT_DIR+"/models")
+MODEL_DIR_PATH=Path(ROOT_DIR+"/asset")
 MODEL_DIR_PATH.mkdir(parents=True, exist_ok=True)
 MODEL_DIR=MODEL_DIR_PATH.as_posix()