Merge pull request #40 from bci-oss/main

Reuse JAVA SDK models for testing (fix)

Author: atextor

core/esmf-aspect-meta-model-python/README.md

@@ -109,13 +109,20 @@ aspect = model_elements[0]
 
 SAMMUnitsGraph is a class contains functions for accessing units of measurement.
 ```python 
-from esmf_aspect_meta_model_python.samm_meta_model import SammUnitsGraph
+from esmf_aspect_meta_model_python.samm_meta_model import units
 
-units_graph = SammUnitsGraph()
-unit_data = units_graph.get_info("unit:volt")
+unit_name = "unit:volt"
+units.print_description(units.get_info(unit_name))
+# preferredName: volt
+# commonCode: VLT
+# ...
+# symbol: V
+
+# Get unit data as dictionary
+volt_info = units.get_info("unit:volt")
 # {'preferredName': rdflib.term.Literal('volt', lang='en'), 'commonCode': rdflib.term.Literal('VLT'), ... }
 
-units_graph.print_description(unit_data)
+units.print_description(volt_info)
 # preferredName: volt
 # commonCode: VLT
 # ...

core/esmf-aspect-meta-model-python/esmf_aspect_meta_model_python/samm_meta_model.py

@@ -81,17 +81,20 @@ def get_info(self, unit: str) -> Dict:
 
         return unit_data
 
-    def print_description(self, unit_data: Dict, tabs: int = 0):
+    def print_info(self, unit_data: Dict, tabs: int = 0):
         """Pretty print a unit data."""
         for key, value in unit_data.items():
             if isinstance(value, dict):
                 print("\t" * tabs + f"{key}:")
-                self.print_description(value, tabs + 1)
+                self.print_info(value, tabs + 1)
             elif isinstance(value, list):
                 print("\t" * tabs + f"{key}:")
                 for node in value:
                     for key, sub_value in node.items():
                         print("\t" * (tabs + 1) + f"{key}:")
-                        self.print_description(sub_value, tabs + 2)
+                        self.print_info(sub_value, tabs + 2)
             else:
                 print("\t" * tabs + f"{key}: {value}")
+
+
+units = SammUnitsGraph()

core/esmf-aspect-meta-model-python/scripts/download_test_models.py

@@ -29,11 +29,9 @@ def get_resources_folder_path() -> str:
     return models_path
 
 
-def clear_folder():
+def clear_folder(resources_folder):
     """Remove all files to clear test models directory."""
-    resources_folder = get_resources_folder_path()
-
-    if exists(resources_folder) or len(listdir(resources_folder)) != 0:
+    if exists(resources_folder) and len(listdir(resources_folder)) != 0:
         shutil.rmtree(resources_folder)
 
     mkdir(resources_folder)
@@ -66,7 +64,7 @@ def download_test_models(version: str = Const.JAVA_CLI_VERSION):
     jar_file_path = join(resources_folder, jar_file_name)
 
     print(f"Remove previous version of test models from the folder {resources_folder}")
-    clear_folder()
+    clear_folder(resources_folder)
 
     print(f"Start downloading esmf-test-aspect-models version {version}")
     download_jar_file(jar_file_path)