esmf-aspect-model-loader 2.2.0__tar.gz → 2.2.1__tar.gz

{esmf_aspect_model_loader-2.2.0 → esmf_aspect_model_loader-2.2.1}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: esmf-aspect-model-loader
-Version: 2.2.0
+Version: 2.2.1
 Summary: Load Aspect Models based on the Semantic Aspect Meta Model
 Home-page: https://projects.eclipse.org/projects/dt.esmf
 License: MPL-2.0
@@ -139,7 +139,7 @@ SAMMUnitsGraph is a class contains functions for accessing units of measurement.
 from esmf_aspect_meta_model_python.samm_meta_model import units
 
 unit_name = "unit:volt"
-units.print_description(units.get_info(unit_name))
+units.print_info(units.get_info(unit_name))
 # preferredName: volt
 # commonCode: VLT
 # ...
@@ -149,7 +149,7 @@ units.print_description(units.get_info(unit_name))
 volt_info = units.get_info("unit:volt")
 # {'preferredName': rdflib.term.Literal('volt', lang='en'), 'commonCode': rdflib.term.Literal('VLT'), ... }
 
-units.print_description(volt_info)
+units.print_info(volt_info)
 # preferredName: volt
 # commonCode: VLT
 # ...

{esmf_aspect_model_loader-2.2.0 → esmf_aspect_model_loader-2.2.1}/README.md

@@ -116,7 +116,7 @@ SAMMUnitsGraph is a class contains functions for accessing units of measurement.
 from esmf_aspect_meta_model_python.samm_meta_model import units
 
 unit_name = "unit:volt"
-units.print_description(units.get_info(unit_name))
+units.print_info(units.get_info(unit_name))
 # preferredName: volt
 # commonCode: VLT
 # ...
@@ -126,7 +126,7 @@ units.print_description(units.get_info(unit_name))
 volt_info = units.get_info("unit:volt")
 # {'preferredName': rdflib.term.Literal('volt', lang='en'), 'commonCode': rdflib.term.Literal('VLT'), ... }
 
-units.print_description(volt_info)
+units.print_info(volt_info)
 # preferredName: volt
 # commonCode: VLT
 # ...

{esmf_aspect_model_loader-2.2.0 → esmf_aspect_model_loader-2.2.1}/esmf_aspect_meta_model_python/base/README.md

@@ -38,11 +38,13 @@ HasUrn
         │   ├── LocaleConstraint
         │   ├── RangeConstraint
         │   └── RegularExpressionConstraint
+        ├── Namespace
         ├── Event
         ├── Operation
         ├── Property
         ├── QuantityKind
-        └── Unit
+        ├── Unit
+        └── Value
 
 BoundDefiniton
 ```

{esmf_aspect_model_loader-2.2.0 → esmf_aspect_model_loader-2.2.1}/esmf_aspect_meta_model_python/base/__init__.py

@@ -27,14 +27,14 @@ from .characteristics.single_entity import SingleEntity
 from .characteristics.state import State
 from .characteristics.structured_value import StructuredValue
 from .characteristics.trait import Trait
-from .contraints.constraint import Constraint
-from .contraints.encoding_constraint import EncodingConstraint
-from .contraints.fixed_point_constraint import FixedPointConstraint
-from .contraints.language_constraint import LanguageConstraint
-from .contraints.length_constraint import LengthConstraint
-from .contraints.locale_constraint import LocaleConstraint
-from .contraints.range_constraint import RangeConstraint
-from .contraints.regular_expression_constraint import RegularExpressionConstraint
+from .constraints.constraint import Constraint
+from .constraints.encoding_constraint import EncodingConstraint
+from .constraints.fixed_point_constraint import FixedPointConstraint
+from .constraints.language_constraint import LanguageConstraint
+from .constraints.length_constraint import LengthConstraint
+from .constraints.locale_constraint import LocaleConstraint
+from .constraints.range_constraint import RangeConstraint
+from .constraints.regular_expression_constraint import RegularExpressionConstraint
 from .data_types.abstract_entity import AbstractEntity
 from .data_types.complex_type import ComplexType
 from .data_types.data_type import DataType

{esmf_aspect_model_loader-2.2.0 → esmf_aspect_model_loader-2.2.1}/esmf_aspect_meta_model_python/base/characteristics/trait.py

@@ -14,7 +14,7 @@ from typing import List
 
 from esmf_aspect_meta_model_python.base.characteristics.characteristic import Characteristic
 
-from ..contraints import constraint
+from ..constraints import constraint
 
 
 class Trait(Characteristic, ABC):

{esmf_aspect_model_loader-2.2.0/esmf_aspect_meta_model_python/base/contraints → esmf_aspect_model_loader-2.2.1/esmf_aspect_meta_model_python/base/constraints}/encoding_constraint.py

@@ -11,7 +11,7 @@
 
 from abc import ABC, abstractmethod
 
-from esmf_aspect_meta_model_python.base.contraints.constraint import Constraint
+from esmf_aspect_meta_model_python.base.constraints.constraint import Constraint
 
 
 class EncodingConstraint(Constraint, ABC):

{esmf_aspect_model_loader-2.2.0/esmf_aspect_meta_model_python/base/contraints → esmf_aspect_model_loader-2.2.1/esmf_aspect_meta_model_python/base/constraints}/fixed_point_constraint.py

@@ -11,7 +11,7 @@
 
 from abc import ABC, abstractmethod
 
-from esmf_aspect_meta_model_python.base.contraints.constraint import Constraint
+from esmf_aspect_meta_model_python.base.constraints.constraint import Constraint
 
 
 class FixedPointConstraint(Constraint, ABC):

{esmf_aspect_model_loader-2.2.0/esmf_aspect_meta_model_python/base/contraints → esmf_aspect_model_loader-2.2.1/esmf_aspect_meta_model_python/base/constraints}/language_constraint.py

@@ -11,7 +11,7 @@
 
 from abc import ABC, abstractmethod
 
-from esmf_aspect_meta_model_python.base.contraints.constraint import Constraint
+from esmf_aspect_meta_model_python.base.constraints.constraint import Constraint
 
 
 class LanguageConstraint(Constraint, ABC):

{esmf_aspect_model_loader-2.2.0/esmf_aspect_meta_model_python/base/contraints → esmf_aspect_model_loader-2.2.1/esmf_aspect_meta_model_python/base/constraints}/length_constraint.py

@@ -12,7 +12,7 @@
 from abc import ABC, abstractmethod
 from typing import Optional
 
-from esmf_aspect_meta_model_python.base.contraints.constraint import Constraint
+from esmf_aspect_meta_model_python.base.constraints.constraint import Constraint
 
 
 class LengthConstraint(Constraint, ABC):

{esmf_aspect_model_loader-2.2.0/esmf_aspect_meta_model_python/base/contraints → esmf_aspect_model_loader-2.2.1/esmf_aspect_meta_model_python/base/constraints}/locale_constraint.py

@@ -11,7 +11,7 @@
 
 from abc import ABC, abstractmethod
 
-from esmf_aspect_meta_model_python.base.contraints.constraint import Constraint
+from esmf_aspect_meta_model_python.base.constraints.constraint import Constraint
 
 
 class LocaleConstraint(Constraint, ABC):

{esmf_aspect_model_loader-2.2.0/esmf_aspect_meta_model_python/base/contraints → esmf_aspect_model_loader-2.2.1/esmf_aspect_meta_model_python/base/constraints}/range_constraint.py

@@ -13,7 +13,7 @@ from abc import ABC, abstractmethod
 from typing import Any, Optional
 
 from esmf_aspect_meta_model_python.base.bound_definition import BoundDefinition
-from esmf_aspect_meta_model_python.base.contraints.constraint import Constraint
+from esmf_aspect_meta_model_python.base.constraints.constraint import Constraint
 
 
 class RangeConstraint(Constraint, ABC):

{esmf_aspect_model_loader-2.2.0/esmf_aspect_meta_model_python/base/contraints → esmf_aspect_model_loader-2.2.1/esmf_aspect_meta_model_python/base/constraints}/regular_expression_constraint.py

@@ -11,7 +11,7 @@
 
 from abc import ABC, abstractmethod
 
-from esmf_aspect_meta_model_python.base.contraints.constraint import Constraint
+from esmf_aspect_meta_model_python.base.constraints.constraint import Constraint
 
 
 class RegularExpressionConstraint(Constraint, ABC):

esmf_aspect_model_loader-2.2.1/esmf_aspect_meta_model_python/base/namespace.py

@@ -0,0 +1,18 @@
+#  Copyright (c) 2023 Robert Bosch Manufacturing Solutions GmbH
+#
+#  See the AUTHORS file(s) distributed with this work for additional
+#  information regarding authorship.
+#
+#  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/.
+#
+#   SPDX-License-Identifier: MPL-2.0
+
+from abc import ABC
+
+from esmf_aspect_meta_model_python.base import Base
+
+
+class Namespace(Base, ABC):
+    """Namespace interface class."""

esmf_aspect_model_loader-2.2.1/esmf_aspect_meta_model_python/base/value.py

@@ -0,0 +1,24 @@
+#  Copyright (c) 2023 Robert Bosch Manufacturing Solutions GmbH
+#
+#  See the AUTHORS file(s) distributed with this work for additional
+#  information regarding authorship.
+#
+#  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/.
+#
+#   SPDX-License-Identifier: MPL-2.0
+
+from abc import ABC, abstractmethod
+from typing import Any
+
+from esmf_aspect_meta_model_python.base import Base
+
+
+class Value(Base, ABC):
+    """Value interface class."""
+
+    @property
+    @abstractmethod
+    def value(self) -> Any:
+        """Value."""

{esmf_aspect_model_loader-2.2.0 → esmf_aspect_model_loader-2.2.1}/esmf_aspect_meta_model_python/impl/__init__.py

@@ -45,3 +45,4 @@ from .default_operation import DefaultOperation
 from .default_property import DefaultBlankProperty, DefaultProperty, DefaultPropertyWithExtends
 from .default_quantity_kind import DefaultQuantityKind
 from .default_unit import DefaultUnit
+from .default_value import DefaultValue

{esmf_aspect_model_loader-2.2.0 → esmf_aspect_model_loader-2.2.1}/esmf_aspect_meta_model_python/impl/characteristics/default_trait.py

@@ -13,7 +13,7 @@ from typing import List
 
 from esmf_aspect_meta_model_python.base.characteristics.characteristic import Characteristic
 from esmf_aspect_meta_model_python.base.characteristics.trait import Trait
-from esmf_aspect_meta_model_python.base.contraints.constraint import Constraint
+from esmf_aspect_meta_model_python.base.constraints.constraint import Constraint
 from esmf_aspect_meta_model_python.impl.characteristics.default_characteristic import DefaultCharacteristic
 from esmf_aspect_meta_model_python.loader.meta_model_base_attributes import MetaModelBaseAttributes
 

{esmf_aspect_model_loader-2.2.0 → esmf_aspect_model_loader-2.2.1}/esmf_aspect_meta_model_python/impl/constraints/default_constraint.py

@@ -11,7 +11,7 @@
 
 import abc
 
-from esmf_aspect_meta_model_python.base.contraints.constraint import Constraint
+from esmf_aspect_meta_model_python.base.constraints.constraint import Constraint
 from esmf_aspect_meta_model_python.impl.base_impl import BaseImpl
 
 

{esmf_aspect_model_loader-2.2.0 → esmf_aspect_model_loader-2.2.1}/esmf_aspect_meta_model_python/impl/constraints/default_encoding_constraint.py

@@ -9,7 +9,7 @@
 #
 #   SPDX-License-Identifier: MPL-2.0
 
-from esmf_aspect_meta_model_python.base.contraints.encoding_constraint import EncodingConstraint
+from esmf_aspect_meta_model_python.base.constraints.encoding_constraint import EncodingConstraint
 from esmf_aspect_meta_model_python.impl.constraints.default_constraint import DefaultConstraint
 from esmf_aspect_meta_model_python.loader.meta_model_base_attributes import MetaModelBaseAttributes
 

{esmf_aspect_model_loader-2.2.0 → esmf_aspect_model_loader-2.2.1}/esmf_aspect_meta_model_python/impl/constraints/default_fixed_point_constraint.py

@@ -9,7 +9,7 @@
 #
 #   SPDX-License-Identifier: MPL-2.0
 
-from esmf_aspect_meta_model_python.base.contraints.fixed_point_constraint import FixedPointConstraint
+from esmf_aspect_meta_model_python.base.constraints.fixed_point_constraint import FixedPointConstraint
 from esmf_aspect_meta_model_python.impl.constraints.default_constraint import DefaultConstraint
 from esmf_aspect_meta_model_python.loader.meta_model_base_attributes import MetaModelBaseAttributes
 

{esmf_aspect_model_loader-2.2.0 → esmf_aspect_model_loader-2.2.1}/esmf_aspect_meta_model_python/impl/constraints/default_language_constraint.py

@@ -9,7 +9,7 @@
 #
 #   SPDX-License-Identifier: MPL-2.0
 
-from esmf_aspect_meta_model_python.base.contraints.language_constraint import LanguageConstraint
+from esmf_aspect_meta_model_python.base.constraints.language_constraint import LanguageConstraint
 from esmf_aspect_meta_model_python.impl.constraints.default_constraint import DefaultConstraint
 from esmf_aspect_meta_model_python.loader.meta_model_base_attributes import MetaModelBaseAttributes
 

{esmf_aspect_model_loader-2.2.0 → esmf_aspect_model_loader-2.2.1}/esmf_aspect_meta_model_python/impl/constraints/default_length_constraint.py

@@ -11,7 +11,7 @@
 
 from typing import Optional
 
-from esmf_aspect_meta_model_python.base.contraints.length_constraint import LengthConstraint
+from esmf_aspect_meta_model_python.base.constraints.length_constraint import LengthConstraint
 from esmf_aspect_meta_model_python.impl.constraints.default_constraint import DefaultConstraint
 from esmf_aspect_meta_model_python.loader.meta_model_base_attributes import MetaModelBaseAttributes
 

{esmf_aspect_model_loader-2.2.0 → esmf_aspect_model_loader-2.2.1}/esmf_aspect_meta_model_python/impl/constraints/default_locale_constraint.py

@@ -9,7 +9,7 @@
 #
 #   SPDX-License-Identifier: MPL-2.0
 
-from esmf_aspect_meta_model_python.base.contraints.locale_constraint import LocaleConstraint
+from esmf_aspect_meta_model_python.base.constraints.locale_constraint import LocaleConstraint
 from esmf_aspect_meta_model_python.impl.constraints.default_constraint import DefaultConstraint
 from esmf_aspect_meta_model_python.loader.meta_model_base_attributes import MetaModelBaseAttributes
 

{esmf_aspect_model_loader-2.2.0 → esmf_aspect_model_loader-2.2.1}/esmf_aspect_meta_model_python/impl/constraints/default_range_constraint.py

@@ -12,7 +12,7 @@
 from typing import Any, Optional
 
 from esmf_aspect_meta_model_python.base.bound_definition import BoundDefinition
-from esmf_aspect_meta_model_python.base.contraints.range_constraint import RangeConstraint
+from esmf_aspect_meta_model_python.base.constraints.range_constraint import RangeConstraint
 from esmf_aspect_meta_model_python.impl.constraints.default_constraint import DefaultConstraint
 from esmf_aspect_meta_model_python.loader.meta_model_base_attributes import MetaModelBaseAttributes
 

{esmf_aspect_model_loader-2.2.0 → esmf_aspect_model_loader-2.2.1}/esmf_aspect_meta_model_python/impl/constraints/default_regular_expression_constraint.py

@@ -9,7 +9,7 @@
 #
 #   SPDX-License-Identifier: MPL-2.0
 
-from esmf_aspect_meta_model_python.base.contraints.regular_expression_constraint import RegularExpressionConstraint
+from esmf_aspect_meta_model_python.base.constraints.regular_expression_constraint import RegularExpressionConstraint
 from esmf_aspect_meta_model_python.impl.constraints.default_constraint import DefaultConstraint
 from esmf_aspect_meta_model_python.loader.meta_model_base_attributes import MetaModelBaseAttributes
 

esmf_aspect_model_loader-2.2.1/esmf_aspect_meta_model_python/impl/default_namespace.py

@@ -0,0 +1,17 @@
+#  Copyright (c) 2023 Robert Bosch Manufacturing Solutions GmbH
+#
+#  See the AUTHORS file(s) distributed with this work for additional
+#  information regarding authorship.
+#
+#  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/.
+#
+#   SPDX-License-Identifier: MPL-2.0
+
+from esmf_aspect_meta_model_python.base.namespace import Namespace
+from esmf_aspect_meta_model_python.impl.base_impl import BaseImpl
+
+
+class DefaultNamespace(BaseImpl, Namespace):
+    """Default namespace class."""

esmf_aspect_model_loader-2.2.1/esmf_aspect_meta_model_python/impl/default_value.py

@@ -0,0 +1,35 @@
+#  Copyright (c) 2023 Robert Bosch Manufacturing Solutions GmbH
+#
+#  See the AUTHORS file(s) distributed with this work for additional
+#  information regarding authorship.
+#
+#  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/.
+#
+#   SPDX-License-Identifier: MPL-2.0
+
+from typing import Any
+
+from esmf_aspect_meta_model_python.base.value import Value
+from esmf_aspect_meta_model_python.impl.base_impl import BaseImpl
+from esmf_aspect_meta_model_python.loader.meta_model_base_attributes import MetaModelBaseAttributes
+
+
+class DefaultValue(BaseImpl, Value):
+    """Default value class."""
+
+    SCALAR_ATTR_NAMES = BaseImpl.SCALAR_ATTR_NAMES + ["value"]
+
+    def __init__(
+        self,
+        meta_model_base_attributes: MetaModelBaseAttributes,
+        value: Any,
+    ):
+        super().__init__(meta_model_base_attributes)
+        self._value = value
+
+    @property
+    def value(self) -> Any:
+        """Value."""
+        return self._value

{esmf_aspect_model_loader-2.2.0 → esmf_aspect_model_loader-2.2.1}/esmf_aspect_meta_model_python/loader/instantiator/encoding_constraint_instantiator.py

@@ -11,7 +11,7 @@
 
 from rdflib.term import Node
 
-from esmf_aspect_meta_model_python.base.contraints.encoding_constraint import EncodingConstraint
+from esmf_aspect_meta_model_python.base.constraints.encoding_constraint import EncodingConstraint
 from esmf_aspect_meta_model_python.impl.constraints.default_encoding_constraint import DefaultEncodingConstraint
 from esmf_aspect_meta_model_python.loader.instantiator_base import InstantiatorBase
 from esmf_aspect_meta_model_python.loader.rdf_helper import RdfHelper

{esmf_aspect_model_loader-2.2.0 → esmf_aspect_model_loader-2.2.1}/esmf_aspect_meta_model_python/loader/instantiator/enumeration_instantiator.py

@@ -9,7 +9,7 @@
 #
 #   SPDX-License-Identifier: MPL-2.0
 
-import typing
+from typing import Any, Dict, List, Optional, Union
 
 import rdflib  # type: ignore
 
@@ -40,7 +40,7 @@ class EnumerationInstantiator(InstantiatorBase[Enumeration]):
 
         return DefaultEnumeration(meta_model_base_attributes, data_type, values)
 
-    def __to_enum_node_value(self, value_node: Node) -> typing.Dict:
+    def __to_enum_node_value(self, value_node: Node) -> Union[Dict, str]:
         """
         This method instantiates one possible value of an enumeration.
         :param value_node:  Node of the Graph that represents one enumeration value.
@@ -49,38 +49,46 @@ class EnumerationInstantiator(InstantiatorBase[Enumeration]):
         - If value_node is a URIRef it will represent a value of a ComplexType
         :return: the one generated value of the enumeration
         """
-        value = {}
+        str_value: Optional[str] = None
+        dict_value: Optional[Dict] = None
 
-        if isinstance(value_node, rdflib.Literal):
+        if isinstance(value_node, rdflib.Literal) or (
+            isinstance(value_node, rdflib.URIRef) and value_node.find("#") == -1
+        ):
             # value represents a simple data type
-            value = value_node.toPython()
+            str_value = value_node.toPython()
 
-        elif isinstance(value_node, rdflib.URIRef):
+        elif isinstance(value_node, rdflib.URIRef) or isinstance(value_node, rdflib.term.BNode):
             # value represents a complex data type
-            value_node_properties = self._aspect_graph.predicate_objects(value_node)
-            for property_urn, property_value in value_node_properties:
+            dict_value = {}
+
+            for property_urn, property_value in self._aspect_graph.predicate_objects(value_node):
                 if property_urn != rdflib.RDF.type and isinstance(property_urn, str):
                     property_name = property_urn.split("#")[1]
-                    actual_value: typing.Optional[typing.Any]
+
+                    actual_value: Optional[Any]
                     if self.__is_collection_value(property_urn):
                         actual_value = self.__instantiate_enum_collection(property_value)
                     else:
                         actual_value = self.__to_enum_node_value(property_value)
-                    value[property_name] = actual_value
+
+                    if property_name == "see":
+                        dict_value.setdefault(property_name, []).append(actual_value)
+                    else:
+                        dict_value[property_name] = actual_value
 
             value_node_name = value_node.split("#")[1]
             value_key = self._samm.get_urn(SAMM.name).toPython()
-            value[value_key] = value_node_name  # type: ignore
+            dict_value[value_key] = value_node_name  # type: ignore
 
-        else:
-            if not isinstance(value_node, rdflib.term.BNode) or value_node == rdflib.namespace.RDF.nil:
-                # illegal node type for enumeration value (e.g., Blank Node)
-                raise TypeError(
-                    f"Every value of an enumeration must either be a Literal (string, int, etc.) or "
-                    f"a URI reference to a ComplexType. Values of type {type(value_node).__name__} are not allowed"
-                )
+        elif value_node == rdflib.namespace.RDF.nil:
+            # illegal node type for enumeration value (e.g., Blank Node)
+            raise TypeError(
+                f"Every value of an enumeration must either be a Literal (string, int, etc.) or "
+                f"a URI reference to a ComplexType. Values of type {type(value_node).__name__} are not allowed"
+            )
 
-        return value
+        return str_value if str_value is not None else dict_value if dict_value is not None else ""
 
     def __is_collection_value(self, property_subject: str) -> bool:
         characteristic = self._aspect_graph.value(  # type: ignore
@@ -88,13 +96,15 @@ class EnumerationInstantiator(InstantiatorBase[Enumeration]):
             predicate=self._samm.get_urn(SAMM.characteristic),
         )
         characteristic_type = self._aspect_graph.value(subject=characteristic, predicate=rdflib.RDF.type)
+
         return characteristic_type in self._sammc.collections_urns()
 
-    def __instantiate_enum_collection(self, value_list) -> typing.List[typing.Dict]:
+    def __instantiate_enum_collection(self, value_list) -> List[Union[Dict, str]]:
         """creates a collection as a child for enumeration characteristics"""
         value_node_list = RdfHelper.get_rdf_list_values(value_list, self._aspect_graph)
         values = []
         for value_node in value_node_list:
             value = self.__to_enum_node_value(value_node)
             values.append(value)
+
         return values

{esmf_aspect_model_loader-2.2.0 → esmf_aspect_model_loader-2.2.1}/esmf_aspect_meta_model_python/loader/instantiator/fixed_point_constraint_instantiator.py

@@ -11,7 +11,7 @@
 
 from rdflib.term import Node
 
-from esmf_aspect_meta_model_python.base.contraints.fixed_point_constraint import FixedPointConstraint
+from esmf_aspect_meta_model_python.base.constraints.fixed_point_constraint import FixedPointConstraint
 from esmf_aspect_meta_model_python.impl.constraints.default_fixed_point_constraint import DefaultFixedPointConstraint
 from esmf_aspect_meta_model_python.loader.instantiator_base import InstantiatorBase
 from esmf_aspect_meta_model_python.loader.rdf_helper import RdfHelper

{esmf_aspect_model_loader-2.2.0 → esmf_aspect_model_loader-2.2.1}/esmf_aspect_meta_model_python/loader/instantiator/language_constraint_instantiator.py

@@ -11,7 +11,7 @@
 
 from rdflib.term import Node
 
-from esmf_aspect_meta_model_python.base.contraints.language_constraint import LanguageConstraint
+from esmf_aspect_meta_model_python.base.constraints.language_constraint import LanguageConstraint
 from esmf_aspect_meta_model_python.impl.constraints.default_language_constraint import DefaultLanguageConstraint
 from esmf_aspect_meta_model_python.loader.instantiator_base import InstantiatorBase
 from esmf_aspect_meta_model_python.loader.rdf_helper import RdfHelper

{esmf_aspect_model_loader-2.2.0 → esmf_aspect_model_loader-2.2.1}/esmf_aspect_meta_model_python/loader/instantiator/length_constraint_instantiator.py

@@ -11,7 +11,7 @@
 
 from rdflib.term import Node
 
-from esmf_aspect_meta_model_python.base.contraints.length_constraint import LengthConstraint
+from esmf_aspect_meta_model_python.base.constraints.length_constraint import LengthConstraint
 from esmf_aspect_meta_model_python.impl.constraints.default_length_constraint import DefaultLengthConstraint
 from esmf_aspect_meta_model_python.loader.instantiator_base import InstantiatorBase
 from esmf_aspect_meta_model_python.loader.rdf_helper import RdfHelper

{esmf_aspect_model_loader-2.2.0 → esmf_aspect_model_loader-2.2.1}/esmf_aspect_meta_model_python/loader/instantiator/locale_constraint_instantiator.py

@@ -11,7 +11,7 @@
 
 from rdflib.term import Node
 
-from esmf_aspect_meta_model_python.base.contraints.locale_constraint import LocaleConstraint
+from esmf_aspect_meta_model_python.base.constraints.locale_constraint import LocaleConstraint
 from esmf_aspect_meta_model_python.impl.constraints.default_locale_constraint import DefaultLocaleConstraint
 from esmf_aspect_meta_model_python.loader.instantiator_base import InstantiatorBase
 from esmf_aspect_meta_model_python.loader.rdf_helper import RdfHelper

esmf_aspect_model_loader-2.2.1/esmf_aspect_meta_model_python/loader/instantiator/namespace_instantiator.py

@@ -0,0 +1,23 @@
+#  Copyright (c) 2023 Robert Bosch Manufacturing Solutions GmbH
+#
+#  See the AUTHORS file(s) distributed with this work for additional
+#  information regarding authorship.
+#
+#  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/.
+#
+#   SPDX-License-Identifier: MPL-2.0
+
+from rdflib.term import Node
+
+from esmf_aspect_meta_model_python.base.namespace import Namespace
+from esmf_aspect_meta_model_python.impl.default_namespace import DefaultNamespace
+from esmf_aspect_meta_model_python.loader.instantiator_base import InstantiatorBase
+
+
+class NamespaceInstantiator(InstantiatorBase[Namespace]):
+    def _create_instance(self, element_node: Node) -> Namespace:
+        meta_model_base_attributes = self._get_base_attributes(element_node)
+
+        return DefaultNamespace(meta_model_base_attributes)

{esmf_aspect_model_loader-2.2.0 → esmf_aspect_model_loader-2.2.1}/esmf_aspect_meta_model_python/loader/instantiator/range_constraint_instantiator.py

@@ -13,7 +13,7 @@ from rdflib import URIRef
 from rdflib.term import Node
 
 from esmf_aspect_meta_model_python.base.bound_definition import BoundDefinition
-from esmf_aspect_meta_model_python.base.contraints.range_constraint import RangeConstraint
+from esmf_aspect_meta_model_python.base.constraints.range_constraint import RangeConstraint
 from esmf_aspect_meta_model_python.impl.constraints.default_range_constraint import DefaultRangeConstraint
 from esmf_aspect_meta_model_python.loader.instantiator_base import InstantiatorBase
 from esmf_aspect_meta_model_python.vocabulary.sammc import SAMMC

{esmf_aspect_model_loader-2.2.0 → esmf_aspect_model_loader-2.2.1}/esmf_aspect_meta_model_python/loader/instantiator/regular_expression_constraint_instantiator.py

@@ -11,7 +11,7 @@
 
 from rdflib.term import Node
 
-from esmf_aspect_meta_model_python.base.contraints.regular_expression_constraint import RegularExpressionConstraint
+from esmf_aspect_meta_model_python.base.constraints.regular_expression_constraint import RegularExpressionConstraint
 from esmf_aspect_meta_model_python.impl.constraints.default_regular_expression_constraint import (
     DefaultRegularExpressionConstraint,
 )

{esmf_aspect_model_loader-2.2.0 → esmf_aspect_model_loader-2.2.1}/esmf_aspect_meta_model_python/loader/instantiator/state_instantiator.py

@@ -67,8 +67,10 @@ class StateInstantiator(EnumerationInstantiator):
                 if property_urn != rdflib.RDF.type and isinstance(property_urn, str):
                     property_name = property_urn.split("#")[1]
                     actual_value: Optional[Any]
-                    if self.__is_collection_value(property_urn):
-                        actual_value = self.__instantiate_enum_collection(property_value)
+                    if self._EnumerationInstantiator__is_collection_value(property_urn):  # type: ignore
+                        actual_value = self._EnumerationInstantiator__instantiate_enum_collection(  # type: ignore
+                            property_value
+                        )
                     else:
                         actual_value = self.__to_state_node_value(property_value)
                     value[property_name] = actual_value

{esmf_aspect_model_loader-2.2.0 → esmf_aspect_model_loader-2.2.1}/esmf_aspect_meta_model_python/loader/instantiator/trait_instantiator.py

@@ -14,7 +14,7 @@ from typing import List
 from rdflib.term import Node
 
 from esmf_aspect_meta_model_python.base.characteristics.trait import Trait
-from esmf_aspect_meta_model_python.base.contraints.constraint import Constraint
+from esmf_aspect_meta_model_python.base.constraints.constraint import Constraint
 from esmf_aspect_meta_model_python.impl.characteristics.default_trait import DefaultTrait
 from esmf_aspect_meta_model_python.loader.instantiator_base import InstantiatorBase
 from esmf_aspect_meta_model_python.vocabulary.sammc import SAMMC

esmf_aspect_model_loader-2.2.1/esmf_aspect_meta_model_python/loader/instantiator/value_instantiator.py

@@ -0,0 +1,27 @@
+#  Copyright (c) 2023 Robert Bosch Manufacturing Solutions GmbH
+#
+#  See the AUTHORS file(s) distributed with this work for additional
+#  information regarding authorship.
+#
+#  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/.
+#
+#   SPDX-License-Identifier: MPL-2.0
+
+from typing import Any
+
+from rdflib.term import Node
+
+from esmf_aspect_meta_model_python.base.value import Value
+from esmf_aspect_meta_model_python.impl.default_value import DefaultValue
+from esmf_aspect_meta_model_python.loader.instantiator_base import InstantiatorBase
+from esmf_aspect_meta_model_python.vocabulary.samm import SAMM
+
+
+class ValueInstantiator(InstantiatorBase[Value]):
+    def _create_instance(self, element_node: Node) -> Value:
+        meta_model_base_attributes = self._get_base_attributes(element_node)
+        value: Any = self._aspect_graph.value(subject=element_node, predicate=self._samm.get_urn(SAMM.value))
+
+        return DefaultValue(meta_model_base_attributes, value)