Agent Zero AI framework
Bundler updates
frdel9da3bd5b2ea6
diff --git a/bundle/mac_pkg_scripts/postinstall b/bundle/mac_pkg_scripts/postinstallindex 09d53b312..72019f97d 100755--- a/bundle/mac_pkg_scripts/postinstall+++ b/bundle/mac_pkg_scripts/postinstall@@ -1,5 +1,8 @@#!/bin/bash+# Define the source path in the user's Library/Application Support+SOURCE_PATH="$HOME/Library/Application Support/agent-zero/install"+# Prompt the user to select a folder using an AppleScript dialogTARGET_FOLDER=$(osascript <<EOTtell application "System Events"@@ -15,15 +18,15 @@ if [ -n "$TARGET_FOLDER" ]; thenecho "Installing files to $TARGET_FOLDER"# Move the installed files to the selected folder- mv /tmp/agent-zero/* "$TARGET_FOLDER"+ mv "$SOURCE_PATH"/* "$TARGET_FOLDER"# Check if the move operation was successfulif [ $? -eq 0 ]; thenecho "Files successfully moved to $TARGET_FOLDER"- # Remove the /tmp/agent-zero folder- rm -rf /tmp/agent-zero- echo "/tmp/agent-zero folder removed."+ # Remove the agent-zero folder in Library/Application Support+ rm -rf "$SOURCE_PATH"+ echo "$SOURCE_PATH folder removed."elseecho "Error moving files. Exiting."exit 1@@ -33,4 +36,4 @@ elseexit 1fi-exit 0\ No newline at end of file+exit 0diff --git a/bundle/macos_bundle.sh b/bundle/macos_bundle.shindex fde05c6a1..71b6467b0 100755--- a/bundle/macos_bundle.sh+++ b/bundle/macos_bundle.sh@@ -22,35 +22,41 @@ if [ $? -ne 0 ]; thenexit 1fi-# 3. Purge folder ./agent-zero (retry mechanism in case of failure)-if [ -d "agent-zero" ]; then- echo "Deleting agent-zero folder..."- rm -rf agent-zero- if [ -d "agent-zero" ]; then- echo "Error: Unable to delete agent-zero folder, retrying..."+# 3. Purge folder ./agent-zero-git (retry mechanism in case of failure)+if [ -d "agent-zero-git" ]; then+ echo "Deleting agent-zero-git folder..."+ rm -rf agent-zero-git+ if [ -d "agent-zero-git" ]; then+ echo "Error: Unable to delete agent-zero-git folder, retrying..."sleep 3- rm -rf agent-zero+ rm -rf agent-zero-gitfi- if [ -d "agent-zero" ]; then- echo "Error: Failed to purge agent-zero folder after retry."+ if [ -d "agent-zero-git" ]; then+ echo "Error: Failed to purge agent-zero-git folder after retry."exit 1fifi# 4. Clone the repository (development branch)echo "Cloning the repository (development branch)..."-git clone --branch development https://github.com/frdel/agent-zero agent-zero+git clone --branch development https://github.com/frdel/agent-zero agent-zero-gitif [ $? -ne 0 ]; thenecho "Error cloning the repository."exit 1fi# 5. Change directory to agent-zero-cd agent-zero || { echo "Error changing directory"; exit 1; }+# cd agent-zero || { echo "Error changing directory"; exit 1; }# 6. Install requirementsecho "Installing requirements from requirements.txt..."-pip install -r requirements.txt+pip install -r ./agent-zero-git/requirements.txt+if [ $? -ne 0 ]; then+ echo "Error installing requirements."+ exit 1+fi++pip install -r ./agent-zero-git/bundle/requirements.txtif [ $? -ne 0 ]; thenecho "Error installing requirements."exit 1@@ -61,7 +67,7 @@ fi# 8. Run bundle.pyecho "Running bundle.py..."-python ./bundle/bundle.py+python ./agent-zero-git/bundle/bundle.pyif [ $? -ne 0 ]; thenecho "Error running bundle.py."exit 1@@ -84,22 +90,24 @@ fi# 9. Create macOS packageecho "Creating macOS package..."-pkgbuild --root ./dist/agent-zero \+pkgbuild --root ./agent-zero-git/bundle/dist/agent-zero \--identifier frdel.agent-zero \- --install-location /tmp/agent-zero \- --scripts ./mac_pkg_scripts \+ --install-location "$HOME/Library/Application Support/agent-zero/install" \+ --scripts ./agent-zero-git/bundle/mac_pkg_scripts \+ --ownership preserve \agent-zero-preinstalled-mac-m1.pkg+if [ $? -ne 0 ]; thenecho "Error creating macOS package."exit 1fi-# 10. Remove the agent-zero folder-echo "Deleting agent-zero folder..."+# 10. Remove the agent-zero-git folder+echo "Deleting agent-zero-git folder..."cd ..-rm -rf agent-zero-if [ -d "agent-zero" ]; then- echo "Error: Failed to delete agent-zero folder."+rm -rf agent-zero-git+if [ -d "agent-zero-git" ]; then+ echo "Error: Failed to delete agent-zero-git folder."exit 1fidiff --git a/bundle/requirements.txt b/bundle/requirements.txtnew file mode 100644index 000000000..0fe15e181--- /dev/null+++ b/bundle/requirements.txt@@ -0,0 +1,3 @@+pathspec==0.12.1+py7zr==0.22.0+pyinstaller==6.10.0\ No newline at end of filediff --git a/bundle/windows_bundle.bat b/bundle/windows_bundle.batindex 7f2a454b2..d81ac81d4 100644--- a/bundle/windows_bundle.bat+++ b/bundle/windows_bundle.bat@@ -56,38 +56,44 @@ if %errorlevel% neq 0 ():: 3. Purge folder ./agent-zero (retry mechanism in case of failure)-if exist agent-zero (- echo Deleting agent-zero folder...- rmdir /s /q agent-zero- if exist agent-zero (- echo Error: Unable to delete agent-zero folder, retrying...+if exist agent-zero-git (+ echo Deleting agent-zero-git folder...+ rmdir /s /q agent-zero-git+ if exist agent-zero-git (+ echo Error: Unable to delete agent-zero-git folder, retrying...timeout /t 3 /nobreak >nul- rmdir /s /q agent-zero+ rmdir /s /q agent-zero-git)- if exist agent-zero (- echo Error: Failed to purge agent-zero folder after retry.+ if exist agent-zero-git (+ echo Error: Failed to purge agent-zero-git folder after retry.pause))-:: 4. Clone the repository (testing branch)-git clone --branch testing https://github.com/frdel/agent-zero agent-zero+:: 4. Clone the repository (development branch)+git clone --branch development https://github.com/frdel/agent-zero agent-zero-gitif %ERRORLEVEL% neq 0 (echo Error cloning the repositorypause)-:: 5. Change directory to agent-zero-cd agent-zero+@REM :: 5. Change directory to agent-zero+@REM cd agent-zero+@REM if %errorlevel% neq 0 (+@REM echo Error changing directory+@REM pause+@REM )++:: 6. Install requirements+pip install -r ./agent-zero-git/requirements.txtif %errorlevel% neq 0 (- echo Error changing directory+ echo Error installing project requirementspause)-:: 6. Install requirements-pip install -r requirements.txt+pip install -r ./agent-zero-git/bundle/requirements.txtif %errorlevel% neq 0 (- echo Error installing requirements+ echo Error installing bundle requirementspause)@@ -99,11 +105,19 @@ if %errorlevel% neq 0 ():: 8. Run bundle.py-python ./bundle/bundle.py+python ./agent-zero-git/bundle/bundle.pyif %errorlevel% neq 0 (echo Error running bundle.pypause)+:: 9. Create Windows self-extracting archive with 7-Zip+echo Creating Windows self-extracting archive...+"C:\Program Files\7-Zip\7z.exe" a -sfx"C:\Program Files\7-Zip\7z.sfx" agent-zero-preinstalled-win-x86.exe ".\agent-zero-git\bundle\dist\agent-zero" -mx=7+if %errorlevel% neq 0 (+ echo Error creating Windows self-extracting archive.+ pause+)+echo Script completedpausediff --git a/requirements.txt b/requirements.txtindex efab97562..8e3fac3df 100644--- a/requirements.txt+++ b/requirements.txt@@ -18,9 +18,6 @@ lxml_html_clean==0.3.1markdown==3.7newspaper3k==0.2.8paramiko==3.4.0-pathspec==0.12.1-py7zr==0.22.0-pyinstaller==6.10.0pypdf==4.3.1python-dotenv==1.0.1sentence-transformers==3.0.1