Merge branch 'main' into main

deployment_scripts/windows/NOTE.txt

@@ -1,5 +1,7 @@
 You will need to make three folders:
 
-node - contains nodejs portable
+node-bin - contains nodejs portable
-py - contains python3 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 - contains ollama portable
+ollama.bin - contains ollama portable
+
+you also need vc redist 2019

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
+start /b scripts\prepare_ollama_free.bat

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

deployment_scripts/windows/python313._pth

@@ -0,0 +1,5 @@
+python313.zip
+.
+
+# Uncomment to run site.main() automatically
+import site

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

deployment_scripts/windows/scripts/prepare_ollama.bat

@@ -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

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

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

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
+py -m pip install setuptools
+py -m pip install -r requirements.txt

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

deployment_scripts/windows/scripts/run_ollama.bat

@@ -1,2 +1,2 @@
 cd ollama-bin
-"ollama app.exe"
+start /b ollama.exe serve

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 ..
 

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