Fixed compatibility to load checkpoint trained by original GPT_SoVITS repo, added .gitignore and removed *.pyc files

.gitignore

@@ -0,0 +1,160 @@
+# Byte-compiled / optimized / DLL files
+__pycache__/
+*.py[cod]
+*$py.class
+
+# C extensions
+*.so
+
+# Distribution / packaging
+.Python
+build/
+develop-eggs/
+dist/
+downloads/
+eggs/
+.eggs/
+lib/
+lib64/
+parts/
+sdist/
+var/
+wheels/
+share/python-wheels/
+*.egg-info/
+.installed.cfg
+*.egg
+MANIFEST
+
+# PyInstaller
+#  Usually these files are written by a python script from a template
+#  before PyInstaller builds the exe, so as to inject date/other infos into it.
+*.manifest
+*.spec
+
+# Installer logs
+pip-log.txt
+pip-delete-this-directory.txt
+
+# Unit test / coverage reports
+htmlcov/
+.tox/
+.nox/
+.coverage
+.coverage.*
+.cache
+nosetests.xml
+coverage.xml
+*.cover
+*.py,cover
+.hypothesis/
+.pytest_cache/
+cover/
+
+# Translations
+*.mo
+*.pot
+
+# Django stuff:
+*.log
+local_settings.py
+db.sqlite3
+db.sqlite3-journal
+
+# Flask stuff:
+instance/
+.webassets-cache
+
+# Scrapy stuff:
+.scrapy
+
+# Sphinx documentation
+docs/_build/
+
+# PyBuilder
+.pybuilder/
+target/
+
+# Jupyter Notebook
+.ipynb_checkpoints
+
+# IPython
+profile_default/
+ipython_config.py
+
+# pyenv
+#   For a library or package, you might want to ignore these files since the code is
+#   intended to run in multiple environments; otherwise, check them in:
+# .python-version
+
+# pipenv
+#   According to pypa/pipenv#598, it is recommended to include Pipfile.lock in version control.
+#   However, in case of collaboration, if having platform-specific dependencies or dependencies
+#   having no cross-platform support, pipenv may install dependencies that don't work, or not
+#   install all needed dependencies.
+#Pipfile.lock
+
+# poetry
+#   Similar to Pipfile.lock, it is generally recommended to include poetry.lock in version control.
+#   This is especially recommended for binary packages to ensure reproducibility, and is more
+#   commonly ignored for libraries.
+#   https://python-poetry.org/docs/basic-usage/#commit-your-poetrylock-file-to-version-control
+#poetry.lock
+
+# pdm
+#   Similar to Pipfile.lock, it is generally recommended to include pdm.lock in version control.
+#pdm.lock
+#   pdm stores project-wide configurations in .pdm.toml, but it is recommended to not include it
+#   in version control.
+#   https://pdm.fming.dev/#use-with-ide
+.pdm.toml
+
+# PEP 582; used by e.g. github.com/David-OConnor/pyflow and github.com/pdm-project/pdm
+__pypackages__/
+
+# Celery stuff
+celerybeat-schedule
+celerybeat.pid
+
+# SageMath parsed files
+*.sage.py
+
+# Environments
+.env
+.venv
+env/
+venv/
+ENV/
+env.bak/
+venv.bak/
+
+# Spyder project settings
+.spyderproject
+.spyproject
+
+# Rope project settings
+.ropeproject
+
+# mkdocs documentation
+/site
+
+# mypy
+.mypy_cache/
+.dmypy.json
+dmypy.json
+
+# Pyre type checker
+.pyre/
+
+# pytype static type analyzer
+.pytype/
+
+# Cython debug symbols
+cython_debug/
+
+# PyCharm
+#  JetBrains specific template is maintained in a separate JetBrains.gitignore that can
+#  be found at https://github.com/github/gitignore/blob/main/Global/JetBrains.gitignore
+#  and can be added to the global gitignore or merged into this file.  For a more nuclear
+#  option (not recommended) you can uncomment the following to ignore the entire idea folder.
+#.idea/

inference.py

@@ -29,11 +29,10 @@
 
 from GPT_SoVITS.module.models import SynthesizerTrn
 from GPT_SoVITS.AR.models.t2s_lightning_module import Text2SemanticLightningModule
+import GPT_SoVITS.utils as utils
 
 i18n = I18nAuto()
 
-
-
 dict_language = {
     i18n("中文"): "all_zh",#全部按中文识别
     i18n("英文"): "en",#全部按英文识别#######不变
@@ -74,7 +73,13 @@ def __delattr__(self, item):
 
 def change_sovits_weights(sovits_path):
     global vq_model, hps
+    # Patch GPT_SoVITS.utils.HParams to be pickable
+    # because it conflicts with utils.py in ComfyUI
+    comfyui_utils = sys.modules['utils']
+    sys.modules['utils'] = utils
     dict_s2 = torch.load(sovits_path, map_location="cpu")
+    # Restore patch for utils
+    sys.modules['utils'] = comfyui_utils
     hps = dict_s2["config"]
     hps = DictToAttrRecursive(hps)
     hps.model.semantic_frame_rate = "25hz"

nodes.py

@@ -72,6 +72,9 @@ def INPUT_TYPES(s):
                          "step": 0.05,
                          "display": "slider"
                      }),
+                     "use_srt":("BOOLEAN",{
+                         "default": False
+                     })
                     }
                 }
     CATEGORY = "AIFSH_GPT_SOVITS"
@@ -82,14 +85,18 @@ def INPUT_TYPES(s):
 
     def get_tts_wav(self,renfer_audio,refer_srt,refer_language,
             text,text_language,gpt_weight,sovits_weight,
-            how_to_cut,top_k,top_p,temperature):
+            how_to_cut,top_k,top_p,temperature,use_srt):
 
-        with open(refer_srt, 'r', encoding="utf-8") as file:
-            file_content = file.read()
         prompt_language = dict_language[refer_language]
-        dot_ = "。" if 'zh' in prompt_language else '.'
-        prompt_text = f'{dot_}'.join([sub.content for sub in list(SrtPare(file_content))])
-        print(f"prompt_text:{prompt_text}")
+
+        prompt_text = None
+        if use_srt:
+            with open(refer_srt, 'r', encoding="utf-8") as file:
+                file_content = file.read()
+            dot_ = "。" if 'zh' in prompt_language else '.'
+            prompt_text = f'{dot_}'.join([sub.content for sub in list(SrtPare(file_content))])
+            print(f"prompt_text:{prompt_text}")
+
         outfile = os.path.join(out_path, f"{ttime()}_gpt_sovits_tts.wav")
         gpt_weight = os.path.join(GPT_weight_root, gpt_weight)
         sovits_weight = os.path.join(SoVITS_weight_root, sovits_weight)