qubership-pipelines-common-library 2.0.1__py3-none-any.whl → 2.0.2__py3-none-any.whl

qubership_pipelines_common_library/v1/utils/utils_cli.py

@@ -1,14 +1,11 @@
 import logging
+import os
 import re
-
+import sys
 import click
-from rich import box
-from rich.logging import RichHandler
-from rich.panel import Panel
 
 from qubership_pipelines_common_library.v1.execution.exec_logger import ExecutionLogger
-from qubership_pipelines_common_library.v1.utils.utils_logging import rich_console, ExtendedReprHighlighter, \
-    LevelColorFilter
+from qubership_pipelines_common_library.v1.utils.utils_string import UtilsString
 
 DEFAULT_CONTEXT_FILE_PATH = 'context.yaml'
 
@@ -37,26 +34,34 @@ def utils_cli(func):
 
 def _configure_global_logger(global_logger: logging.Logger, log_level: 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
-    rich_handler = RichHandler(
-        console=rich_console,
-        show_time=False,
-        show_level=False,
-        show_path=False,
-        enable_link_path=False,
-        rich_tracebacks=True,
-        tracebacks_show_locals=False,
-        markup=True,
-        highlighter=ExtendedReprHighlighter(),
-    )
-    rich_handler.addFilter(LevelColorFilter())
-    rich_handler.setFormatter(logging.Formatter(ExecutionLogger.LEVELNAME_COLORED_FORMAT))
-    log_level_value = getattr(logging, log_level.upper(), logging.INFO)
-    rich_handler.setLevel(log_level_value)
-    global_logger.addHandler(rich_handler)
+    if UtilsString.convert_to_bool(os.getenv('NO_RICH', False)):
+        stdout_handler = logging.StreamHandler(sys.stdout)
+        stdout_handler.setLevel(log_level_value)
+        stdout_handler.setFormatter(logging.Formatter(ExecutionLogger.DEFAULT_FORMAT))
+        global_logger.addHandler(stdout_handler)
+    else:
+        from rich.logging import RichHandler
+        from qubership_pipelines_common_library.v1.utils.utils_logging import rich_console, ExtendedReprHighlighter, LevelColorFilter
+        rich_handler = RichHandler(
+            console=rich_console,
+            show_time=False,
+            show_level=False,
+            show_path=False,
+            enable_link_path=False,
+            rich_tracebacks=True,
+            tracebacks_show_locals=False,
+            markup=True,
+            highlighter=ExtendedReprHighlighter(),
+        )
+        rich_handler.addFilter(LevelColorFilter())
+        rich_handler.setFormatter(logging.Formatter(ExecutionLogger.LEVELNAME_COLORED_FORMAT))
+        rich_handler.setLevel(log_level_value)
+        global_logger.addHandler(rich_handler)
 
 
 def _print_command_name():
@@ -67,10 +72,16 @@ def _print_command_name():
         logging.getLogger().warning("Can't find command name.")
         command_name = ""
 
-    command_panel = Panel(f"command_name = {command_name}", expand=False, padding=(0, 1), box=box.ROUNDED)
-    rich_console.print()
-    rich_console.print(command_panel)
-    rich_console.print()
+    if UtilsString.convert_to_bool(os.getenv('NO_RICH', False)):
+        logging.info(f"command_name = {command_name}")
+    else:
+        from rich import box
+        from rich.panel import Panel
+        from qubership_pipelines_common_library.v1.utils.utils_logging import rich_console
+        command_panel = Panel(f"command_name = {command_name}", expand=False, padding=(0, 1), box=box.ROUNDED)
+        rich_console.print()
+        rich_console.print(command_panel)
+        rich_console.print()
 
 
 def _transform_kwargs(kwargs):

qubership_pipelines_common_library/v1/utils/utils_logging.py

@@ -18,7 +18,6 @@ soft_theme = Theme({
     "repr.str": "rgb(140,180,140)",
     "repr.tag_name": "rgb(200,170,220)",
     "repr.tag_value": "rgb(170,200,220)",
-
     "repr.time": "rgb(160,190,220) italic",
 })
 

{qubership_pipelines_common_library-2.0.1.dist-info → qubership_pipelines_common_library-2.0.2.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: qubership-pipelines-common-library
-Version: 2.0.1
+Version: 2.0.2
 Summary: Qubership Pipelines common library
 License: Apache-2.0
 License-File: LICENSE

{qubership_pipelines_common_library-2.0.1.dist-info → qubership_pipelines_common_library-2.0.2.dist-info}/RECORD

@@ -19,12 +19,12 @@ qubership_pipelines_common_library/v1/utils/__init__.py,sha256=QczIlSYNOtXMuMWSz
 qubership_pipelines_common_library/v1/utils/rest.py,sha256=OfYGPE2tM-vDUg__ytZKfpCeGVCDePSjXDHK61A2KDM,3069
 qubership_pipelines_common_library/v1/utils/utils.py,sha256=aMyUrJqlnRcFSjNtiyKa5TDJ31m2ABpljeQdnil3A20,1866
 qubership_pipelines_common_library/v1/utils/utils_aws.py,sha256=BPPnHBzPPXPqFijtAiw16sTPu1tFZjS95GkSMX_HdjA,808
-qubership_pipelines_common_library/v1/utils/utils_cli.py,sha256=URmspvyL2kzRyoaXJbxsVEEcy9n4l9ezuvFYVW4W1hk,4188
+qubership_pipelines_common_library/v1/utils/utils_cli.py,sha256=jkhBswmYqJHfszaYhWknCTxaBx0tEh42McFx5dP6EXQ,4931
 qubership_pipelines_common_library/v1/utils/utils_context.py,sha256=IlMFXGxS8zJw33Gu3SbOUcj88wquIkobBlWkdFbR7MA,3767
 qubership_pipelines_common_library/v1/utils/utils_dictionary.py,sha256=xe8ftnigzyCKWCZaUnI2Xu2ykYlOl1Nc9ATimXuCbgM,1366
 qubership_pipelines_common_library/v1/utils/utils_file.py,sha256=E4RhpeCRhUt-EQ_6pUz-QEKkH8JidJWwYxZmrAvpHBk,2905
 qubership_pipelines_common_library/v1/utils/utils_json.py,sha256=QczIlSYNOtXMuMWSznhV_BkXMM5KLn1wOogtlT2kcy0,598
-qubership_pipelines_common_library/v1/utils/utils_logging.py,sha256=2kPBjPyQfPOZ8_Zv4W-aBWBlZtN_mDCc3JWHzdW4BJo,1506
+qubership_pipelines_common_library/v1/utils/utils_logging.py,sha256=rVkx1OnyL9WmvLvvYij9Fn9tM16geqsCzeeVwObPhRw,1505
 qubership_pipelines_common_library/v1/utils/utils_string.py,sha256=Phx5ZXPRjhjg9AaSPx6WLX9zQvwJH1txslfnG3jJ43w,993
 qubership_pipelines_common_library/v1/webex_client.py,sha256=JU_0NgLu_p6zgaUi-ixgZeFMlJaTAvXwrU1oA607Bv0,2997
 qubership_pipelines_common_library/v2/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
@@ -70,7 +70,7 @@ qubership_pipelines_common_library/v2/sops/sops_client.py,sha256=vB1czEqIQ6aRywk
 qubership_pipelines_common_library/v2/utils/crypto_utils.py,sha256=zZ32IJY7WKzJEJNyZQVCPdWC4uujo6goR0MyzBAhn78,1504
 qubership_pipelines_common_library/v2/utils/extension_utils.py,sha256=-OyT6xrIg-PdHHy2Y712rbOAB6Q7WXTqGwP7oVne4k4,965
 qubership_pipelines_common_library/v2/utils/retry_decorator.py,sha256=ItYYL7zam4LrpQrsihis_n6aFCAa32ZAOKKSmxkaENM,4391
-qubership_pipelines_common_library-2.0.1.dist-info/METADATA,sha256=leOGiAkgcUaDCECQTxt3p0jzG1vOSno68GLK4UXPr7U,3063
-qubership_pipelines_common_library-2.0.1.dist-info/WHEEL,sha256=zp0Cn7JsFoX2ATtOhtaFYIiE2rmFAD4OcMhtUki8W3U,88
-qubership_pipelines_common_library-2.0.1.dist-info/licenses/LICENSE,sha256=z8d0m5b2O9McPEK1xHG_dWgUBT6EfBDz6wA0F7xSPTA,11358
-qubership_pipelines_common_library-2.0.1.dist-info/RECORD,,
+qubership_pipelines_common_library-2.0.2.dist-info/METADATA,sha256=fKw473tE6YP1Fa4tFCGUpz2uL5754W6rXz0FepFx-KA,3063
+qubership_pipelines_common_library-2.0.2.dist-info/WHEEL,sha256=zp0Cn7JsFoX2ATtOhtaFYIiE2rmFAD4OcMhtUki8W3U,88
+qubership_pipelines_common_library-2.0.2.dist-info/licenses/LICENSE,sha256=z8d0m5b2O9McPEK1xHG_dWgUBT6EfBDz6wA0F7xSPTA,11358
+qubership_pipelines_common_library-2.0.2.dist-info/RECORD,,