DEV-835 moar changes

Signed-off-by: Max Chesterfield <max.chesterfield@zepben.com>

Author: chestm007

src/zepben/ewb/database/sqlite/network/network_cim_writer.py

@@ -1018,6 +1018,7 @@ def _save_telephone_number(self, table: TableTelephoneNumbers, insert: PreparedS
         insert.add_value(table.country_code.query_index, telephone_number.country_code)
         insert.add_value(table.dial_out.query_index, telephone_number.dial_out)
         insert.add_value(table.extension.query_index, telephone_number.extension)
+        insert.add_value(table.international_prefix.query_index, telephone_number.international_prefix)
         insert.add_value(table.local_number.query_index, telephone_number.local_number)
         insert.add_value(table.is_primary.query_index, telephone_number.is_primary)
         insert.add_value(table.description.query_index, telephone_number.description)

src/zepben/ewb/model/cim/iec61968/metering/usage_point.py

@@ -201,7 +201,10 @@ def num_contacts(self):
 
     def get_contact(self, _id: str) -> ContactDetails:
         """All End devices at this usage point."""  # TODO: again, lol, also jvmsdk
-        return get_by_mrid(self._contacts, _id)
+        try:
+            return next((it for it in self.contacts if it.id == _id))
+        except StopIteration:
+            raise KeyError(_id)
 
     def add_contact(self, contact: ContactDetails) -> UsagePoint:
         """Add a `ContactDetails` to this `UsagePoint`"""

src/zepben/ewb/model/cim/iec61970/base/core/identified_object.py

@@ -24,7 +24,7 @@
 """
 
 @dataclass(slots=True)
-class IdentifiedObject(object, metaclass=ABCMeta):
+class IdentifiedObject(metaclass=ABCMeta):
     """
     Root class to provide common identification for all classes needing identification and naming attributes.
     Everything should extend this class, however it's not mandated that every subclass must use all the fields
@@ -49,6 +49,8 @@ class IdentifiedObject(object, metaclass=ABCMeta):
     # TODO: Missing num_diagram_objects: int = None  def has_diagram_objects(self): return (self.num_diagram_objects or 0) > 0
 
     def __init__(self, names: Optional[List[Name]] = None, **kwargs):
+        if kwargs:
+            raise TypeError("unexpected keyword arguments in IdentifiedObject constructor: {}".format(kwargs))
         super(IdentifiedObject, self).__init__(**kwargs)
         if not self.mrid or not self.mrid.strip():
             raise ValueError("You must provide an mRID for this object.")
@@ -212,7 +214,7 @@ def _validate_reference(self, other: T, get_identifier: Callable[[Callable], str
 
     # FIXME: in python 3.11, the IdentifiedObject type hint can be replaced with Self, and this can all be moved into the class def.
     #  @singledispatchmethod
-    def _validate_reference(self, other: IdentifiedObject | T, getter: Callable[[str], IdentifiedObject | T], type_description: Callable[[], str], get_identifier: Callable[[...], str]=None) -> bool:
+    def _validate_reference(self, other: IdentifiedObject | T, getter: Callable[[str], IdentifiedObject | T], type_description: Callable[[], str] | str, get_identifier: Callable[[...], str]=None) -> bool:
         """
         Validate whether a given reference exists to `other` using the provided getter function.
 
@@ -224,18 +226,20 @@ def _validate_reference(self, other: IdentifiedObject | T, getter: Callable[[str
         """
         if isinstance(other, IdentifiedObject):
             get_identifier = lambda _other: _other.mrid
-            describe_other = f"{type_description} with mRID {other.mrid}"
+            describe_other = lambda: f"{type_description} with mRID {other.mrid}"
         else:
             require(get_identifier is not None, lambda: "foo")
             describe_other = type_description
-
         try:
             get_result = getter(get_identifier(other))
-            require(get_result is other, lambda: f"{describe_other} already exists in {str(self)}")
-            return True
         except (KeyError, AttributeError):
             return False
 
+        if get_result is other:
+            return True
+
+        raise ValueError(f"{describe_other()} already exists in {str(self)}")
+
     def _validate_reference_by_field(self, other: IdentifiedObject, field: Any, getter: Callable[[Any], IdentifiedObject],
                                      field_name: str) -> bool:
         """

test/cim/cim_creators.py

@@ -93,7 +93,7 @@ def create_relay_info(include_runtime: bool = True):
 def create_contact_details():
     return builds(
         ContactDetails,
-        id=text(alphabet=ALPHANUM, max_size=TEXT_MAX_SIZE),
+        id=text(alphabet=ALPHANUM, max_size=TEXT_MAX_SIZE, min_size=1),
         contact_address=create_street_address(),
         contact_type=one_of(none(), text(alphabet=ALPHANUM, max_size=TEXT_MAX_SIZE)),
         first_name=one_of(none(), text(alphabet=ALPHANUM, max_size=TEXT_MAX_SIZE)),
@@ -744,7 +744,7 @@ def create_usage_point(include_runtime: bool = True):
         approved_inverter_capacity=integers(min_value=MIN_32_BIT_INTEGER, max_value=MAX_32_BIT_INTEGER),
         equipment=lists(builds(EnergyConsumer, **create_identified_object(include_runtime)), max_size=2),
         end_devices=lists(builds(Meter, **create_identified_object(include_runtime)), max_size=2),
-        contacts=lists(create_contact_details())
+        contacts=lists(create_contact_details(), max_size=2)
     )
 
 

test/cim/iec61968/metering/test_usage_point.py

@@ -131,4 +131,4 @@ def test_contacts_collection():
         UsagePoint.remove_contact,
         UsagePoint.clear_contacts,
         lambda it: it.id,
-    )
+    )