qubership-pipelines-common-library 0.1.9__tar.gz → 0.1.10__tar.gz

{qubership_pipelines_common_library-0.1.9 → qubership_pipelines_common_library-0.1.10}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.3
 Name: qubership-pipelines-common-library
-Version: 0.1.9
+Version: 0.1.10
 Summary: Qubership Pipelines common library
 License: Apache-2.0
 Author: Igor Lebedev

{qubership_pipelines_common_library-0.1.9 → qubership_pipelines_common_library-0.1.10}/pyproject.toml

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "qubership-pipelines-common-library"
-version = "0.1.9"
+version = "0.1.10"
 description = "Qubership Pipelines common library"
 authors = ["Igor Lebedev <lebedev.light@gmail.com>"]
 readme = "README.md"

{qubership_pipelines_common_library-0.1.9 → qubership_pipelines_common_library-0.1.10}/qubership_pipelines_common_library/v1/execution/exec_logger.py

@@ -18,6 +18,8 @@ import logging, os
 class ExecutionLogger:
     FILE_NAME_EXECUTION = "execution.log"
     FILE_NAME_FULL = "full.log"
+    EXECUTION_LOG_LEVEL = logging.INFO
+    FULL_LOG_LEVEL = logging.DEBUG
     DEFAULT_FORMAT = u'[%(asctime)s] [%(levelname)-5s] [class=%(filename)s:%(lineno)-3s] %(message)s'
 
     def __init__(self, path_logs):
@@ -26,18 +28,20 @@ class ExecutionLogger:
         self.path_logs = path_logs
         self.logger = logging.getLogger("execution_logger")
         self.logger.setLevel(logging.DEBUG) # set to the lowest level to allow handlers to capture anything
-        # execution logs - only in local logger
         if path_logs:
+            # execution logs - only in local logger
             handler_exec = logging.FileHandler(os.path.join(path_logs, ExecutionLogger.FILE_NAME_EXECUTION))
-            handler_exec.setLevel(logging.INFO)
+            handler_exec.setLevel(ExecutionLogger.EXECUTION_LOG_LEVEL)
             handler_exec.setFormatter(logging.Formatter(ExecutionLogger.DEFAULT_FORMAT))
             self.logger.addHandler(handler_exec)
-        # full logs - attach to a global logger
-        if path_logs:
+
+            # full logs - attach to a global logger
             handler_full = logging.FileHandler(os.path.join(path_logs, ExecutionLogger.FILE_NAME_FULL))
-            handler_full.setLevel(logging.DEBUG)
+            handler_full.setLevel(ExecutionLogger.FULL_LOG_LEVEL)
             handler_full.setFormatter(logging.Formatter(ExecutionLogger.DEFAULT_FORMAT))
+            logging.getLogger().propagate = False
             logging.getLogger().addHandler(handler_full)
+        self.logger.propagate = True
 
     def info(self, msg, *args, **kwargs):
         self.logger.info(msg, *args, **kwargs)

{qubership_pipelines_common_library-0.1.9 → qubership_pipelines_common_library-0.1.10}/qubership_pipelines_common_library/v1/git_client.py

@@ -59,7 +59,25 @@ class GitClient:
             **kwargs
         )
 
+    def clone_repo_from_commit_hash(self, repo_path: str, commit_hash: str, temp_path: str):
+        """"""
+        repo_path = repo_path.lstrip("/").rstrip("/")
+        if not repo_path:
+            raise Exception("Repository path should be defined")
+        if not commit_hash:
+            raise Exception("Commit hash should be defined")
+        if not temp_path:
+            raise Exception("Temporary path should be defined")
+        self._cleanup_resources()
+        self.repo_path = repo_path
+        self.temp_path = temp_path
+        self.repo = Repo.init(path=temp_path)
+        self.repo.create_remote(name="origin", url=self._gen_repo_auth_url(self.host, self.username, self.password, self.repo_path))
+        self.repo.git.fetch("--depth", "1", "origin", commit_hash)
+        self.repo.git.checkout("FETCH_HEAD")
+
     def commit_and_push(self, commit_message: str):
+        """"""
         self.commit(commit_message)
         self.push()
 

qubership_pipelines_common_library-0.1.10/qubership_pipelines_common_library/v1/utils/utils_cli.py

@@ -0,0 +1,73 @@
+import re
+import click
+import logging
+import sys, os
+from qubership_pipelines_common_library.v1.execution.exec_logger import ExecutionLogger
+
+DEFAULT_CONTEXT_FILE_PATH = 'context.yaml'
+
+
+def utils_cli(func):
+    """Decorator to add CLI options for logging level, context path and custom input params."""
+    @click.option('--log-level', default='INFO', show_default=True,
+                  type=click.Choice(['DEBUG', 'INFO', 'WARNING', 'ERROR', 'CRITICAL'], case_sensitive=False),
+                  help="Set the logging level")
+    @click.option('--context_path', required=True, default=DEFAULT_CONTEXT_FILE_PATH, type=str, help="Path to context")
+    @click.option("--input_params", "-p", multiple=True, callback=_input_params_to_dict,
+                  help="Params to use instead of context as key-values. Nested keys are supported with double-underscores or dots as separators, e.g. -p params__group__key=value")
+    @click.pass_context
+    def wrapper(ctx, *args, log_level, **kwargs):
+        ExecutionLogger.EXECUTION_LOG_LEVEL = getattr(logging, log_level.upper(), logging.INFO)
+        _configure_global_logger(logging.getLogger(), log_level, ExecutionLogger.DEFAULT_FORMAT)
+        _transform_kwargs(kwargs)
+        return ctx.invoke(func, *args, **kwargs)
+    return wrapper
+
+
+def _configure_global_logger(global_logger: logging.Logger, log_level: str, formatter_str: str):
+    """Configure the global logger with a specific log level and formatter."""
+    log_level_value = getattr(logging, log_level.upper(), logging.INFO)
+    global_logger.setLevel(logging.DEBUG)
+    if global_logger.hasHandlers():
+        global_logger.handlers.clear()
+    global_logger.propagate = True
+    stdout_handler = logging.StreamHandler(sys.stdout)
+    stdout_handler.setLevel(log_level_value)
+    stdout_handler.setFormatter(logging.Formatter(formatter_str))
+    global_logger.addHandler(stdout_handler)
+
+
+def _transform_kwargs(kwargs):
+    if kwargs.get("input_params"):
+        kwargs.pop("context_path")
+
+
+def _input_params_to_dict(ctx, param, values: tuple[str, ...]):
+    result = {}
+    for kvp in values:
+        key, value = [item.strip() for item in kvp.split("=", 1)]
+        if _validate_key(key):
+            _set_item_by_path(result, key, _transform_value(value))
+    return result if result else None
+
+
+def _validate_key(key):
+    return True
+
+
+def _transform_value(value):
+    return value
+
+
+_KEY_PARTS_DELIMITER_PATTERN = re.compile(r'\.|__')
+def _set_item_by_path(target_dict: dict, path, value):
+    current_dict = target_dict
+    key_parts = _KEY_PARTS_DELIMITER_PATTERN.split(path)
+    for i, key in enumerate(key_parts):
+        if i == len(key_parts) - 1:
+            current_dict[key] = value
+            break
+        if not isinstance(current_dict.get(key), dict):
+            current_dict[key] = {}
+        current_dict = current_dict[key]
+    return target_dict