Merge pull request #123 from Dartvauder/dev

BUGFIXES-AND-OPTIMIZATIONS-UPDATE

HF-Token.txt

@@ -1,13 +1,4 @@
-EN:
-
-Create and log into your account at https://huggingface.co/
-Go to your profile settings
-In the "Access Tokens" section, create a new token
-Copy it and paste it into this text document, clearing this instruction
-
-RU:
-
-Создайте и войдите в свою учетную запись на https://huggingface.co/
-Перейдите в настройки профиля
-В разделе "Access Tokens" создайте новый токен
-Скопируйте его и впишите в этот текстовый документ очистив эту инструкцию
+1. Create and log into your account at https://huggingface.co/
+2. Go to your profile settings
+3. In the "Access Tokens" section, create a new token
+4. Copy it and paste it into this text document, clearing this instruction

Install.bat

@@ -7,24 +7,43 @@ py -m venv "%CURRENT_DIR%venv"
 call "%CURRENT_DIR%venv\Scripts\activate.bat"
 cls
 
-echo Upgrading pip, setuptools and whell...
+echo Upgrading pip, setuptools and wheel...
 python -m pip install --upgrade pip
 pip install wheel setuptools
+timeout /t 3 /nobreak >nul
 cls
 
 echo Installing dependencies...
-pip install --no-deps -r "%CURRENT_DIR%RequirementsFiles\requirements.txt"
-pip install --no-deps -r "%CURRENT_DIR%RequirementsFiles\requirements-cuda.txt"
-pip install --no-deps -r "%CURRENT_DIR%RequirementsFiles\requirements-llama-cpp.txt"
-pip install git+https://github.com/TencentARC/PhotoMaker.git
-pip install git+https://github.com/tencent-ailab/IP-Adapter.git
-pip install git+https://github.com/vork/PyNanoInstantMeshes.git
-pip install git+https://github.com/openai/CLIP.git
-pip install git+https://github.com/tatsy/torchmcubes.git
+if not exist "%CURRENT_DIR%logs" mkdir "%CURRENT_DIR%logs"
+set ERROR_LOG="%CURRENT_DIR%logs\installation_errors.log"
+type nul > %ERROR_LOG%
+
+pip install --no-deps -r "%CURRENT_DIR%RequirementsFiles\requirements.txt" 2>> %ERROR_LOG%
+pip install --no-deps -r "%CURRENT_DIR%RequirementsFiles\requirements-cuda.txt" 2>> %ERROR_LOG%
+pip install --no-deps -r "%CURRENT_DIR%RequirementsFiles\requirements-llama-cpp.txt" 2>> %ERROR_LOG%
+pip install git+https://github.com/tencent-ailab/IP-Adapter.git 2>> %ERROR_LOG%
+pip install git+https://github.com/vork/PyNanoInstantMeshes.git 2>> %ERROR_LOG%
+pip install git+https://github.com/openai/CLIP.git 2>> %ERROR_LOG%
+timeout /t 3 /nobreak >nul
+cls
+
+echo Post-installing patches...
+python "%CURRENT_DIR%RequirementsFiles\post_install.py"
+timeout /t 3 /nobreak >nul
+cls
+
+echo Checking for installation errors...
+findstr /C:"error" %ERROR_LOG% >nul
+if %ERRORLEVEL% equ 0 (
+    echo Some packages failed to install. Please check %ERROR_LOG% for details.
+) else (
+    echo Installation completed successfully.
+)
+timeout /t 5 /nobreak >nul
 cls
 
-echo Application has been installed successfully. Run start.bat
+echo Application installation process completed. Run start.bat to launch the application.
 
 call "%CURRENT_DIR%venv\Scripts\deactivate.bat"
 
-pause
+pause

Install.sh

@@ -7,24 +7,42 @@ python3 -m venv "$CURRENT_DIR/venv"
 source "$CURRENT_DIR/venv/bin/activate"
 clear
 
-echo "Upgrading pip, setuptools and whell..."
+echo "Upgrading pip, setuptools and wheel..."
 python3 -m pip install --upgrade pip
 pip install wheel setuptools
+sleep 3
 clear
 
 echo "Installing dependencies..."
-pip install --no-deps -r "$CURRENT_DIR/RequirementsFiles/requirements.txt"
-pip install --no-deps -r "$CURRENT_DIR/RequirementsFiles/requirements-cuda.txt"
-pip install --no-deps -r "$CURRENT_DIR/RequirementsFiles/requirements-llama-cpp.txt"
-pip install git+https://github.com/TencentARC/PhotoMaker.git
-pip install git+https://github.com/tencent-ailab/IP-Adapter.git
-pip install git+https://github.com/vork/PyNanoInstantMeshes.git
-pip install git+https://github.com/openai/CLIP.git
-pip install git+https://github.com/tatsy/torchmcubes.git
+mkdir -p "$CURRENT_DIR/logs"
+ERROR_LOG="$CURRENT_DIR/logs/installation_errors.log"
+touch "$ERROR_LOG"
+
+pip install --no-deps -r "$CURRENT_DIR/RequirementsFiles/requirements.txt" 2>> "$ERROR_LOG"
+pip install --no-deps -r "$CURRENT_DIR/RequirementsFiles/requirements-cuda.txt" 2>> "$ERROR_LOG"
+pip install --no-deps -r "$CURRENT_DIR/RequirementsFiles/requirements-llama-cpp.txt" 2>> "$ERROR_LOG"
+pip install git+https://github.com/tencent-ailab/IP-Adapter.git 2>> "$ERROR_LOG"
+pip install git+https://github.com/vork/PyNanoInstantMeshes.git 2>> "$ERROR_LOG"
+pip install git+https://github.com/openai/CLIP.git 2>> "$ERROR_LOG"
+sleep 3
+clear
+
+echo "Post-installing patches..."
+python3 "$CURRENT_DIR/RequirementsFiles/post_install.py"
+sleep 3
+clear
+
+echo "Checking for installation errors..."
+if grep -iq "error" "$ERROR_LOG"; then
+    echo "Some packages failed to install. Please check $ERROR_LOG for details."
+else
+    echo "All packages installed successfully."
+fi
+sleep 5
 clear
 
-echo "Application has been installed successfully. Run start.sh"
+echo "Application installation process completed. Run start.sh to launch the application."
 
 deactivate
 
-read -p "Press enter to continue"
+read -p "Press enter to continue"