obis-parser 0.0.4__tar.gz → 0.0.5__tar.gz

{obis_parser-0.0.4 → obis_parser-0.0.5}/.gitignore

@@ -71,4 +71,4 @@ dmypy.json
 .DS_Store
 
 # VCS version file (generated by hatch-vcs)
-smgw_obis/_version.py
+obis_parser/_version.py

{obis_parser-0.0.4 → obis_parser-0.0.5}/PKG-INFO

@@ -1,11 +1,10 @@
 Metadata-Version: 2.5
 Name: obis-parser
-Version: 0.0.4
+Version: 0.0.5
 Summary: Dependency-free OBIS parser and measurement catalog for smart meters and energy gateways
 Project-URL: Homepage, https://pkg.jf-projects.de/obis-parser
 Project-URL: Repository, https://pkg.jf-projects.de/obis-parser
 Project-URL: Issues, https://pkg.jf-projects.de/obis-parser/issues
-Project-URL: Changelog, https://pkg.jf-projects.de/obis-parser/blob/main/CHANGELOG.md
 Author-email: Jannick Fahlbusch <git@jf-projects.de>
 License-Expression: Apache-2.0
 License-File: LICENSE
@@ -38,7 +37,7 @@ Extracts, parses, and normalizes OBIS (*Object Identification System*) codes (`A
 
 ## Features
 
-* **Zero External Dependencies:** Built entirely with standard library Python (`dataclasses`, `re`, `string`, `typing`).
+* **Zero External Dependencies:** Built entirely with standard library Python (`dataclasses`, `enum`, `re`, `string`, `typing`).
 * **Universal Ingestion:** Auto-detects and parses:
   * Canonical strings: `1-0:1.8.0`, `1-0:1.8.0*255`, `1-1:1.7.0`
   * Shorthand display strings: `1.8.0`, `16.7.0`, `81.7.4` (defaults to electricity A=1, channel B=0)
@@ -48,7 +47,8 @@ Extracts, parses, and normalizes OBIS (*Object Identification System*) codes (`A
 * **Single Domain Model (`OBIS`):** Everything is accessed directly on the `OBIS` instance (`.canonical`, `.name`, `.slug`, `.placeholders`, `.decode()`).
 * **Channel & Tariff Qualifiers:** Treats Channel ($B \neq 0$) and Tariff ($1 \le E < 255$) as name qualifiers on $(C, D)$ base measurements.
 * **4-Variant Localization Slugs:** Generates variant slugs (`base`, `_channel`, `_tariff`, `_channel_tariff`) with placeholder maps, ready for Home Assistant, Prometheus, or UI localization.
-* **Curated Catalog:** 39 standard German electricity registers (DIN EN 62056-6-1 / DIN 43863-3) with units, device classes, state classes, and icons.
+* **Curated Catalog:** 40 standard German electricity and gateway registers (DIN EN 62056-6-1 / DIN 43863-3) with units, device classes, state classes, and icons.
+* **DLMS/COSEM Value Scaling:** `DLMSUnit` (IEC 62056-6-2 unit codes) and `OBIS.scale_value()` turn raw register triples (`value`, `scaler`, `unit`) into values matching the catalog unit (e.g. Wh → kWh).
 
 ---
 
@@ -107,8 +107,31 @@ if obis:
     print(m.device_class)  # "voltage"
     print(m.state_class)  # "measurement"
     print(m.icon)  # "mdi:sine-wave"
+    print(m.dlms_unit)  # 35 (DLMSUnit.VOLT)
 ```
 
+### 4. Scaling Raw DLMS/COSEM Register Values (`obis.scale_value()`)
+
+DLMS/COSEM gateways (e.g. EMH CASA, Theben Conexa) report registers as `value`, `scaler` (power of ten) and `unit` (IEC 62056-6-2 code).
+`scale_value()` applies `10**scaler` and converts Wh/VAh/varh to the catalog's kWh/kVAh/kvarh. All other units are left in their base unit.
+The unit may be passed as an `int`, numeric string, SI symbol, or `DLMSUnit`.
+
+```python
+from obis_parser import OBIS, DLMSUnit
+
+energy = OBIS.parse("1-0:1.8.0")
+if energy:
+    print(energy.scale_value("12345678", -1, 30))  # 1234.5678 (kWh)
+    print(energy.scale_value("12345678", "-1", "30"))  # 1234.5678 (string payloads)
+
+voltage = OBIS.parse("1-0:32.7.0")
+if voltage:
+    print(voltage.scale_value("2301", -1, DLMSUnit.VOLT))  # 230.1 (V)
+```
+
+If the gateway does not report a recognised unit (`None`, `0`, `""`, or an unknown code), the catalog unit of the OBIS code is used as a fallback.
+Cataloged energy registers passed without a unit are therefore assumed to be in Wh/VAh/varh.
+
 ---
 
 ## Supported Registers (Catalog Overview)
@@ -141,6 +164,7 @@ if obis:
 | **(81, 7, 4/15/26)** | Phase angle L1/L2/L3 (U to I) | `phase_angle_l1..3` | `°` | `None` | `measurement` |
 | **(0, 2, 0)** | Firmware version | `firmware_version` | `None` | `None` | `None` |
 | **(96, 1, 0)** | Meter identification / Serial | `meter_identification` | `None` | `None` | `None` |
+| **(96, 99, 0)** | RSSI (cellular signal strength, EMH CASA) | `rssi` | `dBm` | `signal_strength` | `measurement` |
 
 ---
 

{obis_parser-0.0.4 → obis_parser-0.0.5}/README.md

@@ -12,7 +12,7 @@ Extracts, parses, and normalizes OBIS (*Object Identification System*) codes (`A
 
 ## Features
 
-* **Zero External Dependencies:** Built entirely with standard library Python (`dataclasses`, `re`, `string`, `typing`).
+* **Zero External Dependencies:** Built entirely with standard library Python (`dataclasses`, `enum`, `re`, `string`, `typing`).
 * **Universal Ingestion:** Auto-detects and parses:
   * Canonical strings: `1-0:1.8.0`, `1-0:1.8.0*255`, `1-1:1.7.0`
   * Shorthand display strings: `1.8.0`, `16.7.0`, `81.7.4` (defaults to electricity A=1, channel B=0)
@@ -22,7 +22,8 @@ Extracts, parses, and normalizes OBIS (*Object Identification System*) codes (`A
 * **Single Domain Model (`OBIS`):** Everything is accessed directly on the `OBIS` instance (`.canonical`, `.name`, `.slug`, `.placeholders`, `.decode()`).
 * **Channel & Tariff Qualifiers:** Treats Channel ($B \neq 0$) and Tariff ($1 \le E < 255$) as name qualifiers on $(C, D)$ base measurements.
 * **4-Variant Localization Slugs:** Generates variant slugs (`base`, `_channel`, `_tariff`, `_channel_tariff`) with placeholder maps, ready for Home Assistant, Prometheus, or UI localization.
-* **Curated Catalog:** 39 standard German electricity registers (DIN EN 62056-6-1 / DIN 43863-3) with units, device classes, state classes, and icons.
+* **Curated Catalog:** 40 standard German electricity and gateway registers (DIN EN 62056-6-1 / DIN 43863-3) with units, device classes, state classes, and icons.
+* **DLMS/COSEM Value Scaling:** `DLMSUnit` (IEC 62056-6-2 unit codes) and `OBIS.scale_value()` turn raw register triples (`value`, `scaler`, `unit`) into values matching the catalog unit (e.g. Wh → kWh).
 
 ---
 
@@ -81,8 +82,31 @@ if obis:
     print(m.device_class)  # "voltage"
     print(m.state_class)  # "measurement"
     print(m.icon)  # "mdi:sine-wave"
+    print(m.dlms_unit)  # 35 (DLMSUnit.VOLT)
 ```
 
+### 4. Scaling Raw DLMS/COSEM Register Values (`obis.scale_value()`)
+
+DLMS/COSEM gateways (e.g. EMH CASA, Theben Conexa) report registers as `value`, `scaler` (power of ten) and `unit` (IEC 62056-6-2 code).
+`scale_value()` applies `10**scaler` and converts Wh/VAh/varh to the catalog's kWh/kVAh/kvarh. All other units are left in their base unit.
+The unit may be passed as an `int`, numeric string, SI symbol, or `DLMSUnit`.
+
+```python
+from obis_parser import OBIS, DLMSUnit
+
+energy = OBIS.parse("1-0:1.8.0")
+if energy:
+    print(energy.scale_value("12345678", -1, 30))  # 1234.5678 (kWh)
+    print(energy.scale_value("12345678", "-1", "30"))  # 1234.5678 (string payloads)
+
+voltage = OBIS.parse("1-0:32.7.0")
+if voltage:
+    print(voltage.scale_value("2301", -1, DLMSUnit.VOLT))  # 230.1 (V)
+```
+
+If the gateway does not report a recognised unit (`None`, `0`, `""`, or an unknown code), the catalog unit of the OBIS code is used as a fallback.
+Cataloged energy registers passed without a unit are therefore assumed to be in Wh/VAh/varh.
+
 ---
 
 ## Supported Registers (Catalog Overview)
@@ -115,6 +139,7 @@ if obis:
 | **(81, 7, 4/15/26)** | Phase angle L1/L2/L3 (U to I) | `phase_angle_l1..3` | `°` | `None` | `measurement` |
 | **(0, 2, 0)** | Firmware version | `firmware_version` | `None` | `None` | `None` |
 | **(96, 1, 0)** | Meter identification / Serial | `meter_identification` | `None` | `None` | `None` |
+| **(96, 99, 0)** | RSSI (cellular signal strength, EMH CASA) | `rssi` | `dBm` | `signal_strength` | `measurement` |
 
 ---
 

{obis_parser-0.0.4 → obis_parser-0.0.5}/obis_parser/__init__.py

@@ -49,12 +49,14 @@ from .core import (
     OBISTariff,
     ParsedOBIS,
 )
+from .dlms import DLMSUnit
 
 __all__ = [
     "ABSTRACT_OBJECTS",
     "ELECTRICITY_MEDIUM",
     "OBIS",
     "OBIS_CATALOG",
+    "DLMSUnit",
     "MeasurementKey",
     "OBISBillingPeriod",
     "OBISChannel",

{obis_parser-0.0.4 → obis_parser-0.0.5}/obis_parser/_version.py

@@ -18,7 +18,7 @@ version_tuple: tuple[int | str, ...]
 commit_id: str | None
 __commit_id__: str | None
 
-__version__ = version = '0.0.4'
-__version_tuple__ = version_tuple = (0, 0, 4)
+__version__ = version = '0.0.5'
+__version_tuple__ = version_tuple = (0, 0, 5)
 
 __commit_id__ = commit_id = None

{obis_parser-0.0.4 → obis_parser-0.0.5}/obis_parser/core.py

@@ -13,6 +13,8 @@ from dataclasses import dataclass, field
 from string import hexdigits
 from typing import Literal
 
+from .dlms import DLMSUnit
+
 _HEXDIGITS = set(hexdigits)
 _OBIS_STRING_RE = re.compile(r"^(\d+)\s*-\s*(\d+)\s*:\s*(\d+)\s*\.\s*(\d+)\s*\.\s*(\d+)(?:\s*\*\s*(\d+))?$")
 _OBIS_SHORT_STRING_RE = re.compile(r"^(\d+)\s*\.\s*(\d+)\s*\.\s*(\d+)(?:\s*\*\s*(\d+))?$")
@@ -230,6 +232,39 @@ class OBIS:
         """Decode into a fully-resolved OBISMeasurement object."""
         return _build_measurement(self, self.info)
 
+    @property
+    def dlms_unit(self) -> DLMSUnit | None:
+        """Expected DLMS/COSEM physical unit code (IEC 62056-6-2) for this measurement."""
+        info = self.info
+        return info.dlms_unit if info is not None else None
+
+    def scale_value(
+        self,
+        value: str | float,
+        scaler: int | str | None = 0,
+        dlms_unit: float | str | DLMSUnit | None = None,
+    ) -> float:
+        """Scale a raw meter reading by ``10**scaler`` and convert Wh/VAh/varh to kWh/kVAh/kvarh.
+
+        The physical unit is resolved in two steps:
+
+        1. ``dlms_unit`` as reported by the gateway (DLMS code, numeric string or SI symbol,
+           see :meth:`DLMSUnit.from_raw`).
+        2. If that is missing or not a recognised ``DLMSUnit`` (e.g. ``None``, ``0``, ``""``,
+           ``56``), the catalog unit of this OBIS code (:attr:`dlms_unit`) is used instead.
+
+        Consequently, raw values of cataloged energy registers passed without a unit are
+        assumed to be in Wh/VAh/varh and divided by 1000. Uncataloged codes without a
+        recognised unit are only scaled by ``10**scaler``.
+        """
+        numeric_value = float(value)
+        numeric_scaler = int(scaler) if scaler not in (None, "") else 0
+        resolved_unit = DLMSUnit.from_raw(dlms_unit) or self.dlms_unit
+        exp = numeric_scaler - (3 if resolved_unit is not None and resolved_unit.is_kilo_energy else 0)
+        if exp >= 0:
+            return float(numeric_value * (10**exp))
+        return float(numeric_value / (10**-exp))
+
 
 #: Backwards-compatibility alias for OBIS.
 ParsedOBIS = OBIS
@@ -246,6 +281,7 @@ class OBISMeasurementInfo:
     unit: str | None
     icon: str
     suggested_display_precision: int | None = None
+    dlms_unit: DLMSUnit | None = None
 
     @property
     def translation_key(self) -> str:
@@ -288,6 +324,11 @@ class OBISMeasurement:
         """Alias for slug (Home Assistant translation compatibility)."""
         return self.slug
 
+    @property
+    def dlms_unit(self) -> DLMSUnit | None:
+        """DLMS/COSEM physical unit code (IEC 62056-6-2) for this measurement."""
+        return self.info.dlms_unit if self.info is not None else None
+
 
 OBIS_CATALOG: dict[MeasurementKey, OBISMeasurementInfo] = {
     # Active energy (time-integral, D=8)
@@ -299,6 +340,7 @@ OBIS_CATALOG: dict[MeasurementKey, OBISMeasurementInfo] = {
         "kWh",
         "mdi:home-import-outline",
         5,
+        DLMSUnit.WATT_HOUR,
     ),
     (2, 8): OBISMeasurementInfo(
         "Active energy export",
@@ -308,6 +350,7 @@ OBIS_CATALOG: dict[MeasurementKey, OBISMeasurementInfo] = {
         "kWh",
         "mdi:home-export-outline",
         5,
+        DLMSUnit.WATT_HOUR,
     ),
     # Reactive energy
     (3, 8): OBISMeasurementInfo(
@@ -318,6 +361,7 @@ OBIS_CATALOG: dict[MeasurementKey, OBISMeasurementInfo] = {
         "kvarh",
         "mdi:home-import-outline",
         5,
+        DLMSUnit.VAR_HOUR,
     ),
     (4, 8): OBISMeasurementInfo(
         "Reactive energy export",
@@ -327,6 +371,7 @@ OBIS_CATALOG: dict[MeasurementKey, OBISMeasurementInfo] = {
         "kvarh",
         "mdi:home-export-outline",
         5,
+        DLMSUnit.VAR_HOUR,
     ),
     # Apparent energy (no standard HA device class / unit constant exists)
     (9, 8): OBISMeasurementInfo(
@@ -337,6 +382,7 @@ OBIS_CATALOG: dict[MeasurementKey, OBISMeasurementInfo] = {
         "kVAh",
         "mdi:flash",
         5,
+        DLMSUnit.VOLT_AMPERE_HOUR,
     ),
     # Active power (instantaneous, D=7)
     (1, 7): OBISMeasurementInfo(
@@ -347,6 +393,7 @@ OBIS_CATALOG: dict[MeasurementKey, OBISMeasurementInfo] = {
         "W",
         "mdi:flash",
         1,
+        DLMSUnit.WATT,
     ),
     (2, 7): OBISMeasurementInfo(
         "Active power export",
@@ -356,6 +403,7 @@ OBIS_CATALOG: dict[MeasurementKey, OBISMeasurementInfo] = {
         "W",
         "mdi:flash-outline",
         1,
+        DLMSUnit.WATT,
     ),
     # Reactive power
     (3, 7): OBISMeasurementInfo(
@@ -366,6 +414,7 @@ OBIS_CATALOG: dict[MeasurementKey, OBISMeasurementInfo] = {
         "var",
         "mdi:flash",
         1,
+        DLMSUnit.VAR,
     ),
     (4, 7): OBISMeasurementInfo(
         "Reactive power export",
@@ -375,6 +424,7 @@ OBIS_CATALOG: dict[MeasurementKey, OBISMeasurementInfo] = {
         "var",
         "mdi:flash-outline",
         1,
+        DLMSUnit.VAR,
     ),
     # Apparent power
     (9, 7): OBISMeasurementInfo(
@@ -385,6 +435,7 @@ OBIS_CATALOG: dict[MeasurementKey, OBISMeasurementInfo] = {
         "VA",
         "mdi:flash",
         1,
+        DLMSUnit.VOLT_AMPERE,
     ),
     # Active power total + absolute
     (16, 7): OBISMeasurementInfo(
@@ -395,6 +446,7 @@ OBIS_CATALOG: dict[MeasurementKey, OBISMeasurementInfo] = {
         "W",
         "mdi:flash",
         1,
+        DLMSUnit.WATT,
     ),
     (15, 7): OBISMeasurementInfo(
         "Absolute active power",
@@ -404,6 +456,7 @@ OBIS_CATALOG: dict[MeasurementKey, OBISMeasurementInfo] = {
         "W",
         "mdi:flash",
         1,
+        DLMSUnit.WATT,
     ),
     # Active power per phase (signed vector sum)
     (36, 7): OBISMeasurementInfo(
@@ -414,6 +467,7 @@ OBIS_CATALOG: dict[MeasurementKey, OBISMeasurementInfo] = {
         "W",
         "mdi:flash",
         1,
+        DLMSUnit.WATT,
     ),
     (56, 7): OBISMeasurementInfo(
         "Active power L2",
@@ -423,6 +477,7 @@ OBIS_CATALOG: dict[MeasurementKey, OBISMeasurementInfo] = {
         "W",
         "mdi:flash",
         1,
+        DLMSUnit.WATT,
     ),
     (76, 7): OBISMeasurementInfo(
         "Active power L3",
@@ -432,6 +487,7 @@ OBIS_CATALOG: dict[MeasurementKey, OBISMeasurementInfo] = {
         "W",
         "mdi:flash",
         1,
+        DLMSUnit.WATT,
     ),
     # Active power per phase, import (+P)
     (21, 7): OBISMeasurementInfo(
@@ -442,6 +498,7 @@ OBIS_CATALOG: dict[MeasurementKey, OBISMeasurementInfo] = {
         "W",
         "mdi:flash",
         1,
+        DLMSUnit.WATT,
     ),
     (41, 7): OBISMeasurementInfo(
         "Active power import L2",
@@ -451,6 +508,7 @@ OBIS_CATALOG: dict[MeasurementKey, OBISMeasurementInfo] = {
         "W",
         "mdi:flash",
         1,
+        DLMSUnit.WATT,
     ),
     (61, 7): OBISMeasurementInfo(
         "Active power import L3",
@@ -460,6 +518,7 @@ OBIS_CATALOG: dict[MeasurementKey, OBISMeasurementInfo] = {
         "W",
         "mdi:flash",
         1,
+        DLMSUnit.WATT,
     ),
     # Active power per phase, export (-P)
     (22, 7): OBISMeasurementInfo(
@@ -470,6 +529,7 @@ OBIS_CATALOG: dict[MeasurementKey, OBISMeasurementInfo] = {
         "W",
         "mdi:flash-outline",
         1,
+        DLMSUnit.WATT,
     ),
     (42, 7): OBISMeasurementInfo(
         "Active power export L2",
@@ -479,6 +539,7 @@ OBIS_CATALOG: dict[MeasurementKey, OBISMeasurementInfo] = {
         "W",
         "mdi:flash-outline",
         1,
+        DLMSUnit.WATT,
     ),
     (62, 7): OBISMeasurementInfo(
         "Active power export L3",
@@ -488,17 +549,34 @@ OBIS_CATALOG: dict[MeasurementKey, OBISMeasurementInfo] = {
         "W",
         "mdi:flash-outline",
         1,
+        DLMSUnit.WATT,
     ),
     # Voltage per phase + total
-    (32, 7): OBISMeasurementInfo("Voltage L1", "voltage_l1", "voltage", "measurement", "V", "mdi:sine-wave", 1),
-    (52, 7): OBISMeasurementInfo("Voltage L2", "voltage_l2", "voltage", "measurement", "V", "mdi:sine-wave", 1),
-    (72, 7): OBISMeasurementInfo("Voltage L3", "voltage_l3", "voltage", "measurement", "V", "mdi:sine-wave", 1),
-    (12, 7): OBISMeasurementInfo("Voltage", "voltage", "voltage", "measurement", "V", "mdi:sine-wave", 1),
+    (32, 7): OBISMeasurementInfo(
+        "Voltage L1", "voltage_l1", "voltage", "measurement", "V", "mdi:sine-wave", 1, DLMSUnit.VOLT
+    ),
+    (52, 7): OBISMeasurementInfo(
+        "Voltage L2", "voltage_l2", "voltage", "measurement", "V", "mdi:sine-wave", 1, DLMSUnit.VOLT
+    ),
+    (72, 7): OBISMeasurementInfo(
+        "Voltage L3", "voltage_l3", "voltage", "measurement", "V", "mdi:sine-wave", 1, DLMSUnit.VOLT
+    ),
+    (12, 7): OBISMeasurementInfo(
+        "Voltage", "voltage", "voltage", "measurement", "V", "mdi:sine-wave", 1, DLMSUnit.VOLT
+    ),
     # Current per phase + total
-    (31, 7): OBISMeasurementInfo("Current L1", "current_l1", "current", "measurement", "A", "mdi:current-ac", 2),
-    (51, 7): OBISMeasurementInfo("Current L2", "current_l2", "current", "measurement", "A", "mdi:current-ac", 2),
-    (71, 7): OBISMeasurementInfo("Current L3", "current_l3", "current", "measurement", "A", "mdi:current-ac", 2),
-    (11, 7): OBISMeasurementInfo("Current", "current", "current", "measurement", "A", "mdi:current-ac", 2),
+    (31, 7): OBISMeasurementInfo(
+        "Current L1", "current_l1", "current", "measurement", "A", "mdi:current-ac", 2, DLMSUnit.AMPERE
+    ),
+    (51, 7): OBISMeasurementInfo(
+        "Current L2", "current_l2", "current", "measurement", "A", "mdi:current-ac", 2, DLMSUnit.AMPERE
+    ),
+    (71, 7): OBISMeasurementInfo(
+        "Current L3", "current_l3", "current", "measurement", "A", "mdi:current-ac", 2, DLMSUnit.AMPERE
+    ),
+    (11, 7): OBISMeasurementInfo(
+        "Current", "current", "current", "measurement", "A", "mdi:current-ac", 2, DLMSUnit.AMPERE
+    ),
     # Power factor + frequency
     (13, 7): OBISMeasurementInfo(
         "Power factor",
@@ -508,22 +586,43 @@ OBIS_CATALOG: dict[MeasurementKey, OBISMeasurementInfo] = {
         None,
         "mdi:angle-acute",
         2,
+        DLMSUnit.COUNT,
+    ),
+    (14, 7): OBISMeasurementInfo(
+        "Frequency", "frequency", "frequency", "measurement", "Hz", "mdi:sine-wave", 2, DLMSUnit.HERTZ
     ),
-    (14, 7): OBISMeasurementInfo("Frequency", "frequency", "frequency", "measurement", "Hz", "mdi:sine-wave", 2),
     # Phase angles (C=81, D=7)
-    (81, 7, 0): OBISMeasurementInfo("Phase angle", "phase_angle", None, "measurement", "°", "mdi:angle-acute", 1),
+    (81, 7, 0): OBISMeasurementInfo(
+        "Phase angle", "phase_angle", None, "measurement", "°", "mdi:angle-acute", 1, DLMSUnit.DEGREE
+    ),
     (81, 7, 1): OBISMeasurementInfo(
-        "Phase angle U(L2)-U(L1)", "phase_angle_u_l2_l1", None, "measurement", "°", "mdi:angle-acute", 1
+        "Phase angle U(L2)-U(L1)",
+        "phase_angle_u_l2_l1",
+        None,
+        "measurement",
+        "°",
+        "mdi:angle-acute",
+        1,
+        DLMSUnit.DEGREE,
     ),
     (81, 7, 2): OBISMeasurementInfo(
-        "Phase angle U(L3)-U(L1)", "phase_angle_u_l3_l1", None, "measurement", "°", "mdi:angle-acute", 1
+        "Phase angle U(L3)-U(L1)",
+        "phase_angle_u_l3_l1",
+        None,
+        "measurement",
+        "°",
+        "mdi:angle-acute",
+        1,
+        DLMSUnit.DEGREE,
+    ),
+    (81, 7, 4): OBISMeasurementInfo(
+        "Phase angle L1", "phase_angle_l1", None, "measurement", "°", "mdi:angle-acute", 1, DLMSUnit.DEGREE
     ),
-    (81, 7, 4): OBISMeasurementInfo("Phase angle L1", "phase_angle_l1", None, "measurement", "°", "mdi:angle-acute", 1),
     (81, 7, 15): OBISMeasurementInfo(
-        "Phase angle L2", "phase_angle_l2", None, "measurement", "°", "mdi:angle-acute", 1
+        "Phase angle L2", "phase_angle_l2", None, "measurement", "°", "mdi:angle-acute", 1, DLMSUnit.DEGREE
     ),
     (81, 7, 26): OBISMeasurementInfo(
-        "Phase angle L3", "phase_angle_l3", None, "measurement", "°", "mdi:angle-acute", 1
+        "Phase angle L3", "phase_angle_l3", None, "measurement", "°", "mdi:angle-acute", 1, DLMSUnit.DEGREE
     ),
     # Device metadata & identification (exact E=0)
     (0, 2, 0): OBISMeasurementInfo(
@@ -551,6 +650,7 @@ OBIS_CATALOG: dict[MeasurementKey, OBISMeasurementInfo] = {
         "dBm",
         "mdi:signal",
         0,
+        DLMSUnit.DBM,
     ),
 }
 

obis_parser-0.0.5/obis_parser/dlms.py

@@ -0,0 +1,74 @@
+"""DLMS/COSEM physical unit enumeration and resolution (IEC 62056-6-2)."""
+
+from __future__ import annotations
+
+from enum import IntEnum
+
+
+class DLMSUnit(IntEnum):
+    """DLMS/COSEM physical unit enumeration (IEC 62056-6-2)."""
+
+    DEGREE = 8
+    WATT = 27
+    VOLT_AMPERE = 28
+    VAR = 29
+    WATT_HOUR = 30
+    VOLT_AMPERE_HOUR = 31
+    VAR_HOUR = 32
+    AMPERE = 33
+    VOLT = 35
+    HERTZ = 44
+    DBM = 70
+    COUNT = 255
+
+    @property
+    def is_kilo_energy(self) -> bool:
+        """Return True if this unit is an energy unit scaled to kilo-units (kWh/kVAh/kvarh) in the catalog."""
+        return self in _KILO_ENERGY_UNITS
+
+    @classmethod
+    def from_raw(cls, value: float | str | DLMSUnit | None) -> DLMSUnit | None:
+        """Resolve a raw DLMS unit code (int, integral float or string) or SI symbol into a ``DLMSUnit``.
+
+        Returns ``None`` for missing, boolean, non-integral (e.g. ``30.7``) or unknown codes.
+        """
+        if value is None or isinstance(value, bool):
+            return None
+        if isinstance(value, str):
+            cleaned = value.strip()
+            if symbol_unit := _SYMBOL_TO_DLMS_UNIT.get(cleaned):
+                return symbol_unit
+            raw_code: int | str = cleaned
+        elif isinstance(value, float):
+            if not value.is_integer():
+                return None
+            raw_code = int(value)
+        else:
+            raw_code = value
+        try:
+            return cls(int(raw_code))
+        except ValueError:
+            return None
+
+
+_SYMBOL_TO_DLMS_UNIT: dict[str, DLMSUnit] = {
+    "°": DLMSUnit.DEGREE,
+    "W": DLMSUnit.WATT,
+    "VA": DLMSUnit.VOLT_AMPERE,
+    "var": DLMSUnit.VAR,
+    "Wh": DLMSUnit.WATT_HOUR,
+    "VAh": DLMSUnit.VOLT_AMPERE_HOUR,
+    "varh": DLMSUnit.VAR_HOUR,
+    "A": DLMSUnit.AMPERE,
+    "V": DLMSUnit.VOLT,
+    "Hz": DLMSUnit.HERTZ,
+    "dBm": DLMSUnit.DBM,
+}
+
+_KILO_ENERGY_UNITS: frozenset[DLMSUnit] = frozenset(
+    {
+        DLMSUnit.WATT_HOUR,
+        DLMSUnit.VOLT_AMPERE_HOUR,
+        DLMSUnit.VAR_HOUR,
+    }
+)

{obis_parser-0.0.4 → obis_parser-0.0.5}/pyproject.toml

@@ -33,7 +33,6 @@ dependencies = []
 Homepage   = "https://pkg.jf-projects.de/obis-parser"
 Repository = "https://pkg.jf-projects.de/obis-parser"
 Issues     = "https://pkg.jf-projects.de/obis-parser/issues"
-Changelog  = "https://pkg.jf-projects.de/obis-parser/blob/main/CHANGELOG.md"
 
 [tool.hatch.version]
 source = "vcs"

{obis_parser-0.0.4 → obis_parser-0.0.5}/tests/test_decode.py

@@ -4,6 +4,7 @@ import pytest
 
 from obis_parser import (
     OBIS,
+    DLMSUnit,
     OBISMeasurement,
     OBISNameDescriptor,
 )
@@ -185,4 +186,101 @@ class TestOBISDecode:
         assert m.placeholders == {"code": expected_canonical}
         assert m.info is None
         assert m.unit is None
+        assert m.dlms_unit is None
         assert m.icon == "mdi:gauge"
+
+
+class TestDLMSScaling:
+    @pytest.mark.parametrize(
+        ("raw_unit", "expected_unit"),
+        [
+            (DLMSUnit.WATT_HOUR, DLMSUnit.WATT_HOUR),
+            (30, DLMSUnit.WATT_HOUR),
+            ("30", DLMSUnit.WATT_HOUR),
+            (" 32 ", DLMSUnit.VAR_HOUR),
+            ("Wh", DLMSUnit.WATT_HOUR),
+            ("VAh", DLMSUnit.VOLT_AMPERE_HOUR),
+            ("varh", DLMSUnit.VAR_HOUR),
+            ("W", DLMSUnit.WATT),
+            ("VA", DLMSUnit.VOLT_AMPERE),
+            ("var", DLMSUnit.VAR),
+            ("A", DLMSUnit.AMPERE),
+            ("V", DLMSUnit.VOLT),
+            ("Hz", DLMSUnit.HERTZ),
+            ("°", DLMSUnit.DEGREE),
+            ("dBm", DLMSUnit.DBM),
+            (255, DLMSUnit.COUNT),
+            (30.0, DLMSUnit.WATT_HOUR),
+            (30.7, None),
+            (None, None),
+            (0, None),
+            ("0", None),
+            ("", None),
+            ("unknown", None),
+            (999, None),
+            (True, None),
+        ],
+    )
+    def test_dlms_unit_from_raw(self, raw_unit: float | str | DLMSUnit | None, expected_unit: DLMSUnit | None) -> None:
+        assert DLMSUnit.from_raw(raw_unit) == expected_unit
+
+    @pytest.mark.parametrize(
+        ("code", "expected_dlms_unit"),
+        [
+            ("1-0:1.8.0", DLMSUnit.WATT_HOUR),
+            ("1-0:9.8.0", DLMSUnit.VOLT_AMPERE_HOUR),
+            ("1-0:3.8.0", DLMSUnit.VAR_HOUR),
+            ("1-0:16.7.0", DLMSUnit.WATT),
+            ("1-0:9.7.0", DLMSUnit.VOLT_AMPERE),
+            ("1-0:3.7.0", DLMSUnit.VAR),
+            ("1-0:31.7.0", DLMSUnit.AMPERE),
+            ("1-0:32.7.0", DLMSUnit.VOLT),
+            ("1-0:14.7.0", DLMSUnit.HERTZ),
+            ("1-0:81.7.4", DLMSUnit.DEGREE),
+            ("0-0:96.99.0", DLMSUnit.DBM),
+            ("1-0:13.7.0", DLMSUnit.COUNT),
+            ("1-0:0.2.0", None),
+            ("1-0:99.99.99", None),
+        ],
+    )
+    def test_dlms_unit_resolution(self, code: str, expected_dlms_unit: DLMSUnit | None) -> None:
+        obis = OBIS.parse(code)
+        assert obis is not None
+        assert obis.dlms_unit == expected_dlms_unit
+        assert obis.decode().dlms_unit == expected_dlms_unit
+
+    @pytest.mark.parametrize(
+        ("code", "raw_value", "scaler", "dlms_unit", "expected"),
+        [
+            # Energy registers (Wh/VAh/varh -> kWh/kVAh/kvarh)
+            ("1-0:1.8.0", "12345678", -1, 30, 1234.5678),
+            ("1-0:1.8.0", "1337420000", "-3", "30", 1337.42),
+            ("1-0:1.8.0", 10000, -1, None, 1.0),
+            ("1-0:1.8.0", 12, 4, 30, 120.0),
+            ("1-0:3.8.0", "100000", "-1", "32", 10.0),
+            ("1-0:9.8.0", "50000", -1, "VAh", 5.0),
+            # Unrecognised gateway unit falls back to the catalog unit (Wh -> kWh)
+            ("1-0:1.8.0", "1000", 0, 56, 1.0),
+            ("1-0:1.8.0", "1000", 0, 30.7, 1.0),
+            # Non-energy registers (scaled by 10**scaler without /1000, exact float division)
+            ("1-0:16.7.0", "450", "0", "27", 450.0),
+            ("1-0:16.7.0", "450", None, None, 450.0),
+            ("1-0:32.7.0", "2301", "-1", "35", 230.1),
+            ("1-0:31.7.0", "512", -2, 33, 5.12),
+            ("0-0:96.99.0", "-50", 0, 70, -50.0),
+            # Uncataloged register with explicit or absent DLMS unit
+            ("1-0:99.8.0", "10000", -1, 30, 1.0),
+            ("1-0:99.7.0", "100", -1, None, 10.0),
+        ],
+    )
+    def test_scale_value(
+        self,
+        code: str,
+        raw_value: str | float,
+        scaler: int | str | None,
+        dlms_unit: float | str | DLMSUnit | None,
+        expected: float,
+    ) -> None:
+        obis = OBIS.parse(code)
+        assert obis is not None
+        assert obis.scale_value(raw_value, scaler, dlms_unit) == expected