span-panel-api-schema-1 1.2.1b1__tar.gz → 1.2.2__tar.gz

{span_panel_api_schema_1-1.2.1b1 → span_panel_api_schema_1-1.2.2}/CHANGELOG.md

@@ -9,38 +9,46 @@ number. A release here means this parser changed, never that the panel did.
 
 Pre-releases are not listed separately. A beta is a step towards the next public version, so its changes are folded into that version's entry as they land and are described against the last public release, never against the beta before it.
 
-## [1.2.1b1]
+## [1.2.2]
 
-No inverter is primary any more. Requires `span-panel-api` **3.6.1 or newer**. 1.2.0 was withdrawn from PyPI; this release carries its changes, listed under 1.2.0 below, except how `pv` is chosen, which this release replaces.
+Requires `span-panel-api` **3.6.2 or newer**, which waits on this parser's missing labels after a reconnect as well as on connect.
 
-### Changed
+### Fixed
 
-- **`pv` describes the inverters together when a panel commissions more than one**, with their shared vendor and model, the sum of their installed DC sizes and a link that is down if any is down, rather than the one on the lowest breaker space.
+- **`circuit_nodes_missing_names()` gives an inverter that appears after another inverter's feed link has arrived, within the same wait, a full grace for its own**, rather than reporting nothing missing the moment it appears and so letting it be keyed by
+  its device id.
 
-### Removed
+## [1.2.1]
 
-- **`snapshot.primary_pv` and `TreeRoles.pv`**, which singled out one inverter as `pv`.
+Every PV inverter a panel commissions is read, and the battery's power keeps its sign on firmware r202639. Requires `span-panel-api` **3.6.1 or newer**.
 
-## [1.2.0] [YANKED]
+### Added
 
-Every PV inverter a panel commissions is read, and the battery's power keeps its sign on firmware r202639. Requires `span-panel-api` **3.6.0 or newer**.
+- **Every PV inverter is read, not only the first**, each landing in `pv_inverters` with its serial number when published, its device id and its key.
+- **`pv.serial_number` is read from `info/serial-number`**, so that property no longer appears as a discovery row.
+- **`TreeRoles.pvs` and `devices.pv_inverter_key`** list every inverter and give an inverter's key.
+- **`span_panel_api_schema_1.firmware.release_build`** reads the six-digit release build number out of a firmware version string, or returns `None` when it has none.
+- **`build_battery` takes keyword-only `firmware_version` and `power_flow_battery`** to pick the BESS meter's wire frame, and `SchemaOneAdapter` a keyword-only `clock` for the wait on feeding circuits, and both behave as before without them.
+
+### Changed
+
+- **`pv` describes the inverters together when a panel commissions more than one**, with their shared vendor and model, the sum of their installed DC sizes and a link that is down if any is down, rather than whichever came first in the device tree.
+
+### Removed
+
+- **`TreeRoles.pv`**, which held only the first inverter, replaced by `TreeRoles.pvs`.
 
 ### Fixed
 
-- **A second inverter's feeding circuit is labeled `device_type="pv"`**, so its power no longer reads as a load with the opposite sign.
-- **A PV inverter wired through two breakers now reports its power and link status consistently**, with both circuits labeled `pv` and its feed and link status read from the one with the lowest circuit id.
-- **`pv` is the inverter on the lowest breaker space when more than one is commissioned**, rather than whichever came first in the device tree.
+- **Every inverter's feeding circuit is labeled `device_type="pv"`**, so a second inverter's power no longer reads as a load with the opposite sign.
+- **A PV inverter or charger wired through two breakers reports its power and link status consistently**, with both circuits labeled for it and its feed and link status read from the one with the lowest circuit id.
 - **Each inverter's extension properties are filed under that inverter**, with its `pv_inverters` key as the `instance_key` when more than one is commissioned.
 - **The first snapshot waits briefly for the circuits that feed an inverter**, so an inverter's key and its circuit's label do not change just after connecting.
 - **`battery.power_w` is discharge-positive on firmware r202639 and later, from the first snapshot on**, where a charging battery read positive.
 
-### Added
+## [1.2.0] [YANKED]
 
-- **`span_panel_api_schema_1.firmware.release_build`** reads the six-digit release build number out of a firmware version string, or returns `None` when it has none.
-- **`build_battery` takes keyword-only `firmware_version` and `power_flow_battery`** to pick the BESS meter's wire frame, and behaves as before without them.
-- **Every PV inverter is read, not only the first**, each landing in `pv_inverters` with its serial number when published, its device id and its key.
-- **`TreeRoles.pvs` lists every inverter**, and `snapshot.primary_pv`, `devices.pv_inverter_key` and `circuits.circuit_tabs` choose the one `pv` describes, give an inverter's key, and read a circuit's breaker spaces.
-- **`pv.serial_number` is read from `info/serial-number`**, so that property no longer appears as a discovery row.
+Withdrawn from PyPI; 1.2.1 replaces it.
 
 ## [1.1.4]
 

{span_panel_api_schema_1-1.2.1b1 → span_panel_api_schema_1-1.2.2}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.5
 Name: span-panel-api-schema-1
-Version: 1.2.1b1
+Version: 1.2.2
 Summary: Parent/child schema (data-model-version 1.x) parser for span-panel-api
 Project-URL: Homepage, https://github.com/SpanPanel/span-panel-api
 Project-URL: Issues, https://github.com/SpanPanel/span-panel-api/issues
@@ -8,7 +8,7 @@ Author: SpanPanel
 License-Expression: MIT
 Requires-Python: <4.0,>=3.14
 Requires-Dist: ebus-sdk<0.24,>=0.19.0
-Requires-Dist: span-panel-api<4.0,>=3.6.1b1
+Requires-Dist: span-panel-api<4.0,>=3.6.2
 Description-Content-Type: text/markdown
 
 # span-panel-api-schema-1

{span_panel_api_schema_1-1.2.1b1 → span_panel_api_schema_1-1.2.2}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "span-panel-api-schema-1"
-version = "1.2.1b1"
+version = "1.2.2"
 description = "Parent/child schema (data-model-version 1.x) parser for span-panel-api"
 authors = [
     {name = "SpanPanel"}
@@ -25,8 +25,10 @@ dependencies = [
     # and the inverter's `serial_number`, `device_id` and `node_id`, which this
     # parser fills. Against an earlier one, building a snapshot fails on those
     # arguments.
-    # Raised to 3.6.1b1, whose SpanPanelSnapshot.pv documents what this parser builds.
-    "span-panel-api>=3.6.1b1,<4.0",
+    # Raised to 3.6.1, whose SpanPanelSnapshot.pv documents what this parser builds.
+    # Raised to 3.6.2, which waits on this parser's missing labels after a bridge
+    # rebuild as well as on connect; the fix spans both, so the pair moves together.
+    "span-panel-api>=3.6.2,<4.0",
     # Only this distribution depends on the eBus SDK. The bootstrap and
     # schema-0 stay clean, so a flat-panel install never pulls it in — which is
     # what bounds the release coupling this dependency introduces to panels on

{span_panel_api_schema_1-1.2.1b1 → span_panel_api_schema_1-1.2.2}/src/span_panel_api_schema_1/adapter.py

@@ -230,7 +230,9 @@ class SchemaOneAdapter:
         unvalued after the grace is taken as absent. The inverter is then keyed
         by its device id, reported once at INFO rather than the transport
         warning after the full name timeout. The grace restarts whenever
-        anything else is missing again.
+        anything else is missing again, and once every inverter is placed, so
+        an inverter that appears after another's feed has arrived, within the
+        same wait, gets a whole grace of its own.
         """
         roles = TreeRoles(self._children())
         missing = [circuit.device_id for circuit in roles.circuits if not circuit.get_property(NODE_INFO, PROP_NAME)]
@@ -257,8 +259,13 @@ class SchemaOneAdapter:
                     )
                     self._feed_wait_reported = True
                 feeds = []
-        elif missing:
+        else:
+            # No feed is being waited out on its own: something else is still
+            # missing, or every inverter is placed. Either way a later feed wait
+            # is a new one and gets the whole grace.
             self._feed_wait_since = None
+            if not feeds:
+                self._feed_wait_reported = False
         missing.extend(feeds)
         return missing
 

{span_panel_api_schema_1-1.2.1b1 → span_panel_api_schema_1-1.2.2}/src/span_panel_api_schema_1/circuits.py

@@ -116,7 +116,7 @@ def _optional_integer(device: DiscoveredDevice, node: str, prop: str) -> int | N
     return None if raw is None else int(raw)
 
 
-def circuit_tabs(device: DiscoveredDevice) -> list[int]:
+def _tabs(device: DiscoveredDevice) -> list[int]:
     """Breaker spaces from ``info/spaces``.
 
     v1.0 publishes the occupied spaces literally (``"36,38"``), where the flat
@@ -254,7 +254,7 @@ def build_circuit(
         # circuit's.
         produced_energy_wh=_number(device, NODE_METER, PROP_IMPORTED_ENERGY),
         consumed_energy_wh=_number(device, NODE_METER, PROP_EXPORTED_ENERGY),
-        tabs=circuit_tabs(device),
+        tabs=_tabs(device),
         priority=priority,
         # `always-on` is `not relay-controllable`, and the flat schema derived
         # user-controllability from `always-on` — so this is the same answer by