From e39f16e4a8322390f55063bd315216251459e156 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Leon=20M=C3=B6ller?= Date: Sat, 4 Nov 2023 18:18:49 +0100 Subject: [PATCH] model.{aas, submodel}: improve `{AssetInformation, Entity}.global_asset_id` type hints --- basyx/aas/model/aas.py | 8 +++++--- basyx/aas/model/submodel.py | 4 ++-- 2 files changed, 7 insertions(+), 5 deletions(-) diff --git a/basyx/aas/model/aas.py b/basyx/aas/model/aas.py index 81ceb7e07..bf742eef7 100644 --- a/basyx/aas/model/aas.py +++ b/basyx/aas/model/aas.py @@ -63,7 +63,9 @@ def __init__(self, self._specific_asset_id: base.ConstrainedList[base.SpecificAssetId] = \ base.ConstrainedList(specific_asset_id, item_set_hook=self._check_constraint_set_spec_asset_id, item_del_hook=self._check_constraint_del_spec_asset_id) - self.global_asset_id: Optional[base.Identifier] = global_asset_id + self._global_asset_id: Optional[base.Identifier] + # AASd-131 is validated via the global_asset_id setter + self.global_asset_id = global_asset_id self.asset_type: Optional[base.Identifier] = asset_type self.default_thumbnail: Optional[base.Resource] = default_thumbnail @@ -78,11 +80,11 @@ def _check_constraint_del_spec_asset_id(self, _item_to_del: base.SpecificAssetId self._validate_asset_ids(self.global_asset_id, len(list_) > 1) @property - def global_asset_id(self): + def global_asset_id(self) -> Optional[base.Identifier]: return self._global_asset_id @global_asset_id.setter - def global_asset_id(self, global_asset_id: Optional[base.Identifier]): + def global_asset_id(self, global_asset_id: Optional[base.Identifier]) -> None: self._validate_asset_ids(global_asset_id, bool(self.specific_asset_id)) if global_asset_id is not None: _string_constraints.check_identifier(global_asset_id) diff --git a/basyx/aas/model/submodel.py b/basyx/aas/model/submodel.py index 88b189ad7..c228cf9e2 100644 --- a/basyx/aas/model/submodel.py +++ b/basyx/aas/model/submodel.py @@ -1144,11 +1144,11 @@ def entity_type(self, entity_type: base.EntityType) -> None: self._entity_type = entity_type @property - def global_asset_id(self): + def global_asset_id(self) -> Optional[base.Identifier]: return self._global_asset_id @global_asset_id.setter - def global_asset_id(self, global_asset_id: Optional[base.Identifier]): + def global_asset_id(self, global_asset_id: Optional[base.Identifier]) -> None: self._validate_asset_ids_for_entity_type(self.entity_type, global_asset_id, bool(self.specific_asset_id)) if global_asset_id is not None: _string_constraints.check_identifier(global_asset_id)