Upload folder using huggingface_hub

Dockerfile

@@ -54,6 +54,8 @@ RUN apt-get autoremove \
     && rm -rf /var/lib/apt/lists/* \
     && rm -rf ~/.cache
 
+RUN pip install theflow
+
 CMD ["python", "app.py"]
 
 # Full version

scripts/run_windows.bat

@@ -1,300 +1,300 @@
-@ECHO off
-
-:: Main script execution
-CD /D "%~dp0\.."
-
-SET /p app_version=<"%CD%\VERSION" || SET app_version=latest
-SET install_dir=%CD%\install_dir
-SET conda_root=%install_dir%\conda
-SET env_dir=%install_dir%\env
-SET python_version=3.10
-SET miniconda_download_url=https://repo.anaconda.com/miniconda/Miniconda3-latest-Windows-x86_64.exe
-
-SET git_install_dir=%install_dir%\Git
-SET seven_zip_dir=%install_dir%\7zip
-:: Determine if the machine is 32-bit or 64-bit
-IF "%PROCESSOR_ARCHITECTURE%"=="x86" (
-    SET seven_zip_url=https://7-zip.org/a/7z2408.exe
-    SET git_download_url=https://github.com/git-for-windows/git/releases/download/v2.46.0.windows.1/PortableGit-2.46.0-32-bit.7z.exe
-) ELSE (
-    SET seven_zip_url=https://7-zip.org/a/7z2408-x64.exe
-    SET git_download_url=https://github.com/git-for-windows/git/releases/download/v2.46.0.windows.1/PortableGit-2.46.0-64-bit.7z.exe
-)
-
-ECHO %CD%| FINDSTR /C:" " >nul 2>&1
-IF %ERRORLEVEL% EQU 0 (
-    ECHO The current workdir has whitespace which can lead to unintended behaviour. Please modify your path and continue later.
-    GOTO :end
-)
-
-IF NOT EXIST "%install_dir%" ( MKDIR "%install_dir%" )
-
-CALL :print_highlight "Setting up Git"
-CALL :download_and_install_git
-IF ERRORLEVEL 1 GOTO :end
-
-:: Temporarily add Portable Git to PATH
-SET "PATH=%git_install_dir%\bin;%PATH%"
-
-CALL :print_highlight "Setting up Miniconda"
-CALL :download_and_install_miniconda
-IF ERRORLEVEL 1 GOTO :end
-
-CALL :print_highlight "Creating conda environment"
-CALL :create_conda_environment
-IF ERRORLEVEL 1 GOTO :end
-
-CALL :activate_environment
-IF ERRORLEVEL 1 GOTO :end
-
-CALL :print_highlight "Installing Kotaemon"
-CALL :install_dependencies
-IF ERRORLEVEL 1 GOTO :end
-
-CALL :print_highlight "Setting up a local model"
-CALL :setup_local_model
-IF ERRORLEVEL 1 GOTO :end
-
-CALL :print_highlight "Downloading and extracting PDF.js"
-CALL :download_and_extract_pdf_js
-IF ERRORLEVEL 1 GOTO :end
-
-CALL :print_highlight "Launching Kotaemon in your browser, please wait..."
-CALL :launch_ui
-
-CALL :deactivate_environment
-GOTO :end_success
-
-:download_and_install_7zip
-:: Check if 7-Zip is installed
-IF NOT EXIST "%seven_zip_dir%\7z.exe" (
-    ECHO Downloading 7-Zip from %seven_zip_url%
-    CALL curl -Lk "%seven_zip_url%" -o "%install_dir%\7zip_installer.exe" || (
-        ECHO. && ECHO Failed to download 7-Zip. Aborting...
-        GOTO :exit_func_with_error
-    )
-    ECHO Installing 7-Zip to %seven_zip_dir%
-    CALL "%install_dir%\7zip_installer.exe" /S /D=%seven_zip_dir%
-    DEL "%install_dir%\7zip_installer.exe"
-)
-ECHO 7-Zip is installed at %seven_zip_dir%
-
-GOTO :eof
-
-:uninstall_7zip
-IF EXIST "%seven_zip_dir%\Uninstall.exe" (
-    CALL "%seven_zip_dir%\Uninstall.exe" /S
-) ELSE (
-    ECHO. && ECHO Uninstaller not found. Manually deleting 7-Zip directory...
-    RMDIR /S /Q "%seven_zip_dir%"
-)
-
-GOTO :eof
-
-:download_and_install_git
-:: Check if Git is already installed
-CALL "%git_install_dir%\bin\git.exe" --version >nul 2>&1
-IF %ERRORLEVEL% NEQ 0 (
-    ECHO Install 7-Zip to extract Portable Git. It will be uninstalled automatically after Git installation. && ECHO.
-    CALL :download_and_install_7zip
-    IF ERRORLEVEL 1 GOTO :end
-
-    ECHO. && ECHO Downloading Portable Git from %git_download_url%
-    CALL curl -Lk "%git_download_url%" -o "%install_dir%\portable_git.7z.exe" || (
-        ECHO. && ECHO Failed to download Git. Aborting...
-        GOTO :exit_func_with_error
-    )
-
-    ECHO Extracting Git to %git_install_dir%...
-    CALL "%seven_zip_dir%\7z.exe" x "%install_dir%\portable_git.7z.exe" -o"%git_install_dir%" -y >nul || (
-        ECHO. && ECHO Failed to extract Git. Aborting...
-        GOTO :exit_func_with_error
-    )
-    DEL "%install_dir%\portable_git.7z.exe"
-
-    ECHO. && ECHO Uninstalling 7-Zip...
-    CALL :uninstall_7zip
-    IF ERRORLEVEL 1 GOTO :end
-)
-ECHO Git is installed at %git_install_dir%
-:: Recheck Git installation
-CALL "%git_install_dir%\bin\git.exe" --version || (
-    ECHO. && ECHO Git not found. Aborting...
-    GOTO :exit_func_with_error
-)
-
-SET "PATH=%git_install_dir%\bin;%PATH%"
-ECHO Git is added to PATH for this session
-
-GOTO :eof
-
-:download_and_install_miniconda
-:: If conda has been installed at the %conda_root%, don't need to reinstall it
-CALL "%conda_root%\_conda.exe" --version >nul 2>&1
-IF %ERRORLEVEL% NEQ 0 (
-    IF NOT EXIST "%install_dir%\miniconda_installer.exe" (
-        ECHO Downloading Miniconda from %miniconda_download_url%
-        CALL curl -Lk "%miniconda_download_url%" -o "%install_dir%\miniconda_installer.exe" || (
-            ECHO. && ECHO Failed to download Miniconda. Aborting...
-            GOTO :exit_func_with_error
-        )
-    )
-    ECHO Installing Miniconda to %conda_root%
-    START /wait "" "%install_dir%\miniconda_installer.exe" /InstallationType=JustMe /NoShortcuts=1 /AddToPath=0 /RegisterPython=0 /NoRegistry=1 /S /D=%conda_root%
-    DEL "%install_dir%\miniconda_installer.exe"
-)
-ECHO Conda is installed at %conda_root%
-
-:: Recheck conda
-ECHO Conda version:
-CALL "%conda_root%\_conda.exe" --version || ( ECHO. && ECHO Conda not found. Aborting... && GOTO :exit_func_with_error )
-
-GOTO :eof
-
-:create_conda_environment
-:: Create new conda environment if it doesn't exist
-IF NOT EXIST %env_dir% (
-    ECHO Creating conda environment with python=%python_version% in %env_dir%
-    :: Create conda environment. If the interruption happens, rollback and remove the env_dir
-    CALL "%conda_root%\_conda.exe" create --no-shortcuts -y -k --prefix %env_dir% python=%python_version% || (
-        ECHO. && ECHO Failed to create conda environment. Will delete the %env_dir% and abort now...
-        RMDIR /s /q %env_dir%
-        GOTO :exit_func_with_error
-    )
-    ECHO Conda environment created successfully
-) ELSE (
-    ECHO Conda environment exists at %env_dir%
-)
-GOTO :eof
-
-:activate_environment
-:: Deactivate existing conda env(s) to avoid conflicts
-IF EXIST "%conda_root%\condabin\conda.bat" (
-    CALL "%conda_root%\condabin\conda.bat" deactivate
-    CALL "%conda_root%\condabin\conda.bat" deactivate
-    CALL "%conda_root%\condabin\conda.bat" deactivate
-)
-
-CALL "%env_dir%\python.exe" --version >nul 2>&1 || (
-    ECHO The environment appears to be broken. You may need to remove %env_dir% and run the installer again.
-    GOTO :exit_func_with_error
-)
-
-CALL "%conda_root%\condabin\conda.bat" activate %env_dir% || (
-    ECHO Failed to activate environment. You may need to remove %env_dir% and run the installer again.
-    GOTO :exit_func_with_error
-)
-ECHO Activate conda environment at %env_dir%
-
-GOTO :eof
-
-:deactivate_environment
-:: Conda deactivate if we are in the right env
-IF "%CONDA_PREFIX%" == "%env_dir%" (
-    CALL "%conda_root%\condabin\conda.bat" deactivate
-    ECHO Deactivate conda environment at %env_dir%
-)
-GOTO :eof
-
-:install_dependencies
-pip list | findstr /C:"kotaemon" >NUL 2>&1
-IF %ERRORLEVEL% == 0  (
-    ECHO Dependencies are already installed
-) ELSE (
-    IF EXIST "pyproject.toml" (
-        ECHO Found pyproject.toml. Installing from source...
-
-        ECHO Installing libs\kotaemon
-        python -m pip install -e "%CD%\libs\kotaemon"
-
-        ECHO Installing libs\ktem
-        python -m pip install -e "%CD%\libs\ktem"
-
-        python -m pip install --no-deps -e .
-    ) ELSE (
-        ECHO Installing Kotaemon %app_version%
-        @REM Work around for versioning control
-        python -m pip install git+https://github.com/Cinnamon/kotaemon.git@"%app_version%"#subdirectory=libs/kotaemon
-        python -m pip install git+https://github.com/Cinnamon/kotaemon.git@"%app_version%"#subdirectory=libs/ktem
-        python -m pip install --no-deps git+https://github.com/Cinnamon/kotaemon.git@"%app_version%"
-    )
-
-    ( CALL pip list | findstr /C:"kotaemon" >NUL 2>&1 ) || (
-        ECHO. && ECHO Installation failed. You may need to run the installer again.
-        CALL :deactivate_environment
-        GOTO :exit_func_with_error
-    )
-
-    CALL :print_highlight "Install successfully. Clear cache..."
-    "%conda_root%\condabin\conda.bat" clean --all -y
-    python -m pip cache purge
-)
-GOTO :eof
-
-:download_and_extract_pdf_js
-:: Download and extract a ZIP file from a URL to a destination directory
-
-REM Define variables
-set "pdf_js_version=4.0.379"
-set "pdf_js_dist_name=pdfjs-%pdf_js_version%-dist"
-set "pdf_js_dist_url=https://github.com/mozilla/pdf.js/releases/download/v%pdf_js_version%/%pdf_js_dist_name%.zip"
-for /f "delims=" %%i in ('cd') do set "current_dir=%%i"
-set "target_pdf_js_dir=%current_dir%\libs\ktem\ktem\assets\prebuilt\%pdf_js_dist_name%"
-
-REM Create the target directory if it does not exist (including parent folders)
-if not exist "%target_pdf_js_dir%" (
-    echo Creating directory %target_pdf_js_dir%
-    mkdir "%target_pdf_js_dir%"
-) else (
-    echo Directory already exists: %target_pdf_js_dir%
-    GOTO :eof
-)
-
-REM Download the ZIP file using PowerShell
-set "zip_file=%temp%\downloaded.zip"
-echo Downloading %url% to %zip_file%
-powershell -Command "Invoke-WebRequest -Uri '%pdf_js_dist_url%' -OutFile '%zip_file%'"
-
-
-REM Extract the ZIP file using PowerShell
-echo Extracting %zip_file% to %dest_dir%
-powershell -Command "Expand-Archive -Path '%zip_file%' -DestinationPath '%target_pdf_js_dir%'"
-
-REM Clean up the downloaded ZIP file
-del "%zip_file%"
-echo Download and extraction completed successfully.
-
-goto :eof
-
-:setup_local_model
-python "%CD%\scripts\serve_local.py"
-GOTO :eof
-
-:launch_ui
-:: Workaround for diskcache path with folder start with .
-SET THEFLOW_TEMP_PATH=flow_tmp
-SET PDFJS_PREBUILT_DIR=%target_pdf_js_dir%
-ECHO Starting Kotaemon UI... (prebuilt PDF.js is at %PDFJS_PREBUILT_DIR%)
-CALL python "%CD%\app.py" || ( ECHO. && ECHO Will exit now... && GOTO :exit_func_with_error )
-GOTO :eof
-
-:print_highlight
-ECHO. && ECHO ******************************************************
-ECHO %~1
-ECHO ****************************************************** && ECHO.
-GOTO :eof
-
-:exit_func_with_error
-:: Called inside functions when error happens, then back to the main routine with error code 1
-EXIT /B 1
-
-:end_success
-:: Exit the script main routine with error code 0 (success)
-ECHO Script completed successfully.
-PAUSE
-EXIT /B 0
-
-:end
-:: Exit the script main routine with error code 1 (fail)
-PAUSE
-EXIT /B 1
+@ECHO off
+
+:: Main script execution
+CD /D "%~dp0\.."
+
+SET /p app_version=<"%CD%\VERSION" || SET app_version=latest
+SET install_dir=%CD%\install_dir
+SET conda_root=%install_dir%\conda
+SET env_dir=%install_dir%\env
+SET python_version=3.10
+SET miniconda_download_url=https://repo.anaconda.com/miniconda/Miniconda3-latest-Windows-x86_64.exe
+
+SET git_install_dir=%install_dir%\Git
+SET seven_zip_dir=%install_dir%\7zip
+:: Determine if the machine is 32-bit or 64-bit
+IF "%PROCESSOR_ARCHITECTURE%"=="x86" (
+    SET seven_zip_url=https://7-zip.org/a/7z2408.exe
+    SET git_download_url=https://github.com/git-for-windows/git/releases/download/v2.46.0.windows.1/PortableGit-2.46.0-32-bit.7z.exe
+) ELSE (
+    SET seven_zip_url=https://7-zip.org/a/7z2408-x64.exe
+    SET git_download_url=https://github.com/git-for-windows/git/releases/download/v2.46.0.windows.1/PortableGit-2.46.0-64-bit.7z.exe
+)
+
+ECHO %CD%| FINDSTR /C:" " >nul 2>&1
+IF %ERRORLEVEL% EQU 0 (
+    ECHO The current workdir has whitespace which can lead to unintended behaviour. Please modify your path and continue later.
+    GOTO :end
+)
+
+IF NOT EXIST "%install_dir%" ( MKDIR "%install_dir%" )
+
+CALL :print_highlight "Setting up Git"
+CALL :download_and_install_git
+IF ERRORLEVEL 1 GOTO :end
+
+:: Temporarily add Portable Git to PATH
+SET "PATH=%git_install_dir%\bin;%PATH%"
+
+CALL :print_highlight "Setting up Miniconda"
+CALL :download_and_install_miniconda
+IF ERRORLEVEL 1 GOTO :end
+
+CALL :print_highlight "Creating conda environment"
+CALL :create_conda_environment
+IF ERRORLEVEL 1 GOTO :end
+
+CALL :activate_environment
+IF ERRORLEVEL 1 GOTO :end
+
+CALL :print_highlight "Installing Kotaemon"
+CALL :install_dependencies
+IF ERRORLEVEL 1 GOTO :end
+
+CALL :print_highlight "Setting up a local model"
+CALL :setup_local_model
+IF ERRORLEVEL 1 GOTO :end
+
+CALL :print_highlight "Downloading and extracting PDF.js"
+CALL :download_and_extract_pdf_js
+IF ERRORLEVEL 1 GOTO :end
+
+CALL :print_highlight "Launching Kotaemon in your browser, please wait..."
+CALL :launch_ui
+
+CALL :deactivate_environment
+GOTO :end_success
+
+:download_and_install_7zip
+:: Check if 7-Zip is installed
+IF NOT EXIST "%seven_zip_dir%\7z.exe" (
+    ECHO Downloading 7-Zip from %seven_zip_url%
+    CALL curl -Lk "%seven_zip_url%" -o "%install_dir%\7zip_installer.exe" || (
+        ECHO. && ECHO Failed to download 7-Zip. Aborting...
+        GOTO :exit_func_with_error
+    )
+    ECHO Installing 7-Zip to %seven_zip_dir%
+    CALL "%install_dir%\7zip_installer.exe" /S /D=%seven_zip_dir%
+    DEL "%install_dir%\7zip_installer.exe"
+)
+ECHO 7-Zip is installed at %seven_zip_dir%
+
+GOTO :eof
+
+:uninstall_7zip
+IF EXIST "%seven_zip_dir%\Uninstall.exe" (
+    CALL "%seven_zip_dir%\Uninstall.exe" /S
+) ELSE (
+    ECHO. && ECHO Uninstaller not found. Manually deleting 7-Zip directory...
+    RMDIR /S /Q "%seven_zip_dir%"
+)
+
+GOTO :eof
+
+:download_and_install_git
+:: Check if Git is already installed
+CALL "%git_install_dir%\bin\git.exe" --version >nul 2>&1
+IF %ERRORLEVEL% NEQ 0 (
+    ECHO Install 7-Zip to extract Portable Git. It will be uninstalled automatically after Git installation. && ECHO.
+    CALL :download_and_install_7zip
+    IF ERRORLEVEL 1 GOTO :end
+
+    ECHO. && ECHO Downloading Portable Git from %git_download_url%
+    CALL curl -Lk "%git_download_url%" -o "%install_dir%\portable_git.7z.exe" || (
+        ECHO. && ECHO Failed to download Git. Aborting...
+        GOTO :exit_func_with_error
+    )
+
+    ECHO Extracting Git to %git_install_dir%...
+    CALL "%seven_zip_dir%\7z.exe" x "%install_dir%\portable_git.7z.exe" -o"%git_install_dir%" -y >nul || (
+        ECHO. && ECHO Failed to extract Git. Aborting...
+        GOTO :exit_func_with_error
+    )
+    DEL "%install_dir%\portable_git.7z.exe"
+
+    ECHO. && ECHO Uninstalling 7-Zip...
+    CALL :uninstall_7zip
+    IF ERRORLEVEL 1 GOTO :end
+)
+ECHO Git is installed at %git_install_dir%
+:: Recheck Git installation
+CALL "%git_install_dir%\bin\git.exe" --version || (
+    ECHO. && ECHO Git not found. Aborting...
+    GOTO :exit_func_with_error
+)
+
+SET "PATH=%git_install_dir%\bin;%PATH%"
+ECHO Git is added to PATH for this session
+
+GOTO :eof
+
+:download_and_install_miniconda
+:: If conda has been installed at the %conda_root%, don't need to reinstall it
+CALL "%conda_root%\_conda.exe" --version >nul 2>&1
+IF %ERRORLEVEL% NEQ 0 (
+    IF NOT EXIST "%install_dir%\miniconda_installer.exe" (
+        ECHO Downloading Miniconda from %miniconda_download_url%
+        CALL curl -Lk "%miniconda_download_url%" -o "%install_dir%\miniconda_installer.exe" || (
+            ECHO. && ECHO Failed to download Miniconda. Aborting...
+            GOTO :exit_func_with_error
+        )
+    )
+    ECHO Installing Miniconda to %conda_root%
+    START /wait "" "%install_dir%\miniconda_installer.exe" /InstallationType=JustMe /NoShortcuts=1 /AddToPath=0 /RegisterPython=0 /NoRegistry=1 /S /D=%conda_root%
+    DEL "%install_dir%\miniconda_installer.exe"
+)
+ECHO Conda is installed at %conda_root%
+
+:: Recheck conda
+ECHO Conda version:
+CALL "%conda_root%\_conda.exe" --version || ( ECHO. && ECHO Conda not found. Aborting... && GOTO :exit_func_with_error )
+
+GOTO :eof
+
+:create_conda_environment
+:: Create new conda environment if it doesn't exist
+IF NOT EXIST %env_dir% (
+    ECHO Creating conda environment with python=%python_version% in %env_dir%
+    :: Create conda environment. If the interruption happens, rollback and remove the env_dir
+    CALL "%conda_root%\_conda.exe" create --no-shortcuts -y -k --prefix %env_dir% python=%python_version% || (
+        ECHO. && ECHO Failed to create conda environment. Will delete the %env_dir% and abort now...
+        RMDIR /s /q %env_dir%
+        GOTO :exit_func_with_error
+    )
+    ECHO Conda environment created successfully
+) ELSE (
+    ECHO Conda environment exists at %env_dir%
+)
+GOTO :eof
+
+:activate_environment
+:: Deactivate existing conda env(s) to avoid conflicts
+IF EXIST "%conda_root%\condabin\conda.bat" (
+    CALL "%conda_root%\condabin\conda.bat" deactivate
+    CALL "%conda_root%\condabin\conda.bat" deactivate
+    CALL "%conda_root%\condabin\conda.bat" deactivate
+)
+
+CALL "%env_dir%\python.exe" --version >nul 2>&1 || (
+    ECHO The environment appears to be broken. You may need to remove %env_dir% and run the installer again.
+    GOTO :exit_func_with_error
+)
+
+CALL "%conda_root%\condabin\conda.bat" activate %env_dir% || (
+    ECHO Failed to activate environment. You may need to remove %env_dir% and run the installer again.
+    GOTO :exit_func_with_error
+)
+ECHO Activate conda environment at %env_dir%
+
+GOTO :eof
+
+:deactivate_environment
+:: Conda deactivate if we are in the right env
+IF "%CONDA_PREFIX%" == "%env_dir%" (
+    CALL "%conda_root%\condabin\conda.bat" deactivate
+    ECHO Deactivate conda environment at %env_dir%
+)
+GOTO :eof
+
+:install_dependencies
+pip list | findstr /C:"kotaemon" >NUL 2>&1
+IF %ERRORLEVEL% == 0  (
+    ECHO Dependencies are already installed
+) ELSE (
+    IF EXIST "pyproject.toml" (
+        ECHO Found pyproject.toml. Installing from source...
+
+        ECHO Installing libs\kotaemon
+        python -m pip install -e "%CD%\libs\kotaemon"
+
+        ECHO Installing libs\ktem
+        python -m pip install -e "%CD%\libs\ktem"
+
+        python -m pip install --no-deps -e .
+    ) ELSE (
+        ECHO Installing Kotaemon %app_version%
+        @REM Work around for versioning control
+        python -m pip install git+https://github.com/Cinnamon/kotaemon.git@"%app_version%"#subdirectory=libs/kotaemon
+        python -m pip install git+https://github.com/Cinnamon/kotaemon.git@"%app_version%"#subdirectory=libs/ktem
+        python -m pip install --no-deps git+https://github.com/Cinnamon/kotaemon.git@"%app_version%"
+    )
+
+    ( CALL pip list | findstr /C:"kotaemon" >NUL 2>&1 ) || (
+        ECHO. && ECHO Installation failed. You may need to run the installer again.
+        CALL :deactivate_environment
+        GOTO :exit_func_with_error
+    )
+
+    CALL :print_highlight "Install successfully. Clear cache..."
+    "%conda_root%\condabin\conda.bat" clean --all -y
+    python -m pip cache purge
+)
+GOTO :eof
+
+:download_and_extract_pdf_js
+:: Download and extract a ZIP file from a URL to a destination directory
+
+REM Define variables
+set "pdf_js_version=4.0.379"
+set "pdf_js_dist_name=pdfjs-%pdf_js_version%-dist"
+set "pdf_js_dist_url=https://github.com/mozilla/pdf.js/releases/download/v%pdf_js_version%/%pdf_js_dist_name%.zip"
+for /f "delims=" %%i in ('cd') do set "current_dir=%%i"
+set "target_pdf_js_dir=%current_dir%\libs\ktem\ktem\assets\prebuilt\%pdf_js_dist_name%"
+
+REM Create the target directory if it does not exist (including parent folders)
+if not exist "%target_pdf_js_dir%" (
+    echo Creating directory %target_pdf_js_dir%
+    mkdir "%target_pdf_js_dir%"
+) else (
+    echo Directory already exists: %target_pdf_js_dir%
+    GOTO :eof
+)
+
+REM Download the ZIP file using PowerShell
+set "zip_file=%temp%\downloaded.zip"
+echo Downloading %url% to %zip_file%
+powershell -Command "Invoke-WebRequest -Uri '%pdf_js_dist_url%' -OutFile '%zip_file%'"
+
+
+REM Extract the ZIP file using PowerShell
+echo Extracting %zip_file% to %dest_dir%
+powershell -Command "Expand-Archive -Path '%zip_file%' -DestinationPath '%target_pdf_js_dir%'"
+
+REM Clean up the downloaded ZIP file
+del "%zip_file%"
+echo Download and extraction completed successfully.
+
+goto :eof
+
+:setup_local_model
+python "%CD%\scripts\serve_local.py"
+GOTO :eof
+
+:launch_ui
+:: Workaround for diskcache path with folder start with .
+SET THEFLOW_TEMP_PATH=flow_tmp
+SET PDFJS_PREBUILT_DIR=%target_pdf_js_dir%
+ECHO Starting Kotaemon UI... (prebuilt PDF.js is at %PDFJS_PREBUILT_DIR%)
+CALL python "%CD%\app.py" || ( ECHO. && ECHO Will exit now... && GOTO :exit_func_with_error )
+GOTO :eof
+
+:print_highlight
+ECHO. && ECHO ******************************************************
+ECHO %~1
+ECHO ****************************************************** && ECHO.
+GOTO :eof
+
+:exit_func_with_error
+:: Called inside functions when error happens, then back to the main routine with error code 1
+EXIT /B 1
+
+:end_success
+:: Exit the script main routine with error code 0 (success)
+ECHO Script completed successfully.
+PAUSE
+EXIT /B 0
+
+:end
+:: Exit the script main routine with error code 1 (fail)
+PAUSE
+EXIT /B 1

scripts/server_llamacpp_windows.bat

@@ -1,115 +1,115 @@
-@echo off
-
-@rem main code execution
-
-call :print_highlight "Starting inference server for llama-cpp"
-
-cd /D "%~dp0\.."
-echo "Change the current directory to: %cd%"
-
-call :path_sanity_check
-call :deactivate_environment
-
-@rem config
-set ENV_NAME=llama-cpp-python-server
-set PYTHON_VERSION=3.10
-set CONDA_ROOT_PREFIX=%cd%\install_dir\conda
-set INSTALL_ENV_DIR=%cd%\install_dir\server_envs\%ENV_NAME%
-
-echo "Python version: %PYTHON_VERSION%"
-echo "Conda prefix: %CONDA_ROOT_PREFIX%"
-echo "Environment path: %INSTALL_ENV_DIR%"
-
-@rem handle conda environment
-call :check_conda_existence
-call :create_conda_environment
-call :isolate_environment
-call :activate_environment
-
-@rem install dependencies
-@rem ver 0.2.56 produces segment error for /embeddings on MacOS
-call python -m pip install llama-cpp-python[server]==0.2.55
-
-@REM @rem start the server with passed params
-call python -m llama_cpp.server %*
-call conda deactivate
-
-goto :end
-@rem the end of main code execution
-
-
-@rem below are the functions used in the above execution
-
-
-:print_highlight
-echo.
-echo ******************************************************
-echo %~1
-echo ******************************************************
-echo.
-goto :eof
-
-
-:path_sanity_check
-echo "Path sanity checking"
-echo "%cd%"| findstr /C:" " >nul ^
-&& (call :print_highlight "This script relies on Miniconda which can not be silently installed under a path with spaces." ^
-&& goto :end)
-goto :eof
-
-
-:deactivate_environment
-echo "Deactivate existing environment(s)"
-(call conda deactivate && call conda deactivate && call conda deactivate) 2>nul
-goto :eof
-
-
-:check_conda_existence
-echo "Check for conda existence"
-set conda_exists=F
-
-@rem figure out whether conda exists
-call "%CONDA_ROOT_PREFIX%\_conda.exe" --version >nul 2>&1
-if "%ERRORLEVEL%" EQU "0" set conda_exists=T
-
-@rem verify if conda is installed by the main app, if not then raise error
-if "%conda_exists%" == "F" (
-	call :print_highlight "conda is not installed, seems like the app wasn't installed correctly."
-    goto :end
-)
-goto :eof
-
-
-:create_conda_environment
-@rem create the environment if needed
-if not exist "%INSTALL_ENV_DIR%" (
-    echo "Create conda environment"
-	call "%CONDA_ROOT_PREFIX%\_conda.exe" create ^
-        --no-shortcuts -y -k --prefix "%INSTALL_ENV_DIR%" python="%PYTHON_VERSION%" || ^
-    ( echo. && call :print_highlight "Conda environment creation failed." && goto :end )
-)
-
-@rem check if conda environment was actually created
-if not exist "%INSTALL_ENV_DIR%\python.exe" (
-    call :print_highlight "Conda environment was not correctly created."
-    goto :end
-)
-goto :eof
-
-
-:isolate_environment
-echo "Isolate environment"
-set PYTHONNOUSERSITE=1
-set PYTHONPATH=
-set PYTHONHOME=
-goto :eof
-
-
-:activate_environment
-echo "Activate conda environment"
-call "%CONDA_ROOT_PREFIX%\condabin\conda.bat" activate "%INSTALL_ENV_DIR%" || ^
-( echo. && call :print_highlight "Miniconda hook not found." && goto :end )
-goto :eof
-
-
-:end
+@echo off
+
+@rem main code execution
+
+call :print_highlight "Starting inference server for llama-cpp"
+
+cd /D "%~dp0\.."
+echo "Change the current directory to: %cd%"
+
+call :path_sanity_check
+call :deactivate_environment
+
+@rem config
+set ENV_NAME=llama-cpp-python-server
+set PYTHON_VERSION=3.10
+set CONDA_ROOT_PREFIX=%cd%\install_dir\conda
+set INSTALL_ENV_DIR=%cd%\install_dir\server_envs\%ENV_NAME%
+
+echo "Python version: %PYTHON_VERSION%"
+echo "Conda prefix: %CONDA_ROOT_PREFIX%"
+echo "Environment path: %INSTALL_ENV_DIR%"
+
+@rem handle conda environment
+call :check_conda_existence
+call :create_conda_environment
+call :isolate_environment
+call :activate_environment
+
+@rem install dependencies
+@rem ver 0.2.56 produces segment error for /embeddings on MacOS
+call python -m pip install llama-cpp-python[server]==0.2.55
+
+@REM @rem start the server with passed params
+call python -m llama_cpp.server %*
+call conda deactivate
+
+goto :end
+@rem the end of main code execution
+
+
+@rem below are the functions used in the above execution
+
+
+:print_highlight
+echo.
+echo ******************************************************
+echo %~1
+echo ******************************************************
+echo.
+goto :eof
+
+
+:path_sanity_check
+echo "Path sanity checking"
+echo "%cd%"| findstr /C:" " >nul ^
+&& (call :print_highlight "This script relies on Miniconda which can not be silently installed under a path with spaces." ^
+&& goto :end)
+goto :eof
+
+
+:deactivate_environment
+echo "Deactivate existing environment(s)"
+(call conda deactivate && call conda deactivate && call conda deactivate) 2>nul
+goto :eof
+
+
+:check_conda_existence
+echo "Check for conda existence"
+set conda_exists=F
+
+@rem figure out whether conda exists
+call "%CONDA_ROOT_PREFIX%\_conda.exe" --version >nul 2>&1
+if "%ERRORLEVEL%" EQU "0" set conda_exists=T
+
+@rem verify if conda is installed by the main app, if not then raise error
+if "%conda_exists%" == "F" (
+	call :print_highlight "conda is not installed, seems like the app wasn't installed correctly."
+    goto :end
+)
+goto :eof
+
+
+:create_conda_environment
+@rem create the environment if needed
+if not exist "%INSTALL_ENV_DIR%" (
+    echo "Create conda environment"
+	call "%CONDA_ROOT_PREFIX%\_conda.exe" create ^
+        --no-shortcuts -y -k --prefix "%INSTALL_ENV_DIR%" python="%PYTHON_VERSION%" || ^
+    ( echo. && call :print_highlight "Conda environment creation failed." && goto :end )
+)
+
+@rem check if conda environment was actually created
+if not exist "%INSTALL_ENV_DIR%\python.exe" (
+    call :print_highlight "Conda environment was not correctly created."
+    goto :end
+)
+goto :eof
+
+
+:isolate_environment
+echo "Isolate environment"
+set PYTHONNOUSERSITE=1
+set PYTHONPATH=
+set PYTHONHOME=
+goto :eof
+
+
+:activate_environment
+echo "Activate conda environment"
+call "%CONDA_ROOT_PREFIX%\condabin\conda.bat" activate "%INSTALL_ENV_DIR%" || ^
+( echo. && call :print_highlight "Miniconda hook not found." && goto :end )
+goto :eof
+
+
+:end

scripts/update_windows.bat

@@ -1,99 +1,99 @@
-@ECHO off
-
-:: Main script execution
-CD /D "%~dp0\.."
-
-SET app_version=latest
-SET install_dir=%CD%\install_dir
-SET conda_root=%install_dir%\conda
-SET env_dir=%install_dir%\env
-
-ECHO %CD%| FINDSTR /C:" " >nul 2>&1
-IF %ERRORLEVEL% EQU 0 (
-    ECHO The current workdir has whitespace which can lead to unintended behaviour. Please modify your path and continue later.
-    GOTO :end
-)
-
-CALL :print_highlight "Activating conda environment"
-CALL :activate_environment
-IF ERRORLEVEL 1 GOTO :end
-
-CALL :print_highlight "Updating Kotaemon to latest"
-CALL :update_latest
-IF ERRORLEVEL 1 GOTO :end
-
-CALL :deactivate_environment
-GOTO :end_success
-
-
-:activate_environment
-:: deactivate existing conda env(s) to avoid conflicts
-( CALL conda deactivate && CALL conda deactivate && CALL conda deactivate ) 2> nul
-
-CALL "%env_dir%\python.exe" --version >nul 2>&1 || (
-    ECHO The environment appears to be broken. You may need to remove %env_dir% and run the installer again.
-    GOTO :exit_func_with_error
-)
-
-CALL "%conda_root%\condabin\conda.bat" activate %env_dir% || (
-    ECHO Failed to activate environment. You may need to remove %env_dir% and run the installer again.
-    GOTO :exit_func_with_error
-)
-ECHO Activate conda environment at %env_dir%
-
-GOTO :eof
-
-:deactivate_environment
-:: Conda deactivate if we are in the right env
-IF "%CONDA_PREFIX%" == "%env_dir%" (
-    CALL "%conda_root%\condabin\conda.bat" deactivate
-    ECHO Deactivate conda environment at %env_dir%
-)
-GOTO :eof
-
-:update_latest
-FOR /F "tokens=1,2" %%a in ('pip list') do if "%%a"=="kotaemon-app" set current_version=%%b
-ECHO Current version %current_version%
-
-IF EXIST "pyproject.toml" (
-    ECHO Source files detected. Please perform git pull manually.
-    CALL :deactivate_environment
-    GOTO :exit_func_with_error
-) ELSE (
-    ECHO Installing version: %app_version%
-    @REM Work around for versioning control
-    python -m pip install git+https://github.com/Cinnamon/kotaemon.git@"%app_version%"#subdirectory=libs/kotaemon
-    python -m pip install git+https://github.com/Cinnamon/kotaemon.git@"%app_version%"#subdirectory=libs/ktem
-    python -m pip install --no-deps git+https://github.com/Cinnamon/kotaemon.git@"%app_version%"
-) || (
-    ECHO. && ECHO Update failed. You may need to run the update again.
-    CALL :deactivate_environment
-    GOTO :exit_func_with_error
-)
-
-CALL :print_highlight "Update successfully."
-FOR /F "tokens=1,2" %%a in ('pip list') do if "%%a"=="kotaemon-app" set updated_version=%%b
-ECHO Updated version %updated_version%
-ECHO %updated_version% > VERSION
-GOTO :eof
-
-:print_highlight
-ECHO. && ECHO ******************************************************
-ECHO %~1
-ECHO ****************************************************** && ECHO.
-GOTO :eof
-
-:exit_func_with_error
-:: Called inside functions when error happens, then back to the main routine with error code 1
-EXIT /B 1
-
-:end_success
-:: Exit the script main routine with error code 0 (success)
-ECHO Script completed successfully.
-PAUSE
-EXIT /B 0
-
-:end
-:: Exit the script main routine with error code 1 (fail)
-PAUSE
-EXIT /B 1
+@ECHO off
+
+:: Main script execution
+CD /D "%~dp0\.."
+
+SET app_version=latest
+SET install_dir=%CD%\install_dir
+SET conda_root=%install_dir%\conda
+SET env_dir=%install_dir%\env
+
+ECHO %CD%| FINDSTR /C:" " >nul 2>&1
+IF %ERRORLEVEL% EQU 0 (
+    ECHO The current workdir has whitespace which can lead to unintended behaviour. Please modify your path and continue later.
+    GOTO :end
+)
+
+CALL :print_highlight "Activating conda environment"
+CALL :activate_environment
+IF ERRORLEVEL 1 GOTO :end
+
+CALL :print_highlight "Updating Kotaemon to latest"
+CALL :update_latest
+IF ERRORLEVEL 1 GOTO :end
+
+CALL :deactivate_environment
+GOTO :end_success
+
+
+:activate_environment
+:: deactivate existing conda env(s) to avoid conflicts
+( CALL conda deactivate && CALL conda deactivate && CALL conda deactivate ) 2> nul
+
+CALL "%env_dir%\python.exe" --version >nul 2>&1 || (
+    ECHO The environment appears to be broken. You may need to remove %env_dir% and run the installer again.
+    GOTO :exit_func_with_error
+)
+
+CALL "%conda_root%\condabin\conda.bat" activate %env_dir% || (
+    ECHO Failed to activate environment. You may need to remove %env_dir% and run the installer again.
+    GOTO :exit_func_with_error
+)
+ECHO Activate conda environment at %env_dir%
+
+GOTO :eof
+
+:deactivate_environment
+:: Conda deactivate if we are in the right env
+IF "%CONDA_PREFIX%" == "%env_dir%" (
+    CALL "%conda_root%\condabin\conda.bat" deactivate
+    ECHO Deactivate conda environment at %env_dir%
+)
+GOTO :eof
+
+:update_latest
+FOR /F "tokens=1,2" %%a in ('pip list') do if "%%a"=="kotaemon-app" set current_version=%%b
+ECHO Current version %current_version%
+
+IF EXIST "pyproject.toml" (
+    ECHO Source files detected. Please perform git pull manually.
+    CALL :deactivate_environment
+    GOTO :exit_func_with_error
+) ELSE (
+    ECHO Installing version: %app_version%
+    @REM Work around for versioning control
+    python -m pip install git+https://github.com/Cinnamon/kotaemon.git@"%app_version%"#subdirectory=libs/kotaemon
+    python -m pip install git+https://github.com/Cinnamon/kotaemon.git@"%app_version%"#subdirectory=libs/ktem
+    python -m pip install --no-deps git+https://github.com/Cinnamon/kotaemon.git@"%app_version%"
+) || (
+    ECHO. && ECHO Update failed. You may need to run the update again.
+    CALL :deactivate_environment
+    GOTO :exit_func_with_error
+)
+
+CALL :print_highlight "Update successfully."
+FOR /F "tokens=1,2" %%a in ('pip list') do if "%%a"=="kotaemon-app" set updated_version=%%b
+ECHO Updated version %updated_version%
+ECHO %updated_version% > VERSION
+GOTO :eof
+
+:print_highlight
+ECHO. && ECHO ******************************************************
+ECHO %~1
+ECHO ****************************************************** && ECHO.
+GOTO :eof
+
+:exit_func_with_error
+:: Called inside functions when error happens, then back to the main routine with error code 1
+EXIT /B 1
+
+:end_success
+:: Exit the script main routine with error code 0 (success)
+ECHO Script completed successfully.
+PAUSE
+EXIT /B 0
+
+:end
+:: Exit the script main routine with error code 1 (fail)
+PAUSE
+EXIT /B 1