diff --git a/lollms_core b/lollms_core index e77c97f2..de5e73c9 160000 --- a/lollms_core +++ b/lollms_core @@ -1 +1 @@ -Subproject commit e77c97f2384e97de974cba4c580511b88ae71d2a +Subproject commit de5e73c90f8b4bac5a636a8cb51a80902b2da4b4 diff --git a/new_app.py b/new_app.py index 12ec9966..7e76260b 100644 --- a/new_app.py +++ b/new_app.py @@ -46,6 +46,11 @@ if __name__ == "__main__": LOLLMSWebUI.build_instance(config=config, lollms_paths=lollms_paths, socketio=sio) # Import all endpoints - from lollms.server.endpoints.lollms_infos import router + from lollms.server.endpoints.lollms_infos import router as lollms_infos_router + from lollms.server.endpoints.lollms_generator import router as lollms_generator_router + + app.include_router(lollms_infos_router) + app.include_router(lollms_generator_router) + uvicorn.run(app, host=config.host, port=config.port) \ No newline at end of file diff --git a/scripts/linux/linux_install.sh b/scripts/linux/linux_install.sh index ed819153..d7f90f0e 100644 --- a/scripts/linux/linux_install.sh +++ b/scripts/linux/linux_install.sh @@ -35,7 +35,7 @@ if [[ "$PWD" =~ [^#\$\%\&\(\)\*\+\] ]]; then fi -export PACKAGES_TO_INSTALL=python=3.11 git +export PACKAGES_TO_INSTALL=python=3.11 git pip read -rp "Press Enter to continue..." clear @@ -101,19 +101,19 @@ if [ -d "lollms-webui" ]; then cd lollms-core pip install -e . cd .. - cd utilities\safe_store + cd utilities/safe_store pip install -e . - cd ..\.. + cd ../.. else git clone --depth 1 --recurse-submodules "$REPO_URL" git submodule update --init --recursive - cd lollms-webui\lollms_core + cd lollms-webui/lollms_core pip install -e . cd .. - cd utilities\safe_store + cd utilities/safe_store pip install -e . - cd ..\.. + cd ../.. cd lollms-webui || exit 1 fi diff --git a/scripts/macos/macos_install.sh b/scripts/macos/macos_install.sh index 202fc6e4..4415b5c3 100644 --- a/scripts/macos/macos_install.sh +++ b/scripts/macos/macos_install.sh @@ -39,7 +39,7 @@ read -rp "Press Enter to continue..." clear -export PACKAGES_TO_INSTALL=python=3.11 git +export PACKAGES_TO_INSTALL=python=3.11 git pip echo "Installing gcc..." brew install gcc @@ -108,19 +108,19 @@ if [ -d "lollms-webui" ]; then cd lollms-core pip install -e . cd .. - cd utilities\safe_store + cd utilities/safe_store pip install -e . - cd ..\.. + cd ../.. else git clone --depth 1 --recurse-submodules "$REPO_URL" git submodule update --init --recursive - cd lollms-webui\lollms_core + cd lollms-webui/lollms_core pip install -e . cd .. - cd utilities\safe_store + cd utilities/safe_store pip install -e . - cd ..\.. + cd ../.. cd lollms-webui || exit 1 fi diff --git a/scripts/windows/win_install.bat b/scripts/windows/win_install.bat index 5c5e31d2..849a9ac6 100644 --- a/scripts/windows/win_install.bat +++ b/scripts/windows/win_install.bat @@ -50,7 +50,7 @@ set INSTALL_ENV_DIR=%cd%\installer_files\lollms_env set MINICONDA_DOWNLOAD_URL=https://repo.anaconda.com/miniconda/Miniconda3-latest-Windows-x86_64.exe set REPO_URL=https://github.com/ParisNeo/lollms-webui.git -set "PACKAGES_TO_INSTALL=python=3.11 git" +set "PACKAGES_TO_INSTALL=python=3.11 git pip" if not exist "%MINICONDA_DIR%\Scripts\conda.exe" ( @rem download miniconda diff --git a/zoos/personalities_zoo b/zoos/personalities_zoo index 1194248d..f8ba27ca 160000 --- a/zoos/personalities_zoo +++ b/zoos/personalities_zoo @@ -1 +1 @@ -Subproject commit 1194248d00606c69f9edb5d2b5fcf12c5fe23ee9 +Subproject commit f8ba27ca727f905618bc044ab45f62889e41b668