sok-ble 0.1.8__tar.gz → 0.1.9a5__tar.gz

sok_ble-0.1.9a5/.github/workflows/prerelease.yml

@@ -0,0 +1,105 @@
+name: Prerelease
+
+on:
+  pull_request:
+    branches: [main]
+    types: [opened]
+  workflow_dispatch:
+    inputs:
+      release_branch:
+        description: Branch to build from
+        required: false
+        default: release-please--branches--main
+      semantic_version:
+        description: Optional semantic version to publish (x.x.x)
+        required: false
+      prerelease:
+        description: Prerelease type (defaults to beta)
+        required: false
+        type: choice
+        options:
+          - beta
+          - alpha
+      beta_iteration:
+        description: Optional alpha/beta iteration identifier (defaults to run number)
+        required: false
+
+permissions:
+  contents: write
+  id-token: write
+
+jobs:
+  publish-beta:
+    if: |
+      github.event_name == 'workflow_dispatch' ||
+      (github.event_name == 'pull_request' && startsWith(github.event.pull_request.head.ref, 'release-please--'))
+    runs-on: ubuntu-latest
+    environment: release
+    steps:
+      - uses: actions/checkout@v6
+        with:
+          ref: ${{ github.event_name == 'workflow_dispatch' && (inputs.release_branch || 'release-please--main') || github.event.pull_request.head.ref }}
+          fetch-depth: 0
+
+      - name: Install uv
+        uses: astral-sh/setup-uv@v7
+
+      - name: Set up Python
+        run: uv python install
+
+      - name: Derive beta version
+        id: version
+        env:
+          BETA_ITERATION: ${{ github.event_name == 'workflow_dispatch' && inputs.beta_iteration || '' }}
+          SEMANTIC_VERSION: ${{ github.event_name == 'workflow_dispatch' && inputs.semantic_version || '' }}
+          PRERELEASE_ID: ${{ github.event_name == 'workflow_dispatch' && inputs.prerelease || '' }}
+        run: |
+          python - <<'PY'
+          from pathlib import Path
+          import os
+          import re
+          import sys
+
+          pyproject = Path("pyproject.toml")
+          content = pyproject.read_text(encoding="utf-8")
+
+          match = re.search(r'^version\s*=\s*"(?P<version>[^"]+)"', content, flags=re.MULTILINE)
+          if not match:
+            sys.exit("Version not found in pyproject.toml")
+
+          semver_input = os.environ.get("SEMANTIC_VERSION", "").strip()
+          prerelease_input = os.environ.get("PRERELEASE_ID", "").strip().lower()
+          prerelease_map = {"alpha": "a", "beta": "b", "a": "a", "b": "b"}
+          if prerelease_input and prerelease_input not in prerelease_map:
+            sys.exit("Invalid prerelease identifier. Use 'alpha' or 'beta'.")
+
+          if semver_input:
+            if not re.fullmatch(r"\d+\.\d+\.\d+", semver_input):
+              sys.exit("Invalid semantic version. Use x.x.x format.")
+            base_version = semver_input
+          else:
+            base_version = match.group("version")
+
+          prerelease = prerelease_map.get(prerelease_input, "b")
+          iteration = os.environ.get("BETA_ITERATION") or os.environ.get("GITHUB_RUN_NUMBER")
+          beta_version = f"{base_version}{prerelease}{iteration}"
+
+          new_content = re.sub(
+            r'^version\s*=\s*".*"',
+            f'version = "{beta_version}"',
+            content,
+            count=1,
+            flags=re.MULTILINE,
+          )
+          pyproject.write_text(new_content, encoding="utf-8")
+
+          print(f"Publishing beta version {beta_version}")
+          with open(os.environ["GITHUB_OUTPUT"], "a", encoding="utf-8") as output:
+            output.write(f"beta_version={beta_version}\n")
+          PY
+
+      - name: Build package
+        run: uv build
+
+      - name: Publish beta to PyPI
+        run: uv publish

{sok_ble-0.1.8 → sok_ble-0.1.9a5}/.github/workflows/release.yml

@@ -37,12 +37,12 @@ jobs:
       id-token: write
       contents: write
     steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v6
         with:
           fetch-depth: 0
 
       - name: Install uv
-        uses: astral-sh/setup-uv@v5
+        uses: astral-sh/setup-uv@v7
 
       - name: Set up Python
         run: uv python install

{sok_ble-0.1.8 → sok_ble-0.1.9a5}/.github/workflows/test.yml

@@ -22,12 +22,13 @@ jobs:
           - "3.11"
           - "3.12"
           - "3.13"
+          - "3.14"
 
     steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v6
 
       - name: Install uv and set the python version
-        uses: astral-sh/setup-uv@v5
+        uses: astral-sh/setup-uv@v7
         with:
           python-version: ${{ matrix.python-version }}
 
@@ -42,3 +43,6 @@ jobs:
 
       - name: Lint with Ruff
         run: uv run ruff check . --output-format=github
+
+      - name: Type check with ty
+        run: uv run ty check . --output-format=github

sok_ble-0.1.8/.github/copilot-instructions.md → sok_ble-0.1.9a5/AGENTS.md

@@ -32,3 +32,36 @@ sok-ble is a library written in Python. Its purpose is to connect to SOK LiFePO4
 
 - Use conventional commits for all changes
   - Prefix all commit messages with fix:; feat:; build:; chore:; ci:; docs:; style:; refactor:; perf:; or test: as appropriate.
+
+# Before Checking In Code
+
+- Fix all code formatting and quality issues in the entire codebase.
+- Ensure all new code is covered by appropriate unit tests.
+
+## Python
+
+Fix all Python formatting and linting issues.
+
+### Steps:
+
+1. **Format with ruff**: `uv run ruff format .`
+2. **Lint with ruff**: `uv run ruff check . --output-format=github`
+3. **Type check with ty**: `uv run ty check . --output-format=github`
+4. **Run unit tests**: `uv run pytest tests`
+
+## General Process:
+
+1. Run automated formatters first.
+2. Fix remaining linting issues manually.
+3. Resolve type checking errors.
+4. Verify all tests pass with no errors.
+5. Review changes before committing.
+
+## Common Issues:
+
+- Import order conflicts between tools
+- Line length violations
+- Unused imports/variables
+- Type annotation requirements
+- Missing return types
+- Inconsistent quotes/semicolons

{sok_ble-0.1.8 → sok_ble-0.1.9a5}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: sok-ble
-Version: 0.1.8
+Version: 0.1.9a5
 Summary: SOK BLE battery interface library
 Project-URL: Homepage, https://github.com/IAmTheMitchell/sok-ble
 Project-URL: Bug Tracker, https://github.com/IAmTheMitchell/sok-ble/issues
@@ -13,8 +13,8 @@ Classifier: Operating System :: OS Independent
 Classifier: Programming Language :: Python :: 3
 Requires-Python: >=3.11
 Requires-Dist: async-timeout>=4.0.3
-Requires-Dist: bleak-retry-connector>=3.9.0
-Requires-Dist: bleak>=0.22.3
+Requires-Dist: bleak-retry-connector>=4.4.3
+Requires-Dist: bleak>=1.0.1
 Description-Content-Type: text/markdown
 
 # SOK BLE

{sok_ble-0.1.8 → sok_ble-0.1.9a5}/pyproject.toml

@@ -1,13 +1,13 @@
 [project]
 name = "sok-ble"
-version = "0.1.8"
+version = "0.1.9a5"
 description = "SOK BLE battery interface library"
 readme = "README.md"
 requires-python = ">=3.11"
 dependencies = [
     "async-timeout>=4.0.3",
-    "bleak>=0.22.3",
-    "bleak-retry-connector>=3.9.0",
+    "bleak>=1.0.1",
+    "bleak-retry-connector>=4.4.3",
 ]
 authors = [
     {name = "Mitchell Carlson", email = "mitchell.carlson.pro@gmail.com"}
@@ -24,6 +24,7 @@ dev = [
     "pytest>=7.0.1",
     "pytest-asyncio>=1.0.0",
     "ruff>=0.12.3",
+    "ty>=0.0.15",
 ]
 
 [project.urls]

{sok_ble-0.1.8 → sok_ble-0.1.9a5}/src/sok_ble/sok_bluetooth_device.py

@@ -10,6 +10,7 @@ from contextlib import asynccontextmanager
 from typing import AsyncIterator, Optional
 
 import async_timeout
+from bleak.backends.characteristic import BleakGATTCharacteristic
 from bleak.backends.device import BLEDevice
 from bleak.exc import BleakError
 
@@ -86,6 +87,15 @@ class SokBluetoothDevice:
                     self._ble_device.address,
                     err,
                 )
+                if client is not None:
+                    try:
+                        await asyncio.shield(client.disconnect())
+                    except (BleakError, asyncio.TimeoutError):
+                        logger.debug(
+                            "Failed to disconnect after connect error for %s",
+                            self._ble_device.address,
+                        )
+                    client = None
                 await asyncio.sleep(0.5)
         else:
             raise BLEConnectionError(
@@ -114,7 +124,7 @@ class SokBluetoothDevice:
 
                 queue: asyncio.Queue[bytes] = asyncio.Queue()
 
-                def handler(_: int, data: bytearray) -> None:
+                def handler(_: BleakGATTCharacteristic, data: bytearray) -> None:
                     queue.put_nowait(bytes(data))
 
                 await client.start_notify(UUID_RX, handler)
@@ -136,6 +146,10 @@ class SokBluetoothDevice:
                     await asyncio.sleep(0.2)
                     continue
                 raise
+        raise BleakError(
+            f"Failed to receive response 0x{expected:04X} "
+            f"from {self._ble_device.address}"
+        )
 
     async def async_update(self) -> None:
         """Poll the device for all telemetry and update attributes."""
@@ -180,13 +194,30 @@ class SokBluetoothDevice:
         parsed = SokParser.parse_all(responses)
         logger.debug("Parsed update: %s", parsed)
 
-        self.voltage = parsed["voltage"]
-        self.current = parsed["current"]
-        self.soc = parsed["soc"]
-        self.temperature = parsed["temperature"]
-        self.capacity = parsed["capacity"]
-        self.num_cycles = parsed["num_cycles"]
-        self.cell_voltages = parsed["cell_voltages"]
+        voltage = parsed.get("voltage")
+        self.voltage = voltage if isinstance(voltage, (int, float)) else None
+
+        current = parsed.get("current")
+        self.current = current if isinstance(current, (int, float)) else None
+
+        soc = parsed.get("soc")
+        self.soc = soc if isinstance(soc, int) else None
+
+        temperature = parsed.get("temperature")
+        self.temperature = (
+            temperature if isinstance(temperature, (int, float)) else None
+        )
+
+        capacity = parsed.get("capacity")
+        self.capacity = capacity if isinstance(capacity, (int, float)) else None
+
+        num_cycles = parsed.get("num_cycles")
+        self.num_cycles = num_cycles if isinstance(num_cycles, int) else None
+
+        cell_voltages = parsed.get("cell_voltages")
+        self.cell_voltages = (
+            list(cell_voltages) if isinstance(cell_voltages, list) else None
+        )
 
         self.num_samples += 1
 

{sok_ble-0.1.8 → sok_ble-0.1.9a5}/tests/test_derived.py

@@ -5,7 +5,7 @@ from sok_ble.sok_bluetooth_device import SokBluetoothDevice
 
 
 def make_device():
-    return SokBluetoothDevice(BLEDevice("00:11:22:33:44:55", "Test", None, -60))
+    return SokBluetoothDevice(BLEDevice("00:11:22:33:44:55", "Test", None))
 
 
 def test_power_property():

{sok_ble-0.1.8 → sok_ble-0.1.9a5}/tests/test_device_full.py

@@ -40,9 +40,7 @@ async def test_full_update(monkeypatch):
         device_mod, "BleakClientWithServiceCache", lambda *a, **k: dummy
     )
 
-    dev = device_mod.SokBluetoothDevice(
-        BLEDevice("00:11:22:33:44:55", "Test", None, -60)
-    )
+    dev = device_mod.SokBluetoothDevice(BLEDevice("00:11:22:33:44:55", "Test", None))
 
     await dev.async_update()
 

{sok_ble-0.1.8 → sok_ble-0.1.9a5}/tests/test_device_minimal.py

@@ -1,7 +1,10 @@
+import asyncio
+
 import pytest
 from bleak.backends.device import BLEDevice
 
 from sok_ble import sok_bluetooth_device as device_mod
+from sok_ble.exceptions import BLEConnectionError
 
 
 class DummyClient:
@@ -35,12 +38,44 @@ async def test_minimal_update(monkeypatch):
     monkeypatch.setattr(device_mod, "establish_connection", None, raising=False)
     monkeypatch.setattr(device_mod, "BleakClientWithServiceCache", DummyClient)
 
-    dev = device_mod.SokBluetoothDevice(
-        BLEDevice("00:11:22:33:44:55", "Test", None, -60)
-    )
+    dev = device_mod.SokBluetoothDevice(BLEDevice("00:11:22:33:44:55", "Test", None))
 
     await dev.async_update()
 
     assert dev.voltage == pytest.approx(13.066)
     assert dev.current == 10.0
     assert dev.soc == 65
+
+
+@pytest.mark.asyncio
+async def test_disconnect_on_connect_failure(monkeypatch):
+    class FailingClient:
+        disconnect_calls = 0
+
+        def __init__(self, *args, **kwargs):
+            return None
+
+        async def connect(self):
+            return True
+
+        async def disconnect(self):
+            FailingClient.disconnect_calls += 1
+            return True
+
+        @property
+        def services(self):
+            raise asyncio.TimeoutError
+
+    async def fast_sleep(*args, **kwargs):
+        return None
+
+    monkeypatch.setattr(device_mod, "establish_connection", None, raising=False)
+    monkeypatch.setattr(device_mod, "BleakClientWithServiceCache", FailingClient)
+    monkeypatch.setattr(device_mod.asyncio, "sleep", fast_sleep)
+
+    dev = device_mod.SokBluetoothDevice(BLEDevice("00:11:22:33:44:55", "Test", None))
+
+    with pytest.raises(BLEConnectionError):
+        await dev.async_update()
+
+    assert FailingClient.disconnect_calls == 3

{sok_ble-0.1.8 → sok_ble-0.1.9a5}/tests/test_integration_mock.py

@@ -45,9 +45,7 @@ async def test_async_update_full_flow(monkeypatch):
 
     monkeypatch.setattr(device_mod.SokBluetoothDevice, "_connect", fake_connect)
 
-    dev = device_mod.SokBluetoothDevice(
-        BLEDevice("00:11:22:33:44:55", "Test", None, -60)
-    )
+    dev = device_mod.SokBluetoothDevice(BLEDevice("00:11:22:33:44:55", "Test", None))
 
     await dev.async_update()