Update to EcoG-io/iso15118 version 0.28.3

Author: SebaLukas

.env.dev.local

@@ -12,7 +12,7 @@ FREE_CERT_INSTALL_SERVICE=True
 ALLOW_CERT_INSTALL_SERVICE=True
 USE_CPO_BACKEND=False
 SECC_ENFORCE_TLS=False
-#PROTOCOLS=ISO_15118_20_AC,DIN_SPEC_70121,ISO_15118_2
+#PROTOCOLS=DIN_SPEC_70121,ISO_15118_2,ISO_15118_20_AC,ISO_15118_20_DC
 EVCC_CONFIG_PATH=iso15118/shared/examples/evcc/iso15118_2/evcc_config_eim_ac.json
 # LOG Settings
 LOG_LEVEL="DEBUG"

CHANGELOG.md

@@ -4,6 +4,25 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
 ## [Unreleased]
+## [0.28.3] - 2024-06-18
+* Fix/min charge current is missing by @ikaratass in https://github.com/SwitchEV/iso15118/pull/421
+
+## [0.28.2] - 2024-06-06
+* Added missed param in ev data by @shalinnijel2 in https://github.com/SwitchEV/iso15118/pull/412
+* session limits are rearranged according to rated limits by @ikaratass in https://github.com/SwitchEV/iso15118/pull/415
+
+## [0.28.1] - 2024-05-21
+* Fixed pydantic issues. by @shalinnijel2 in https://github.com/SwitchEV/iso15118/pull/405
+* Modify cable check contactor status check by @shalinnijel2 in https://github.com/SwitchEV/iso15118/pull/404
+* Fixed comment. by @shalinnijel2 in https://github.com/SwitchEV/iso15118/pull/407
+* selected_energy_mode is a part of evdata by @ikaratass in https://github.com/SwitchEV/iso15118/pull/408
+
+## [0.28.0] - 2024-05-02
+* fix typo in SECC interface.py by @M4GNV5 in https://github.com/SwitchEV/iso15118/pull/398
+* Update .env.dev.local, ISO_15118_20_DC is not implemented for use by @lwollinger in https://github.com/SwitchEV/iso15118/pull/395
+* Share cpd params with CS. by @shalinnijel2 in https://github.com/SwitchEV/iso15118/pull/400
+* Share display params with CS. by @shalinnijel2 in https://github.com/SwitchEV/iso15118/pull/401
+* Relaxed contactor status check for DC. by @shalinnijel2 in https://github.com/SwitchEV/iso15118/pull/402
 
 ## [0.27.0] - 2024-04-17
 * ScheduleExchangeRes parsing fix by @heavyweight87 in https://github.com/SwitchEV/iso15118/pull/391

iso15118/__init__.py

@@ -1 +1 @@
-__version__ = "0.27.0"
+__version__ = "0.28.3"

iso15118/evcc/comm_session_handler.py

@@ -34,6 +34,7 @@
 from iso15118.shared.messages.enums import (
     AuthEnum,
     DINPayloadTypes,
+    EnergyTransferModeEnum,
     ISOV2PayloadTypes,
     ISOV20PayloadTypes,
     Namespace,
@@ -138,7 +139,8 @@ def __init__(
         # "Caching" authorization_req. (Required in ISO15118-20)
         # Avoids recomputing the signature, eim, pnc params during authorization loop.
         self.authorization_req_message: Optional[AuthorizationReq] = None
-
+        # The energy mode the EVCC selected (ISO 15118-2)
+        self.selected_energy_mode: Optional[EnergyTransferModeEnum] = None
         self.is_tls = False
 
         self.sae_j2847_active: int = 0
@@ -191,9 +193,11 @@ def create_sap(self) -> Union[SupportedAppProtocolReq, None]:
             priority += 1
             app_protocol_entry = AppProtocol(
                 protocol_ns=protocol.ns.value,
-                major_version=2
-                if protocol in [Protocol.ISO_15118_2, Protocol.DIN_SPEC_70121]
-                else 1,
+                major_version=(
+                    2
+                    if protocol in [Protocol.ISO_15118_2, Protocol.DIN_SPEC_70121]
+                    else 1
+                ),
                 minor_version=0,
                 schema_id=schema_id,
                 priority=priority,

iso15118/evcc/states/evcc_state.py

@@ -2,6 +2,7 @@
 This module contains the abstract class for an EVCC-specific state,
 which extends the state shared between the EVCC and SECC.
 """
+
 import logging
 import time
 from abc import ABC

iso15118/evcc/states/iso15118_20_states.py

@@ -458,9 +458,9 @@ async def process_message(
             service_discovery_res.service_renegotiation_supported
         )
 
-        req_energy_services: List[
-            ServiceV20
-        ] = await self.comm_session.ev_controller.get_supported_energy_services()
+        req_energy_services: List[ServiceV20] = (
+            await self.comm_session.ev_controller.get_supported_energy_services()
+        )
 
         for energy_service in service_discovery_res.energy_service_list.services:
             for requested_energy_service in req_energy_services:

iso15118/evcc/states/iso15118_2_states.py

@@ -198,9 +198,9 @@ async def process_message(
         await self.select_energy_transfer_mode()
 
         charge_service: ChargeService = service_discovery_res.charge_service
-        offered_energy_modes: List[
-            EnergyTransferModeEnum
-        ] = charge_service.supported_energy_transfer_mode.energy_modes
+        offered_energy_modes: List[EnergyTransferModeEnum] = (
+            charge_service.supported_energy_transfer_mode.energy_modes
+        )
 
         if self.comm_session.selected_energy_mode not in offered_energy_modes:
             self.stop_state_machine(

iso15118/secc/comm_session_handler.py

@@ -203,9 +203,9 @@ def __init__(
         # The comm_sessions dict keys are of type str (the IPv6 address), the
         # values are a tuple containing the SECCCommunicationSession and the
         # associated ayncio.Task object (so we can cancel the task when needed)
-        self.comm_sessions: Dict[
-            str, Tuple[SECCCommunicationSession, asyncio.Task]
-        ] = {}
+        self.comm_sessions: Dict[str, Tuple[SECCCommunicationSession, asyncio.Task]] = (
+            {}
+        )
 
     async def start_session_handler(
         self, iface: str, start_udp_server: Optional[bool] = True

iso15118/secc/controller/ev_data.py

@@ -10,7 +10,12 @@
     DCEVChargeParameter as DIN_DCEVChargeParameter,
 )
 from iso15118.shared.messages.din_spec.body import PreChargeReq as DIN_PreChargeReq
-from iso15118.shared.messages.enums import AuthEnum, ControlMode, ServiceV20
+from iso15118.shared.messages.enums import (
+    AuthEnum,
+    ControlMode,
+    EnergyTransferModeEnum,
+    ServiceV20,
+)
 from iso15118.shared.messages.iso15118_2.body import (
     ACEVChargeParameter,
     CurrentDemandReq,
@@ -213,9 +218,9 @@ def __init__(
         self.max_soc: Optional[int] = max_soc  # 0-100
         self.max_v2x_energy_request: Optional[float] = max_v2x_energy_request
         self.min_v2x_energy_request: Optional[float] = min_v2x_energy_request
-        self.remaining_time_to_target_soc: Optional[
-            float
-        ] = remaining_time_to_target_soc  # noqa: E501
+        self.remaining_time_to_target_soc: Optional[float] = (
+            remaining_time_to_target_soc  # noqa: E501
+        )
         # In -2 is FullSOC
         self.remaining_time_to_max_soc: Optional[float] = remaining_time_to_max_soc
         self.remaining_time_to_min_soc: Optional[float] = remaining_time_to_min_soc
@@ -243,6 +248,8 @@ def __init__(
         # Sent in -2,-20 PreChargeReq
         # and same as above
         self.target_voltage: float = target_voltage
+        # The energy mode the EVCC selected.
+        self.selected_energy_mode: Optional[EnergyTransferModeEnum] = None
 
     def update_ac_charge_parameters_v2(
         self, ac_ev_charge_parameter: ACEVChargeParameter
@@ -689,6 +696,9 @@ def _update_common_dc_charge_parameters_v20(
         dc_rated_limits.max_charge_current = (
             params.ev_max_charge_current.get_decimal_value()
         )  # noqa: E501
+        dc_rated_limits.min_charge_current = (
+            params.ev_min_charge_current.get_decimal_value()
+        )  # noqa: E501
         dc_rated_limits.max_voltage = (
             params.ev_max_voltage.get_decimal_value()
         )  # noqa: E501

iso15118/secc/controller/evse_data.py

@@ -173,21 +173,21 @@ def __init__(
         self.max_power_asymmetry: Optional[float] = max_power_asymmetry
 
         #  Optional in 15118-2 CPD
-        self.current_regulation_tolerance: Optional[
-            float
-        ] = current_regulation_tolerance
+        self.current_regulation_tolerance: Optional[float] = (
+            current_regulation_tolerance
+        )
         self.peak_current_ripple: Optional[float] = peak_current_ripple
         self.energy_to_be_delivered: Optional[float] = energy_to_be_delivered
         # Metering
-        self.present_active_power: Optional[
-            float
-        ] = present_active_power  # Optional in AC Scheduled CL
-        self.present_active_power_l2: Optional[
-            float
-        ] = present_active_power_l2  # Optional in AC Scheduled CL
-        self.present_active_power_l3: Optional[
-            float
-        ] = present_active_power_l3  # Optional in AC Scheduled CL
+        self.present_active_power: Optional[float] = (
+            present_active_power  # Optional in AC Scheduled CL
+        )
+        self.present_active_power_l2: Optional[float] = (
+            present_active_power_l2  # Optional in AC Scheduled CL
+        )
+        self.present_active_power_l3: Optional[float] = (
+            present_active_power_l3  # Optional in AC Scheduled CL
+        )
 
         # Required for -2 DC CurrentDemand, -20 DC CL
         self.present_current: Union[float, int] = present_current
@@ -218,34 +218,56 @@ def update_ac_charge_parameters_v2(
     ) -> None:
         """Update the EVSE data context with the AC charge parameters."""
         self.current_type = CurrentType.AC
-        rated_limits = self.rated_limits.ac_limits = EVSEACCPDLimits()
-        self.session_limits.ac_limits = EVSEACCLLimits()
+        if self.rated_limits.ac_limits is None:
+            self.rated_limits.ac_limits = EVSEACCPDLimits()
+        rated_limits = self.rated_limits.ac_limits
+        if self.session_limits.ac_limits is None:
+            self.session_limits.ac_limits = EVSEACCLLimits()
+        session_limits = self.session_limits.ac_limits
         self.nominal_voltage = (
             ac_charge_parameter.evse_nominal_voltage.get_decimal_value()
         )  # noqa: E501
         rated_limits.max_current = (
             ac_charge_parameter.evse_max_current.get_decimal_value()
         )
+
         rated_limits.max_charge_power = rated_limits.max_current * self.nominal_voltage
+        rated_limits.max_charge_power_l2 = rated_limits.max_charge_power
+        rated_limits.max_charge_power_l3 = rated_limits.max_charge_power
         rated_limits.max_discharge_power = 0
         rated_limits.min_charge_power = 0
         rated_limits.min_discharge_power = 0
         # Create the session limits based on the rated limits
-        self.session_limits.ac_limits.update(rated_limits.as_dict())
+        # without exceeding the rated limits
+        for value in vars(rated_limits):
+            if hasattr(session_limits, value):
+                rated_value = getattr(rated_limits, value)
+                session_value = getattr(session_limits, value)
+                try:
+                    if not session_value or (session_value > rated_value):
+                        setattr(session_limits, value, rated_value)
+                except TypeError:
+                    pass
 
     def update_dc_charge_parameters(
         self, dc_charge_parameter: DCEVSEChargeParameter
     ) -> None:
         """Update the EVSE data context with the DC charge parameters."""
         self.current_type = CurrentType.DC
-        rated_limits = self.rated_limits.dc_limits = EVSEDCCPDLimits()
-        self.session_limits.dc_limits = EVSEDCCLLimits()
+        if not self.rated_limits.dc_limits:
+            self.rated_limits.dc_limits = EVSEDCCPDLimits()
+        rated_limits = self.rated_limits.dc_limits
+        if not self.session_limits.dc_limits:
+            self.session_limits.dc_limits = EVSEDCCLLimits()
         rated_limits.max_charge_power = (
             dc_charge_parameter.evse_maximum_power_limit.get_decimal_value()
         )
         rated_limits.max_charge_current = (
             dc_charge_parameter.evse_maximum_current_limit.get_decimal_value()
         )
+        rated_limits.min_charge_current = (
+            dc_charge_parameter.evse_minimum_current_limit.get_decimal_value()
+        )
         rated_limits.max_voltage = (
             dc_charge_parameter.evse_maximum_voltage_limit.get_decimal_value()
         )
@@ -264,8 +286,17 @@ def update_dc_charge_parameters(
             self.energy_to_be_delivered = (
                 dc_charge_parameter.evse_energy_to_be_delivered.get_decimal_value()
             )
-        # Create the session limits based on the rated limits
-        self.session_limits.dc_limits.update(rated_limits.as_dict())
+            # Create the session limits based on the rated limits
+            # without exceeding the rated limits
+            for value in vars(rated_limits):
+                if hasattr(self.session_limits.dc_limits, value):
+                    rated_value = getattr(rated_limits, value)
+                    session_value = getattr(self.session_limits.dc_limits, value)
+                    try:
+                        if not session_value or (session_value > rated_value):
+                            setattr(self.session_limits.dc_limits, value, rated_value)
+                    except TypeError:
+                        pass
 
     def update_ac_charge_parameters_v20(
         self,