Fix PR comments

Author: Hanna-Shalamitskaya-EPAM

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

@@ -18,9 +18,10 @@
 
 
 class SammCli:
-    """Class to eecute SAMM CLI functions.
+    """Class to execute SAMM CLI functions.
 
-    If there is no downloaded SAMM CLI, code will identify operation system and download a corresponding client.
+    If there is no downloaded SAMM CLI, the code will identify the operating system and download a corresponding
+    SAMM CLI version.
     """
 
     def __init__(self):
@@ -29,23 +30,22 @@ def __init__(self):
 
     @staticmethod
     def _get_client_path():
-        """Get path to the SAMM Cli executable file.."""
+        """Get path to the SAMM CLI executable file.."""
         base_path = Path(__file__).resolve()
         cli_path = join(base_path.parents[1], "samm-cli", "samm.exe")
 
         return cli_path
 
     def _validate_client(self):
-        """Validate SAMM Cli.
+        """Validate SAMM CLI.
 
-        If there is no SAMM Cli executable file, run a script for downloading.
+        If there is no SAMM CLI executable file, run a script for downloading.
         """
         if not exists(self._samm):
-            # download SAMM CLI
             download_samm_cli()
 
     def _call_function(self, function_name, path_to_model, *args, **kwargs):
-        """Run a SAMM Cli function as a subprocess."""
+        """Run a SAMM CLI function as a subprocess."""
         call_args = [self._samm, "aspect", path_to_model] + function_name.split()
 
         if args:
@@ -78,7 +78,7 @@ def to_openapi(self, path_to_model, *args, **kwargs):
         param path_to_model: local path to the aspect model file (*.ttl)
         possible arguments:
             - output, o: output file path (default: stdout)
-            - api-base-url, b: the base url for the Aspect API used in the OpenAPI specification, b="http://mysite.de"
+            - api-base-url, b: the base url for the Aspect API used in the OpenAPI specification, b="http://localhost/"
             - json, j: generate a JSON specification for an Aspect Model (default format is YAML)
             - comment, c: only in combination with --json; generates $comment OpenAPI 3.1 keyword for all
                 samm:see attributes

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

@@ -12,18 +12,25 @@
 import sys
 import zipfile
 
-BASE_PATH = "https://github.com/eclipse-esmf/esmf-sdk/releases/download/v2.6.1/"
+from string import Template
+
+BASE_PATH = Template("https://github.com/eclipse-esmf/esmf-sdk/releases/download/v$version_number/$file_name")
+LINUX_FILE_NAME = Template("samm-cli-$version_number-linux-x86_64.tar.gz")
+SAMM_CLI_VERSION = "2.6.1"
+WIN_FILE_NAME = Template("samm-cli-$version_number-windows-x86_64.zip")
 
 
 def get_samm_cli_file_name():
     """Get a SAMM CLI file name for the current platform."""
 
     if platform.system() == "Windows":
-        file_name = "samm-cli-2.6.1-windows-x86_64.zip"
+        file_name = WIN_FILE_NAME.substitute(version_number=SAMM_CLI_VERSION)
     elif platform.system() == "Linux":
-        file_name = "samm-cli-2.6.1-linux-x86_64.tar.gz"
+        file_name = LINUX_FILE_NAME.substitute(version_number=SAMM_CLI_VERSION)
     else:
-        raise NotImplementedError(f"Please download a SAMM CLI manually for your operation system from '{BASE_PATH}'")
+        raise NotImplementedError(
+            f"Please download a SAMM CLI manually for your operation system from '{BASE_PATH}'"
+        )
 
     return file_name
 
@@ -60,17 +67,17 @@ def download_samm_cli():
         print(error)
     else:
         print(f"Start downloading SAMM CLI {samm_cli_file_name}")
-        url = BASE_PATH + samm_cli_file_name
-        dir_path = Path(__file__).resolve().parent
-        archive_file = os.path.join(dir_path, f".\\{samm_cli_file_name}")
+        url = BASE_PATH.substitute(version_number=SAMM_CLI_VERSION, file_name=samm_cli_file_name)
+        dir_path = Path(__file__).resolve().parents[1]
+        archive_file = os.path.join(dir_path, samm_cli_file_name)
 
         download_archive_file(url, archive_file)
-        print("SAMM CLI archive file downloaded")
+        print("\nSAMM CLI archive file downloaded")
 
         print("Start extracting files")
         archive = zipfile.ZipFile(archive_file)
         for file in archive.namelist():
-            archive.extract(file, ".\\samm-cli")
+            archive.extract(file, "samm-cli")
         archive.close()
         print("Done extracting files.")