From cc332dae36cfb1c0eb7e82a3b7d559f7d16cbb0e Mon Sep 17 00:00:00 2001 From: David Bieber Date: Sat, 2 Nov 2024 19:27:38 -0400 Subject: [PATCH 01/20] Update action triggers --- .github/workflows/build.yml | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 30003bcf..cbf6946d 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -1,6 +1,9 @@ name: Build image, lint, and run tests -on: [push] +on: + push: + pull_request: + branches: ["master"] jobs: build: From e83dd48f69b68d349d895a627cf1aeaffe935481 Mon Sep 17 00:00:00 2001 From: David Bieber Date: Sat, 2 Nov 2024 19:45:42 -0400 Subject: [PATCH 02/20] Switch to uv --- .github/workflows/build.yml | 16 +++++++++------- .gitignore | 1 + gonotego/command_center/system_commands.py | 2 +- gonotego/supervisord.conf | 12 ++++++------ gonotego/uploader/blob/blob_uploader.py | 6 +++++- installation.md | 10 ++++++---- 6 files changed, 28 insertions(+), 19 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index cbf6946d..2cb34337 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -58,15 +58,16 @@ jobs: git checkout $GITHUB_SHA echo "Setting up Python environment" - python3 -m venv env - ./env/bin/pip install -e . # Install Python dependencies + python3 -m pip install uv + python3 -m uv venv + python3 -m uv pip install -e . # Install Python dependencies echo "Start on boot" sudo cat /etc/rc.local sudo sed '/^exit 0/i \ sudo -u pi mkdir -p /home/pi/out \ bash /home/pi/code/github/dbieber/GoNoteGo/scripts/install_settings.sh \ - /home/pi/code/github/dbieber/GoNoteGo/env/bin/supervisord -c /home/pi/code/github/dbieber/GoNoteGo/gonotego/supervisord.conf \ + /home/pi/code/github/dbieber/GoNoteGo/.venv/bin/supervisord -c /home/pi/code/github/dbieber/GoNoteGo/gonotego/supervisord.conf \ ' /etc/rc.local > ./rc.local.modified && sudo mv ./rc.local.modified /etc/rc.local sudo chmod +x /etc/rc.local @@ -236,15 +237,16 @@ jobs: cat /etc/dhcpcd.conf cat /etc/dnsmasq.conf python -m http.server + python3 -m http.server sudo iptables -t nat -A POSTROUTING -o wlan0 -j MASQUERADE sudo iptables -t nat -L sudo cat /etc/wpa_supplicant/wpa_supplicant.conf sudo nano /etc/wpa_supplicant/wpa_supplicant.conf nano /home/pi/code/github/dbieber/GoNoteGo/gonotego/settings/secure_settings.py - /home/pi/code/github/dbieber/GoNoteGo/env/bin/python - /home/pi/code/github/dbieber/GoNoteGo/env/bin/supervisord -c /home/pi/code/github/dbieber/GoNoteGo/gonotego/supervisord.conf - /home/pi/code/github/dbieber/GoNoteGo/env/bin/supervisorctl -u go -p notego status - /home/pi/code/github/dbieber/GoNoteGo/env/bin/supervisorctl -u go -p notego restart all + /home/pi/code/github/dbieber/GoNoteGo/.venv/bin/python + /home/pi/code/github/dbieber/GoNoteGo/.venv/bin/supervisord -c /home/pi/code/github/dbieber/GoNoteGo/gonotego/supervisord.conf + /home/pi/code/github/dbieber/GoNoteGo/.venv/bin/supervisorctl -u go -p notego status + /home/pi/code/github/dbieber/GoNoteGo/.venv/bin/supervisorctl -u go -p notego restart all cd /home/pi/code/github/dbieber/GoNoteGo/ EOF diff --git a/.gitignore b/.gitignore index 7ead14c9..2cc22e88 100644 --- a/.gitignore +++ b/.gitignore @@ -9,6 +9,7 @@ screenshot-*.png geckodriver.log scratch env +.venv tmp-say auth_url build diff --git a/gonotego/command_center/system_commands.py b/gonotego/command_center/system_commands.py index d423f0a7..a046ed3d 100644 --- a/gonotego/command_center/system_commands.py +++ b/gonotego/command_center/system_commands.py @@ -118,7 +118,7 @@ def update(): @register_command('restart') def restart(): - shell('./env/bin/supervisorctl -u go -p notego restart all') + shell('./.venv/bin/supervisorctl -u go -p notego restart all') @register_command('reboot') diff --git a/gonotego/supervisord.conf b/gonotego/supervisord.conf index 89783b6d..10c8ba75 100644 --- a/gonotego/supervisord.conf +++ b/gonotego/supervisord.conf @@ -23,33 +23,33 @@ username=go password=notego [program:GoNoteGo-audio-listener] -command=/home/pi/code/github/dbieber/GoNoteGo/env/bin/python /home/pi/code/github/dbieber/GoNoteGo/gonotego/audio/runner.py +command=/home/pi/code/github/dbieber/GoNoteGo/.venv/bin/python /home/pi/code/github/dbieber/GoNoteGo/gonotego/audio/runner.py directory=/home/pi user=root [program:GoNoteGo-command-center] environment=XDG_RUNTIME_DIR="/run/user/1000" -command=/home/pi/code/github/dbieber/GoNoteGo/env/bin/python /home/pi/code/github/dbieber/GoNoteGo/gonotego/command_center/runner.py +command=/home/pi/code/github/dbieber/GoNoteGo/.venv/bin/python /home/pi/code/github/dbieber/GoNoteGo/gonotego/command_center/runner.py directory=/home/pi user=pi [program:GoNoteGo-text-listener] -command=/home/pi/code/github/dbieber/GoNoteGo/env/bin/python /home/pi/code/github/dbieber/GoNoteGo/gonotego/text/runner.py +command=/home/pi/code/github/dbieber/GoNoteGo/.venv/bin/python /home/pi/code/github/dbieber/GoNoteGo/gonotego/text/runner.py directory=/home/pi user=root [program:GoNoteGo-transcription] environment=GOOGLE_APPLICATION_CREDENTIALS="/home/pi/secrets/google_credentials.json",LD_PRELOAD=/usr/lib/arm-linux-gnueabihf/libatomic.so.1.2.0 -command=/home/pi/code/github/dbieber/GoNoteGo/env/bin/python /home/pi/code/github/dbieber/GoNoteGo/gonotego/transcription/runner.py +command=/home/pi/code/github/dbieber/GoNoteGo/.venv/bin/python /home/pi/code/github/dbieber/GoNoteGo/gonotego/transcription/runner.py directory=/home/pi user=pi [program:GoNoteGo-uploader] -command=/home/pi/code/github/dbieber/GoNoteGo/env/bin/python /home/pi/code/github/dbieber/GoNoteGo/gonotego/uploader/runner.py +command=/home/pi/code/github/dbieber/GoNoteGo/.venv/bin/python /home/pi/code/github/dbieber/GoNoteGo/gonotego/uploader/runner.py directory=/home/pi user=pi [program:GoNoteGo-settings-server] -command=/home/pi/code/github/dbieber/GoNoteGo/env/bin/python /home/pi/code/github/dbieber/GoNoteGo/gonotego/settings_server/runner.py +command=/home/pi/code/github/dbieber/GoNoteGo/.venv/bin/python /home/pi/code/github/dbieber/GoNoteGo/gonotego/settings_server/runner.py directory=/home/pi user=pi diff --git a/gonotego/uploader/blob/blob_uploader.py b/gonotego/uploader/blob/blob_uploader.py index 4f3325b6..d633d70e 100644 --- a/gonotego/uploader/blob/blob_uploader.py +++ b/gonotego/uploader/blob/blob_uploader.py @@ -20,5 +20,9 @@ def upload_blob(filepath, client): dropbox_path = f'/{filepath}' with open(filepath, 'rb') as f: unused_file_metadata = client.files_upload(f.read(), dropbox_path) # noqa - link_metadata = client.sharing_create_shared_link(dropbox_path) + try: + link_metadata = client.sharing_create_shared_link(dropbox_path) + except dropbox.exceptions.ApiError as e: + print(e) + return None return link_metadata.url.replace('www.', 'dl.').replace('?dl=0', '') diff --git a/installation.md b/installation.md index e9fb62bc..97784389 100644 --- a/installation.md +++ b/installation.md @@ -4,6 +4,8 @@ These instructions assume you're starting from a clean install of Raspbian, and that your Raspberry Pi is connected to an external monitor. Once you are set up, an external monitor will no longer be necessary. +Update 2024: Newer, better instructions are in the works. Stay tuned! + 1. Clone GoNoteGo ```bash @@ -39,9 +41,9 @@ sudo apt install firefox-esr xvfb portaudio19-dev libatlas-base-dev redis-server cd /home/pi/code/github/dbieber/GoNoteGo mkdir out pip3 install virtualenv -/home/pi/.local/bin/virtualenv env -p python3 -./env/bin/pip install grpcio -U --no-binary=grpcio -./env/bin/pip install -e . +/home/pi/.local/bin/virtualenv .venv -p python3 +./.venv/bin/pip install grpcio -U --no-binary=grpcio +./.venv/bin/pip install -e . ``` 5. Start on boot @@ -50,7 +52,7 @@ pip3 install virtualenv sudo nano /etc/rc.local ``` Add this line to rc.local: - `/home/pi/code/github/dbieber/GoNoteGo/env/bin/supervisord -c /home/pi/code/github/dbieber/GoNoteGo/gonotego/supervisord.conf` + `/home/pi/code/github/dbieber/GoNoteGo/.venv/bin/supervisord -c /home/pi/code/github/dbieber/GoNoteGo/gonotego/supervisord.conf` 6. Install geckodriver to /usr/local/bin From 0b99824c1e0e65329d7856ff756ffab5ccbcee59 Mon Sep 17 00:00:00 2001 From: David Bieber Date: Sat, 2 Nov 2024 19:55:07 -0400 Subject: [PATCH 03/20] Use venv the old way --- .github/workflows/build.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 2cb34337..2315847d 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -58,9 +58,9 @@ jobs: git checkout $GITHUB_SHA echo "Setting up Python environment" - python3 -m pip install uv - python3 -m uv venv - python3 -m uv pip install -e . # Install Python dependencies + python3 -m venv .venv + ./env/bin/pip install uv + ./env/bin/python3 -m uv pip install -e . # Install Python dependencies echo "Start on boot" sudo cat /etc/rc.local From 57ad580432205a17a0b26291933b5742c83d51b9 Mon Sep 17 00:00:00 2001 From: David Bieber Date: Sat, 2 Nov 2024 20:00:26 -0400 Subject: [PATCH 04/20] Use venv the old way --- .github/workflows/build.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 2315847d..985e553d 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -59,8 +59,8 @@ jobs: echo "Setting up Python environment" python3 -m venv .venv - ./env/bin/pip install uv - ./env/bin/python3 -m uv pip install -e . # Install Python dependencies + ./.venv/bin/pip install uv + ./.venv/bin/python3 -m uv pip install -e . # Install Python dependencies echo "Start on boot" sudo cat /etc/rc.local From 87a0edcb777fd162104784a4dfd8b52f7bf4841b Mon Sep 17 00:00:00 2001 From: David Bieber Date: Sat, 2 Nov 2024 20:18:47 -0400 Subject: [PATCH 05/20] Mark versions --- pyproject.toml | 30 +++++++++++++++--------------- 1 file changed, 15 insertions(+), 15 deletions(-) diff --git a/pyproject.toml b/pyproject.toml index 9094d1cf..4c9047e3 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -19,24 +19,24 @@ classifiers = [ ] dependencies = [ - 'absl-py', - 'apscheduler', - 'dropbox', - 'fire>=0.4.0', - 'flask', - 'keyboard', - 'numpy', - 'openai', - 'parsedatetime', - 'python-dateutil', - 'redis', + 'absl-py<=2.1.0', + 'apscheduler<=3.10.4', + 'dropbox<=12.0.2', + 'fire<=0.7.0', + 'flask<=3.0.3', + 'keyboard<=0.13.5', + 'numpy<=2.1.3', + 'openai<=1.52.2', + 'parsedatetime<=2.6', + 'python-dateutil<=2.8.2', + 'redis<=4.3.4', # selenium 4.0 breaks with arm geckodriver. 'selenium==3.141.0', - 'setuptools-rust', - 'sounddevice', + 'setuptools-rust<=1.5.2', + 'sounddevice<=0.4.5', 'soundfile', - 'supervisor', - 'twython', + 'supervisor<=4.2.4', + 'twython<=3.9.1', "urllib3==1.26.16", # For compatibility with selenium==3.141.0 ] From f1c060674ea9df6d4feedc5bc81ea749d654c610 Mon Sep 17 00:00:00 2001 From: David Bieber Date: Sat, 2 Nov 2024 20:32:03 -0400 Subject: [PATCH 06/20] set jiter version --- pyproject.toml | 1 + 1 file changed, 1 insertion(+) diff --git a/pyproject.toml b/pyproject.toml index 4c9047e3..3c678e6e 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -27,6 +27,7 @@ dependencies = [ 'keyboard<=0.13.5', 'numpy<=2.1.3', 'openai<=1.52.2', + 'jiter<=0.6.1', # for openai on arm (not directly required) 'parsedatetime<=2.6', 'python-dateutil<=2.8.2', 'redis<=4.3.4', From e9a085c50aa1056d05fb177bae8e50b4083a1ad5 Mon Sep 17 00:00:00 2001 From: David Bieber Date: Sat, 2 Nov 2024 20:45:16 -0400 Subject: [PATCH 07/20] remove jitter, bump python --- .github/workflows/build.yml | 2 +- pyproject.toml | 1 - 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 985e553d..c87057b7 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -10,7 +10,7 @@ jobs: runs-on: ubuntu-latest strategy: matrix: - python-version: [3.9] + python-version: [3.12] steps: - uses: actions/checkout@v4 diff --git a/pyproject.toml b/pyproject.toml index 3c678e6e..4c9047e3 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -27,7 +27,6 @@ dependencies = [ 'keyboard<=0.13.5', 'numpy<=2.1.3', 'openai<=1.52.2', - 'jiter<=0.6.1', # for openai on arm (not directly required) 'parsedatetime<=2.6', 'python-dateutil<=2.8.2', 'redis<=4.3.4', From bc39e4d106b54fad19a9b3c2f5bd73235287df51 Mon Sep 17 00:00:00 2001 From: David Bieber Date: Sat, 2 Nov 2024 20:53:51 -0400 Subject: [PATCH 08/20] Install openai but not jiter --- .github/workflows/build.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index c87057b7..789114aa 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -60,6 +60,8 @@ jobs: echo "Setting up Python environment" python3 -m venv .venv ./.venv/bin/pip install uv + ./.venv/bin/python3 -m uv pip install openai --no-deps + ./.venv/bin/python3 -m uv pip install anyio distro httpx pydantic sniffio tqdm typing_extensions # openai deps, less jiter. ./.venv/bin/python3 -m uv pip install -e . # Install Python dependencies echo "Start on boot" From 1b2f3844faf08a5398b2260f1b37dec1401ec01f Mon Sep 17 00:00:00 2001 From: David Bieber Date: Sat, 2 Nov 2024 21:06:55 -0400 Subject: [PATCH 09/20] no-binary --- .github/workflows/build.yml | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 789114aa..8a6740e8 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -47,7 +47,9 @@ jobs: sudo apt update echo "Installing dependencies!" - sudo apt install -y git firefox-esr xvfb portaudio19-dev libatlas-base-dev redis-server espeak rustc python3-dev libopenblas-dev iptables iptables-persistent + sudo apt install -y git firefox-esr xvfb portaudio19-dev libatlas-base-dev redis-server \ + espeak rustc python3-dev libopenblas-dev iptables iptables-persistent \ + build-essential echo "Installing Go Note Go!" mkdir -p /home/pi/code/github/dbieber @@ -61,7 +63,8 @@ jobs: python3 -m venv .venv ./.venv/bin/pip install uv ./.venv/bin/python3 -m uv pip install openai --no-deps - ./.venv/bin/python3 -m uv pip install anyio distro httpx pydantic sniffio tqdm typing_extensions # openai deps, less jiter. + ./.venv/bin/python3 -m uv pip install anyio distro httpx sniffio tqdm typing_extensions # openai deps, less jiter. + ./.venv/bin/python3 -m uv pip install --no-binary=:all: pydantic # openai deps, less jiter. ./.venv/bin/python3 -m uv pip install -e . # Install Python dependencies echo "Start on boot" From 7d67d8ab84a840db84616864288f95eb0c46987a Mon Sep 17 00:00:00 2001 From: David Bieber Date: Sat, 2 Nov 2024 21:18:38 -0400 Subject: [PATCH 10/20] install cargo --- .github/workflows/build.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 8a6740e8..0758de8f 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -49,7 +49,7 @@ jobs: echo "Installing dependencies!" sudo apt install -y git firefox-esr xvfb portaudio19-dev libatlas-base-dev redis-server \ espeak rustc python3-dev libopenblas-dev iptables iptables-persistent \ - build-essential + build-essential cargo echo "Installing Go Note Go!" mkdir -p /home/pi/code/github/dbieber From 97b244da2a400cff28ae5a728dcc6849283081ab Mon Sep 17 00:00:00 2001 From: David Bieber Date: Sat, 2 Nov 2024 21:27:46 -0400 Subject: [PATCH 11/20] no deps --- .github/workflows/build.yml | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 0758de8f..9f5c72fd 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -48,8 +48,7 @@ jobs: echo "Installing dependencies!" sudo apt install -y git firefox-esr xvfb portaudio19-dev libatlas-base-dev redis-server \ - espeak rustc python3-dev libopenblas-dev iptables iptables-persistent \ - build-essential cargo + espeak rustc python3-dev libopenblas-dev iptables iptables-persistent echo "Installing Go Note Go!" mkdir -p /home/pi/code/github/dbieber @@ -64,7 +63,7 @@ jobs: ./.venv/bin/pip install uv ./.venv/bin/python3 -m uv pip install openai --no-deps ./.venv/bin/python3 -m uv pip install anyio distro httpx sniffio tqdm typing_extensions # openai deps, less jiter. - ./.venv/bin/python3 -m uv pip install --no-binary=:all: pydantic # openai deps, less jiter. + ./.venv/bin/python3 -m uv pip install --no-binary=:all: pydantic --no-deps # openai deps, less jiter. ./.venv/bin/python3 -m uv pip install -e . # Install Python dependencies echo "Start on boot" From 43879ae6a0a512ba6e6a480756e343e9aa293100 Mon Sep 17 00:00:00 2001 From: David Bieber Date: Sat, 2 Nov 2024 21:41:12 -0400 Subject: [PATCH 12/20] rustup --- .github/workflows/build.yml | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 9f5c72fd..2f0809dc 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -49,6 +49,10 @@ jobs: echo "Installing dependencies!" sudo apt install -y git firefox-esr xvfb portaudio19-dev libatlas-base-dev redis-server \ espeak rustc python3-dev libopenblas-dev iptables iptables-persistent + rustc --version + curl --proto '=https' --tlsv1.2 -sSf https://sh.rustup.rs | sh + rustc --version + rustup update echo "Installing Go Note Go!" mkdir -p /home/pi/code/github/dbieber From a6631450bce3d78fd7667ddca881f6aa0fde1280 Mon Sep 17 00:00:00 2001 From: David Bieber Date: Sat, 2 Nov 2024 21:52:33 -0400 Subject: [PATCH 13/20] -y --- .github/workflows/build.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 2f0809dc..b3666138 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -50,9 +50,9 @@ jobs: sudo apt install -y git firefox-esr xvfb portaudio19-dev libatlas-base-dev redis-server \ espeak rustc python3-dev libopenblas-dev iptables iptables-persistent rustc --version - curl --proto '=https' --tlsv1.2 -sSf https://sh.rustup.rs | sh + curl --proto '=https' --tlsv1.2 -sSf https://sh.rustup.rs | sh -s -- -y rustc --version - rustup update + rustup update -y echo "Installing Go Note Go!" mkdir -p /home/pi/code/github/dbieber From d8971577b1d5327e853a09f465ddf19f720f01d4 Mon Sep 17 00:00:00 2001 From: David Bieber Date: Sat, 2 Nov 2024 22:09:54 -0400 Subject: [PATCH 14/20] remove rustup line --- .github/workflows/build.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index b3666138..fdcf8332 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -52,7 +52,6 @@ jobs: rustc --version curl --proto '=https' --tlsv1.2 -sSf https://sh.rustup.rs | sh -s -- -y rustc --version - rustup update -y echo "Installing Go Note Go!" mkdir -p /home/pi/code/github/dbieber From b3837b995b87e35ff63d6ff713eb2303fe757004 Mon Sep 17 00:00:00 2001 From: David Bieber Date: Sat, 9 Nov 2024 13:01:53 -0500 Subject: [PATCH 15/20] Remove rustc install --- .github/workflows/build.yml | 3 --- 1 file changed, 3 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index fdcf8332..9f5c72fd 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -49,9 +49,6 @@ jobs: echo "Installing dependencies!" sudo apt install -y git firefox-esr xvfb portaudio19-dev libatlas-base-dev redis-server \ espeak rustc python3-dev libopenblas-dev iptables iptables-persistent - rustc --version - curl --proto '=https' --tlsv1.2 -sSf https://sh.rustup.rs | sh -s -- -y - rustc --version echo "Installing Go Note Go!" mkdir -p /home/pi/code/github/dbieber From 0df45e2cbeb14b77015ee60f084e5db0e75cdc36 Mon Sep 17 00:00:00 2001 From: David Bieber Date: Sat, 9 Nov 2024 13:14:53 -0500 Subject: [PATCH 16/20] Add setuptools-rust --- pyproject.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pyproject.toml b/pyproject.toml index 4c9047e3..736426d0 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -62,5 +62,5 @@ lint.ignore = ["E722"] exclude = ["scratch"] [build-system] -requires = ["setuptools>=43.0.0", "wheel"] +requires = ["setuptools>=43.0.0", "setuptools-rust", "wheel"] build-backend = "setuptools.build_meta" From 759cca5f328b52619f6ea708d720996d4e9d83ff Mon Sep 17 00:00:00 2001 From: David Bieber Date: Sat, 9 Nov 2024 13:24:25 -0500 Subject: [PATCH 17/20] Remove openai dep --- .github/workflows/build.yml | 29 ++++++++++++++++++++++++++--- pyproject.toml | 2 +- 2 files changed, 27 insertions(+), 4 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 9f5c72fd..7a5c2015 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -32,6 +32,32 @@ jobs: source .venv/bin/activate pytest + build_tmp: + runs-on: ubuntu-latest + steps: + - uses: pguyot/arm-runner-action@v2 + id: build_image + with: + base_image: https://downloads.raspberrypi.com/raspios_armhf/images/raspios_armhf-2024-03-15/2024-03-15-raspios-bookworm-armhf.img.xz + bootpartition: 1 + rootpartition: 2 + image_additional_mb: 4000 + commands: | + ls + + - name: Compress the release image + run: | + sudo fdisk -l + sudo ls /etc/xdg/autostart/ + mv ${{ steps.build_image.outputs.image }} go-note-go.img + xz -0 -T 0 -v go-note-go.img + - name: Upload release image + uses: actions/upload-artifact@v4 + with: + name: Release image + path: go-note-go.img.xz + + build_image: runs-on: ubuntu-latest steps: @@ -61,9 +87,6 @@ jobs: echo "Setting up Python environment" python3 -m venv .venv ./.venv/bin/pip install uv - ./.venv/bin/python3 -m uv pip install openai --no-deps - ./.venv/bin/python3 -m uv pip install anyio distro httpx sniffio tqdm typing_extensions # openai deps, less jiter. - ./.venv/bin/python3 -m uv pip install --no-binary=:all: pydantic --no-deps # openai deps, less jiter. ./.venv/bin/python3 -m uv pip install -e . # Install Python dependencies echo "Start on boot" diff --git a/pyproject.toml b/pyproject.toml index 736426d0..17a30b29 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -26,7 +26,7 @@ dependencies = [ 'flask<=3.0.3', 'keyboard<=0.13.5', 'numpy<=2.1.3', - 'openai<=1.52.2', + # 'openai<=1.52.2', 'parsedatetime<=2.6', 'python-dateutil<=2.8.2', 'redis<=4.3.4', From 78b3fe6181b467eed85deadf692aee4b3bde9815 Mon Sep 17 00:00:00 2001 From: David Bieber Date: Sat, 9 Nov 2024 13:31:39 -0500 Subject: [PATCH 18/20] Install cmake --- .github/workflows/build.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 7a5c2015..77724381 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -74,7 +74,7 @@ jobs: echo "Installing dependencies!" sudo apt install -y git firefox-esr xvfb portaudio19-dev libatlas-base-dev redis-server \ - espeak rustc python3-dev libopenblas-dev iptables iptables-persistent + espeak rustc python3-dev libopenblas-dev iptables iptables-persistent cmake echo "Installing Go Note Go!" mkdir -p /home/pi/code/github/dbieber From 7a9a741a4a3e75f78d2112805a7b3f1044476100 Mon Sep 17 00:00:00 2001 From: David Bieber Date: Sat, 9 Nov 2024 13:40:04 -0500 Subject: [PATCH 19/20] Install autoconf --- .github/workflows/build.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 77724381..a7c7913f 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -74,7 +74,7 @@ jobs: echo "Installing dependencies!" sudo apt install -y git firefox-esr xvfb portaudio19-dev libatlas-base-dev redis-server \ - espeak rustc python3-dev libopenblas-dev iptables iptables-persistent cmake + espeak rustc python3-dev libopenblas-dev iptables iptables-persistent cmake autoconf echo "Installing Go Note Go!" mkdir -p /home/pi/code/github/dbieber From 9ca499f05cac42f9fb227ad3de8dae4102e3ce07 Mon Sep 17 00:00:00 2001 From: David Bieber Date: Sat, 9 Nov 2024 13:41:09 -0500 Subject: [PATCH 20/20] Install build-essential gfortran --- .github/workflows/build.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index a7c7913f..d6f84152 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -74,7 +74,8 @@ jobs: echo "Installing dependencies!" sudo apt install -y git firefox-esr xvfb portaudio19-dev libatlas-base-dev redis-server \ - espeak rustc python3-dev libopenblas-dev iptables iptables-persistent cmake autoconf + espeak rustc python3-dev libopenblas-dev iptables iptables-persistent cmake autoconf \ + build-essential gfortran echo "Installing Go Note Go!" mkdir -p /home/pi/code/github/dbieber