utils_devops 0.1.140__tar.gz → 0.1.142__tar.gz

{utils_devops-0.1.140 → utils_devops-0.1.142}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: utils_devops
-Version: 0.1.140
+Version: 0.1.142
 Summary: Lightweight DevOps utilities for automation scripts: config editing (YAML/JSON/INI/.env), templating, diffing, and CLI tools
 License: MIT
 Keywords: devops,automation,nginx,cli,jinja2,yaml,config,diff,templating,logging,docker,compose,file-ops

{utils_devops-0.1.140 → utils_devops-0.1.142}/pyproject.toml

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "utils_devops"
-version = "0.1.140"  # Bumped for new string features + diffing
+version = "0.1.142"  # Bumped for new string features + diffing
 description = "Lightweight DevOps utilities for automation scripts: config editing (YAML/JSON/INI/.env), templating, diffing, and CLI tools"
 authors = ["Hamed Sheikhan <sh.sheikhan.m@gmail.com>"]
 license = "MIT"

{utils_devops-0.1.140 → utils_devops-0.1.142}/src/utils_devops/extras/docker_ops.py

@@ -545,7 +545,7 @@ def validate_compose_file(compose_file: str, env_file: Optional[str] = None) ->
 # Compose operations
 def compose_up(compose_file: str, services: Optional[List[str]] = None, 
               build: bool = False, pull: bool = False, detach: bool = True,
-              project_name: Optional[str] = None , env_file: Optional[str] = None) -> bool:
+              project_name: Optional[str] = None , env_file: Optional[str] = None , no_build: Optional[bool] = False ,no_pull: Optional[bool] = False) -> bool:
     """Start compose services with detailed progress logging"""
     cmd = ["up"]
     if detach:
@@ -556,6 +556,12 @@ def compose_up(compose_file: str, services: Optional[List[str]] = None,
     if pull:
         cmd.append("--pull")
         logger.info("⬇️ Pulling latest images before starting...")
+    if no_build:
+        cmd.append("--no-build")
+        logger.info("🔨 Forbidden Building images before starting...")
+    if no_pull:
+        cmd.append("--no-pull")
+        logger.info("⬇️ Forbidden Pulling latest images before starting...")
     if services:
         cmd.extend(services)
         logger.info(f"🚀 Starting services: {services}")
@@ -767,9 +773,6 @@ def check_service_health(compose_file: str, service: str,
         logger.error(f"Error checking health for {service}: {e}")
         return {"healthy": False, "error": str(e)}
 
-import time
-from collections import defaultdict
-
 def wait_for_healthy(
     compose_file: str,
     services: List[str],
@@ -797,8 +800,17 @@ def wait_for_healthy(
             if overall == 'healthy':
                 status_groups[overall].append(service)
             else:
-                detail = f"{service}: {status['status']} (health: {status['health']}) | Error: {status['error']}"
-                status_groups[overall].append(detail)
+                # Customize message based on overall
+                msg = f"{service}: {status['status']} (health: {status['health']})"
+                if overall == 'starting':
+                    msg += " | Starting..."
+                elif overall == 'restarting':
+                    msg += " | Restarting..."
+                elif overall == 'unhealthy':
+                    msg += f" | Error: {status['error']}"
+                elif overall == 'not found':
+                    msg += f" | Not found: {status['error']}"
+                status_groups[overall].append(msg)
         
         # Define order and emojis
         statuses = ['healthy', 'starting', 'restarting', 'unhealthy', 'not found']
@@ -816,8 +828,10 @@ def wait_for_healthy(
                     for detail in sorted(group):
                         logger.info(f"      - {detail}")
         
-        # Check if all healthy
-        if len(status_groups['healthy']) == len(services):
+        # Check if all healthy using the 'healthy' bool
+        all_healthy = all(status.get('healthy', False) for status in detailed_health.values())
+        
+        if all_healthy:
             logger.info(f"🎉 ALL SERVICES HEALTHY! Completed in {elapsed:.1f}s after {attempt} attempts")
             return True
         
@@ -847,17 +861,35 @@ def _compute_overall_status(service_status: Dict[str, Any]) -> str:
     if not service_status:
         return "not found"
     
-    status = service_status.get('status', 'not found').lower()
+    # Use 'state' for base status (e.g., "running", "restarting")
+    state = service_status.get('state', '').lower()
     health = service_status.get('health', 'none').lower()
+    status = service_status.get('status', '').lower()  # Fallback for parsing
+    
+    # Fallback parsing if state is empty
+    if not state:
+        if ' (health: ' in status:
+            health = status.split('(health: ')[1].split(')')[0].lower()
+        elif '(healthy)' in status:
+            health = 'healthy'
+        base_status = status.split(' (')[0]
+        if base_status.startswith('up'):
+            state = 'running'
+        elif 'restarting' in base_status:
+            state = 'restarting'
+        elif 'created' in base_status or 'paused' in base_status:
+            state = base_status
+        else:
+            state = 'unknown'
     
-    if status == 'restarting':
+    if state == 'restarting':
         return "restarting"
     
-    if status in ['created', 'paused']:  # Treat as starting or unhealthy based on context
+    if state in ['created', 'paused']:
         return "starting" if health == 'starting' else "unhealthy"
     
-    if status != 'running':
-        return "unhealthy"  # exited, dead, etc.
+    if state != 'running':
+        return "unhealthy"
     
     if health == 'starting':
         return "starting"
@@ -878,11 +910,11 @@ def check_health_from_compose_ps(compose_file: str) -> Dict[str, Any]:
         result = run_compose_command(compose_file, ["ps", "--format", "json"])
         if result.rc != 0:
             return {"healthy": False, "error": f"docker compose ps failed: {result.stderr}"}
-        
+       
         # Parse JSON output - handle multiple JSON objects (one per line)
         import json
         containers_data = []
-        
+       
         # Split by lines and parse each JSON object separately
         for line in result.stdout.strip().split('\n'):
             if line.strip():  # Skip empty lines
@@ -892,18 +924,19 @@ def check_health_from_compose_ps(compose_file: str) -> Dict[str, Any]:
                 except json.JSONDecodeError as e:
                     logger.error(f"Failed to parse JSON line: {line}, error: {e}")
                     continue
-        
+       
         if not containers_data:
             return {"healthy": False, "error": "No container data parsed from output"}
-        
+       
         health_status = {}
         all_healthy = True
-        
+       
         for container in containers_data:
             service = container.get('Service', '')
             health = container.get('Health', '')
             status = container.get('Status', '')
-            
+            state = container.get('State', '')  # Added: the base state like "running"
+           
             # Determine health status
             is_healthy = False
             if health:
@@ -911,22 +944,23 @@ def check_health_from_compose_ps(compose_file: str) -> Dict[str, Any]:
             else:
                 # Fallback to status parsing
                 is_healthy = '(healthy)' in status.lower()
-            
+           
             health_status[service] = {
                 'healthy': is_healthy,
                 'health': health,
-                'status': status
+                'status': status,
+                'state': state  # Added
             }
-            
+           
             if not is_healthy:
                 all_healthy = False
-        
+       
         return {
             "healthy": all_healthy,
             "services": health_status,
             "details": f"{sum(1 for s in health_status.values() if s['healthy'])}/{len(health_status)} services healthy"
         }
-        
+       
     except Exception as e:
         return {"healthy": False, "error": f"Health check failed: {e}"}
 
@@ -1350,24 +1384,34 @@ def _get_detailed_health_status(
 ) -> Dict[str, Dict[str, Any]]:
     """Get detailed health status for each service with overall_status."""
     detailed_status = {}
-   
+    
     try:
         # Use the reliable JSON parsing method
         health_result = check_health_from_compose_ps(compose_file)
         all_services_status = health_result.get('services', {})
-       
+        
         for service in services:
             service_status = all_services_status.get(service, {})
             overall_status = _compute_overall_status(service_status)
+            error_msg = "No error details"
+            if overall_status == "starting":
+                error_msg = "Service is starting"
+            elif overall_status == "restarting":
+                error_msg = "Service is restarting"
+            elif overall_status == "unhealthy":
+                error_msg = f"Service is unhealthy: {service_status.get('status', 'unknown')}"
+            elif overall_status == "not found":
+                error_msg = "Service not found"
             detailed_status[service] = {
                 'healthy': overall_status == 'healthy',
                 'health': service_status.get('health', 'unknown'),
                 'status': service_status.get('status', 'not found'),
-                'error': service_status.get('error', 'No error details'),
+                'state': service_status.get('state', 'unknown'),  # Added
+                'error': error_msg,
                 'overall_status': overall_status
             }
-            # Removed: logger.info(f"   {service}: {overall_status}")  # Now handled grouped in _perform_health_checks
-           
+            # Removed individual logging; handled in groups
+        
     except Exception as e:
         logger.error(f"Failed to get detailed health status: {e}")
         # Fallback: mark all as unhealthy
@@ -1376,10 +1420,11 @@ def _get_detailed_health_status(
                 'healthy': False,
                 'health': 'unknown',
                 'status': 'check failed',
+                'state': 'unknown',
                 'error': str(e),
                 'overall_status': 'unhealthy'
             }
-   
+    
     return detailed_status
 
 
@@ -2332,6 +2377,8 @@ def test_compose(
                     compose_file,
                     services=services,
                     project_name=project_name,
+                    no_build=no_build,
+                    no_pull=no_pull,
                 )
                 # Assuming compose_up returns a dict with 'success'; adjust if needed
                 if up_result is not True:  # If it doesn't raise, check result