Merge branch 'main' into 2.1.x

Author: atextor

core/esmf-aspect-meta-model-python/esmf_aspect_meta_model_python/resolver/meta_model.py

@@ -17,8 +17,6 @@
 
 from rdflib import Graph
 
-from scripts.samm.download_samm_release import main as download_samm_release
-
 
 class BaseMetaModelResolver(ABC):
     """Interface for meta-model resolver class."""
@@ -51,19 +49,6 @@ def _get_samm_files_path(self, meta_model_version: str) -> List[str]:
 
         return samm_files
 
-    def get_samm_files(self, meta_model_version: str) -> List[str]:
-        """Check and collect paths to SAMM files.
-
-        :param meta_model_version: meta-model version
-        :return: List of all path to SAMM files for the given meta-model version
-        """
-        samm_files = self._get_samm_files_path(meta_model_version)
-        if not samm_files:
-            download_samm_release()
-            samm_files = self._get_samm_files_path(meta_model_version)
-
-        return samm_files
-
     @staticmethod
     def validate_file(file_path: str):
         """Validate a SAMM file.
@@ -89,6 +74,6 @@ def parse(self, aspect_graph: Graph, meta_model_version: str):
         :param aspect_graph: RDF Graph
         :param meta_model_version: version of the meta-model to extract the right SAMM turtle files
         """
-        for file_path in self.get_samm_files(meta_model_version):
+        for file_path in self._get_samm_files_path(meta_model_version):
             self.validate_file(file_path)
             aspect_graph.parse(file_path, format="turtle")

core/esmf-aspect-meta-model-python/pyproject.toml

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "esmf-aspect-model-loader"
-version = "2.1.4"
+version = "2.1.5"
 description = "Load Aspect Models based on the Semantic Aspect Meta Model"
 authors = [
     "Eclipse Semantic Modeling Framework",

core/esmf-aspect-meta-model-python/tests/unit/resolver/test_meta_model.py

@@ -24,18 +24,6 @@ def test_init_with_defaults(self, path_mock):
         assert result._base_path == "parent_3"
         path_mock.assert_called_once()
 
-    @mock.patch("esmf_aspect_meta_model_python.resolver.meta_model.glob")
-    @mock.patch("esmf_aspect_meta_model_python.resolver.meta_model.join")
-    def test_get_samm_files(self, join_mock, glob_mock):
-        join_mock.return_value = "path_template"
-        glob_mock.return_value = ["samm_file_1", "samm_file_2"]
-        aspect_resolver = AspectMetaModelResolver("base_path")
-        aspect_resolver.samm_folder_path = "samm_folder_path"
-        result = aspect_resolver.get_samm_files("meta_model_version")
-
-        assert sorted(result) == ["samm_file_1", "samm_file_2"]
-        join_mock.assert_called_once_with("base_path", "samm_folder_path", "**", "meta_model_version", "*.ttl")
-
     @mock.patch("esmf_aspect_meta_model_python.resolver.meta_model.exists")
     def test_validate_file(self, exists_mock):
         exists_mock.return_value = False
@@ -49,14 +37,14 @@ def test_validate_file(self, exists_mock):
         exists_mock.assert_called_once_with("file_path")
 
     @mock.patch("esmf_aspect_meta_model_python.resolver.meta_model.AspectMetaModelResolver.validate_file")
-    @mock.patch("esmf_aspect_meta_model_python.resolver.meta_model.AspectMetaModelResolver.get_samm_files")
-    def test_parse(self, get_samm_files_mock, validate_file_mock):
-        get_samm_files_mock.return_value = ["samm_file_path"]
+    @mock.patch("esmf_aspect_meta_model_python.resolver.meta_model.AspectMetaModelResolver._get_samm_files_path")
+    def test_parse(self, get_samm_files_path_mock, validate_file_mock):
+        get_samm_files_path_mock.return_value = ["samm_file_path"]
         aspect_graph_mock = mock.MagicMock(name="graph")
         aspect_resolver = AspectMetaModelResolver("base_path")
         result = aspect_resolver.parse(aspect_graph_mock, "meta_model_version")
 
         assert result is None
-        get_samm_files_mock.assert_called_once_with("meta_model_version")
+        get_samm_files_path_mock.assert_called_once_with("meta_model_version")
         validate_file_mock.assert_called_once_with("samm_file_path")
         aspect_graph_mock.parse.assert_called_once_with("samm_file_path", format="turtle")