version 5.1.10

hbd/__init__.py

@@ -14,4 +14,4 @@ Install options:
 """
 
 __all__ = ["__version__"]
-__version__ = "5.1.8"
+__version__ = "5.1.10"

pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "hbd"
-version = "5.1.8"
+version = "5.1.10"
 description = "Heartbeat monitoring system — client (hbc) and server (hbd)"
 readme = "README.md"
 requires-python = ">=3.11"
@@ -34,6 +34,9 @@ server = [
   "matrix-nio>=0.24",
 ]
 
+# Minimal client — hbc_mini only, no external dependencies
+mini = []
+
 # Install both client and server
 all = [
   "hbd[client,server]",

scripts/bumpminor.sh

@@ -4,12 +4,14 @@ set -e
 uv version --bump patch 
 VER=$(uv  version  --short)
 sed -i".bak"  "s/__version__ = \"[0-9.]*\"\(.*\)$/__version__ = \"$VER\"\1/" hbd/__init__.py
+sed -i".bak"  "s/__version__ = \"[0-9.]*\"\(.*\)$/__version__ = \"$VER\"\1/" scripts/hbc_mini.py
 
 # commit pyproject.toml
-git commit -m "version $VER" pyproject.toml hbd/__init__.py
+git commit -m "version $VER" pyproject.toml hbd/__init__.py scripts/hbc_mini.py
 git push 
 # tag version
 git tag -a v$VER -m "Version $VER"
 git push --tags
 
 rm hbd/__init__.py.bak
+rm scripts/hbc_mini.py.bak

scripts/hb_install.sh

@@ -12,11 +12,15 @@
 set -e
 what=$1
 on_ha=0
+where=""
+venv=""
+prog=$(realpath $0)
+[ "$2" = "HA" ] && on_ha=1
 [ -z "$what" ] && what="client"
 
 if [ -d /homeassistant ]; then
-    echo "cannot install in HA, running \"docker exec homeassistant $0 $@\""
-    docker exec homeassistant $0 $@
+    echo "HA, running \"docker exec homeassistant $prog $@\""
+    docker exec homeassistant $prog $@ HA
     rc=$?
     if [ $rc -ne 0 ]; then
         echo "Failed to install heartbeat in HA, please check the logs for more details"
@@ -24,11 +28,11 @@ if [ -d /homeassistant ]; then
     fi
     exit 0
 fi
-if [ -d /config ]; then
-    echo "Installing on HA"
+
+if [ $on_ha -eq 1 ]; then
+    echo "Installing under docker on Home Assistant OS, using /config/bin for executables and /config/venvs for virtual environments "
     where="/config/bin"
     venv="/config/venvs"
-    on_ha=1
 else
     if [ ! -d $HOME/.local/bin ] && [ ! -d $HOME/bin ]; then
         echo "No suitable bin directory found in PATH, please add either $HOME/.local/bin or $HOME/bin to your PATH"
@@ -43,18 +47,23 @@ else
         echo "No suitable bin directory found in PATH, please add either $HOME/.local/bin or $HOME/bin to your PATH"
         exit 1
     fi
+    if [ "$what" = "mini" ]; then
+        venv=""
+    else
         venv="$HOME/venvs"
     fi
+fi
 
 echo "Installing heartbeat $what"
 
-if [ ! -d  $venv/hbd ]; then
+if [ "$venv" != "" ] && [ ! -d  $venv/hbd ]; then
     set +e
     python3 -m pip --version > /dev/null 2>&1 
     rc=$?
     set -e
+    arg=""
     if [ $rc -ne 0 ]; then
-        # truenas does not have pip installed by default, so we need to fetch get-pip.py and install pip
+        # some systems do not have pip installed by default, so we need to fetch get-pip.py and install pip
         echo "pip is not installed, fetching get-pip.py and installing pip"
         arg="--without-pip"
     fi
@@ -74,19 +83,39 @@ if [ ! -d  $venv/hbd ]; then
     deactivate
 fi
 
+if [ -z "$venv" ]; then
+    echo "Installing heartbeat $what globally"
+else
+    echo "Installing heartbeat $what in virtual environment $venv/hbd"
     . $venv/hbd/bin/activate
+fi
+if [ "$what" = "mini" ]; then
+    echo "Installing hbc mini, which has no external dependencies and is meant for quick setup and testing. For the full client with all features, please run this script with the 'client' argument."
+    curl -s -o $where/hbc_mini https://git.wrede.ca/andreas/heartbeat/raw/branch/master/scripts/hbc_mini.py
+    chmod +x $where/hbc_mini
+else
+    echo "Installing heartbeat $what, which includes the full client with all features. If you want to install the minimal client with no external dependencies, please run this script with the 'mini' argument."
     python3 -mpip install --upgrade --index-url https://git.wrede.ca/api/packages/andreas/pypi/simple/ --extra-index-url https://pypi.org/simple hbd[$what]
+fi
 
 if [ "$what" = "server" ]; then
     rm -f $where/hbd
     ln -sf $(which hbd) $where/hbd
     echo "hbd installed, you can run it with \"$where/hbd\" or \"hbd\" if $where is in your PATH"
-else
+elif [ "$what" = "client" ]; then
+    hbc_path=$(which hbc)
+    if [ -z "$hbc_path" ]; then
+        echo "hbc not found in PATH, installation failed"
+        exit 1
+    fi
+    if [ "$hbc_path" != "$where/hbc" ]; then
         rm -f $where/hbc
         ln -sf $(which hbc) $where/hbc
-    # rm -f $where/hb_install.sh
-    cp "$0" $where/hb_install.sh
+    fi
+    if [ "$prog" != "$where/hb_install.sh" ]; then
+        cp "$prog" $where/hb_install.sh
         chmod +x $where/hb_install.sh
+    fi
     if [ $on_ha -eq 1 ]; then
         echo "restarting hbc "
         job=$(grep run_hbc configuration.yaml | sed 's/run_hbc://')
@@ -94,4 +123,10 @@ else
     else
         echo "hbc installed, you can run it with \"$where/hbc\" or \"hbc\" if $where is in your PATH"
     fi  
+elif [ "$what" = "mini" ]; then
+    hbc_path=$(which hbc_mini)
+    if [ "$hbc_path" != "$where/hbc_mini" ]; then
+       ln -sf $hbc_path $where/hbc_mini
+    fi
+    echo "hbc mini installed, you can run it with \"$where/hbc_mini\" or \"hbc_mini\" if $where is in your PATH"
 fi

scripts/hbc_mini.py

@@ -40,6 +40,9 @@ from logging.handlers import SysLogHandler
 from pathlib import Path
 from typing import Any, Dict, List, Optional, Tuple
 
+# updated by scripts/bumpminor.sh
+__version__ = "5.1.10"
+
 # ---------------------------------------------------------------------------
 # Protocol  (mirrors hbd/common/proto.py)
 # ---------------------------------------------------------------------------
@@ -233,7 +236,7 @@ class OSInfoPlugin(InfoPlugin):
             "machine": platform.machine(),
             "architecture": platform.architecture()[0],
             "python_version": platform.python_version(),
-            "hbc_version": "5.1.8",
+            "hbc_version": __version__,
             "hbc_type": "mini",
         }
         if platform.system() == "Linux":
@@ -875,7 +878,7 @@ async def _handle_update(conn: AsyncConnection):
     log.info("running installer: %s", installer)
     try:
         proc = await asyncio.create_subprocess_exec(
-            installer, "client",
+            installer, "mini",
             stdout=asyncio.subprocess.PIPE,
             stderr=asyncio.subprocess.STDOUT,
         )