openadr3-client-gac-compliance 1.2.1__tar.gz → 1.4.0__tar.gz

{openadr3_client_gac_compliance-1.2.1 → openadr3_client_gac_compliance-1.4.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.3
 Name: openadr3-client-gac-compliance
-Version: 1.2.1
+Version: 1.4.0
 Summary: 
 Author: Nick van der Burgt
 Author-email: nick.van.der.burgt@elaad.nl
@@ -8,7 +8,7 @@ Requires-Python: >=3.12, <4
 Classifier: Programming Language :: Python :: 3
 Classifier: Programming Language :: Python :: 3.12
 Classifier: Programming Language :: Python :: 3.13
-Requires-Dist: openadr3-client (>=0.0.1,<1.0.0)
+Requires-Dist: openadr3-client (>=0.0.7,<1.0.0)
 Requires-Dist: pycountry (>=24.6.1,<25.0.0)
 Requires-Dist: pydantic (>=2.11.2,<3.0.0)
 Description-Content-Type: text/markdown

{openadr3_client_gac_compliance-1.2.1 → openadr3_client_gac_compliance-1.4.0}/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,
@@ -228,34 +228,34 @@ def _payload_descriptor_gac_compliant(
     """
     validation_errors: list[InitErrorDetails] = []
 
-    if self.payload_descriptor is None:
+    if self.payload_descriptors is None:
         validation_errors.append(
             InitErrorDetails(
                 type=PydanticCustomError(
                     "value_error",
                     "The event must have a payload descriptor.",
                 ),
-                loc=("payload_descriptor",),
-                input=self.payload_descriptor,
+                loc=("payload_descriptors",),
+                input=self.payload_descriptors,
                 ctx={},
             )
         )
 
-    if self.payload_descriptor is not None:
-        if len(self.payload_descriptor) != 1:
+    if self.payload_descriptors is not None:
+        if len(self.payload_descriptors) != 1:
             validation_errors.append(
                 InitErrorDetails(
                     type=PydanticCustomError(
                         "value_error",
                         "The event must have exactly one payload descriptor.",
                     ),
-                    loc=("payload_descriptor",),
-                    input=self.payload_descriptor,
+                    loc=("payload_descriptors",),
+                    input=self.payload_descriptors,
                     ctx={},
                 )
             )
 
-        payload_descriptor = self.payload_descriptor[0]
+        payload_descriptor = self.payload_descriptors[0]
 
         if payload_descriptor.payload_type != EventPayloadType.IMPORT_CAPACITY_LIMIT:
             validation_errors.append(
@@ -264,8 +264,8 @@ def _payload_descriptor_gac_compliant(
                         "value_error",
                         "The payload descriptor must have a payload type of 'IMPORT_CAPACITY_LIMIT'.",
                     ),
-                    loc=("payload_descriptor",),
-                    input=self.payload_descriptor,
+                    loc=("payload_descriptors",),
+                    input=self.payload_descriptors,
                     ctx={},
                 )
             )
@@ -277,8 +277,8 @@ def _payload_descriptor_gac_compliant(
                         "value_error",
                         "The payload descriptor must have a units of 'KW' (case sensitive).",
                     ),
-                    loc=("payload_descriptor",),
-                    input=self.payload_descriptor,
+                    loc=("payload_descriptors",),
+                    input=self.payload_descriptors,
                     ctx={},
                 )
             )

{openadr3_client_gac_compliance-1.2.1 → openadr3_client_gac_compliance-1.4.0}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "openadr3-client-gac-compliance"
-version = "1.2.1"
+version = "1.4.0"
 description = ""
 authors = [
     {name = "Nick van der Burgt", email = "nick.van.der.burgt@elaad.nl"}
@@ -9,7 +9,7 @@ readme = "README.md"
 requires-python = ">=3.12, <4"
 dependencies = [
     "pydantic (>=2.11.2,<3.0.0)",
-    "openadr3-client (>=0.0.1,<1.0.0)",
+    "openadr3-client (>=0.0.7,<1.0.0)",
     "pycountry (>=24.6.1,<25.0.0)",
 ]