[WIP] Add homeassistant-supervisor container to improve Home Assistant Voice Assistant stack onboarding on Jetson devices

jetson_containers/__init__.py

@@ -8,4 +8,4 @@
 from .packages import *
 from .container import *
 from .l4t_version import *
-from .utils import github_latest_commit
+from .utils import handle_json_request, handle_text_request, github_latest_commit, github_latest_tag, get_json_value_from_url

jetson_containers/utils.py

@@ -2,10 +2,8 @@
 import os
 import grp
 import sys
-import json
 import pprint
-import urllib.request
-from urllib.request import urlopen, Request
+import requests
 
 
 def check_dependencies(install=True):
@@ -132,28 +130,131 @@ def sudo_prefix(group='docker'):
         return "sudo "
     else:
         return ""
-
-
-def github_latest_commit(repo, branch='main'):
+
+
+def handle_text_request(url) -> str | None:
+    """
+    Handles a request to fetch text data from the given URL.
+
+    Args:
+        url (str): The URL from which to fetch text data.
+
+    Returns:
+        str or None: The fetched text data, stripped of leading and trailing whitespace, 
+                     or None if an error occurs.
     """
-    Returns the SHA of the latest commit to the given github user/repo/branch.
+    try:
+        response = requests.get(url)
+        if response.status_code == 200:
+            return response.text.strip()
+        else:
+            print("Failed to fetch version information. Status code:", response.status_code)
+            return None
+    except Exception as e:
+        print("An error occurred:", e)
+        return None
+
+
+def handle_json_request(url, headers=None):
+    """
+    Handles a JSON request from the given URL with optional headers and returns the parsed JSON data.
+
+    Args:
+        url (str): The URL from which to fetch the JSON data.
+        headers (dict, optional): Headers to include in the request. Defaults to None.
+
+    Returns:
+        dict or None: The parsed JSON data as a dictionary, or None if an error occurs.
+    """
+    try:
+        response = requests.get(url, headers=headers)
+        response.raise_for_status()
+        return response.json()
+    except requests.HTTPError as e:
+        print(f"HTTP error occurred: {e}")
+        return None
+    except requests.RequestException as e:
+        print(f"Error occurred: {e}")
+        return None
+    except Exception as e:
+        print(f"An unexpected error occurred: {e}")
+        return None
+
+
+def github_api(url):
+    """
+    Sends a request to the GitHub API using the specified URL, including authorization headers if available.
+
+    Args:
+        url (str): The GitHub API URL endpoint relative to the base URL.
+
+    Returns:
+        dict or None: The parsed JSON response data as a dictionary, or None if an error occurs.
     """
-    url = f"https://api.github.com/repos/{repo}/commits/{branch}"
     github_token = os.environ.get('GITHUB_TOKEN')
+    headers = {'Authorization': f'token {github_token}'} if github_token else None
+    request_url = f'https://api.github.com/{url}'
+
+    return handle_json_request(request_url, headers)
 
-    if github_token:
-        log_debug(f"-- GITHUB_TOKEN={github_token}")
-        headers = {'Authorization': 'token %s' % github_token}
-        request = Request(url, headers=headers)
-    else:
-        request = Request(url)
-
-    response = urlopen(request)
-    data = response.read()
-    encoding = response.info().get_content_charset('utf-8')
-    msg = json.loads(data.decode(encoding))
+
+def github_latest_commit(repo, branch='main'):
+    """
+    Retrieves the latest commit SHA from the specified branch of a GitHub repository.
+
+    Args:
+        repo (str): The full name of the GitHub repository in the format 'owner/repo'.
+        branch (str, optional): The branch name. Defaults to 'main'.
+
+    Returns:
+        str or None: The SHA (hash) of the latest commit, or None if no commit is found.
+    """
+    commit_info = github_api(f"repos/{repo}/commits/{branch}")
+    return commit_info.get('sha') if commit_info else None
+
+
+def github_latest_tag(repo):
+    """
+    Retrieves the latest tag name from the specified GitHub repository.
+
+    Args:
+        repo (str): The full name of the GitHub repository in the format 'owner/repo'.
+
+    Returns:
+        str or None: The name of the latest tag, or None if no tags are found.
+    """
+    tags = github_api(f"repos/{repo}/tags")
+    return tags[0].get('name') if tags else None
 
-    return msg['sha']
+
+def get_json_value_from_url(url, notation=None):
+    """
+    Retrieves JSON data from the given URL and returns either the whole data or a specified nested value using a dot notation string.
+
+    Args:
+        url (str): The URL from which to fetch the JSON data.
+        notation (str, optional): A dot notation string specifying the nested property to retrieve.
+                                  If None or an empty string is provided, the entire JSON data is returned.
+
+    Returns:
+        str or dict: The value of the specified nested property or the whole data if `notation` is None.
+                     Returns None if the specified property does not exist.
+    """
+    data = handle_json_request(url)
+
+    if notation and data is not None:
+        keys = notation.split('.') if '.' in notation else [notation]
+        current = data
+
+        try:
+            for key in keys:
+                current = current[key]
+            return str(current).strip()
+        except KeyError as e:
+            print(f'ERROR: Failed to get the value for {notation}: {e}')
+            return None
+
+    return data
 
 
 def log_debug(*args, **kwargs):

packages/audio/piper-tts/Dockerfile

@@ -2,7 +2,7 @@
 # name: piper-tts
 # group: audio
 # depends: [onnxruntime]
-# test: test.py
+# test: [test_piper_phonemize.sh, test.py]
 #---
 ARG BASE_IMAGE
 FROM ${BASE_IMAGE}

packages/audio/piper-tts/test_piper_phonemize.sh

@@ -0,0 +1,12 @@
+#!/usr/bin/env bash
+
+set -ex
+
+echo "Testing piper-phonemize..."
+
+${PIPER_PHONEMIZE_DIR}/piper_phonemize -l en-us --espeak-data ${ESPEAK_NG_DATA_DIR} <<EOF
+This is a test.
+This is another test!
+EOF
+
+echo "piper-phonemize OK"

packages/build/go-lang/Dockerfile

@@ -0,0 +1,32 @@
+#---
+# name: go-lang
+# group: build
+# config: config.py
+# depends: [build-essential]
+# notes: installs go lang
+# test: test.sh
+#---
+
+ARG BASE_IMAGE
+FROM ${BASE_IMAGE}
+
+ARG GO_VERSION \
+	GO_INSTALL_DIR=/usr/local
+
+# Install golang
+RUN wget --quiet --show-progress --progress=bar:force:noscroll \
+		https://golang.org/dl/go${GO_VERSION}.linux-arm64.tar.gz \
+		-O /tmp/go${GO_VERSION}.linux-arm64.tar.gz \
+	&& rm -rf ${GO_INSTALL_DIR}/go \
+	&& tar -C ${GO_INSTALL_DIR} -xzf /tmp/go${GO_VERSION}.linux-arm64.tar.gz \
+	&& rm /tmp/go${GO_VERSION}.linux-arm64.tar.gz
+
+# set Go env variables
+ENV PATH="$PATH:${GO_INSTALL_DIR}/go/bin" \
+	GOOS=linux \
+	GOARCH=arm64
+
+# Test golang version
+RUN set -ex \
+	&& go version \
+	&& go env

packages/build/go-lang/config.py

@@ -0,0 +1,16 @@
+def create_package(version, default=False) -> list:
+    pkg = package.copy()
+
+    pkg['name'] = f'go-lang:{version}'
+    pkg['build_args'] = {
+        'GO_VERSION': version,
+    }
+
+    if default:
+        pkg['alias'] = 'go-lang'
+
+    return pkg
+
+package = [
+    create_package('1.19', default=True),
+]

packages/build/go-lang/test.go

@@ -0,0 +1,7 @@
+package main
+
+import "fmt"
+
+func main() {
+    fmt.Println("Hello, World!")
+}

packages/build/go-lang/test.sh

@@ -0,0 +1,13 @@
+#!/usr/bin/env bash
+
+set -e
+
+echo "testing go-lang..."
+
+go version
+
+go env
+
+go run /${GOPATH}/test/test.go
+
+echo "go-lang OK"

packages/smart-home/dependencies/ciso8601/Dockerfile

@@ -0,0 +1,20 @@
+#---
+# name: ciso8601
+# group: smart-home
+# config: config.py
+# requires: '>=34.1.0'
+# depends: [build-essential, python:3.12]
+# test: test.py
+# notes: The `ciso8601` wheel that's build is saved in `/opt/wheels`
+#---
+ARG BASE_IMAGE
+FROM ${BASE_IMAGE}
+
+ARG FORCE_BUILD=off \
+    CISO8601_VERSION
+
+WORKDIR /
+
+COPY *.diff *.sh /tmp/ciso8601/
+
+RUN /tmp/ciso8601/install.sh || /tmp/ciso8601/build.sh

packages/smart-home/dependencies/ciso8601/build.sh

@@ -0,0 +1,12 @@
+#!/usr/bin/env bash
+# ciso8601
+set -xo pipefail
+
+git clone --branch=${CISO8601_VERSION} https://github.com/closeio/ciso8601 /opt/ciso8601
+git -C /opt/ciso8601 apply /tmp/ciso8601/patch.diff
+git -C /opt/ciso8601 diff
+
+pip3 wheel --wheel-dir=/opt/wheels --no-deps --verbose /opt/ciso8601
+rm -rf /opt/ciso8601
+
+twine upload --verbose /opt/wheels/ciso8601*.whl || echo "failed to upload wheel to ${TWINE_REPOSITORY_URL}"

packages/smart-home/dependencies/ciso8601/config.py

@@ -0,0 +1,25 @@
+from jetson_containers import github_latest_tag
+
+
+def create_package(version, default=False):
+    pkg = package.copy()
+    wanted_version = github_latest_tag('closeio/ciso8601') if version == 'latest' else version
+
+    pkg['name'] = f'ciso8601:{version}'
+    pkg['build_args'] = {
+        'CISO8601_VERSION': wanted_version,
+    }
+
+    builder = pkg.copy()
+    builder['name'] = f'ciso8601:{version}-builder'
+    builder['build_args'] = {**pkg['build_args'], **{'FORCE_BUILD': 'on'}}
+
+    if default:
+        pkg['alias'] = 'ciso8601'
+        builder['alias'] = 'ciso8601:builder'
+
+    return pkg, builder
+
+package = [
+    create_package('latest', default=True),
+]

packages/smart-home/dependencies/ciso8601/install.sh

@@ -0,0 +1,16 @@
+#!/usr/bin/env bash
+# ciso8601
+
+set -euxo pipefail
+
+if [ "$FORCE_BUILD" == "on" ]; then
+	echo "Forcing build of ciso8601 ${CISO8601_VERSION}..."
+	exit 1
+fi
+
+echo "Installing ciso8601 ${CISO8601_VERSION}..."
+
+pip3 install --no-cache-dir --verbose ciso8601==${CISO8601_VERSION}
+
+pip3 show ciso8601
+python3 -c 'import ciso8601; print(ciso8601.__version__);'

packages/smart-home/homeassistant-core/test_ciso8601.py → packages/smart-home/dependencies/ciso8601/test.py

@@ -1,8 +1,7 @@
-import ciso8601
-
-
 print("testing ciso8601...")
 
+import ciso8601
+
 print(ciso8601.__version__)
 
 # Parse an ISO 8601 formatted date string

packages/smart-home/dependencies/eudev/Dockerfile

@@ -0,0 +1,18 @@
+#---
+# name: eudev
+# group: smart-home
+# config: config.py
+# test: test.sh
+# requires: '>=34.1.0'
+# depends: [build-essential]
+#---
+ARG BASE_IMAGE
+FROM ${BASE_IMAGE}
+
+ARG EUDEV_VERSION
+
+WORKDIR /
+
+COPY *.sh /tmp/eudev/
+
+RUN /tmp/eudev/build.sh