pySmartHashtag 0.14.2__tar.gz → 0.14.4__tar.gz

{pysmarthashtag-0.14.2/pySmartHashtag.egg-info → pysmarthashtag-0.14.4}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: pySmartHashtag
-Version: 0.14.2
+Version: 0.14.4
 Summary: A python library to get information from Smart #1, #3 and #5 web API
 Home-page: https://github.com/dasBasti/pySmartHashtag
 Author: dasBasti

{pysmarthashtag-0.14.2 → pysmarthashtag-0.14.4/pySmartHashtag.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: pySmartHashtag
-Version: 0.14.2
+Version: 0.14.4
 Summary: A python library to get information from Smart #1, #3 and #5 web API
 Home-page: https://github.com/dasBasti/pySmartHashtag
 Author: dasBasti

pysmarthashtag-0.14.4/pySmartHashtag.egg-info/scm_version.json

@@ -0,0 +1,8 @@
+{
+  "tag": "0.14.4",
+  "distance": 0,
+  "node": "gb04b393f4789d1d8d298d6cb2657c81b47d0d764",
+  "dirty": false,
+  "branch": "HEAD",
+  "node_date": "2026-10-15"
+}

{pysmarthashtag-0.14.2 → pysmarthashtag-0.14.4}/pysmarthashtag/control/climate.py

@@ -47,7 +47,7 @@ class RearHeatingLocation(str, Enum):
 # ZAF service parameter keys of the Smart #5 comfort functions
 ZAF_HEATING_KEYS = {
     HeatingLocation.DRIVER_SEAT: "SH.11",
-    HeatingLocation.PASSENGER_SEAT: "SH.19",
+    HeatingLocation.PASSENGER_SEAT: "SH.12",
     HeatingLocation.STEERING_WHEEL: "SW",
 }
 ZAF_VENTILATION_KEYS = {
@@ -56,9 +56,10 @@ ZAF_VENTILATION_KEYS = {
 }
 ZAF_REAR_HEATING_KEYS = {
     RearHeatingLocation.REAR_LEFT: "SH.21",
-    RearHeatingLocation.REAR_RIGHT: "SH.29",
+    RearHeatingLocation.REAR_RIGHT: "SH.22",
 }
-ZAF_ALL_COMFORT_KEYS = ("AC", "SH.11", "SH.19", "SH.21", "SH.29", "SW", "DF", "SV.11", "SV.19")
+ZAF_SEAT_HEATING_DURATION = "15"
+ZAF_ALL_COMFORT_KEYS = ("AC", "SH.11", "SH.12", "SH.21", "SH.22", "SW", "DF", "SV.11", "SV.19")
 
 
 class ClimateControll:
@@ -122,6 +123,10 @@ class ClimateControll:
         else:
             for key in ZAF_ALL_COMFORT_KEYS:
                 params[key] = "false"
+        return self._build_zaf_payload(params)
+
+    def _build_zaf_payload(self, params: dict[str, str]) -> str:
+        """Wrap ZAF service parameters in the request body. Start and stop both use ``command: start``."""
         payload = {
             "serviceId": "ZAF",
             "command": "start",
@@ -140,6 +145,13 @@ class ClimateControll:
         }
         return json.dumps(payload).replace(" ", "")
 
+    async def _send_zaf_command(self, params: str) -> bool:
+        """Send a ZAF request and log what was sent and what the cloud answered."""
+        _LOGGER.debug("Sending ZAF command: %s", params)
+        result = await send_telematics_command(self.account, self.vin, params)
+        _LOGGER.debug("ZAF command result: %s", result)
+        return result is True
+
     def set_ventilation_level(self, location: VentilationLocation, level: int):
         """Set the (Smart #5) seat ventilation level; selecting one clears the seat's heating."""
         if not self.use_zaf:
@@ -214,7 +226,7 @@ class ClimateControll:
 
         _LOGGER.debug("Setting climate conditioning: active=%s, temp=%s", active, temp)
         if self.use_zaf:
-            return (await send_telematics_command(self.account, self.vin, self._get_zaf_payload(active))) is True
+            return await self._send_zaf_command(self._get_zaf_payload(active))
         return await self._send_rce_command(self._get_payload(active))
 
     def _get_heating_payload(self, active: bool, levels: dict[HeatingLocation, int]) -> str:
@@ -256,8 +268,24 @@ class ClimateControll:
                 raise ValueError("Heating level must be between 1 and 3 to start heating.")
 
         _LOGGER.debug("Setting heating: active=%s, levels=%s", active, levels)
+        if self.use_zaf:
+            return await self._send_zaf_command(self._get_zaf_heating_payload(active, levels))
         return await self._send_rce_command(self._get_heating_payload(active, levels))
 
+    def _get_zaf_heating_payload(self, active: bool, levels: dict[HeatingLocation, int]) -> str:
+        """Build the Smart #5 ZAF request that only touches the given seats / steering wheel."""
+        params: dict[str, str] = {"operation": "4"}
+        for loc, level in levels.items():
+            key = ZAF_HEATING_KEYS[loc]
+            if active:
+                params[key] = "true"
+                params[f"{key}.level"] = str(level)
+                if loc != HeatingLocation.STEERING_WHEEL:
+                    params[f"{key}.duration"] = ZAF_SEAT_HEATING_DURATION
+            else:
+                params[key] = "false"
+        return self._build_zaf_payload(params)
+
     def _get_defrost_payload(self, active: bool) -> str:
         _payload = self.BASE_PAYLOAD_TEMPLATE.copy()
         _payload["command"] = "start" if active else "stop"
@@ -277,6 +305,9 @@ class ClimateControll:
         if not isinstance(active, bool):
             raise TypeError("Defrost state must be a boolean")
         _LOGGER.debug("Setting front windscreen defrost: active=%s", active)
+        if self.use_zaf:
+            params = {"operation": "4", "DF": "true" if active else "false"}
+            return await self._send_zaf_command(self._build_zaf_payload(params))
         return await self._send_rce_command(self._get_defrost_payload(active))
 
     async def _send_rce_command(self, params: str) -> bool:

{pysmarthashtag-0.14.2 → pysmarthashtag-0.14.4}/pysmarthashtag/tests/test_charging_states.py

@@ -117,3 +117,28 @@ class TestChargerConnectionState:
         assert battery is not None
         assert battery.charger_connection_status is None
         assert battery.charger_connection_state is None
+
+
+class TestIsChargerConnected:
+    """The plug state must not depend on the car currently drawing power (issue #441)."""
+
+    def test_plugged_not_charging(self):
+        """Plugged in with chargerState NOT_CHARGING still counts as connected."""
+        battery = Battery.from_vehicle_data(create_vehicle_data("0", "2"))
+
+        assert battery is not None
+        assert battery.is_charger_connected is True
+
+    def test_not_connected(self):
+        """Unplugged stays disconnected."""
+        battery = Battery.from_vehicle_data(create_vehicle_data("0", "0"))
+
+        assert battery is not None
+        assert battery.is_charger_connected is False
+
+    def test_unknown_connection_code_does_not_connect(self):
+        """Codes the API adds later do not flip the plug state on their own."""
+        battery = Battery.from_vehicle_data(create_vehicle_data("0", "42"))
+
+        assert battery is not None
+        assert battery.is_charger_connected is False

{pysmarthashtag-0.14.2 → pysmarthashtag-0.14.4}/pysmarthashtag/tests/test_climate_zaf.py

@@ -31,7 +31,7 @@ def test_start_with_ventilation():
     assert params["operation"] == "4"
     assert params["AC"] == "true" and params["AC.temp"] == "21.0"
     assert params["SV.11"] == "true" and params["SV.11.level"] == "2"
-    assert params["SH.19"] == "true" and params["SH.19.level"] == "3"
+    assert params["SH.12"] == "true" and params["SH.12.level"] == "3"
     assert params["SH.11"] == "false" and "SH.11.level" not in params
     assert params["SV.19"] == "false"
 
@@ -51,7 +51,7 @@ def test_stop_is_all_off():
     params = _params(ctrl._get_zaf_payload(False))
     assert json.loads(ctrl._get_zaf_payload(False))["command"] == "start"
     assert params["operation"] == "4"
-    for key in ("AC", "SH.11", "SH.19", "SH.21", "SH.29", "SW", "DF", "SV.11", "SV.19"):
+    for key in ("AC", "SH.11", "SH.12", "SH.21", "SH.22", "SW", "DF", "SV.11", "SV.19"):
         assert params[key] == "false"
 
 
@@ -70,7 +70,7 @@ def test_rear_heating_and_all_keys_string_values():
     ctrl.set_rear_heating_level(RearHeatingLocation.REAR_LEFT, 2)
     params = _params(ctrl._get_zaf_payload(True))
     assert params["SH.21"] == "true" and params["SH.21.level"] == "2"
-    assert params["SH.29"] == "false" and "SH.29.level" not in params
+    assert params["SH.22"] == "false" and "SH.22.level" not in params
     with pytest.raises(ValueError):
         ctrl.set_rear_heating_level(RearHeatingLocation.REAR_LEFT, 4)
     with pytest.raises(NotImplementedError):
@@ -92,3 +92,50 @@ async def test_stop_works_with_corrupt_temperature(monkeypatch):
     with pytest.raises(TypeError):
         await ctrl.set_climate_conditioning("garbage", True)
     assert len(sent) == 1
+
+
+@pytest.mark.asyncio
+async def test_set_heating_on_smart5_uses_zaf_without_ac(monkeypatch):
+    sent = []
+
+    async def fake_send(account, vin, payload):
+        sent.append(payload)
+        return True
+
+    monkeypatch.setattr("pysmarthashtag.control.climate.send_telematics_command", fake_send)
+    ctrl = _ctrl()
+    levels = {HeatingLocation.DRIVER_SEAT: 3, HeatingLocation.PASSENGER_SEAT: 2}
+    assert await ctrl.set_heating(True, levels) is True
+    payload = json.loads(sent[0])
+    assert payload["serviceId"] == "ZAF"
+    params = _params(sent[0])
+    assert params == {
+        "operation": "4",
+        "SH.11": "true",
+        "SH.11.level": "3",
+        "SH.11.duration": "15",
+        "SH.12": "true",
+        "SH.12.level": "2",
+        "SH.12.duration": "15",
+    }
+    assert ctrl.heating_levels[HeatingLocation.DRIVER_SEAT] == 0
+
+    assert await ctrl.set_heating(False, {HeatingLocation.STEERING_WHEEL: 0}) is True
+    assert _params(sent[1]) == {"operation": "4", "SW": "false"}
+
+
+@pytest.mark.asyncio
+async def test_set_defrost_on_smart5_uses_zaf(monkeypatch):
+    sent = []
+
+    async def fake_send(account, vin, payload):
+        sent.append(payload)
+        return True
+
+    monkeypatch.setattr("pysmarthashtag.control.climate.send_telematics_command", fake_send)
+    ctrl = _ctrl()
+    assert await ctrl.set_defrost(True) is True
+    assert json.loads(sent[0])["serviceId"] == "ZAF"
+    assert _params(sent[0]) == {"operation": "4", "DF": "true"}
+    await ctrl.set_defrost(False)
+    assert _params(sent[1]) == {"operation": "4", "DF": "false"}

{pysmarthashtag-0.14.2 → pysmarthashtag-0.14.4}/pysmarthashtag/vehicle/battery.py

@@ -304,6 +304,14 @@ class Battery(VehicleDataBase):
             if charger_conn is not None:
                 retval["charger_connection_status"] = charger_conn
                 retval["charger_connection_state"] = charger_connection_state_name(charger_conn)
+                # chargerState reports NOT_CHARGING for a plugged-in car that is not drawing power,
+                # so the connection code is the only reliable plug signal. See SmartHashtag issue #441.
+                if charger_conn in (
+                    ChargerConnectionState.DC_CONNECTED,
+                    ChargerConnectionState.PLUGGED_NOT_CHARGING,
+                    ChargerConnectionState.CHARGING,
+                ):
+                    retval["is_charger_connected"] = True
 
             charging_status = retval.get("charging_status")
             battery_percent = retval.get("remaining_battery_percent")

pysmarthashtag-0.14.2/pySmartHashtag.egg-info/scm_version.json

@@ -1,8 +0,0 @@
-{
-  "tag": "0.14.2",
-  "distance": 0,
-  "node": "gb73ae6cbc61e57756b26a7bb9ea3fd79957d7a89",
-  "dirty": false,
-  "branch": "HEAD",
-  "node_date": "2026-10-10"
-}