Merge branch 'main' into headless

.github/workflows/publish.yaml

@@ -1,18 +1,31 @@
 # see https://github.com/viamrobotics/build-action for help
 on:
-  push:
-    tags:
-    - '[0-9]+.[0-9]+.[0-9]+'
+  release:
+    types: [published]
 
 jobs:
+  validate-tag:  # Make sure we're publishing a tag that looks like semantic versioning
+    runs-on: ubuntu-latest
+    steps:
+      - name: Validate tag format
+        run: |
+          TAG="${{ github.event.release.tag_name }}"
+          echo "Validating tag: '$TAG'"
+          if [[ $TAG =~ ^[0-9]+\.[0-9]+\.[0-9]+(-rc[0-9]*)?$ ]]; then
+            echo "Tag matches semver."
+          else
+            echo "Error: tag does not match semver."
+            exit 1
+          fi
+
   publish:
     runs-on: ubuntu-latest
+    needs: [validate-tag]
     steps:
-    - uses: actions/checkout@v3
+    - uses: actions/checkout@v4
     - uses: viamrobotics/build-action@v1
       with:
-        # note: you can replace this line with 'version: ""' if you want to test the build process without deploying
-        version: ${{ github.ref_name }}
+        version: ${{ github.event.release.tag_name }}
         ref: ${{ github.sha }}
         key-id: ${{ secrets.viam_key_id }}
         key-value: ${{ secrets.viam_key_value }}

.github/workflows/test.yaml

@@ -15,7 +15,11 @@ jobs:
     - uses: actions/checkout@v3
 
     - name: Install dependencies
-      run: pip install -r requirements.txt
+      run: |
+        python --version
+        pip install --upgrade pip
+        pip --version
+        pip install -r requirements.txt
 
     - name: Run lint
       run: make lint

.gitignore

@@ -1,5 +1,8 @@
-.venv/
+__pycache__
+.venv
+
+# Artifacts created from running `make setup`
 build/
 dist/
 main.spec
-__pycache__/
+.venv/

build.sh

@@ -31,6 +31,8 @@ python3 -m venv $VIRTUAL_ENV
 echo installing dependencies from requirements.txt
 $VIRTUAL_ENV/bin/pip install -r requirements.txt -U
 source $VIRTUAL_ENV/bin/activate
-$PYTHON -m PyInstaller --onefile --hidden-import="googleapiclient" main.py
+$PYTHON -m PyInstaller --onefile --hidden-import="googleapiclient" --add-data="./src:src"  src/main.py
+# When running as a local module, we need meta.json to be in the same directory as the module.
+ln -sf ../meta.json dist
 tar -czvf dist/archive.tar.gz dist/main
 

main.py

@@ -13,15 +13,15 @@ async def main():
     registry before the module adds the resource model.
     """
     Registry.register_resource_creator(
-        Vision.SUBTYPE,
+        Vision.API,
         MotionDetector.MODEL,
         ResourceCreatorRegistration(
             MotionDetector.new_service, MotionDetector.validate_config
         ),
     )
     module = Module.from_args()
 
-    module.add_model_from_registry(Vision.SUBTYPE, MotionDetector.MODEL)
+    module.add_model_from_registry(Vision.API, MotionDetector.MODEL)
     await module.start()
 
 

requirements.txt

@@ -1,7 +1,8 @@
-pillow == 10.0.1
-numpy == 1.25.0
-viam-sdk>=0.27
-pyinstaller
-pylint
-pytest
+pillow == 11.0.0
+numpy == 1.26.4
+viam-sdk==0.39.0
+pyinstaller==6.11.1
+pylint==3.3.4
+pytest==8.3.4
+pytest-asyncio==0.25.3
 opencv-python-headless == 4.9.0.80

src/motion_detector.py

@@ -193,7 +193,8 @@ async def get_properties(
             object_point_clouds_supported=False,
         )
 
-    async def capture_all_from_camera(
+    # The linter doesn't like the vision service API, which we can't change.
+    async def capture_all_from_camera(  # pylint: disable=too-many-positional-arguments
         self,
         camera_name: str,
         return_image: bool = False,