temperature-sensor-scanner 2.0.0__tar.gz → 2.0.1__tar.gz

{temperature_sensor_scanner-2.0.0 → temperature_sensor_scanner-2.0.1}/.github/workflows/publish-to-pypi.yml

@@ -1,12 +1,13 @@
 name: Publish to PyPI and TestPyPI
 
-on: push
+on:
+  release:
+    types: [published]
+  workflow_dispatch:
 
 jobs:
   build:
     name: Build distribution
-    if: startsWith(github.ref, 'refs/tags/')  # only build on tag pushes
-
     runs-on: ubuntu-latest
 
     steps:
@@ -34,7 +35,6 @@ jobs:
   publish-to-pypi:
     name: >-
       Publish to PyPI
-    if: startsWith(github.ref, 'refs/tags/')  # only publish to PyPI on tag pushes
     needs:
       - build
     runs-on: ubuntu-latest
@@ -55,7 +55,6 @@ jobs:
 
   publish-to-testpypi:
     name: Publish to TestPyPI
-    if: startsWith(github.ref, 'refs/tags/')  # only publish to PyPI on tag pushes
     needs:
       - build
     runs-on: ubuntu-latest

{temperature_sensor_scanner-2.0.0 → temperature_sensor_scanner-2.0.1}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.5
 Name: temperature-sensor-scanner
-Version: 2.0.0
+Version: 2.0.1
 Summary: A tool to collect data from temperature sensors and emit it into InfluxDB 3
 Project-URL: Homepage, https://github.com/gene1wood/temperature-sensor-scanner
 Project-URL: Repository, https://github.com/gene1wood/temperature-sensor-scanner
@@ -9,7 +9,6 @@ License: GPL-3.0-or-later
 Requires-Python: >=3.10
 Requires-Dist: atc-mi-interface
 Requires-Dist: bleak
-Requires-Dist: influxdb3-python
 Requires-Dist: platformdirs
 Requires-Dist: pyyaml
 Description-Content-Type: text/markdown

{temperature_sensor_scanner-2.0.0 → temperature_sensor_scanner-2.0.1}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "hatchling.build"
 
 [project]
 name = "temperature-sensor-scanner"
-version = "2.0.0"
+version = "2.0.1"
 description = "A tool to collect data from temperature sensors and emit it into InfluxDB 3"
 readme = "README.md"
 requires-python = ">=3.10"
@@ -15,7 +15,6 @@ authors = [
 dependencies = [
     "bleak",
     "atc-mi-interface",
-    "influxdb3-python",
     "platformdirs",
     "PyYAML"
 ]

{temperature_sensor_scanner-2.0.0 → temperature_sensor_scanner-2.0.1}/requirements.txt

@@ -1,5 +1,4 @@
 bleak
 atc-mi-interface
-influxdb3-python
 platformdirs
 PyYAML

{temperature_sensor_scanner-2.0.0 → temperature_sensor_scanner-2.0.1}/temperature_sensor_scanner/__init__.py

@@ -11,9 +11,10 @@ from atc_mi_interface import (
 
 # atc-mi-interface
 # https://github.com/pvvx/ATC_MiThermometer/tree/master/python-interface#decoding-and-encoding
-from influxdb_client_3 import InfluxDBClient3, Point  # pip install influxdb3-python
 
 import sys
+import urllib.parse
+import urllib.request
 from pathlib import Path
 
 import yaml  # pip install PyYAML
@@ -51,6 +52,20 @@ def load_config(path: Path) -> dict:
         sys.exit(1)
 
 
+def escape_tag(value: str) -> str:
+    """
+    Escape a tag key or value for InfluxDB line protocol.
+
+    :param value: The raw tag key or value
+    :type value: str
+    :returns: The escaped string
+    :rtype: str
+    """
+    for char in ("\\", ",", "=", " "):
+        value = value.replace(char, f"\\{char}")
+    return value
+
+
 def gather_data(config: dict) -> list:
     scan_results = asyncio.run(ble_coro(config))
 
@@ -65,26 +80,46 @@ def gather_data(config: dict) -> list:
         else:
             macs_seen.add(scan_result["mac"])
         sensor = config["sensors"][scan_result["mac"]]
+        tags = {
+            "location": sensor["location"],
+            "domain": sensor["domain"],
+            "mac": scan_result["mac"],
+        }
+        tag_set = ",".join(
+            f"{escape_tag(k)}={escape_tag(str(v))}" for k, v in tags.items()
+        )
         points.append(
-            Point("environment")
-            .tag("location", sensor["location"])
-            .tag("domain", sensor["domain"])
-            .tag("mac", scan_result["mac"])
-            .field("temperature", scan_result["temperature"])
+            f"environment,{tag_set} temperature={float(scan_result['temperature'])}"
         )
     return points
 
 
 def emit_data(config: dict, points: list) -> None:
-    client = InfluxDBClient3(
-        host=config["influxdb"]["url"],
-        token=config["influxdb"]["token"],
-        database=config["influxdb"]["database"],
+    """
+    Write line protocol points to InfluxDB 3 via the /api/v3/write_lp endpoint.
+
+    :param config: The loaded configuration
+    :type config: dict
+    :param points: Line protocol strings to write
+    :type points: list
+    :returns: None
+    :rtype: None
+    """
+    if not points:
+        return
+    query = urllib.parse.urlencode({"db": config["influxdb"]["database"]})
+    request = urllib.request.Request(
+        f"{config['influxdb']['url'].rstrip('/')}/api/v3/write_lp?{query}",
+        data="\n".join(points).encode("utf-8"),
+        headers={
+            "Authorization": f"Bearer {config['influxdb']['token']}",
+            "Content-Type": "text/plain; charset=utf-8",
+        },
+        method="POST",
     )
-    try:
-        client.write(record=points)
-    finally:
-        client.close()
+    # Raises urllib.error.HTTPError on a non-2xx response
+    with urllib.request.urlopen(request, timeout=30):
+        pass
 
 
 async def ble_coro(config):
@@ -136,7 +171,9 @@ async def ble_coro(config):
                 timeout=timeout,
             )
             if not done:
-                print(f"Scan timed out after {timeout}s — returning {len(results)} result(s)")
+                print(
+                    f"Scan timed out after {timeout}s — returning {len(results)} result(s)"
+                )
             # Exiting the `async with` block here always runs scanner cleanup
             # synchronously and correctly, regardless of whether we timed out.
     except BleakDBusError as e: