openadr3-client-gac-compliance 1.2.1__py3-none-any.whl → 1.3.0__py3-none-any.whl

openadr3_client_gac_compliance/gac20/event_gac_compliant.py

@@ -86,17 +86,15 @@ def _targets_compliant(self: Event) -> Tuple[Event, list[InitErrorDetails]]:
 
     GAC enforces the following constraints for targets:
 
-    - The event must contain a POWER_SERVICE_LOCATIONS target.
-    - The POWER_SERVICE_LOCATIONS target value must be a list of 'EAN18' values.
+    - The event must contain a POWER_SERVICE_LOCATION target.
+    - The POWER_SERVICE_LOCATION target value must be a list of 'EAN18' values.
     - The event must contain a VEN_NAME target.
     - The VEN_NAME target value must be a list of 'ven object name' values (between 1 and 128 characters).
     """
     validation_errors: list[InitErrorDetails] = []
     targets = self.targets or ()
 
-    power_service_locations = [
-        t for t in targets if t.type == "POWER_SERVICE_LOCATIONS"
-    ]
+    power_service_locations = [t for t in targets if t.type == "POWER_SERVICE_LOCATION"]
     ven_names = [t for t in targets if t.type == "VEN_NAME"]
 
     if not power_service_locations:
@@ -104,7 +102,7 @@ def _targets_compliant(self: Event) -> Tuple[Event, list[InitErrorDetails]]:
             InitErrorDetails(
                 type=PydanticCustomError(
                     "value_error",
-                    "The event must contain a POWER_SERVICE_LOCATIONS target.",
+                    "The event must contain a POWER_SERVICE_LOCATION target.",
                 ),
                 loc=("targets",),
                 input=self.targets,
@@ -130,7 +128,7 @@ def _targets_compliant(self: Event) -> Tuple[Event, list[InitErrorDetails]]:
             InitErrorDetails(
                 type=PydanticCustomError(
                     "value_error",
-                    "The event must contain exactly one POWER_SERVICE_LOCATIONS target.",
+                    "The event must contain exactly one POWER_SERVICE_LOCATION target.",
                 ),
                 loc=("targets",),
                 input=self.targets,
@@ -165,7 +163,7 @@ def _targets_compliant(self: Event) -> Tuple[Event, list[InitErrorDetails]]:
                 InitErrorDetails(
                     type=PydanticCustomError(
                         "value_error",
-                        "The POWER_SERVICE_LOCATIONS target value cannot be empty.",
+                        "The POWER_SERVICE_LOCATION target value cannot be empty.",
                     ),
                     loc=("targets",),
                     input=self.targets,
@@ -173,12 +171,14 @@ def _targets_compliant(self: Event) -> Tuple[Event, list[InitErrorDetails]]:
                 )
             )
 
-        if not all(re.fullmatch(r"\d{18}", v) for v in power_service_location.values):
+        if not all(
+            re.fullmatch(r"^EAN\d{15}$", v) for v in power_service_location.values
+        ):
             validation_errors.append(
                 InitErrorDetails(
                     type=PydanticCustomError(
                         "value_error",
-                        "The POWER_SERVICE_LOCATIONS target value must be a list of 'EAN18' values.",
+                        "The POWER_SERVICE_LOCATION target value must be a list of 'EAN18' values.",
                     ),
                     loc=("targets",),
                     input=self.targets,

{openadr3_client_gac_compliance-1.2.1.dist-info → openadr3_client_gac_compliance-1.3.0.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.3
 Name: openadr3-client-gac-compliance
-Version: 1.2.1
+Version: 1.3.0
 Summary: 
 Author: Nick van der Burgt
 Author-email: nick.van.der.burgt@elaad.nl

{openadr3_client_gac_compliance-1.2.1.dist-info → openadr3_client_gac_compliance-1.3.0.dist-info}/RECORD

@@ -1,11 +1,11 @@
 openadr3_client_gac_compliance/__init__.py,sha256=dzf9YdOlssEb9GSIoThaMzEJ956G-hpLi7HIXRC3TR8,334
 openadr3_client_gac_compliance/config.py,sha256=X_KEl99bUm05rH0IOKLyeR4Zn2utdC8U3vLkdG8MYXU,675
 openadr3_client_gac_compliance/gac20/__init__.py,sha256=YPjRHMl-uR6ZwrDGjY_EboScHe_VhTrovso_zDOSd6o,220
-openadr3_client_gac_compliance/gac20/event_gac_compliant.py,sha256=dZIVRRgpRajkceu8IDLNaz9b0lNmlFfWjdlAvlxymTo,15060
+openadr3_client_gac_compliance/gac20/event_gac_compliant.py,sha256=tktjQHDCXg76k_DksYcXmDV4lIeRLloE80ETK1bS6GQ,15066
 openadr3_client_gac_compliance/gac20/program_gac_compliant.py,sha256=i7l9oboA31_HMHZ-b8GbVTXGfeNCL3kF-o5e7--riCg,3540
 openadr3_client_gac_compliance/gac20/ven_gac_compliant.py,sha256=57MH73JorFSNyeB6Tep4XX_WMhtKls2DXoSoBaMhob8,1751
 openadr3_client_gac_compliance/gac21/__init__.py,sha256=GTu1EyBj2T72zT3MKPettcvP-DNCJ0p6oAMj3Z-08N0,61
-openadr3_client_gac_compliance-1.2.1.dist-info/LICENSE.md,sha256=NNNxKzhSK6afX-UaN8WZIVtMi5Tu8dVr6q3ciTSnH-g,10250
-openadr3_client_gac_compliance-1.2.1.dist-info/METADATA,sha256=n5GMDEvlXrEreakDfUWYiVOTZF7mgT1W8JzzhhsGK6g,1096
-openadr3_client_gac_compliance-1.2.1.dist-info/WHEEL,sha256=b4K_helf-jlQoXBBETfwnf4B04YC67LOev0jo4fX5m8,88
-openadr3_client_gac_compliance-1.2.1.dist-info/RECORD,,
+openadr3_client_gac_compliance-1.3.0.dist-info/LICENSE.md,sha256=NNNxKzhSK6afX-UaN8WZIVtMi5Tu8dVr6q3ciTSnH-g,10250
+openadr3_client_gac_compliance-1.3.0.dist-info/METADATA,sha256=_ECpcxY77Yc71oltWj3RuHTdO7oIDocNGMpNBpWnlzI,1096
+openadr3_client_gac_compliance-1.3.0.dist-info/WHEEL,sha256=b4K_helf-jlQoXBBETfwnf4B04YC67LOev0jo4fX5m8,88
+openadr3_client_gac_compliance-1.3.0.dist-info/RECORD,,