esmf-aspect-model-loader 2.3.1__tar.gz → 2.3.2__tar.gz

{esmf_aspect_model_loader-2.3.1 → esmf_aspect_model_loader-2.3.2}/PKG-INFO

@@ -1,6 +1,6 @@
-Metadata-Version: 2.4
+Metadata-Version: 2.5
 Name: esmf-aspect-model-loader
-Version: 2.3.1
+Version: 2.3.2
 Summary: Load Aspect Models based on the Semantic Aspect Meta Model
 Project-URL: Homepage, https://projects.eclipse.org/projects/dt.esmf
 Project-URL: Repository, https://github.com/eclipse-esmf/esmf-sdk-py-aspect-model-loader
@@ -11,8 +11,11 @@ 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
-Requires-Python: <4.0,>=3.10
+Classifier: Programming Language :: Python :: 3.11
+Classifier: Programming Language :: Python :: 3.12
+Classifier: Programming Language :: Python :: 3.13
+Classifier: Programming Language :: Python :: 3.14
+Requires-Python: <4.0,>=3.11
 Requires-Dist: rdflib==7.6.0
 Requires-Dist: requests==2.34.2
 Description-Content-Type: text/markdown
@@ -213,7 +216,7 @@ is located.
 `tox` is used for the tests automation purpose. There are two environments with different purposes and tests can 
 be running with the tox:
 - pep8: static code checks (PEP8 style) with MyPy and Black
-- py310: unit and integration tests
+- py311, py312, py313 and py314: unit and integration tests
 
 ### tox-uv plugin
 
@@ -225,16 +228,19 @@ 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 
+- `py311` 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
 uv run tox
 
+# run all checks in parallel use the next command
+uv run tox run-parallel
+
 # run only pep8 checks
 uv run tox -e pep8
 
 # run tests
-uv run tox -e py310
+uv run tox -e py311
 ```

{esmf_aspect_model_loader-2.3.1 → esmf_aspect_model_loader-2.3.2}/README.md

@@ -194,7 +194,7 @@ is located.
 `tox` is used for the tests automation purpose. There are two environments with different purposes and tests can 
 be running with the tox:
 - pep8: static code checks (PEP8 style) with MyPy and Black
-- py310: unit and integration tests
+- py311, py312, py313 and py314: unit and integration tests
 
 ### tox-uv plugin
 
@@ -206,16 +206,19 @@ 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 
+- `py311` 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
 uv run tox
 
+# run all checks in parallel use the next command
+uv run tox run-parallel
+
 # run only pep8 checks
 uv run tox -e pep8
 
 # run tests
-uv run tox -e py310
+uv run tox -e py311
 ```

{esmf_aspect_model_loader-2.3.1 → esmf_aspect_model_loader-2.3.2}/esmf_aspect_meta_model_python/resolver/local_file.py

@@ -9,7 +9,7 @@
 #
 #   SPDX-License-Identifier: MPL-2.0
 
-from os.path import exists, join
+from os.path import exists, isabs, join
 from pathlib import Path
 from typing import Dict, List, Optional, Tuple, Union
 
@@ -72,7 +72,7 @@ class LocalFileResolver(ResolverInterface):
             urn, namespace_id, namespace_specific_str, version = namespace_info
 
             if urn == "urn" and namespace_id == SAMM_NAMESPACE_PREFIX:
-                if namespace_specific_str == SAMM_ORG_IDENTIFIER:
+                if namespace_specific_str == SAMM_ORG_IDENTIFIER or isabs(namespace_specific_str):
                     namespace_specific_str = None
                     version = None
                 else:

{esmf_aspect_model_loader-2.3.1 → esmf_aspect_model_loader-2.3.2}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "esmf-aspect-model-loader"
-version = "2.3.1"
+version = "2.3.2"
 description = "Load Aspect Models based on the Semantic Aspect Meta Model"
 authors = [
     { name = "Eclipse Semantic Modeling Framework" },
@@ -15,12 +15,15 @@ authors = [
 ]
 license = "MPL-2.0"
 readme = "README.md"
-requires-python = ">=3.10,<4.0"
+requires-python = ">=3.11,<4.0"
 keywords = ["samm", "esmf", "digital twin", "idta", "model loader", "semantic api", "semantics", "aspect"]
 classifiers = [
     "License :: OSI Approved :: Mozilla Public License 2.0 (MPL 2.0)",
     "Programming Language :: Python :: 3",
-    "Programming Language :: Python :: 3.10",
+    "Programming Language :: Python :: 3.11",
+    "Programming Language :: Python :: 3.12",
+    "Programming Language :: Python :: 3.13",
+    "Programming Language :: Python :: 3.14",
 ]
 # Pinned to exact versions (no ranges) to harden against supply-chain attacks.
 dependencies = [

esmf_aspect_model_loader-2.3.2/tests/integration/aspect_model_loader/test_dependency_resolution.py

@@ -0,0 +1,112 @@
+#  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
+
+import platform
+
+from os import makedirs, remove
+from os.path import abspath, dirname, isfile, join
+from shutil import rmtree
+
+from rdflib.term import URIRef
+
+from esmf_aspect_meta_model_python.resolver.local_file import LocalFileResolver
+
+
+class TestDependencyResolution:
+    """Test dependency resolution for local aspect model files."""
+
+    ROOT_PATH: str = dirname(dirname(abspath(__file__)))
+    SOURCE_PATH = join(ROOT_PATH, "resources", "traversal_dependency")
+    SECRET_PATH = join(ROOT_PATH, "secrets")
+
+    model_path = ["models", "org.example.test", "1.0.0"]
+    secret_path = ["secrets", "1.0.0"]
+
+    @classmethod
+    def setup_class(cls):
+        """Create the model and dependency files used by the tests."""
+        cls.evil_model_dir = join(cls.ROOT_PATH, cls.SOURCE_PATH, *cls.model_path)
+        cls.evil_model_name = "Evil.ttl"
+        cls._create_file(cls.evil_model_dir, cls.evil_model_name)
+
+        cls.secret_dir = join(cls.ROOT_PATH, cls.SOURCE_PATH, *cls.secret_path)
+        cls.secret_model_name = "confidential.ttl"
+        cls._create_file(cls.secret_dir, cls.secret_model_name)
+
+    @classmethod
+    def _create_file(cls, file_path, file_name):
+        """Create a test Turtle file at the specified path."""
+        file_full_path = join(file_path, file_name)
+
+        if isfile(file_full_path):
+            remove(file_full_path)
+
+        makedirs(file_path, exist_ok=True)
+
+        if file_name == cls.evil_model_name:
+            cls._create_evil_model_file(file_full_path)
+        elif file_name == cls.secret_model_name:
+            cls._create_secret_model_file(file_full_path)
+        else:
+            raise NotImplementedError(f"Unknown file name: {file_name}")
+
+    @classmethod
+    def _create_evil_model_file(cls, file_full_path):
+        """Create a model containing an absolute dependency namespace path."""
+        with open(file_full_path, "w") as f:
+            # absolute path component → os.path.join discards base_path entirely
+            f.write(
+                "@prefix samm: <urn:samm:org.eclipse.esmf.samm:meta-model:2.2.0#> .\n"
+                f'@prefix evil: <urn:samm:{join(cls.ROOT_PATH, cls.SOURCE_PATH, "secrets")}:1.0.0#> .\n'
+                "<urn:samm:org.example.test:1.0.0#Evil> a samm:Aspect ;\n"
+                "   samm:properties () ; samm:operations () .\n"
+            )
+
+    @classmethod
+    def _create_secret_model_file(cls, file_full_path):
+        """Create a dependency file containing a value that must not be loaded."""
+        with open(join(file_full_path), "w") as f:
+            f.write(
+                "@prefix samm: <urn:samm:org.eclipse.esmf.samm:meta-model:2.2.0#> .\n"
+                "@prefix ex: <http://example.com/secret#> .\n"
+                'ex:LeakedSecret ex:value "TOP-SECRET-CREDENTIAL-12345" .\n'
+            )
+
+    @classmethod
+    def teardown_class(cls):
+        """Remove the model file created for the tests."""
+        remove(join(cls.evil_model_dir, cls.evil_model_name))
+        rmtree(cls.secret_dir)
+
+    def test_parse_namespace_relative_path_return_path(self):
+        """Verify that relative namespace paths are parsed normally."""
+        result = LocalFileResolver._parse_namespace("urn:samm:../secrets:1.0.0#")
+
+        assert result == ("../secrets", "1.0.0")
+
+    def test_parse_namespace_absolute_path_return_none(self):
+        """Verify that absolute namespace paths are ignored."""
+        if platform.system() == "Windows":
+            param = "urn:samm:C:\\etc:1.0.0#"
+        else:
+            param = "urn:samm:/etc:1.0.0#"
+        result = LocalFileResolver._parse_namespace(param)
+
+        assert result == (None, None)
+
+    def test_read_secrets(self):
+        """Verify that an absolute dependency path cannot load the secret file."""
+        local_file_resolver = LocalFileResolver()
+        graph = local_file_resolver.read(join(self.evil_model_dir, self.evil_model_name))
+        local_file_resolver.prepare_aspect_model(graph)
+        result = list(local_file_resolver.graph.triples((URIRef("http://example.com/secret#LeakedSecret"), None, None)))
+
+        assert len(result) == 0

{esmf_aspect_model_loader-2.3.1 → esmf_aspect_model_loader-2.3.2}/tests/integration/test_cli_functions.py

@@ -14,6 +14,7 @@ import json
 import os
 import shutil
 import tempfile
+import uuid
 
 from pathlib import Path
 
@@ -27,7 +28,7 @@ RESOURCE_PATH = Path(__file__).parent / "resources" / "org.eclipse.esmf.test.gen
 
 @pytest.fixture(scope="module")
 def file_path():
-    yield RESOURCE_PATH / "SampleAspect.ttl"
+    return RESOURCE_PATH / "SampleAspect.ttl"
 
 
 @pytest.fixture(scope="module")
@@ -45,19 +46,29 @@ def temp_output_dir():
 @pytest.fixture(scope="module")
 def samm_cli():
     """Create a SammCli instance for integration testing."""
-    cli = SammCli()
-    yield cli
+    return SammCli()
+
+
+def _get_temp_file_name(temp_output_dir: str, name: str, suffix: str):
+    """Generate a temporary file name in the output directory."""
+    return os.path.join(temp_output_dir, f"{name}_{uuid.uuid4}{suffix}")
 
 
 class TestSammCliIntegration:
     """Integration tests for SAMM CLI transformations."""
 
+    def __init__(self):
+        pass
+
     class TestPrettyPrint:
         """Test pretty-printing functionality."""
 
+        def __init__(self):
+            pass
+
         def test_file_output(self, samm_cli, file_path, temp_output_dir):
             """Test pretty-printing to a file."""
-            output_file = os.path.join(temp_output_dir, "prettyprinted.ttl")
+            output_file = _get_temp_file_name(temp_output_dir, "prettyprinted", ".ttl")
 
             samm_cli.prettyprint(file_path, output=output_file)
 
@@ -78,7 +89,7 @@ class TestSammCliIntegration:
 
     def test_to_json(self, samm_cli, file_path, temp_output_dir):
         """Test generating example JSON payload."""
-        output_file = os.path.join(temp_output_dir, "example.json")
+        output_file = _get_temp_file_name(temp_output_dir, "example", ".json")
 
         samm_cli.to_json(file_path, output=output_file)
 
@@ -91,7 +102,7 @@ class TestSammCliIntegration:
 
     def test_to_parquet(self, samm_cli, file_path, temp_output_dir):
         """Test generating example Parquet payload."""
-        output_file = os.path.join(temp_output_dir, "example.parquet")
+        output_file = _get_temp_file_name(temp_output_dir, "example", ".parquet")
 
         samm_cli.to_parquet(file_path, output=output_file)
 
@@ -103,7 +114,7 @@ class TestSammCliIntegration:
 
     def test_to_schema(self, samm_cli, file_path, temp_output_dir):
         """Test generating JSON schema."""
-        output_file = os.path.join(temp_output_dir, "schema.json")
+        output_file = _get_temp_file_name(temp_output_dir, "schema", ".json")
 
         samm_cli.to_schema(file_path, output=output_file)
 
@@ -116,7 +127,7 @@ class TestSammCliIntegration:
 
     def test_to_openapi(self, samm_cli, file_path, temp_output_dir):
         """Test generating OpenAPI specification."""
-        output_file = os.path.join(temp_output_dir, "openapi.yaml")
+        output_file = _get_temp_file_name(temp_output_dir, "openapi", ".yaml")
 
         samm_cli.to_openapi(file_path, output=output_file, api_base_url="http://localhost:8080")
 
@@ -130,7 +141,7 @@ class TestSammCliIntegration:
 
     def test_to_openapi_json(self, samm_cli, file_path, temp_output_dir):
         """Test generating OpenAPI specification in JSON format."""
-        output_file = os.path.join(temp_output_dir, "openapi.json")
+        output_file = _get_temp_file_name(temp_output_dir, "openapi", ".json")
 
         samm_cli.to_openapi(file_path, "j", output=output_file, api_base_url="http://localhost:8080")  # JSON flag
 
@@ -143,7 +154,7 @@ class TestSammCliIntegration:
 
     def test_to_asyncapi(self, samm_cli, file_path, temp_output_dir):
         """Test generating AsyncAPI specification."""
-        output_file = os.path.join(temp_output_dir, "asyncapi.yaml")
+        output_file = _get_temp_file_name(temp_output_dir, "asyncapi", ".yaml")
 
         samm_cli.to_asyncapi(file_path, output=output_file, channel_address="test/topic")
 
@@ -155,7 +166,7 @@ class TestSammCliIntegration:
 
     def test_to_html(self, samm_cli, file_path, temp_output_dir):
         """Test generating HTML documentation."""
-        output_file = os.path.join(temp_output_dir, "documentation.html")
+        output_file = _get_temp_file_name(temp_output_dir, "documentation", ".html")
 
         samm_cli.to_html(file_path, output=output_file)
 
@@ -167,7 +178,7 @@ class TestSammCliIntegration:
 
     def test_to_png(self, samm_cli, file_path, temp_output_dir):
         """Test generating PNG diagram."""
-        output_file = os.path.join(temp_output_dir, "diagram.png")
+        output_file = _get_temp_file_name(temp_output_dir, "diagram", ".png")
 
         samm_cli.to_png(file_path, output=output_file)
 
@@ -179,7 +190,7 @@ class TestSammCliIntegration:
 
     def test_to_svg(self, samm_cli, file_path, temp_output_dir):
         """Test generating SVG diagram."""
-        output_file = os.path.join(temp_output_dir, "diagram.svg")
+        output_file = _get_temp_file_name(temp_output_dir, "diagram", ".svg")
 
         samm_cli.to_svg(file_path, output=output_file)
 
@@ -191,7 +202,7 @@ class TestSammCliIntegration:
 
     def test_to_java(self, samm_cli, file_path, temp_output_dir):
         """Test generating Java classes."""
-        output_dir = os.path.join(temp_output_dir, "java")
+        output_dir = _get_temp_file_name(temp_output_dir, "java", "")
         os.makedirs(output_dir, exist_ok=True)
 
         samm_cli.to_java(file_path, output_directory=output_dir, package_name="com.example.test")
@@ -207,7 +218,7 @@ class TestSammCliIntegration:
 
     def test_to_sql(self, samm_cli, file_path, temp_output_dir):
         """Test generating SQL script."""
-        output_file = os.path.join(temp_output_dir, "schema.sql")
+        output_file = _get_temp_file_name(temp_output_dir, "schema", ".sql")
 
         samm_cli.to_sql(file_path, output=output_file, dialect="databricks")
 
@@ -218,7 +229,7 @@ class TestSammCliIntegration:
 
     def test_to_jsonld(self, samm_cli, file_path, temp_output_dir):
         """Test generating JSON-LD representation."""
-        output_file = os.path.join(temp_output_dir, "model.jsonld")
+        output_file = _get_temp_file_name(temp_output_dir, "model", ".jsonld")
 
         samm_cli.to_jsonld(file_path, output=output_file)
 
@@ -231,7 +242,7 @@ class TestSammCliIntegration:
 
     def test_to_aas(self, samm_cli, file_path, temp_output_dir):
         """Test generating AAS submodel template."""
-        output_file_json = os.path.join(temp_output_dir, "aas.json")
+        output_file_json = _get_temp_file_name(temp_output_dir, "aas", ".json")
 
         samm_cli.to_aas(file_path, output=output_file_json, format="JSON")
 
@@ -242,7 +253,7 @@ class TestSammCliIntegration:
 
     def test_package_export_import(self, samm_cli, file_path, temp_output_dir):
         """Test exporting and importing a package."""
-        package_file = os.path.join(temp_output_dir, "package.zip")
+        package_file = _get_temp_file_name(temp_output_dir, "package", ".zip")
 
         # Export the model as a package
         samm_cli.package_export(file_path, output=package_file)
@@ -256,26 +267,39 @@ class TestSammCliIntegration:
         assert zipfile.is_zipfile(package_file)
 
         # Import the package (would need models-root directory)
-        import_dir = os.path.join(temp_output_dir, "imported_models")
+        import_dir = _get_temp_file_name(temp_output_dir, "imported_models", "")
         os.makedirs(import_dir, exist_ok=True)
 
+        imported_files = []
+        import_failed = False
+        import_error = None
+
         # Note: This might fail if the package structure doesn't match expectations
         try:
             samm_cli.package_import(package_file, models_root=import_dir)
             # Check if files were imported
             imported_files = list(Path(import_dir).rglob("*.ttl"))
-            assert len(imported_files) > 0
         except Exception as e:
-            pytest.skip(f"Package import failed: {e}")
+            import_failed = True
+            import_error = e
+
+        if import_failed:
+            pytest.skip(f"Package import failed: {import_error}")
+
+        # assertions are outside the try/except -> no S5779
+        assert len(imported_files) > 0
 
 
 class TestSammCliLanguageSupport:
     """Test language-specific outputs."""
 
+    def __init__(self):
+        pass
+
     @pytest.mark.parametrize("language", ("en", "de"))
     def test_to_html_languages(self, samm_cli, file_path, temp_output_dir, language):
         """Test generating HTML in different languages."""
-        output_file = os.path.join(temp_output_dir, f"doc_{language}.html")
+        output_file = _get_temp_file_name(temp_output_dir, f"doc_{language}", ".html")
 
         samm_cli.to_html(file_path, output=output_file, language=language)
 
@@ -284,7 +308,7 @@ class TestSammCliLanguageSupport:
     @pytest.mark.parametrize("language", ("en", "de"))
     def test_to_schema_languages(self, samm_cli, file_path, temp_output_dir, language):
         """Test generating JSON schema in different languages."""
-        output_file = os.path.join(temp_output_dir, f"schema_{language}.json")
+        output_file = _get_temp_file_name(temp_output_dir, f"schema_{language}", ".json")
 
         samm_cli.to_schema(file_path, output=output_file, language=language)
 
@@ -294,9 +318,12 @@ class TestSammCliLanguageSupport:
 class TestSammCliErrorHandling:
     """Test error handling in SAMM CLI."""
 
+    def __init__(self):
+        pass
+
     def test_invalid_model_validation(self, capfd, samm_cli, temp_output_dir):
         """Test validation of an invalid model."""
-        invalid_model = os.path.join(temp_output_dir, "invalid.ttl")
+        invalid_model = _get_temp_file_name(temp_output_dir, "invalid", ".ttl")
         with open(invalid_model, "w") as f:
             f.write("This is not valid Turtle syntax!!!")
 

{esmf_aspect_model_loader-2.3.1 → esmf_aspect_model_loader-2.3.2}/tox.ini

@@ -3,16 +3,19 @@ isolated_build = true
 toxworkdir = ../../.tox
 envlist =
     pep8
-    py310
+    py311
+    py312
+    py313
+    py314
 
 [testenv]
 allowlist_externals = uv
 description = Run the tests
 commands_pre =
-    uv sync
-    uv run download-samm-release
+    uv sync --active
+    uv run --active download-samm-release
 commands =
-    uv run pytest {posargs: \
+    uv run --active pytest {posargs: \
     -x -s -vv \
     --cov=esmf_aspect_meta_model_python/ \
     --cov-fail-under=85 \