separate venv with bleak version for psk pairing

Dockerfile

@@ -18,8 +18,15 @@ RUN apk add git
 # copy files
 COPY . .
 
+# create a separate venv for a specific bleak version that has a pairing agent that can pair devices with a PSK
+RUN python3 -m venv venv_bleak_pairing
+RUN venv_bleak_pairing/bin/pip3 install -r requirements.txt
+RUN venv_bleak_pairing/bin/pip3 install 'git+https://github.com/jpeters-ml/bleak@feature/windowsPairing'
+
+
 RUN python3 -m venv venv
 RUN venv/bin/pip3 install -r requirements.txt
+RUN venv/bin/pip3 install influxdb || true
 RUN . venv/bin/activate
 
 RUN chmod a+x addon_main.sh

addon_main.sh

@@ -1,13 +1,12 @@
 #!/usr/bin/with-contenv bashio
 
-. /app/venv/bin/activate
-
-python install_bleak.py
-
-
 MQTT_HOST=$(bashio::services mqtt "host")
 MQTT_USER=$(bashio::services mqtt "username")
 MQTT_PASSWORD=$(bashio::services mqtt "password")
 
-MQTT_HOST=$MQTT_HOST MQTT_USER=$MQTT_USER MQTT_PASSWORD=$MQTT_PASSWORD python3 main.py
+/app/venv/bin/python3 main.py pair-only
+
+
+MQTT_HOST=$MQTT_HOST MQTT_USER=$MQTT_USER MQTT_PASSWORD=$MQTT_PASSWORD \
+  /app/venv/bin/python3 main.py
 

main.py

@@ -113,6 +113,14 @@ async def background_loop(timeout: float, sampler_list: List[BmsSampler]):
 async def main():
     global shutdown
 
+    pair_only = len(sys.argv) > 1 and sys.argv[1] == "pair-only"
+    if pair_only:
+        logger.info('Started in pair-only mode (bleak %s)', bmslib.bt.bleak_version())
+        psks = set(dev.get('psk', None) for dev in user_config.get('devices', []) if dev.get('psk', None))
+        if not psks:
+            logger.info('No PSK, nothing to pair')
+            sys.exit(0)
+
     bms_list: List[bmslib.bt.BtBms] = []
     extra_tasks = []  # currently unused, add custom coroutines here. must return True on success and can raise
 
@@ -288,6 +296,9 @@ async def main():
         except:
             pass
 
+    if pair_only:
+        sys.exit(0)
+
     if parallel_fetch:
         # parallel_fetch now uses a loop for each BMS, so they don't delay each other
 

requirements.txt

@@ -1,14 +1,10 @@
-#bleak
-#git+https://github.com/hbldh/bleak@ed0b1c1cddf3a2f01882512745199e0f8f4dfa68 #https://github.com/hbldh/bleak/pull/640
-#git+https://github.com/jpeters-ml/bleak@ed0b1c1
-git+https://github.com/jpeters-ml/bleak@feature/windowsPairing
 
-# bleak==0.20.2 # (installed with install_bleak.py)
+bleak==0.22.3 # see Dockerfile
 
 paho-mqtt==2.1.0
 backoff
 crcmod
 
-#influxdb #optional (installed with install_bleak.py)
+#influxdb # see Dockerfile
 # the influxdb package appears to be not available from some platforms, so install it only if needed
 # see https://github.com/fl4p/batmon-ha/issues/147 (rpi 3)