New prints and demo behaviours

Author: Peter-Sh

src/redis_release/bht/behaviours.py

@@ -374,7 +374,15 @@ def update(self) -> Status:
                 return Status.RUNNING
 
             result = self.task.result()
+            if self.workflow.status != result.status:
+                self.logger.info(
+                    f"Workflow {self.workflow.workflow_file}({self.workflow.run_id}) status changed: {self.workflow.status} -> {result.status}"
+                )
             self.workflow.status = result.status
+            if self.workflow.conclusion != result.conclusion:
+                self.logger.info(
+                    f"Workflow {self.workflow.workflow_file}({self.workflow.run_id}) conclusion changed: {self.workflow.conclusion} -> {result.conclusion}"
+                )
             self.workflow.conclusion = result.conclusion
             self.feedback_message = (
                 f" {self.workflow.status}, {self.workflow.conclusion}"

src/redis_release/bht/state.py

@@ -2,7 +2,6 @@
 import logging
 import uuid
 from datetime import datetime
-from importlib.metadata import packages_distributions
 from pathlib import Path
 from typing import TYPE_CHECKING, Any, Dict, List, Optional, Protocol, Union
 

src/redis_release/bht/tree.py

@@ -11,6 +11,7 @@
 from py_trees.display import unicode_tree
 from py_trees.trees import BehaviourTree
 from py_trees.visitors import SnapshotVisitor
+from rich.pretty import pretty_repr
 from rich.text import Text
 
 from ..config import Config
@@ -374,3 +375,35 @@ def create_extract_result_tree_branch(
     )
     latch_chains(extract_artifact_result, download_artifacts)
     return extract_artifact_result
+
+
+class DemoBehaviour(Behaviour):
+    def __init__(self, name: str):
+        super().__init__(name=name)
+
+    def update(self) -> Status:
+        return Status.SUCCESS
+
+
+def create_sequence_branch() -> Sequence:
+    s = Sequence(
+        name="Sequence: A && B",
+        memory=False,
+        children=[
+            DemoBehaviour("A"),
+            DemoBehaviour("B"),
+        ],
+    )
+    return s
+
+
+def create_selector_branch() -> Selector:
+    s = Selector(
+        name="Selector: A || B",
+        memory=False,
+        children=[
+            DemoBehaviour("A"),
+            DemoBehaviour("B"),
+        ],
+    )
+    return s

src/redis_release/cli.py

@@ -36,6 +36,8 @@
     create_build_workflow_tree_branch,
     create_extract_result_tree_branch,
     create_publish_workflow_tree_branch,
+    create_selector_branch,
+    create_sequence_branch,
     create_workflow_complete_tree_branch,
     create_workflow_with_result_tree_branch,
     initialize_tree_and_state,
@@ -231,7 +233,20 @@ def release_print_bht(
         None,
         "--name",
         "-n",
-        help="Name of specific PPA or tree branch to print. PPAs: 'workflow_success', 'workflow_completion', 'find_workflow', 'trigger_workflow', 'identify_target_ref', 'download_artifacts', 'extract_artifact_result'. Tree branches: 'workflow_success_branch', 'workflow_result_branch'",
+        help="""Name of specific PPA or tree branch to print.
+            PPAs:
+                'workflow_success',
+                'workflow_completion',
+                'find_workflow',
+                'trigger_workflow',
+                'identify_target_ref',
+                'download_artifacts',
+                'extract_artifact_result'.
+            Tree branches:
+                'workflow_complete_branch',
+                'workflow_with_result_branch',
+                'publish_workflow_branch',
+                'build_workflow_branch'""",
     ),
 ) -> None:
     """Print and render (using graphviz) the release behaviour tree or a specific PPA."""
@@ -292,12 +307,20 @@ def release_print_bht(
             "workflow_with_result_branch": lambda: create_workflow_with_result_tree_branch(
                 "artifact", workflow, package_meta, release_meta, github_client, ""
             ),
-            "publish_worflow_branch": lambda: create_publish_workflow_tree_branch(
-                workflow, workflow, package_meta, release_meta, github_client, ""
+            "publish_workflow_branch": lambda: create_publish_workflow_tree_branch(
+                workflow,
+                workflow,
+                package_meta,
+                release_meta,
+                workflow,
+                github_client,
+                "",
             ),
             "build_workflow_branch": lambda: create_build_workflow_tree_branch(
-                workflow, package_meta, release_meta, github_client, ""
+                package, release_meta, package, github_client, ""
             ),
+            "demo_sequence": lambda: create_sequence_branch(),
+            "demo_selector": lambda: create_selector_branch(),
         }
 
         if name not in ppa_creators:
@@ -332,7 +355,7 @@ def release_bht(
     ),
 ) -> None:
     """Run release using behaviour tree implementation."""
-    setup_logging(logging.DEBUG)
+    setup_logging()
     config_path = config_file or "config.yaml"
     config = load_config(config_path)
 

src/redis_release/logging_config.py

@@ -1,49 +1,103 @@
 """Logging configuration with Rich handler for beautiful colored output."""
 
 import logging
+import os
+from typing import Optional
 
 from rich.logging import RichHandler
 
 
+def _get_log_level_from_env() -> Optional[int]:
+    """Get log level from environment variables.
+
+    Checks for LOG_LEVEL and LOGGING_LEVEL environment variables.
+    Supports both numeric values (10, 20, 30, 40, 50) and string values
+    (DEBUG, INFO, WARNING, ERROR, CRITICAL).
+
+    Returns:
+        Log level as integer, or None if not found/invalid
+    """
+    for env_var in ["LOG_LEVEL", "LOGGING_LEVEL"]:
+        level_str = os.getenv(env_var)
+        if level_str:
+            # Try to parse as integer first
+            try:
+                return int(level_str)
+            except ValueError:
+                pass
+
+            # Try to parse as string level name
+            level_str = level_str.upper()
+            level_map = {
+                "DEBUG": logging.DEBUG,
+                "INFO": logging.INFO,
+                "WARNING": logging.WARNING,
+                "WARN": logging.WARNING,
+                "ERROR": logging.ERROR,
+                "CRITICAL": logging.CRITICAL,
+                "FATAL": logging.CRITICAL,
+            }
+            if level_str in level_map:
+                return level_map[level_str]
+
+    return None
+
+
 def setup_logging(
-    level: int = logging.INFO,
+    level: Optional[int] = None,
     show_path: bool = True,
     third_party_level: int = logging.WARNING,
+    log_file: Optional[str] = None,
 ) -> None:
-    """Configure logging with Rich handler.
+    """Configure logging with Rich handler for beautiful colored output.
 
     Args:
-        level: Logging level (e.g., logging.INFO, logging.DEBUG)
+        level: Logging level (e.g., logging.INFO, logging.DEBUG).
+               If None, will check LOG_LEVEL or LOGGING_LEVEL environment variables.
+               Defaults to logging.INFO if no environment variable is set.
         show_path: Whether to show file path and line numbers in logs
         third_party_level: Logging level for third-party libraries (botocore, boto3, etc.)
+        log_file: Optional file path to also log to a file
+    """
+    # Determine the actual log level to use
+    if level is None:
+        level = _get_log_level_from_env()
+        if level is None:
+            level = logging.INFO
 
-    Example:
-        >>> from redis_release.logging_config import setup_logging
-        >>> import logging
-        >>> setup_logging(level=logging.DEBUG)
-        >>> logger = logging.getLogger(__name__)
-        >>> logger.info("[blue]Hello[/blue] [green]World[/green]")
+    handler = RichHandler(
+        rich_tracebacks=True,
+        show_time=True,
+        show_level=True,
+        show_path=show_path,
+        markup=True,
+        tracebacks_show_locals=True,
+        omit_repeated_times=False,
+    )
+
+    handlers = [handler]
+
+    # Add file handler if log_file is specified
+    if log_file:
+        file_handler = logging.FileHandler(log_file)
+        file_handler.setLevel(level)
+        formatter = logging.Formatter(
+            "%(asctime)s - %(name)s - %(levelname)s - %(message)s"
+        )
+        file_handler.setFormatter(formatter)
+        handlers.append(file_handler)
 
-        # To see botocore debug logs:
-        >>> setup_logging(level=logging.DEBUG, third_party_level=logging.DEBUG)
-    """
     logging.basicConfig(
         level=level,
-        format="[cyan1]%(name)s:[/cyan1] %(message)s",
+        format="%(name)s: %(message)s",
         datefmt="[%X]",
-        handlers=[
-            RichHandler(
-                rich_tracebacks=True,
-                show_time=True,
-                show_level=True,
-                show_path=show_path,
-                markup=True,  # Enable Rich markup in log messages
-                tracebacks_show_locals=True,  # Show local variables in tracebacks
-                omit_repeated_times=False,  # Force timestamp on every line
-            )
-        ],
+        handlers=handlers,
+        force=True,
     )
 
+    # Set root logger to the desired level
+    logging.getLogger().setLevel(level)
+
     # Optionally reduce noise from some verbose libraries
     logging.getLogger("asyncio").setLevel(third_party_level)
     logging.getLogger("aiohttp").setLevel(third_party_level)