diff --git a/lollms_core b/lollms_core index fbac0b87..1cd958f5 160000 --- a/lollms_core +++ b/lollms_core @@ -1 +1 @@ -Subproject commit fbac0b87312d153f7bc535867979b940f57c37ec +Subproject commit 1cd958f51153caab112991e8d49cd480fd81edf1 diff --git a/scripts/python/models_zoo b/scripts/python/models_zoo deleted file mode 160000 index 8ca6f513..00000000 --- a/scripts/python/models_zoo +++ /dev/null @@ -1 +0,0 @@ -Subproject commit 8ca6f513073eaea1db4bcd09c8b41e9f8abe2cc2 diff --git a/scripts/python/sd_server.py b/scripts/python/sd_server.py new file mode 100644 index 00000000..923f6948 --- /dev/null +++ b/scripts/python/sd_server.py @@ -0,0 +1,27 @@ +from lollms.paths import LollmsPaths +from pathlib import Path +from ascii_colors import ASCIIColors +import subprocess + +global_path = Path(__file__).parent.parent.parent/"global_paths_cfg.yaml" +ASCIIColors.yellow(f"global_path: {global_path}") +lollms_paths = LollmsPaths(global_path) +shared_folder = lollms_paths.personal_path/"shared" +sd_folder = shared_folder / "auto_sd" +output_dir = lollms_paths.personal_path / "outputs/sd" +output_dir.mkdir(parents=True, exist_ok=True) +script_path = sd_folder / "lollms_sd.bat" +output_folder = lollms_paths.personal_outputs_path/"audio_out" + +ASCIIColors.red(" ") +ASCIIColors.red(" __ _____ __ __ _____ _____ _____ ____ ") +ASCIIColors.red("| | | | | | | | | __| | __| \ ") +ASCIIColors.red("| |__| | | |__| |__| | | |__ | |__ | | |") +ASCIIColors.red("|_____|_____|_____|_____|_|_|_|_____|_____|_____|____/ ") +ASCIIColors.red(" |_____| ") + +ASCIIColors.red(" Forked from Auto1111's Stable diffusion api") +ASCIIColors.red(" Integration in lollms by ParisNeo using mix1009's sdwebuiapi ") + + +subprocess.Popen(str(script_path) +" --share", cwd=sd_folder) \ No newline at end of file diff --git a/scripts/python/xtts_start.py b/scripts/python/xtts_start.py index 776468e7..ea1059db 100644 --- a/scripts/python/xtts_start.py +++ b/scripts/python/xtts_start.py @@ -7,4 +7,15 @@ global_path = Path(__file__).parent.parent.parent/"global_paths_cfg.yaml" ASCIIColors.yellow(f"global_path: {global_path}") lollms_paths = LollmsPaths(global_path) output_folder = lollms_paths.personal_outputs_path/"audio_out" + +ASCIIColors.red(".____ ________ .____ .____ _____ _________ ____ __________________________________ ") +ASCIIColors.red("| | \_____ \ | | | | / \ / _____/ \ \/ /\__ ___/\__ ___/ _____/ ") +ASCIIColors.red("| | / | \| | | | / \ / \ \_____ \ ______ \ / | | | | \_____ \ ") +ASCIIColors.red("| |___/ | \ |___| |___/ Y \/ \ /_____/ / \ | | | | / \ ") +ASCIIColors.red("|_______ \_______ /_______ \_______ \____|__ /_______ / /___/\ \ |____| |____| /_______ / ") +ASCIIColors.red(" \/ \/ \/ \/ \/ \/ \_/ \/ ") + +ASCIIColors.red(" Forked from daswer123's XTTS server") +ASCIIColors.red(" Integration in lollms by ParisNeo using daswer123's webapi ") + subprocess.Popen(["python", "-m", "xtts_api_server", "-o", f"{output_folder}", "-sf", f"{lollms_paths.custom_voices_path}"]) \ No newline at end of file diff --git a/scripts/windows/win_install.bat b/scripts/windows/win_install.bat index 32e51b51..65f6549f 100644 --- a/scripts/windows/win_install.bat +++ b/scripts/windows/win_install.bat @@ -34,15 +34,6 @@ echo " \:\__\ \::/ / \:\__\ \:\__\ /:/ / \::/ / " echo " \/__/ \/__/ \/__/ \/__/ \/__/ \/__/ " echo By ParisNeo -:retry -echo Please specify if you want to use a GPU or CPU. -echo *Note* that only NVidea GPUs (cuda) or AMD GPUs (rocm) are supported. -echo A) Enable cuda GPU -echo B) Enable ROCm compatible GPU (AMD and other GPUs) (NOT SUPPORTED UNDER WINDOWS) -echo C) Run CPU mode -set /p "gpuchoice=Input> " -set gpuchoice=%gpuchoice:~0,1% - @rem better isolation for virtual environment SET "CONDA_SHLVL=" SET PYTHONNOUSERSITE=1 @@ -86,33 +77,32 @@ if not exist "%INSTALL_ENV_DIR%\python.exe" ( echo. && echo Conda environment is @rem activate installer env call conda activate "%INSTALL_ENV_DIR%" || ( echo. && echo Conda environment activation failed. && goto end ) + + @rem clone the repository if exist lollms-webui\ ( cd lollms-webui git pull + git submodule update --init --recursive + cd lollms-core + pip install -e . + cd .. + cd utilities/safe_store + pip install -e . + cd ../.. ) else ( - git clone https://github.com/ParisNeo/lollms-webui.git - cd lollms-webui + git clone --depth 1 --recurse-submodules https://github.com/ParisNeo/lollms-webui.git + git submodule update --init --recursive + pause + cd lollms-webui/lollms-core + pip install -e . + cd .. + cd utilities/safe_store + pip install -e . + cd ../.. ) -git submodule update --init -cd zoos/bindings_zoo -git checkout main -cd ../personalities_zoo -git checkout main -cd ../extensions_zoo -git checkout main -cd ../models_zoo -git checkout main -cd ../.. - -cd lollms_core -git checkout main - -cd ../utilities/safe_store -git checkout main - -cd ../.. +pip install -r requirements.txt @rem create launcher if exist ..\win_run.bat ( diff --git a/web/src/views/SettingsView.vue b/web/src/views/SettingsView.vue index 8dc51f05..f3640e7a 100644 --- a/web/src/views/SettingsView.vue +++ b/web/src/views/SettingsView.vue @@ -764,8 +764,8 @@
@@ -1921,7 +1921,8 @@ export default { return { voices: [], - voice_languages:{"Arabic": "ar", + voice_languages:{ + "Arabic": "ar", "Brazilian Portuguese": "pt", "Chinese": "zh-cn", "Czech": "cs", @@ -1937,7 +1938,8 @@ export default { "Japanese": "ja", "Korean": "ko", "Hungarian": "hu", - "Hindi": "hi"}, + "Hindi": "hi" + }, binding_changed:false, SVGGPU:SVGGPU, models_zoo:[], diff --git a/zoos/personalities_zoo b/zoos/personalities_zoo index a728904e..ea9afc3e 160000 --- a/zoos/personalities_zoo +++ b/zoos/personalities_zoo @@ -1 +1 @@ -Subproject commit a728904ed1307199b9940000f26cf700f6d97e8e +Subproject commit ea9afc3e5630611af10f19106ee28927dd587587