ExternalVendorCode/lollms
1
0
Fork 0
mirror of https://github.com/ParisNeo/lollms.git synced 2025-04-15 22:46:35 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

upgraded

Browse Source
This commit is contained in:
Saifeddine ALOUI 2024-03-21 00:53:35 +01:00
parent f1faa98d9b
commit f98fa3949c
2 changed files with 4 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
lollms/services/xtts/lollms_xtts.py
View File

@ -29,7 +29,7 @@ from typing import List, Dict, Any
from ascii_colors import ASCIIColors, trace_exception
from lollms.paths import LollmsPaths
from lollms.utilities import git_pull, show_yes_no_dialog
from lollms.utilities import git_pull, show_yes_no_dialog, run_python_script_in_env
import subprocess
import platform
@ -155,19 +155,9 @@ class LollmsXTTS:
python_path = sys.executable
ASCIIColors.yellow("Loading XTTS ")
# Get the path to the parent directory, which should be the 'bin' directory
bin_dir = Path(python_path).parent.parent/"miniconda3/envs/xtts"
if bin_dir.exists():
python_path = Path(sys.executable).parent.parent/"miniconda3/envs/xtts/python"
command = f"{python_path} -m xtts_api_server -o {self.output_folder} -sf {self.voice_samples_path} -p {self.xtts_base_url.split(':')[-1].replace('/','')}"
ASCIIColors.cyan(command)
process = subprocess.Popen(command, stdout=subprocess.PIPE, shell=True)
else:
command = f"conda activate xtts && python -m xtts_api_server -o {self.output_folder} -sf {self.voice_samples_path} -p {self.xtts_base_url.split(':')[-1].replace('/','')}"
process = subprocess.Popen(command, stdout=subprocess.PIPE, shell=True)
process = run_python_script_in_env("xtts",f"{python_path} -m xtts_api_server -o {self.output_folder} -sf {self.voice_samples_path} -p {self.xtts_base_url.split(':')[-1].replace('/','')}", wait= False)
return process
def wait_for_service(self, max_retries = 150, show_warning=True):
url = f"{self.xtts_base_url}/languages"
# Adjust this value as needed

1
lollms/utilities.py
View File

@ -91,6 +91,7 @@ def run_python_script_in_env(env_name, script_path, cwd=None, wait=True):
process.wait()
#subprocess.Popen(f'conda activate {env_name} && {script_path}', shell=True, cwd=cwd)
#run_command(Commands.RUN, "-n", env_name, "python " + str(script_path), cwd=cwd)
return process
def run_script_in_env(env_name, script_path, cwd=None):
from conda.cli.python_api import run_command, Commands