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

esmf_aspect_model_loader-2.3.0/.gitignore

@@ -0,0 +1,73 @@
+# Byte-compiled / optimized / DLL files
+__pycache__/
+*.py[cod]
+*$py.class
+
+# Distribution / packaging
+.Python
+**/dist
+build/
+develop-eggs/
+dist/
+downloads/
+eggs/
+.eggs/
+lib/
+lib64/
+parts/
+sdist/
+var/
+wheels/
+share/python-wheels/
+*.egg-info/
+.installed.cfg
+*.egg
+MANIFEST
+
+# Unit test / coverage reports
+htmlcov/
+.tox/
+.nox/
+.coverage
+.coverage.*
+.cache
+nosetests.xml
+coverage.xml
+*.cover
+*.py,cover
+.hypothesis/
+.pytest_cache/
+cover/
+
+# uv
+#   uv.lock should be committed to version control for reproducibility.
+#   https://docs.astral.sh/uv/concepts/projects/layout/#the-lockfile
+
+# Environments
+.env
+.venv
+env/
+venv/
+ENV/
+env.bak/
+venv.bak/
+
+# mypy
+.mypy_cache/
+.dmypy.json
+dmypy.json
+
+# PyCharm
+#  JetBrains specific template is maintained in a separate JetBrains.gitignore that can
+#  be found at https://github.com/github/gitignore/blob/main/Global/JetBrains.gitignore
+#  and can be added to the global gitignore or merged into this file.  For a more nuclear
+#  option (not recommended) you can uncomment the following to ignore the entire idea folder.
+.idea/
+
+# VSCode
+.vscode/
+
+# SAMM
+core/esmf-aspect-meta-model-python/esmf_aspect_meta_model_python/samm_aspect_meta_model/samm/
+core/esmf-aspect-meta-model-python/esmf_aspect_meta_model_python/samm_cli/samm-cli/
+/core/esmf-aspect-meta-model-python/tests/integration/aspect_model_loader/java_models/resources/

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

@@ -1,24 +1,20 @@
-Metadata-Version: 2.1
+Metadata-Version: 2.4
 Name: esmf-aspect-model-loader
-Version: 2.2.0
+Version: 2.3.0
 Summary: Load Aspect Models based on the Semantic Aspect Meta Model
-Home-page: https://projects.eclipse.org/projects/dt.esmf
-License: MPL-2.0
-Keywords: samm,esmf,digital twin,idta,model loader,semantic api,semantics,aspect
-Author: Eclipse Semantic Modeling Framework
-Requires-Python: >=3.10,<4.0
-Classifier: License :: OSI Approved
+Project-URL: Homepage, https://projects.eclipse.org/projects/dt.esmf
+Project-URL: Repository, https://github.com/eclipse-esmf/esmf-sdk-py-aspect-model-loader
+Project-URL: Documentation, https://eclipse-esmf.github.io/python-sdk-guide/index.html
+Author: Eclipse Semantic Modeling Framework, Nico Makowe, Aghyad Farrouh
+Author-email: Hanna Shalamitskaya <external.Hanna.Shalamitskaya@de.bosch.com>, Oleksandr Muzyka <external.Oleksandr.Muzyka@bosch.com>, Andreas Textor <Andreas.Textor@de.bosch.com>, Georg Schmidt-Dumont <Georg.Schmidt-Dumont@de.bosch.com>, Michele Santoro <michele.santoro@de.bosch.com>, Lars Heppler <Lars.Heppler@de.bosch.com>
+License-Expression: MPL-2.0
+Keywords: aspect,digital twin,esmf,idta,model loader,samm,semantic api,semantics
 Classifier: License :: OSI Approved :: Mozilla Public License 2.0 (MPL 2.0)
 Classifier: Programming Language :: Python :: 3
 Classifier: Programming Language :: Python :: 3.10
-Classifier: Programming Language :: Python :: 3.11
-Requires-Dist: keyboard (>=0.13,<0.14)
-Requires-Dist: rdflib (>=7.1.3,<8.0.0)
-Requires-Dist: requests (>=2.28.1,<3.0.0)
-Requires-Dist: tox (>=4.5.2,<5.0.0)
-Requires-Dist: zipfile37 (>=0.1.3,<0.2.0)
-Project-URL: Documentation, https://eclipse-esmf.github.io/python-sdk-guide/index.html
-Project-URL: Repository, https://github.com/bci-oss/esmf-sdk-py-aspect-model-loader
+Requires-Python: <4.0,>=3.10
+Requires-Dist: rdflib==7.6.0
+Requires-Dist: requests==2.34.2
 Description-Content-Type: text/markdown
 
 The Aspect Model Loader as part of the Python SDK provided by the [*Eclipse Semantic Modeling Framework*](
@@ -41,28 +37,28 @@ implementation.
 Before getting started to use the `esmf-aspect-model-loader` library you need to apply some set up actions:
 
 Required
-- [Install poetry](#install-poetry)
+- [Install uv](#install-uv)
 - [Install project dependencies](#install-project-dependencies)
 - [Download SAMM files](#download-samm-files)
 
-### Install poetry
+### Install uv
 
-`Poetry` used as a dependency management for the `esmf-aspect-model-loader`. Follow the next [instruction](https://python-poetry.org/docs/#installation)
+`uv` is used as the dependency manager for the `esmf-aspect-model-loader`. Follow the next [instruction](https://docs.astral.sh/uv/getting-started/installation/)
  to install it.
 
-To check the poetry version run:
+To check the uv version run:
 ```console
-poetry --version
+uv --version
 ```
 
 ### Install project dependencies
 
-Poetry provides convenient functionality for working with dependencies in the project.
-To automatically download and install all the necessary libraries, just run one command:
+uv provides convenient functionality for working with dependencies in the project.
+To automatically create a virtual environment and install all the necessary libraries, just run one command:
 ```console
-poetry install
+uv sync
 ```
-It is required to run `poetry install` once in the esmf-aspect-model-loader module.
+It is required to run `uv sync` once in the esmf-aspect-model-loader module.
 
 ### Download SAMM files
 
@@ -75,7 +71,7 @@ This script downloads a release JAR-file from GitHub, extracts them for further
 
 To run script, execute the next command.
 ```console
-poetry run download-samm-release
+uv run download-samm-release
 ```
 The version of the SAMM release is specified in the python script.
 
@@ -90,7 +86,7 @@ the API is called without a token. This may cause problems because unauthorized
 
 Run the next command to download and start working with the Aspect Model Loader.
 ```console
-poetry run download-samm-branch
+uv run download-samm-branch
 ```
 Link to all branches: [SAMM Releases](https://github.com/eclipse-esmf/esmf-semantic-aspect-meta-model/branches)
 
@@ -136,10 +132,12 @@ model_elements = samm_graph.load_model_elements()
 
 SAMMUnitsGraph is a class contains functions for accessing units of measurement.
 ```python 
-from esmf_aspect_meta_model_python.samm_meta_model import units
+from esmf_aspect_meta_model_python.samm_meta_model import SammUnitsGraph
+
+units = SammUnitsGraph()
 
 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 +147,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
 # ...
@@ -167,22 +165,35 @@ Python Aspect Model Loader provide a wrapper class to be able to call SAMM CLI f
 For instance, validation of a model can be done with the following code snippet:
 
 ```python
-from esmf_aspect_meta_model_python.samm_cli_functions import SammCli
+from esmf_aspect_meta_model_python.samm_cli import SammCli
 
 samm_cli = SammCli()
-model_path = "Paht_to_the_model/Model.ttl"
+model_path = "Path_to_the_model/Model.ttl"
 samm_cli.validate(model_path)
 # Input model is valid
 ```
 
 List of SAMMCLI functions:
 - validate
+- prettyprint
+- usage
 - to_openapi
 - to_schema
 - to_json
 - to_html
 - to_png
 - to_svg
+- to_java
+- to_asyncapi
+- to_jsonld
+- to_sql
+- to_aas
+- edit_move
+- edit_newversion
+- aas_to_aspect
+- aas_list
+- package_import
+- package_export
 
 # Scripts
 
@@ -193,7 +204,7 @@ Provided scripts:
  - download-samm-cli
  - download-test-models
 
-All scripts run like a poetry command. The poetry is available from the folder where [pyproject.toml](pyproject.toml) 
+All scripts run like a uv command. uv is available from the folder where [pyproject.toml](pyproject.toml) 
 is located.
 
 # Tests running
@@ -204,14 +215,26 @@ be running with the tox:
 - pep8: static code checks (PEP8 style) with MyPy and Black
 - py310: unit and integration tests
 
+### tox-uv plugin
+
+`tox` is integrated with `uv` through the [`tox-uv`](https://github.com/tox-dev/tox-uv) plugin. Both `tox` and 
+`tox-uv` are declared as `dev` dependencies in [pyproject.toml](pyproject.toml), so a single `uv sync` installs 
+everything required - no separate installation step is needed.
+
+The two environments use the plugin differently (see [tox.ini](tox.ini)):
+- `pep8` uses the `uv-venv-lock-runner` provided by `tox-uv`, which provisions the environment directly from the 
+  pinned `uv.lock` and installs the `dev` dependency group. This guarantees the linters run with the exact, locked 
+  versions.
+- `py310` uses the default runner and explicitly runs `uv sync` and `uv run download-samm-release` in its 
+  `commands_pre` to prepare dependencies and the SAMM meta model files before executing the test suite.
+
 ```console
 # run all checks use the next command
-poetry run tox
+uv run tox
 
 # run only pep8 checks
-poetry run tox -e pep8
+uv run tox -e pep8
 
 # run tests
-poetry run tox -e py310
+uv run tox -e py310
 ```
-

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

@@ -18,28 +18,28 @@ implementation.
 Before getting started to use the `esmf-aspect-model-loader` library you need to apply some set up actions:
 
 Required
-- [Install poetry](#install-poetry)
+- [Install uv](#install-uv)
 - [Install project dependencies](#install-project-dependencies)
 - [Download SAMM files](#download-samm-files)
 
-### Install poetry
+### Install uv
 
-`Poetry` used as a dependency management for the `esmf-aspect-model-loader`. Follow the next [instruction](https://python-poetry.org/docs/#installation)
+`uv` is used as the dependency manager for the `esmf-aspect-model-loader`. Follow the next [instruction](https://docs.astral.sh/uv/getting-started/installation/)
  to install it.
 
-To check the poetry version run:
+To check the uv version run:
 ```console
-poetry --version
+uv --version
 ```
 
 ### Install project dependencies
 
-Poetry provides convenient functionality for working with dependencies in the project.
-To automatically download and install all the necessary libraries, just run one command:
+uv provides convenient functionality for working with dependencies in the project.
+To automatically create a virtual environment and install all the necessary libraries, just run one command:
 ```console
-poetry install
+uv sync
 ```
-It is required to run `poetry install` once in the esmf-aspect-model-loader module.
+It is required to run `uv sync` once in the esmf-aspect-model-loader module.
 
 ### Download SAMM files
 
@@ -52,7 +52,7 @@ This script downloads a release JAR-file from GitHub, extracts them for further
 
 To run script, execute the next command.
 ```console
-poetry run download-samm-release
+uv run download-samm-release
 ```
 The version of the SAMM release is specified in the python script.
 
@@ -67,7 +67,7 @@ the API is called without a token. This may cause problems because unauthorized
 
 Run the next command to download and start working with the Aspect Model Loader.
 ```console
-poetry run download-samm-branch
+uv run download-samm-branch
 ```
 Link to all branches: [SAMM Releases](https://github.com/eclipse-esmf/esmf-semantic-aspect-meta-model/branches)
 
@@ -113,10 +113,12 @@ model_elements = samm_graph.load_model_elements()
 
 SAMMUnitsGraph is a class contains functions for accessing units of measurement.
 ```python 
-from esmf_aspect_meta_model_python.samm_meta_model import units
+from esmf_aspect_meta_model_python.samm_meta_model import SammUnitsGraph
+
+units = SammUnitsGraph()
 
 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 +128,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
 # ...
@@ -144,22 +146,35 @@ Python Aspect Model Loader provide a wrapper class to be able to call SAMM CLI f
 For instance, validation of a model can be done with the following code snippet:
 
 ```python
-from esmf_aspect_meta_model_python.samm_cli_functions import SammCli
+from esmf_aspect_meta_model_python.samm_cli import SammCli
 
 samm_cli = SammCli()
-model_path = "Paht_to_the_model/Model.ttl"
+model_path = "Path_to_the_model/Model.ttl"
 samm_cli.validate(model_path)
 # Input model is valid
 ```
 
 List of SAMMCLI functions:
 - validate
+- prettyprint
+- usage
 - to_openapi
 - to_schema
 - to_json
 - to_html
 - to_png
 - to_svg
+- to_java
+- to_asyncapi
+- to_jsonld
+- to_sql
+- to_aas
+- edit_move
+- edit_newversion
+- aas_to_aspect
+- aas_list
+- package_import
+- package_export
 
 # Scripts
 
@@ -170,7 +185,7 @@ Provided scripts:
  - download-samm-cli
  - download-test-models
 
-All scripts run like a poetry command. The poetry is available from the folder where [pyproject.toml](pyproject.toml) 
+All scripts run like a uv command. uv is available from the folder where [pyproject.toml](pyproject.toml) 
 is located.
 
 # Tests running
@@ -181,13 +196,26 @@ be running with the tox:
 - pep8: static code checks (PEP8 style) with MyPy and Black
 - py310: unit and integration tests
 
+### tox-uv plugin
+
+`tox` is integrated with `uv` through the [`tox-uv`](https://github.com/tox-dev/tox-uv) plugin. Both `tox` and 
+`tox-uv` are declared as `dev` dependencies in [pyproject.toml](pyproject.toml), so a single `uv sync` installs 
+everything required - no separate installation step is needed.
+
+The two environments use the plugin differently (see [tox.ini](tox.ini)):
+- `pep8` uses the `uv-venv-lock-runner` provided by `tox-uv`, which provisions the environment directly from the 
+  pinned `uv.lock` and installs the `dev` dependency group. This guarantees the linters run with the exact, locked 
+  versions.
+- `py310` uses the default runner and explicitly runs `uv sync` and `uv run download-samm-release` in its 
+  `commands_pre` to prepare dependencies and the SAMM meta model files before executing the test suite.
+
 ```console
 # run all checks use the next command
-poetry run tox
+uv run tox
 
 # run only pep8 checks
-poetry run tox -e pep8
+uv run tox -e pep8
 
 # run tests
-poetry run tox -e py310
+uv run tox -e py310
 ```

esmf_aspect_model_loader-2.3.0/esmf_aspect_meta_model_python/adaptive_graph.py

@@ -0,0 +1,131 @@
+import pathlib
+import subprocess
+import tempfile
+
+from typing import Optional, Union
+
+from rdflib import Graph
+
+from esmf_aspect_meta_model_python import utils
+from esmf_aspect_meta_model_python.constants import SAMM_VERSION
+from esmf_aspect_meta_model_python.samm_cli import SammCli
+
+
+class AdaptiveGraph(Graph):  # TODO: avoid double parsing when an upgrade is not performed
+    """An RDF graph that can adaptively upgrade SAMM files using the SAMM CLI."""
+
+    _samm_cli = SammCli()
+
+    def __init__(self, samm_version: str = SAMM_VERSION, *args, **kwargs) -> None:
+        super().__init__(*args, **kwargs)
+
+        self._samm_version = samm_version
+
+    def _upgrade_ttl_file(self, file_path: pathlib.Path) -> str:
+        """Run SAMM CLI prettyprint to upgrade a TTL file to the latest version."""
+        try:
+            return self._samm_cli.prettyprint(str(file_path), capture=True)
+        except subprocess.CalledProcessError as e:
+            raise RuntimeError(f"SAMM CLI failed for {file_path}:\n{e.stdout}\n{e.stderr}") from e
+
+    def _upgrade_source(self, source_path: pathlib.Path) -> str:
+        print(f"[INFO] SAMM version mismatch detected in {source_path}. Upgrading...")
+
+        return self._upgrade_ttl_file(source_path)
+
+    def _upgrade_data(self, data: str | bytes) -> str:
+        print(  # TODO: improve logging
+            f"[INFO] SAMM version mismatch detected in provided data (target v{self._samm_version}) Upgrading..."
+        )
+
+        with tempfile.NamedTemporaryFile("wb", suffix=".ttl", delete=False) as tmp:
+            tmp.write(data.encode("utf-8") if isinstance(data, str) else data)
+            tmp_path = pathlib.Path(tmp.name)
+
+        try:
+            return self._upgrade_ttl_file(tmp_path)
+        finally:
+            tmp_path.unlink(missing_ok=True)
+
+    def set_samm_version(self, samm_version: str) -> None:
+        """Set the SAMM version for this graph."""
+        self._samm_version = samm_version
+
+    def parse(  # type: ignore[override]
+        self,
+        *,
+        source: Optional[str | pathlib.Path] = None,
+        data: Optional[str | bytes] = None,
+        **kwargs,
+    ) -> "AdaptiveGraph":
+        """
+        Parse a TTL file into this graph, upgrading via SAMM CLI if version mismatch detected.
+
+        If a SAMM version mismatch is detected, the TTL file will be upgraded using the SAMM CLI prettyprint
+        before parsing into this graph.
+
+        Args:
+            source: Path to the TTL file as pathlib.Path or str.
+            data: RDF content as string or bytes.
+            **kwargs: Additional arguments passed to rdflib.Graph.parse().
+
+        Returns:
+            self (AdaptiveGraph): The current graph instance with parsed data.
+
+        Raises:
+            RuntimeError: If the SAMM CLI fails during the upgrade process.
+            ValueError: If neither 'source' nor 'data' is provided, or if both are provided.
+        """
+        if (source is None) == (data is None):
+            raise ValueError("Either 'source' or 'data' must be provided.")
+
+        if source:
+            input_source = source = pathlib.Path(source)
+            upgrade_method = self._upgrade_source
+        else:
+            input_source = data  # type: ignore[assignment]
+            upgrade_method = self._upgrade_data  # type: ignore[assignment]
+
+        if utils.has_version_mismatch_from_input(input_source, samm_version=self._samm_version):
+            data = upgrade_method(input_source)
+            source = None
+
+        super().parse(source=source, data=data, **kwargs)
+
+        return self
+
+    def __add__(self, other: Union["Graph", "AdaptiveGraph"]) -> "AdaptiveGraph":
+        """Override addition to propagate SAMM version to the resulting graph."""
+        retval = super().__add__(other)
+
+        if isinstance(retval, AdaptiveGraph):
+            if isinstance(other, AdaptiveGraph) and other._samm_version != self._samm_version:
+                raise ValueError("SAMM version mismatch during addition.")
+
+            retval.set_samm_version(self._samm_version)
+
+        return retval  # type: ignore[return-value]
+
+    def __sub__(self, other: Union["Graph", "AdaptiveGraph"]) -> "AdaptiveGraph":
+        """Override subtraction to propagate SAMM version to the resulting graph."""
+        retval = super().__sub__(other)
+
+        if isinstance(retval, AdaptiveGraph):
+            if isinstance(other, AdaptiveGraph) and other._samm_version != self._samm_version:
+                raise ValueError("SAMM version mismatch during subtraction.")
+
+            retval.set_samm_version(self._samm_version)
+
+        return retval  # type: ignore[return-value]
+
+    def __mul__(self, other: Union["Graph", "AdaptiveGraph"]) -> "AdaptiveGraph":
+        """Override multiplication to propagate SAMM version to the resulting graph."""
+        retval = super().__mul__(other)
+
+        if isinstance(retval, AdaptiveGraph):
+            if isinstance(other, AdaptiveGraph) and other._samm_version != self._samm_version:
+                raise ValueError("SAMM version mismatch during multiplication.")
+
+            retval.set_samm_version(self._samm_version)
+
+        return retval  # type: ignore[return-value]

esmf_aspect_model_loader-2.3.0/esmf_aspect_meta_model_python/base/README.md

@@ -0,0 +1,69 @@
+# Base
+This folder contains a minimum definition of the elements in the SAMM. The folder does not include any implementations. 
+It can be seen as a contract that establishes a fixed structure and inheritance hierarchy.
+The classes should not be instantiated because they are abstract which is similar to interfaces in Java.
+
+# Inheritance hierarchy
+
+The diagram below shows the inheritance hierarchy of the base (interface) classes. `HasUrn`,
+`IsDescribed` and `HasProperties` are abstract base classes; `StructureElement` and `ComplexType`
+use multiple inheritance.
+
+```mermaid
+classDiagram
+    HasUrn <|-- IsDescribed
+    HasUrn <|-- DataType
+    IsDescribed <|-- Base
+
+    Base <|-- StructureElement
+    HasProperties <|-- StructureElement
+    StructureElement <|-- Aspect
+    StructureElement <|-- ComplexType
+    DataType <|-- ComplexType
+    DataType <|-- Scalar
+    ComplexType <|-- AbstractEntity
+    ComplexType <|-- Entity
+
+    Base <|-- Characteristic
+    Characteristic <|-- Code
+    Characteristic <|-- Collection
+    Collection <|-- List
+    Collection <|-- Set
+    Collection <|-- SortedSet
+    SortedSet <|-- TimeSeries
+    Characteristic <|-- Enumeration
+    Enumeration <|-- State
+    Characteristic <|-- SingleEntity
+    Characteristic <|-- StructuredValue
+    Characteristic <|-- Quantifiable
+    Quantifiable <|-- Duration
+    Quantifiable <|-- Measurement
+    Characteristic <|-- Trait
+
+    Base <|-- Either
+    Base <|-- Constraint
+    Constraint <|-- EncodingConstraint
+    Constraint <|-- FixedPointConstraint
+    Constraint <|-- LanguageConstraint
+    Constraint <|-- LengthConstraint
+    Constraint <|-- LocaleConstraint
+    Constraint <|-- RangeConstraint
+    Constraint <|-- RegularExpressionConstraint
+
+    Base <|-- Namespace
+    Base <|-- Event
+    Base <|-- Operation
+    Base <|-- AbstractProperty
+    AbstractProperty <|-- Property
+    Base <|-- QuantityKind
+    Base <|-- Unit
+    QuantityKind <|-- Unit
+    Base <|-- Value
+
+    class HasUrn { <<abstract>> }
+    class IsDescribed { <<abstract>> }
+    class HasProperties { <<abstract>> }
+```
+
+> Note: `BoundDefinition` is a standalone `enum.Enum` (the upper/lower boundary rule for a
+> `RangeConstraint`) and is therefore not part of the class hierarchy above.

{esmf_aspect_model_loader-2.2.0 → esmf_aspect_model_loader-2.3.0}/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
@@ -43,6 +43,6 @@ from .data_types.scalar import Scalar
 from .either import Either
 from .event import Event
 from .operation import Operation
-from .property import Property
+from .property import AbstractProperty, Property
 from .quantity_kind import QuantityKind
 from .unit import Unit

{esmf_aspect_model_loader-2.2.0 → esmf_aspect_model_loader-2.3.0}/esmf_aspect_meta_model_python/base/characteristics/characteristic.py

@@ -8,7 +8,9 @@
 #  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 Optional
 
 from esmf_aspect_meta_model_python.base.base import Base
 from esmf_aspect_meta_model_python.base.data_types.data_type import DataType
@@ -18,11 +20,15 @@ class Characteristic(Base, ABC):
     """Characteristic interface class.
 
     Specifies a property by describing its data type.
-    Multiple classes inherit from Characteristic which describe the property in a more specific way
-    (e.g. Enumeration or Collection).
+    Multiple classes inherit from Characteristic to describe the property in a more specific way
+    (e.g., Enumeration or Collection).
     """
 
     @property
     @abstractmethod
-    def data_type(self) -> DataType:
-        """Data type."""
+    def data_type(self) -> Optional[DataType]:
+        """Returns the data type of the characteristic.
+
+        Returns:
+            Optional[DataType]: The data type of the characteristic, or None if not set.
+        """