diff --git a/deployment_scripts/windows/NOTE.txt b/deployment_scripts/windows/NOTE.txt index 330097c..efcc53d 100644 --- a/deployment_scripts/windows/NOTE.txt +++ b/deployment_scripts/windows/NOTE.txt @@ -1,5 +1,7 @@ You will need to make three folders: -node - contains nodejs portable -py - contains python3 portable -ollama - contains ollama portable +node-bin - contains nodejs portable +python-bin - contains python3 portable - don't forget to add the .pth file and adjust it accordingly, because import site is normally missing. +ollama.bin - contains ollama portable + +you also need vc redist 2019 \ No newline at end of file diff --git a/deployment_scripts/windows/prepare.bat b/deployment_scripts/windows/prepare_free.bat similarity index 60% rename from deployment_scripts/windows/prepare.bat rename to deployment_scripts/windows/prepare_free.bat index 163e99d..6a8c26d 100644 --- a/deployment_scripts/windows/prepare.bat +++ b/deployment_scripts/windows/prepare_free.bat @@ -1,3 +1,3 @@ start /b scripts\prepare_py.bat start /b scripts\prepare_npm.bat -start /b scripts\prepare_ollama.bat \ No newline at end of file +start /b scripts\prepare_ollama_free.bat \ No newline at end of file diff --git a/deployment_scripts/windows/prepare_nonfree.bat b/deployment_scripts/windows/prepare_nonfree.bat new file mode 100644 index 0000000..c30ce0b --- /dev/null +++ b/deployment_scripts/windows/prepare_nonfree.bat @@ -0,0 +1,3 @@ +start /b scripts\prepare_py.bat +start /b scripts\prepare_npm.bat +start /b scripts\prepare_ollama_nonfree.bat \ No newline at end of file diff --git a/deployment_scripts/windows/python313._pth b/deployment_scripts/windows/python313._pth new file mode 100644 index 0000000..4b5ab01 --- /dev/null +++ b/deployment_scripts/windows/python313._pth @@ -0,0 +1,5 @@ +python313.zip +. + +# Uncomment to run site.main() automatically +import site diff --git a/deployment_scripts/windows/scripts/prepare_npm.bat b/deployment_scripts/windows/scripts/prepare_npm.bat index 13f4f57..2fac437 100644 --- a/deployment_scripts/windows/scripts/prepare_npm.bat +++ b/deployment_scripts/windows/scripts/prepare_npm.bat @@ -1,5 +1,5 @@ cd node-bin -set PATH=%PATH%;%CD% +set PATH=%PATH%;"%CD%"; cd .. npm install diff --git a/deployment_scripts/windows/scripts/prepare_ollama.bat b/deployment_scripts/windows/scripts/prepare_ollama.bat deleted file mode 100644 index ce6187d..0000000 --- a/deployment_scripts/windows/scripts/prepare_ollama.bat +++ /dev/null @@ -1,16 +0,0 @@ -cd ollama-bin -ollama.exe pull phi3.5 -ollama.exe pull qwen2-math:1.5b -ollama.exe pull starcoder2 -ollama.exe pull llava-phi3 -ollama.exe pull qwen2.5-coder:1.5b -ollama.exe pull starcoder2:7b -ollama.exe pull wizard-math -ollama.exe pull llama3.1 -ollama.exe pull llama3.2 -ollama.exe pull dolphin-phi -ollama.exe pull dolphin-llama3 -ollama.exe pull llava -ollama.exe pull qwen2.5 -ollama.exe pull mathstral -ollama.exe pull qwen2.5-coder \ No newline at end of file diff --git a/deployment_scripts/windows/scripts/prepare_ollama_free.bat b/deployment_scripts/windows/scripts/prepare_ollama_free.bat new file mode 100644 index 0000000..95597d6 --- /dev/null +++ b/deployment_scripts/windows/scripts/prepare_ollama_free.bat @@ -0,0 +1,10 @@ +cd ollama-bin +start /b ollama.exe serve +timeout 5 +ollama.exe pull qwen2-math:1.5b +ollama.exe pull qwen2.5-coder:1.5b +ollama.exe pull phi3.5 + +ollama.exe pull mathstral +ollama.exe pull qwen2.5-coder +ollama.exe pull qwen2.5 \ No newline at end of file diff --git a/deployment_scripts/windows/scripts/prepare_ollama_nonfree.bat b/deployment_scripts/windows/scripts/prepare_ollama_nonfree.bat new file mode 100644 index 0000000..bc88592 --- /dev/null +++ b/deployment_scripts/windows/scripts/prepare_ollama_nonfree.bat @@ -0,0 +1,10 @@ +cd ollama-bin +start /b ollama.exe serve +timeout 5 +ollama.exe pull qwen2-math:1.5b +ollama.exe pull starcoder2 +ollama.exe pull llama3.2 + +ollama.exe pull wizard-math +ollama.exe pull starcoder2:7b +ollama.exe pull llama3.1 \ No newline at end of file diff --git a/deployment_scripts/windows/scripts/prepare_py.bat b/deployment_scripts/windows/scripts/prepare_py.bat index dc9c8eb..dd2d168 100644 --- a/deployment_scripts/windows/scripts/prepare_py.bat +++ b/deployment_scripts/windows/scripts/prepare_py.bat @@ -1,11 +1,13 @@ cd python-bin -set PATH=%PATH%;%CD% +set PATH=%PATH%;"%CD%"; curl -O https://bootstrap.pypa.io/get-pip.py -python get-pip.py +ren python.exe py.exe +py get-pip.py cd Scripts -set PATH=%PATH%;%CD% +set PATH=%PATH%;"%CD%"; cd .. cd .. cd py -python -m pip install -r requirements.txt \ No newline at end of file +py -m pip install setuptools +py -m pip install -r requirements.txt \ No newline at end of file diff --git a/deployment_scripts/windows/scripts/run_electron.bat b/deployment_scripts/windows/scripts/run_electron.bat index 4b7d254..3a97ac3 100644 --- a/deployment_scripts/windows/scripts/run_electron.bat +++ b/deployment_scripts/windows/scripts/run_electron.bat @@ -1,5 +1,5 @@ cd node-bin -set PATH=%PATH%;%CD% +set PATH=%PATH%;"%CD%"; cd .. start /b npm start diff --git a/deployment_scripts/windows/scripts/run_ollama.bat b/deployment_scripts/windows/scripts/run_ollama.bat index 018e09e..87d1459 100644 --- a/deployment_scripts/windows/scripts/run_ollama.bat +++ b/deployment_scripts/windows/scripts/run_ollama.bat @@ -1,2 +1,2 @@ cd ollama-bin -"ollama app.exe" \ No newline at end of file +start /b ollama.exe serve \ No newline at end of file diff --git a/deployment_scripts/windows/scripts/run_py.bat b/deployment_scripts/windows/scripts/run_py.bat index d4c9e98..d54c44e 100644 --- a/deployment_scripts/windows/scripts/run_py.bat +++ b/deployment_scripts/windows/scripts/run_py.bat @@ -1,7 +1,7 @@ cd python-bin -set PATH=%PATH%;%CD% +set PATH=%PATH%;"%CD%"; cd Scripts -set PATH=%PATH%;%CD% +set PATH=%PATH%;"%CD%"; cd .. cd .. diff --git a/py/requirements.txt b/py/requirements.txt index 3a91239..ca6f1da 100644 --- a/py/requirements.txt +++ b/py/requirements.txt @@ -5,14 +5,10 @@ mistralai openai anthropic pyOpenSSL -SpeechRecognition -PocketSphinx -google-cloud-speech google-generativeai python-weather pycouchdb pyttsx3 -pip-licenses faster-whisper pydub ffmpeg \ No newline at end of file