runbooks 1.1.4__py3-none-any.whl → 1.1.6__py3-none-any.whl

runbooks/enterprise/validation.py

@@ -19,54 +19,47 @@ from rich.logging import RichHandler
 # Rich console for enterprise logging
 console = Console()
 
+
 class EnhancedLogging:
     """Enhanced logging capabilities for enterprise operations."""
-    
+
     def __init__(self, module_name: str = "runbooks"):
         self.module_name = module_name
         self.logger = self._setup_enhanced_logger()
-    
+
     def _setup_enhanced_logger(self) -> logging.Logger:
         """Setup enhanced logger with Rich integration."""
         logger = logging.getLogger(f"runbooks.{self.module_name}")
-        
+
         # Skip if already configured
         if logger.handlers:
             return logger
-            
+
         logger.setLevel(logging.INFO)
-        
+
         # Rich handler for beautiful console output
-        rich_handler = RichHandler(
-            console=console,
-            show_time=True,
-            show_path=True,
-            rich_tracebacks=True
-        )
-        
-        formatter = logging.Formatter(
-            fmt="[%(name)s] %(message)s",
-            datefmt="[%X]"
-        )
+        rich_handler = RichHandler(console=console, show_time=True, show_path=True, rich_tracebacks=True)
+
+        formatter = logging.Formatter(fmt="[%(name)s] %(message)s", datefmt="[%X]")
         rich_handler.setFormatter(formatter)
-        
+
         logger.addHandler(rich_handler)
         logger.propagate = False
-        
+
         return logger
-    
+
     def info(self, message: str, **kwargs) -> None:
         """Log info message with Rich formatting."""
         self.logger.info(message, **kwargs)
-    
+
     def warning(self, message: str, **kwargs) -> None:
         """Log warning message with Rich formatting."""
         self.logger.warning(message, **kwargs)
-    
+
     def error(self, message: str, **kwargs) -> None:
         """Log error message with Rich formatting."""
         self.logger.error(message, **kwargs)
-    
+
     def debug(self, message: str, **kwargs) -> None:
         """Log debug message with Rich formatting."""
         self.logger.debug(message, **kwargs)
@@ -74,60 +67,60 @@ class EnhancedLogging:
 
 class ConfigValidator:
     """Configuration validation utilities."""
-    
+
     @staticmethod
     def validate_aws_profile(profile: str) -> bool:
         """Validate AWS profile configuration."""
         if not profile or not isinstance(profile, str):
             return False
         return len(profile.strip()) > 0
-    
+
     @staticmethod
     def validate_region(region: str) -> bool:
         """Validate AWS region format."""
         if not region or not isinstance(region, str):
             return False
         # Basic AWS region format validation
-        return len(region.split('-')) >= 3
+        return len(region.split("-")) >= 3
 
 
 class InputValidator:
     """Input validation utilities."""
-    
+
     @staticmethod
     def validate_account_id(account_id: str) -> bool:
         """Validate AWS account ID format."""
         if not account_id or not isinstance(account_id, str):
             return False
         return account_id.isdigit() and len(account_id) == 12
-    
+
     @staticmethod
     def validate_instance_id(instance_id: str) -> bool:
         """Validate EC2 instance ID format."""
         if not instance_id or not isinstance(instance_id, str):
             return False
-        return instance_id.startswith('i-') and len(instance_id) >= 10
+        return instance_id.startswith("i-") and len(instance_id) >= 10
 
 
 class TypeValidator:
     """Type validation utilities."""
-    
+
     @staticmethod
     def validate_list_of_strings(value: Any) -> bool:
         """Validate that value is a list of strings."""
         if not isinstance(value, list):
             return False
         return all(isinstance(item, str) for item in value)
-    
+
     @staticmethod
     def validate_dict(value: Any, required_keys: Optional[List[str]] = None) -> bool:
         """Validate dictionary structure."""
         if not isinstance(value, dict):
             return False
-        
+
         if required_keys:
             return all(key in value for key in required_keys)
-        
+
         return True
 
 
@@ -135,43 +128,37 @@ def validate_configuration(config: Dict[str, Any]) -> Dict[str, Any]:
     """Validate configuration dictionary."""
     validator = ConfigValidator()
     errors = []
-    
+
     # Validate profile if present
-    if 'profile' in config:
-        if not validator.validate_aws_profile(config['profile']):
+    if "profile" in config:
+        if not validator.validate_aws_profile(config["profile"]):
             errors.append("Invalid AWS profile configuration")
-    
+
     # Validate region if present
-    if 'region' in config:
-        if not validator.validate_region(config['region']):
+    if "region" in config:
+        if not validator.validate_region(config["region"]):
             errors.append("Invalid AWS region format")
-    
-    return {
-        'valid': len(errors) == 0,
-        'errors': errors
-    }
+
+    return {"valid": len(errors) == 0, "errors": errors}
 
 
 def validate_user_input(user_input: Dict[str, Any]) -> Dict[str, Any]:
     """Validate user input data."""
     validator = InputValidator()
     errors = []
-    
+
     # Validate account ID if present
-    if 'account_id' in user_input:
-        if not validator.validate_account_id(user_input['account_id']):
+    if "account_id" in user_input:
+        if not validator.validate_account_id(user_input["account_id"]):
             errors.append("Invalid AWS account ID format")
-    
-    # Validate instance ID if present  
-    if 'instance_id' in user_input:
-        if not validator.validate_instance_id(user_input['instance_id']):
+
+    # Validate instance ID if present
+    if "instance_id" in user_input:
+        if not validator.validate_instance_id(user_input["instance_id"]):
             errors.append("Invalid EC2 instance ID format")
-    
-    return {
-        'valid': len(errors) == 0,
-        'errors': errors
-    }
+
+    return {"valid": len(errors) == 0, "errors": errors}
 
 
 # Create default enhanced logger
-enhanced_logger = EnhancedLogging("enterprise")
+enhanced_logger = EnhancedLogging("enterprise")

runbooks/finops/__init__.py

@@ -1,5 +1,5 @@
 """
-CloudOps Runbooks FinOps Module - Enterprise Cost and Resource Monitoring
+CloudOps & FinOps Runbooks Module - Enterprise Cost and Resource Monitoring
 
 This module provides terminal-based AWS cost monitoring with features including:
 - Multi-account cost summaries
@@ -31,7 +31,11 @@ from runbooks.finops.aws_client import (
 
 # Data processors
 from runbooks.finops.cost_processor import export_to_csv, export_to_json, get_cost_data, get_trend
+
+# Enterprise FinOps Dashboard Components - Using consolidated dashboard_runner.py
+# Backward compatibility for legacy tests and components
 from runbooks.finops.dashboard_runner import (
+    FinOpsConfig,
     _run_audit_report,
     _run_cost_trend_analysis,
     _run_executive_dashboard,
@@ -40,47 +44,39 @@ from runbooks.finops.dashboard_runner import (
     run_dashboard,
 )
 
-# Enterprise FinOps Dashboard Components - Using existing dashboard_runner.py
-# Backward compatibility module for legacy tests and components
-from runbooks.finops.finops_dashboard import FinOpsConfig
-
 # Enhanced helpers with notebook integration functions
 from runbooks.finops.helpers import (
+    create_business_summary_table,
+    create_roi_analysis_table,
     export_audit_report_to_csv,
     export_audit_report_to_json,
     export_audit_report_to_pdf,
     export_cost_dashboard_to_pdf,
+    export_scenarios_to_notebook_html,
     export_trend_data_to_json,
-    load_config_file,
     # NOTEBOOK INTEGRATION FUNCTIONS - Added for clean notebook consumption
     format_currency,
-    create_business_summary_table,
-    export_scenarios_to_notebook_html,
-    create_roi_analysis_table,
+    load_config_file,
 )
+from runbooks.finops.profile_processor import process_combined_profiles, process_single_profile
 
 # Business scenarios with notebook integration
-from runbooks.finops.finops_scenarios import (
-    create_business_scenarios_validated,
-    format_for_business_audience,
-    format_for_technical_audience,
-    FinOpsBusinessScenarios,
-)
-
 # NEW latest version: Clean API wrapper for notebook consumption
 from runbooks.finops.scenarios import (
-    finops_workspaces,
-    finops_snapshots,
-    finops_commvault,
-    get_business_scenarios_summary,
-    format_for_audience,
-    validate_scenarios_accuracy,
+    UnifiedScenarioManager,  # Replaces FinOpsBusinessScenarios
+    create_business_scenarios_validated,
+    display_unlimited_scenarios_help,  # CLI help function
+    finops_23_rds_snapshots_optimization,
     # Legacy aliases for backward compatibility
     finops_24_workspaces_cleanup,
-    finops_23_rds_snapshots_optimization,
     finops_25_commvault_investigation,
+    finops_commvault,
+    finops_snapshots,
+    finops_workspaces,
+    format_for_audience,  # Consolidated function replaces format_for_business_audience and format_for_technical_audience
+    get_business_scenarios_summary,
+    validate_finops_mcp_accuracy,
 )
-from runbooks.finops.profile_processor import process_combined_profiles, process_single_profile
 
 # Type definitions
 from runbooks.finops.types import BudgetInfo, CostData, EC2Summary, ProfileData, RegionName
@@ -99,11 +95,10 @@ __all__ = [
     "_run_executive_dashboard",
     # Enterprise Dashboard Classes - backward compatibility
     "FinOpsConfig",
-    # Business scenarios with notebook integration (latest version)
+    # Business scenarios with notebook integration (consolidated version)
     "create_business_scenarios_validated",
-    "format_for_business_audience",
-    "format_for_technical_audience",
-    "FinOpsBusinessScenarios",
+    "format_for_audience",  # Consolidated function
+    "UnifiedScenarioManager",  # Consolidated class
     # NEW latest version: Clean API wrapper functions (cleaned naming)
     "finops_workspaces",
     "finops_snapshots",
@@ -114,7 +109,8 @@ __all__ = [
     "finops_25_commvault_investigation",
     "get_business_scenarios_summary",
     "format_for_audience",
-    "validate_scenarios_accuracy",
+    "validate_finops_mcp_accuracy",  # Updated function name in consolidated version
+    "display_unlimited_scenarios_help",  # CLI help function
     # Processors
     "get_cost_data",
     "get_trend",
@@ -142,7 +138,7 @@ __all__ = [
     "load_config_file",
     # NOTEBOOK INTEGRATION FUNCTIONS (latest version)
     "format_currency",
-    "create_business_summary_table", 
+    "create_business_summary_table",
     "export_scenarios_to_notebook_html",
     "create_roi_analysis_table",
     # Types

runbooks/finops/account_resolver.py

@@ -1,6 +1,6 @@
 #!/usr/bin/env python3
 """
-AWS Account Name Resolution Module for CloudOps Runbooks FinOps
+AWS Account Name Resolution Module for CloudOps & FinOps Runbooks
 
 This module provides account ID to account name mapping functionality using
 the AWS Organizations API for readable account display in FinOps dashboards.