This commit is contained in:
Saifeddine ALOUI 2024-10-07 23:20:14 +02:00
parent c2ecc3ee30
commit c12a717990
4 changed files with 34 additions and 25 deletions

2
app.py
View File

@ -68,7 +68,7 @@ def check_and_install_package(package: str, version: str):
packages: List[Tuple[str, str]] = [ packages: List[Tuple[str, str]] = [
("freedom_search", "0.1.9"), ("freedom_search", "0.1.9"),
("scrapemaster", "0.2.0"), ("scrapemaster", "0.2.1"),
("lollms_client", "0.7.5"), ("lollms_client", "0.7.5"),
("lollmsvectordb", "1.1.3"), ("lollmsvectordb", "1.1.3"),
] ]

@ -1 +1 @@
Subproject commit 5f0b0341bebf6ea79727c6644c7ed1e4b95af06e Subproject commit eefff3c85c0134a93e9b7549fa9ab5cbf4fc94d6

View File

@ -20,7 +20,7 @@ set USE_MASTER=0
if "%1"=="--use-master" set USE_MASTER=1 if "%1"=="--use-master" set USE_MASTER=1
if %USE_MASTER%==1 ( if %USE_MASTER%==1 (
echo Using current master repo for LollmsEnv... echo --- Using current master repo for LollmsEnv...
git clone https://github.com/ParisNeo/LollmsEnv.git "%LOLLMSENV_DIR%" git clone https://github.com/ParisNeo/LollmsEnv.git "%LOLLMSENV_DIR%"
cd "%LOLLMSENV_DIR%" cd "%LOLLMSENV_DIR%"
call install.bat --dir "%LOLLMSENV_DIR%" -y call install.bat --dir "%LOLLMSENV_DIR%" -y
@ -28,13 +28,13 @@ if %USE_MASTER%==1 (
) else ( ) else (
REM Download LollmsEnv installer REM Download LollmsEnv installer
echo Downloading LollmsEnv installer... echo Downloading LollmsEnv installer...
powershell -Command "Invoke-WebRequest -Uri 'https://github.com/ParisNeo/LollmsEnv/releases/download/V1.2.9/lollmsenv_installer.bat' -OutFile 'lollmsenv_installer.bat'" powershell -Command "Invoke-WebRequest -Uri 'https://github.com/ParisNeo/LollmsEnv/releases/download/V1.2.13/lollmsenv_installer.bat' -OutFile 'lollmsenv_installer.bat'"
REM Install LollmsEnv REM Install LollmsEnv
call lollmsenv_installer.bat --dir "%LOLLMSENV_DIR%" -y call lollmsenv_installer.bat --dir "%LOLLMSENV_DIR%" -y
) )
REM Check for NVIDIA GPU and CUDA REM Check for NVIDIA GPU and CUDA
echo Checking for NVIDIA GPU and CUDA... echo --- Checking for NVIDIA GPU and CUDA...
nvidia-smi >nul 2>&1 nvidia-smi >nul 2>&1
if %errorlevel% equ 0 ( if %errorlevel% equ 0 (
echo NVIDIA GPU detected. echo NVIDIA GPU detected.
@ -94,20 +94,23 @@ if /i "%INSTALL_VSCODE%"=="Y" (
pause pause
) )
cd %ORIGINAL_PATH%
echo %CD% echo %CD%
REM Install Python and create environment
echo activating lollmsenv
call "%LOLLMSENV_DIR%\activate.bat"
call "%LOLLMSENV_DIR%\bin\lollmsenv.bat" install-python 3.10.11
call "%LOLLMSENV_DIR%\bin\lollmsenv.bat" create-env lollms_env 3.10.11
pause
REM Activate environment
"%LOLLMSENV_DIR%\bin\lollmsenv.bat" activate lollms_env
REM venv activate lollms_env
REM Install Python and create environment
:: echo --- installing python
:: call "%LOLLMSENV_DIR%\bin\lollmsenv.bat" install-python 3.11.9
echo --- creating environment
call "%LOLLMSENV_DIR%\bin\lollmsenv.bat" create-env lollms_env
echo --- activating environment
REM Activate environment
call "%LOLLMSENV_DIR%\envs\lollms_env\Scripts\activate.bat"
REM venv activate lollms_env
echo %ORIGINAL_PATH%
cd "%ORIGINAL_PATH%" cd "%ORIGINAL_PATH%"
echo --- cloning lollmw_webui
REM Clone or update repository REM Clone or update repository
if exist lollms-webui\ ( if exist lollms-webui\ (
cd lollms-webui cd lollms-webui
@ -122,22 +125,28 @@ if exist lollms-webui\ (
) )
REM Install requirements REM Install requirements
echo --- Install requirements
cd lollms-webui cd lollms-webui
pip install -r requirements.txt call "%LOLLMSENV_DIR%\envs\lollms_env\Scripts\python.exe" -m pip install -r requirements.txt
call "%LOLLMSENV_DIR%\envs\lollms_env\Scripts\python.exe" -m pip install -e lollms_core
cd .. cd ..
REM Create launcher scripts REM Create launcher scripts
echo @echo off > ..\win_run.bat echo @echo off > lollms.bat
echo call "%LOLLMSENV_DIR%\bin\lollmsenv.bat" activate lollms_env >> ..\lollms.bat echo call "%LOLLMSENV_DIR%\envs\lollms_env\Scripts\activate.bat" >> lollms.bat
echo cd lollms-webui >> ..\lollms.bat echo cd lollms-webui >> lollms.bat
echo python app.py %%* >> ..\lollms.bat echo python app.py %%* >> lollms.bat
echo pause >> lollms.bat
echo @echo off > ..\win_conda_session.bat echo @echo off > lollms_cmd.bat
echo call "%LOLLMSENV_DIR%\bin\lollmsenv.bat" activate lollms_env >> ..\lollms_cmd.bat echo call "%LOLLMSENV_DIR%\envs\lollms_env\Scripts\activate.bat" >> lollms_cmd.bat
echo cd lollms-webui >> ..\lollms_cmd.bat echo cd lollms-webui >> lollms_cmd.bat
echo cmd /k >> ..\lollms_cmd.bat echo cmd /k >> lollms_cmd.bat
cd lollms_webui
echo --- current folder
echo %cd%
REM Binding selection menu REM Binding selection menu
echo Select the default binding to be installed: echo Select the default binding to be installed:
echo 1) None (install the binding later) echo 1) None (install the binding later)

@ -1 +1 @@
Subproject commit 0ac43f6badf085b5f9c710eec9c156f5652518d0 Subproject commit 5ff95e7b530a8b3e5ba5f396bf89175bc2ec5353