Switch to the SAMM 2.2.0

core/esmf-aspect-meta-model-python/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
 # ...

core/esmf-aspect-meta-model-python/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
 ```

core/esmf-aspect-meta-model-python/esmf_aspect_meta_model_python/base/__init__.py

@@ -27,14 +27,14 @@
 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

core/esmf-aspect-meta-model-python/esmf_aspect_meta_model_python/base/characteristics/trait.py

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

core/esmf-aspect-meta-model-python/esmf_aspect_meta_model_python/base/contraints/encoding_constraint.py → core/esmf-aspect-meta-model-python/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):

core/esmf-aspect-meta-model-python/esmf_aspect_meta_model_python/base/contraints/fixed_point_constraint.py → core/esmf-aspect-meta-model-python/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):

core/esmf-aspect-meta-model-python/esmf_aspect_meta_model_python/base/contraints/language_constraint.py → core/esmf-aspect-meta-model-python/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):

core/esmf-aspect-meta-model-python/esmf_aspect_meta_model_python/base/contraints/length_constraint.py → core/esmf-aspect-meta-model-python/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):

core/esmf-aspect-meta-model-python/esmf_aspect_meta_model_python/base/contraints/locale_constraint.py → core/esmf-aspect-meta-model-python/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):

core/esmf-aspect-meta-model-python/esmf_aspect_meta_model_python/base/contraints/range_constraint.py → core/esmf-aspect-meta-model-python/esmf_aspect_meta_model_python/base/constraints/range_constraint.py

@@ -13,7 +13,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.constraint import Constraint
+from esmf_aspect_meta_model_python.base.constraints.constraint import Constraint
 
 
 class RangeConstraint(Constraint, ABC):

core/esmf-aspect-meta-model-python/esmf_aspect_meta_model_python/base/contraints/regular_expression_constraint.py → core/esmf-aspect-meta-model-python/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):

core/esmf-aspect-meta-model-python/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."""

core/esmf-aspect-meta-model-python/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."""

core/esmf-aspect-meta-model-python/esmf_aspect_meta_model_python/impl/__init__.py

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

core/esmf-aspect-meta-model-python/esmf_aspect_meta_model_python/impl/characteristics/default_trait.py

@@ -13,7 +13,7 @@
 
 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
 

core/esmf-aspect-meta-model-python/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
 
 

core/esmf-aspect-meta-model-python/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
 

core/esmf-aspect-meta-model-python/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
 

core/esmf-aspect-meta-model-python/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
 

core/esmf-aspect-meta-model-python/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
 

core/esmf-aspect-meta-model-python/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
 

core/esmf-aspect-meta-model-python/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
 

core/esmf-aspect-meta-model-python/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
 

core/esmf-aspect-meta-model-python/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."""

core/esmf-aspect-meta-model-python/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

core/esmf-aspect-meta-model-python/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