zepben.ewb 1.0.0b1__py3-none-any.whl

zepben/ewb/services/common/translator/base_proto2cim.py

@@ -0,0 +1,112 @@
+#  Copyright 2024 Zeppelin Bend Pty Ltd
+#  This Source Code Form is subject to the terms of the Mozilla Public
+#  License, v. 2.0. If a copy of the MPL was not distributed with this
+#  file, You can obtain one at https://mozilla.org/MPL/2.0/.
+
+__all__ = ["identified_object_to_cim", "document_to_cim", "organisation_to_cim", "organisation_role_to_cim", "BaseProtoToCim"]
+
+from abc import ABCMeta
+from typing import Optional
+
+# noinspection PyPackageRequirements
+from zepben.protobuf.cim.iec61968.common.Document_pb2 import Document as PBDocument
+from zepben.protobuf.cim.iec61968.common.OrganisationRole_pb2 import OrganisationRole as PBOrganisationRole
+from zepben.protobuf.cim.iec61968.common.Organisation_pb2 import Organisation as PBOrganisation
+from zepben.protobuf.cim.iec61970.base.core.IdentifiedObject_pb2 import IdentifiedObject as PBIdentifiedObject
+from zepben.protobuf.cim.iec61970.base.core.NameType_pb2 import NameType as PBNameType
+from zepben.protobuf.cim.iec61970.base.core.Name_pb2 import Name as PBName
+
+from zepben.ewb import Document, IdentifiedObject, Organisation, OrganisationRole
+from zepben.ewb.dataclassy import dataclass
+from zepben.ewb.model.cim.iec61970.base.core.name_type import NameType
+from zepben.ewb.services.common import resolver
+from zepben.ewb.services.common.base_service import BaseService
+
+
+###################
+# IEC61968 Common #
+###################
+
+def document_to_cim(pb: PBDocument, cim: Document, service: BaseService):
+    cim.title = pb.title
+    cim.created_date_time = pb.createdDateTime.ToDatetime() if pb.HasField("createdDateTime") else None
+    cim.author_name = pb.authorName
+    cim.type = pb.type
+    cim.status = pb.status
+    cim.comment = pb.comment
+
+    identified_object_to_cim(pb.io, cim, service)
+
+
+def organisation_to_cim(pb: PBOrganisation, service: BaseService) -> Optional[Organisation]:
+    cim = Organisation()
+
+    identified_object_to_cim(pb.io, cim, service)
+    return cim if service.add(cim) else None
+
+
+def organisation_role_to_cim(pb: PBOrganisationRole, cim: OrganisationRole, service: BaseService):
+    service.resolve_or_defer_reference(resolver.organisation(cim), pb.organisationMRID)
+
+    identified_object_to_cim(pb.io, cim, service)
+
+
+PBDocument.to_cim = document_to_cim
+PBOrganisation.to_cim = organisation_to_cim
+PBOrganisationRole.to_cim = organisation_role_to_cim
+
+
+######################
+# IEC61970 Base Core #
+######################
+
+def identified_object_to_cim(pb: PBIdentifiedObject, cim: IdentifiedObject, service: BaseService):
+    cim.mrid = pb.mRID
+    cim.name = pb.name
+    cim.description = pb.description
+    [cim.add_name(name_to_cim(name, cim, service).type, name.name) for name in pb.names]
+
+
+def name_to_cim(pb: PBName, io: IdentifiedObject, service: BaseService):
+    try:
+        nt = service.get_name_type(pb.type)
+    except KeyError:
+        # noinspection PyArgumentList
+        nt = NameType(pb.type)
+        service.add_name_type(nt)
+
+    return nt.get_or_add_name(pb.name, io)
+
+
+def name_type_to_cim(pb: PBNameType, service: BaseService):
+    try:
+        nt = service.get_name_type(pb.name)
+    except KeyError:
+        # noinspection PyArgumentList
+        nt = NameType(pb.name)
+        service.add_name_type(nt)
+
+    nt.description = pb.description
+    return nt
+
+
+PBIdentifiedObject.to_cim = identified_object_to_cim
+PBName.to_cim = name_to_cim
+PBNameType.to_cim = name_type_to_cim
+
+
+@dataclass(slots=True)
+class BaseProtoToCim(object, metaclass=ABCMeta):
+    service: BaseService
+
+
+# Extensions
+def _add_from_pb(service: BaseService, pb) -> Optional[IdentifiedObject]:
+    """Must only be called by objects for which .to_cim() takes themselves and the network service."""
+    try:
+        return pb.to_cim(service)
+    except AttributeError as e:
+        raise TypeError(f"Type {pb.__class__.__name__} is not supported by {service.__class__.__name__}. (Error was: {e})")
+
+
+BaseService.add_from_pb = _add_from_pb

zepben/ewb/services/common/translator/service_differences.py

@@ -0,0 +1,81 @@
+#  Copyright 2024 Zeppelin Bend Pty Ltd
+#  This Source Code Form is subject to the terms of the Mozilla Public
+#  License, v. 2.0. If a copy of the MPL was not distributed with this
+#  file, You can obtain one at https://mozilla.org/MPL/2.0/.
+from typing import Callable, Optional, Set, Dict, Generator, Tuple, Any, Iterable
+
+from zepben.ewb import IdentifiedObject
+from zepben.ewb.model.cim.iec61970.base.core.name_type import NameType
+from zepben.ewb.services.common.difference import ObjectDifference
+
+
+class ServiceDifferences(object):
+
+    def __init__(
+        self,
+        source_lookup: Callable[[str], Optional[IdentifiedObject]],
+        target_lookup: Callable[[str], Optional[IdentifiedObject]],
+        source_name_type_lookup: Callable[[str], Optional[NameType]],
+        target_name_type_lookup: Callable[[str], Optional[NameType]]
+    ):
+
+        self._source_lookup = source_lookup
+        self._target_lookup = target_lookup
+        self._source_name_type_lookup = source_name_type_lookup
+        self._target_name_type_lookup = target_name_type_lookup
+
+        self._missing_from_target: Set[str] = set()
+        self._missing_from_source: Set[str] = set()
+        self._modifications: Dict[str, ObjectDifference] = {}
+
+    def missing_from_target(self) -> Generator[str, None, None]:
+        for it in self._missing_from_target:
+            yield it
+
+    def missing_from_source(self) -> Generator[str, None, None]:
+        for it in self._missing_from_source:
+            yield it
+
+    def modifications(self) -> Generator[Tuple[str, ObjectDifference], None, None]:
+        for k, v in self._modifications.items():
+            yield k, v
+
+    def add_to_missing_from_target(self, mrid: str):
+        self._missing_from_target.add(mrid)
+
+    def add_to_missing_from_source(self, mrid: str):
+        self._missing_from_source.add(mrid)
+
+    def add_modifications(self, mrid: str, difference: ObjectDifference):
+        self._modifications[mrid] = difference
+
+    def __str__(self) -> str:
+        return "Missing From Target:" + _indent_each(self._missing_from_target, self._source_lookup, self._source_name_type_lookup) + \
+               "\nMissing From Source:" + _indent_each(self._missing_from_source, self._target_lookup, self._target_name_type_lookup) + \
+               "\nModifications:" + ''.join(_indented_line("{!r}: {!r},".format(k, v)) for k, v in self._modifications.items())
+
+
+def _indent_each(items: Iterable, obj_lookup, name_lookup) -> str:
+    return ''.join([_indented_line(_lookup(it, obj_lookup, name_lookup)) for it in items])
+
+
+def _indented_line(line: Any) -> str:
+    return "\n   " + str(line)
+
+
+def _lookup(it, obj_lookup, name_lookup):
+    try:
+        s = obj_lookup(it)
+        if s:
+            return s
+    except KeyError:
+        pass
+
+    try:
+        s = name_lookup(it)
+        if s:
+            return s
+    except KeyError:
+        pass
+
+    return it

zepben/ewb/services/common/translator/util.py

@@ -0,0 +1,78 @@
+#  Copyright 2024 Zeppelin Bend Pty Ltd
+#  This Source Code Form is subject to the terms of the Mozilla Public
+#  License, v. 2.0. If a copy of the MPL was not distributed with this
+#  file, You can obtain one at https://mozilla.org/MPL/2.0/.
+
+__all__ = [
+    "mrid_or_empty", "int_or_none", "uint_or_none", "float_or_none", "long_or_none", "str_or_none", "from_nullable_int", "from_nullable_uint",
+    "from_nullable_float", "from_nullable_long", "nullable_bool_settings"
+]
+
+from typing import Optional, Dict
+
+# noinspection PyPackageRequirements
+# noinspection PyUnresolvedReferences
+# pylint: disable=import-error
+from google.protobuf.struct_pb2 import NullValue
+
+from zepben.ewb import IdentifiedObject
+
+#
+# NOTE: These values must be comparable using standard equality operators (i.e ==)
+#
+
+_UNKNOWN_FLOAT = float("-inf")
+_UNKNOWN_INT = -2147483648
+_UNKNOWN_UINT = 4294967295
+_UNKNOWN_LONG = -9223372036854775808
+
+
+def mrid_or_empty(io: Optional[IdentifiedObject]) -> str:
+    return str(io.mrid) if io else ""
+
+
+def int_or_none(value: int) -> Optional[int]:
+    return value if value != _UNKNOWN_INT else None
+
+
+def uint_or_none(value: int) -> Optional[int]:
+    # The check against negative numbers is to handle issues with Python 3.7, which have been fixed in Python 3.9.
+    return value if value != _UNKNOWN_UINT and value >= 0 else None
+
+
+def float_or_none(value: float) -> Optional[float]:
+    return value if value != _UNKNOWN_FLOAT else None
+
+
+def long_or_none(value: int) -> Optional[int]:
+    return value if value != _UNKNOWN_LONG else None
+
+
+def str_or_none(value: str) -> Optional[str]:
+    return value if value else None
+
+
+def from_nullable_int(value: Optional[int]) -> int:
+    return value if value is not None else _UNKNOWN_INT
+
+
+def from_nullable_uint(value: Optional[int]) -> int:
+    return value if value is not None else _UNKNOWN_UINT
+
+
+def from_nullable_float(value: Optional[float]) -> float:
+    return value if value is not None else _UNKNOWN_FLOAT
+
+
+def from_nullable_long(value: Optional[int]) -> int:
+    return value if value is not None else _UNKNOWN_LONG
+
+
+def nullable_bool_settings(flag_name: str, value: Optional[bool]) -> Dict:
+    settings = {}
+    if value is None:
+        settings[f"{flag_name}Null"] = NullValue.NULL_VALUE
+    else:
+        settings[f"{flag_name}Set"] = value
+
+    return settings

zepben/ewb/services/customer/__init__.py

@@ -0,0 +1,4 @@
+#  Copyright 2024 Zeppelin Bend Pty Ltd
+#  This Source Code Form is subject to the terms of the Mozilla Public
+#  License, v. 2.0. If a copy of the MPL was not distributed with this
+#  file, You can obtain one at https://mozilla.org/MPL/2.0/.

zepben/ewb/services/customer/customer_service_comparator.py

@@ -0,0 +1,52 @@
+#  Copyright 2024 Zeppelin Bend Pty Ltd
+#  This Source Code Form is subject to the terms of the Mozilla Public
+#  License, v. 2.0. If a copy of the MPL was not distributed with this
+#  file, You can obtain one at https://mozilla.org/MPL/2.0/.
+from zepben.ewb import BaseServiceComparator, ObjectDifference, Customer, CustomerAgreement, PricingStructure, Tariff
+
+
+#
+# NOTE: The functions below are accessed by reflection rather than directly. Make sure you check the code coverage
+#       to ensure they are covered correctly.
+#
+class CustomerServiceComparator(BaseServiceComparator):
+    """
+    Compare the objects supported by the customer service.
+    """
+
+    ###################
+    # IEC61968 Common #
+    ###################
+
+    def _compare_agreement(self, diff: ObjectDifference) -> ObjectDifference:
+        return self._compare_document(diff)
+
+    ######################
+    # IEC61968 Customers #
+    ######################
+
+    def _compare_customer(self, source: Customer, target: Customer) -> ObjectDifference:
+        diff = ObjectDifference(source, target)
+
+        self._compare_values(diff, Customer.kind, Customer.special_need)
+        self._compare_id_reference_collections(diff, Customer.agreements)
+
+        return self._compare_organisation_role(diff)
+
+    def _compare_customer_agreement(self, source: CustomerAgreement, target: CustomerAgreement) -> ObjectDifference:
+        diff = ObjectDifference(source, target)
+
+        self._compare_id_references(diff, CustomerAgreement.customer)
+        self._compare_id_reference_collections(diff, CustomerAgreement.pricing_structures)
+
+        return self._compare_agreement(diff)
+
+    def _compare_pricing_structure(self, source: PricingStructure, target: PricingStructure) -> ObjectDifference:
+        diff = ObjectDifference(source, target)
+
+        self._compare_id_reference_collections(diff, PricingStructure.tariffs)
+
+        return self._compare_document(diff)
+
+    def _compare_tariff(self, source: Tariff, target: Tariff) -> ObjectDifference:
+        return self._compare_document(ObjectDifference(source, target))

zepben/ewb/services/customer/customers.py

@@ -0,0 +1,23 @@
+#  Copyright 2024 Zeppelin Bend Pty Ltd
+#  This Source Code Form is subject to the terms of the Mozilla Public
+#  License, v. 2.0. If a copy of the MPL was not distributed with this
+#  file, You can obtain one at https://mozilla.org/MPL/2.0/.
+
+__all__ = ["CustomerService"]
+
+from typing import Optional
+
+from zepben.ewb.services.common.base_service import BaseService
+from zepben.ewb.services.common.meta.metadata_collection import MetadataCollection
+
+
+class CustomerService(BaseService):
+    """
+    Used to store Customer related types.
+    """
+
+    def __init__(
+        self,
+        metadata: Optional[MetadataCollection] = None
+    ):
+        super().__init__("customer", metadata)

zepben/ewb/services/customer/translator/__init__.py

@@ -0,0 +1,21 @@
+#  Copyright 2024 Zeppelin Bend Pty Ltd
+#  This Source Code Form is subject to the terms of the Mozilla Public
+#  License, v. 2.0. If a copy of the MPL was not distributed with this
+#  file, You can obtain one at https://mozilla.org/MPL/2.0/.
+
+__all__ = []
+
+from zepben.protobuf.cim.iec61968.common.Agreement_pb2 import Agreement
+from zepben.protobuf.cim.iec61968.customers.CustomerAgreement_pb2 import CustomerAgreement
+from zepben.protobuf.cim.iec61968.customers.Customer_pb2 import Customer
+from zepben.protobuf.cim.iec61968.customers.PricingStructure_pb2 import PricingStructure
+from zepben.protobuf.cim.iec61968.customers.Tariff_pb2 import Tariff
+
+Customer.mrid = lambda self: getattr(self, 'or').mrid()
+CustomerAgreement.mrid = lambda self: self.agr.mrid()
+Agreement.mrid = lambda self: self.doc.mrid()
+PricingStructure.mrid = lambda self: self.doc.mrid()
+Tariff.mrid = lambda self: self.doc.mrid()
+
+CustomerAgreement.name_and_mrid = lambda self: self.agr.name_and_mrid()
+Agreement.name_and_mrid = lambda self: self.doc.name_and_mrid()

zepben/ewb/services/customer/translator/customer_cim2proto.py

@@ -0,0 +1,71 @@
+#  Copyright 2024 Zeppelin Bend Pty Ltd
+#  This Source Code Form is subject to the terms of the Mozilla Public
+#  License, v. 2.0. If a copy of the MPL was not distributed with this
+#  file, You can obtain one at https://mozilla.org/MPL/2.0/.
+
+__all__ = ["agreement_to_pb", "customer_to_pb", "customer_agreement_to_pb", "pricing_structure_to_pb", "tariff_to_pb"]
+
+from zepben.protobuf.cim.iec61968.common.Agreement_pb2 import Agreement as PBAgreement
+from zepben.protobuf.cim.iec61968.customers.CustomerAgreement_pb2 import CustomerAgreement as PBCustomerAgreement
+from zepben.protobuf.cim.iec61968.customers.Customer_pb2 import Customer as PBCustomer
+from zepben.protobuf.cim.iec61968.customers.PricingStructure_pb2 import PricingStructure as PBPricingStructure
+from zepben.protobuf.cim.iec61968.customers.Tariff_pb2 import Tariff as PBTariff
+
+from zepben.ewb.model.cim.iec61968.common.agreement import Agreement
+from zepben.ewb.model.cim.iec61968.customers.customer import Customer
+from zepben.ewb.model.cim.iec61968.customers.customer_agreement import CustomerAgreement
+from zepben.ewb.model.cim.iec61968.customers.pricing_structure import PricingStructure
+from zepben.ewb.model.cim.iec61968.customers.tariff import Tariff
+from zepben.ewb.services.common.translator.base_cim2proto import document_to_pb, organisation_role_to_pb
+from zepben.ewb.services.common.translator.util import mrid_or_empty
+# noinspection PyProtectedMember
+from zepben.ewb.services.customer.translator.customer_enum_mappers import _map_customer_kind
+
+
+###################
+# IEC61968 Common #
+###################
+
+def agreement_to_pb(cim: Agreement) -> PBAgreement:
+    return PBAgreement(doc=document_to_pb(cim))
+
+
+######################
+# IEC61968 Customers #
+######################
+
+def customer_to_pb(cim: Customer) -> PBCustomer:
+    customer = PBCustomer(
+        kind=_map_customer_kind.to_pb(cim.kind),
+        specialNeed=cim.special_need,
+        customerAgreementMRIDs=[str(io.mrid) for io in cim.agreements]
+    )
+
+    getattr(customer, 'or').CopyFrom(organisation_role_to_pb(cim))
+    return customer
+
+
+def customer_agreement_to_pb(cim: CustomerAgreement) -> PBCustomerAgreement:
+    return PBCustomerAgreement(
+        agr=agreement_to_pb(cim),
+        customerMRID=mrid_or_empty(cim.customer),
+        pricingStructureMRIDs=[str(io.mrid) for io in cim.pricing_structures]
+    )
+
+
+def pricing_structure_to_pb(cim: PricingStructure) -> PBPricingStructure:
+    return PBPricingStructure(
+        doc=document_to_pb(cim),
+        tariffMRIDs=[str(io.mrid) for io in cim.tariffs]
+    )
+
+
+def tariff_to_pb(cim: Tariff) -> PBTariff:
+    return PBTariff(doc=document_to_pb(cim))
+
+
+Agreement.to_pb = agreement_to_pb
+Customer.to_pb = customer_to_pb
+CustomerAgreement.to_pb = customer_agreement_to_pb
+PricingStructure.to_pb = pricing_structure_to_pb
+Tariff.to_pb = tariff_to_pb

zepben/ewb/services/customer/translator/customer_enum_mappers.py

@@ -0,0 +1,18 @@
+#  Copyright 2025 Zeppelin Bend Pty Ltd
+#  This Source Code Form is subject to the terms of the Mozilla Public
+#  License, v. 2.0. If a copy of the MPL was not distributed with this
+#  file, You can obtain one at https://mozilla.org/MPL/2.0/.
+
+__all__ = []
+
+from zepben.protobuf.cim.iec61968.customers.CustomerKind_pb2 import CustomerKind as PBCustomerKind
+
+from zepben.ewb.model.cim.iec61968.customers.customer_kind import CustomerKind
+# noinspection PyProtectedMember
+from zepben.ewb.services.common.enum_mapper import EnumMapper
+
+#
+# NOTE: These are deliberately excluded from the module export, as they aren't part of the public api.
+#
+
+_map_customer_kind = EnumMapper(CustomerKind, PBCustomerKind)

zepben/ewb/services/customer/translator/customer_proto2cim.py

@@ -0,0 +1,87 @@
+#  Copyright 2024 Zeppelin Bend Pty Ltd
+#  This Source Code Form is subject to the terms of the Mozilla Public
+#  License, v. 2.0. If a copy of the MPL was not distributed with this
+#  file, You can obtain one at https://mozilla.org/MPL/2.0/.
+
+from __future__ import annotations
+
+__all__ = ["agreement_to_cim", "customer_to_cim", "customer_agreement_to_cim", "pricing_structure_to_cim", "tariff_to_cim"]
+
+from typing import Optional
+
+from zepben.protobuf.cim.iec61968.common.Agreement_pb2 import Agreement as PBAgreement
+from zepben.protobuf.cim.iec61968.customers.CustomerAgreement_pb2 import CustomerAgreement as PBCustomerAgreement
+from zepben.protobuf.cim.iec61968.customers.Customer_pb2 import Customer as PBCustomer
+from zepben.protobuf.cim.iec61968.customers.PricingStructure_pb2 import PricingStructure as PBPricingStructure
+from zepben.protobuf.cim.iec61968.customers.Tariff_pb2 import Tariff as PBTariff
+
+import zepben.ewb.services.common.resolver as resolver
+from zepben.ewb import organisation_role_to_cim, document_to_cim, BaseService, CustomerKind
+from zepben.ewb.model.cim.iec61968.common.agreement import Agreement
+from zepben.ewb.model.cim.iec61968.customers.customer import Customer
+from zepben.ewb.model.cim.iec61968.customers.customer_agreement import CustomerAgreement
+from zepben.ewb.model.cim.iec61968.customers.pricing_structure import PricingStructure
+from zepben.ewb.model.cim.iec61968.customers.tariff import Tariff
+from zepben.ewb.services.customer.customers import CustomerService
+
+
+###################
+# IEC61968 Common #
+###################
+
+def agreement_to_cim(pb: PBAgreement, cim: Agreement, service: BaseService):
+    document_to_cim(pb.doc, cim, service)
+
+
+######################
+# IEC61968 Customers #
+######################
+
+def customer_to_cim(pb: PBCustomer, service: CustomerService) -> Optional[Customer]:
+    cim = Customer(
+        mrid=pb.mrid(),
+        kind=CustomerKind(pb.kind),
+        special_need=pb.specialNeed if pb.specialNeed else None
+    )
+
+    for mrid in pb.customerAgreementMRIDs:
+        service.resolve_or_defer_reference(resolver.agreements(cim), mrid)
+
+    organisation_role_to_cim(getattr(pb, 'or'), cim, service)
+    return cim if service.add(cim) else None
+
+
+def customer_agreement_to_cim(pb: PBCustomerAgreement, service: CustomerService) -> Optional[CustomerAgreement]:
+    cim = CustomerAgreement(mrid=pb.mrid())
+
+    service.resolve_or_defer_reference(resolver.customer(cim), pb.customerMRID)
+    for mrid in pb.pricingStructureMRIDs:
+        service.resolve_or_defer_reference(resolver.pricing_structures(cim), mrid)
+
+    agreement_to_cim(pb.agr, cim, service)
+    return cim if service.add(cim) else None
+
+
+def pricing_structure_to_cim(pb: PBPricingStructure, service: CustomerService) -> Optional[PricingStructure]:
+    cim = PricingStructure(mrid=pb.mrid())
+
+    for mrid in pb.tariffMRIDs:
+        service.resolve_or_defer_reference(resolver.tariffs(cim), mrid)
+
+    document_to_cim(pb.doc, cim, service)
+    return cim if service.add(cim) else None
+
+
+def tariff_to_cim(pb: PBTariff, service: CustomerService) -> Optional[Tariff]:
+    # noinspection PyArgumentList
+    cim = Tariff(mrid=pb.mrid())
+
+    document_to_cim(pb.doc, cim, service)
+    return cim if service.add(cim) else None
+
+
+PBAgreement.to_cim = agreement_to_cim
+PBCustomer.to_cim = customer_to_cim
+PBCustomerAgreement.to_cim = customer_agreement_to_cim
+PBPricingStructure.to_cim = pricing_structure_to_cim
+PBTariff.to_cim = tariff_to_cim

zepben/ewb/services/diagram/__init__.py

@@ -0,0 +1,4 @@
+#  Copyright 2024 Zeppelin Bend Pty Ltd
+#  This Source Code Form is subject to the terms of the Mozilla Public
+#  License, v. 2.0. If a copy of the MPL was not distributed with this
+#  file, You can obtain one at https://mozilla.org/MPL/2.0/.

zepben/ewb/services/diagram/diagram_service_comparator.py

@@ -0,0 +1,39 @@
+#  Copyright 2024 Zeppelin Bend Pty Ltd
+#  This Source Code Form is subject to the terms of the Mozilla Public
+#  License, v. 2.0. If a copy of the MPL was not distributed with this
+#  file, You can obtain one at https://mozilla.org/MPL/2.0/.
+from zepben.ewb import BaseServiceComparator, ObjectDifference
+from zepben.ewb.model.cim.iec61970.base.diagramlayout.diagram import Diagram
+from zepben.ewb.model.cim.iec61970.base.diagramlayout.diagram_object import DiagramObject
+
+
+#
+# NOTE: The functions below are accessed by reflection rather than directly. Make sure you check the code coverage
+#       to ensure they are covered correctly.
+#
+class DiagramServiceComparator(BaseServiceComparator):
+    """
+    Compare the objects supported by the diagram service.
+    """
+
+    ################################
+    # IEC61970 Base Diagram Layout #
+    ################################
+
+    def _compare_diagram(self, source: Diagram, target: Diagram) -> ObjectDifference:
+        diff = ObjectDifference(source, target)
+
+        self._compare_values(diff, Diagram.diagram_style, Diagram.orientation_kind)
+        self._compare_id_reference_collections(diff, Diagram.diagram_objects)
+
+        return self._compare_identified_object(diff)
+
+    def _compare_diagram_object(self, source: DiagramObject, target: DiagramObject) -> ObjectDifference:
+        diff = ObjectDifference(source, target)
+
+        self._compare_id_references(diff, DiagramObject.diagram)
+        self._compare_values(diff, DiagramObject.identified_object_mrid, DiagramObject.style)
+        self._compare_floats(diff, DiagramObject.rotation)
+        self._compare_indexed_value_collections(diff, DiagramObject.points)
+
+        return self._compare_identified_object(diff)