utils_devops 0.1.160__py3-none-any.whl → 0.1.166__py3-none-any.whl

utils_devops/extras/docker_ops.py

@@ -82,6 +82,7 @@ class ContainerInfo:
     status: str
     service: Optional[str] = None
     ports: Dict[str, Any] = field(default_factory=dict)
+    exit_code: Optional[int] = None
 
 # Core Docker operations
 def get_docker_client():
@@ -615,36 +616,82 @@ def compose_restart(compose_file: str, remove_volumes: bool = False,
 
     return None
 
+import json
+import re
+from typing import List, Optional
+
+_EXITED_RE = re.compile(r'Exited\s*\((\d+)\)', re.I)
+
 def compose_ps(compose_file: str, project_name: Optional[str] = None, env_file: Optional[str] = None) -> List[ContainerInfo]:
-    """List compose services status using detected compose command"""
-    result = run_compose_command(compose_file, ["ps" ,"-a", "--format", "json"], project_name , env_file)
-    
-    containers = []
-    try:
-        data = json.loads(result.stdout)
-        for item in data if isinstance(data, list) else [data]:
+    """List compose services status using detected compose command. Returns ContainerInfo items
+    and attempts to populate `exit_code` when available (JSON ExitCode or parsed from Status)."""
+    result = run_compose_command(compose_file, ["ps", "-a", "--format", "json"], project_name, env_file)
+    logger.info(f"DEBUG: compose_ps stdout: {result.stdout}")  # Use logger instead of print if available
+    containers: List[ContainerInfo] = []
+    lines = result.stdout.splitlines()
+    items = []
+    for line in lines:
+        if line.strip():
+            try:
+                items.append(json.loads(line))
+            except json.JSONDecodeError:
+                pass  # ignore bad lines
+    if items:
+        for item in items:
+            state_str = item.get('State') or ''
+            full_status = item.get('Status') or state_str or ''
+            exit_code = item.get('ExitCode') or item.get('Exit')
+            if exit_code is not None:
+                try:
+                    exit_code = int(exit_code)
+                except ValueError:
+                    exit_code = None
+            if exit_code is None:
+                m = _EXITED_RE.search(full_status)
+                if m:
+                    try:
+                        exit_code = int(m.group(1))
+                    except ValueError:
+                        exit_code = None
             containers.append(ContainerInfo(
-                id=item.get('ID', ''),
-                name=item.get('Name', ''),
-                image=item.get('Image', ''),
-                status=item.get('State', ''),
-                service=item.get('Service', '')
+                id=item.get('ID', '') or item.get('Id', ''),
+                name=item.get('Name', '') or item.get('Names', ''),
+                image=item.get('Image', '') or item.get('ImageName', ''),
+                status=state_str,
+                service=item.get('Service', '') or item.get('Labels', {}).get('com.docker.compose.service', ''),
+                exit_code=exit_code
             ))
-    except json.JSONDecodeError:
-        # Fallback to text parsing
-        lines = result.stdout.strip().splitlines()[1:]  # Skip header
-        for line in lines:
-            parts = line.split()
-            if len(parts) >= 4:
-                containers.append(ContainerInfo(
-                    id=parts[0],
-                    name=parts[1],
-                    image=parts[2],
-                    status=' '.join(parts[3:])
-                ))
-    
+    else:
+        # Fallback to text parsing (if not JSON format)
+        if len(lines) > 0 and 'NAME' in lines[0].upper():  # Check for header
+            for line in lines[1:]:  # skip header
+                parts = re.split(r'\s{2,}', line.strip())
+                if len(parts) >= 6:
+                    name = parts[0]
+                    image = parts[1]
+                    command = parts[2]
+                    service = parts[3]
+                    created = parts[4]
+                    status = parts[5]
+                    ports = ' '.join(parts[6:]) if len(parts) > 6 else ''
+                    exit_code = None
+                    m = _EXITED_RE.search(status)
+                    if m:
+                        try:
+                            exit_code = int(m.group(1))
+                        except ValueError:
+                            exit_code = None
+                    containers.append(ContainerInfo(
+                        id='',  # ID not in text
+                        name=name,
+                        image=image,
+                        status=status,
+                        service=service,
+                        exit_code=exit_code
+                    ))
     return containers
 
+
 # Add a function to check compose version
 def get_compose_version() -> Dict[str, str]:
     """Get detected compose command and version"""
@@ -2222,6 +2269,7 @@ def playwright_test_compose(
     keep_compose_up: bool = False,
     dry_run: bool = False,
     project_name: Optional[str] = None,
+    ui: Optional[bool] = False,
     logger: Optional[logger] = None,
 ) -> Dict[str, Any]:
     """
@@ -2304,14 +2352,14 @@ def playwright_test_compose(
                 new_version = _update_env_version(env_file=env_file, source=version_source, logger=logger)
                 if new_version:
                     logger.info(f"{STICKERS['success']} Version updated to {new_version}")
-                envs.set_system_env(key='STATIC_CAPTCHA', value='true')
             else:
                 logger.info(f"{STICKERS['info']} Version update skipped (dry run)")
             logger.info("")
         
         # STEP 2: Environment
         if not dry_run:
-            envs.set_system_env(key='STATIC_CAPTCHA', value='true')
+            envs.dotenv_set_key(env_file,"STATIC_CAPTCHA","true")
+
         
         # STEP 3: Application stack
         logger.info(f"{STICKERS['info']} STEP 3: Starting application stack")
@@ -2348,6 +2396,7 @@ def playwright_test_compose(
         logger.info(f"{STICKERS['info']} STEP 4: Starting Playwright runner")
         if not dry_run:
             logger.info(f"{STICKERS['info']} Project: {project_name_playwright}")
+            resolve_conflicts(playwright_compose_file,remove_conflicting_containers=True)
             up_success = compose_up(
                 playwright_compose_file,
                 services=playwright_services,
@@ -2367,7 +2416,8 @@ def playwright_test_compose(
         # STEP 5: Log capture
         pw_services = []
         logs_acc = {}
-        
+        if ui :
+            capture_logs = False
         if not dry_run and capture_logs:
             logger.info(f"{STICKERS['logs']} STEP 5: Capturing logs")
             
@@ -2419,54 +2469,66 @@ def playwright_test_compose(
                 
                 # Check if all services have finished
                 ps = compose_ps(playwright_compose_file, project_name=project_name_playwright)
-                running_count = 0
-                
-                for container in ps:
-                    service_name = container.service or ''
-                    if service_name in pw_services:
-                        status = (container.status or '').lower()
+
+                running = []
+                exited = []
+
+                for c in ps:
+                    if c.service in pw_services:
+                        status = (c.status or '').lower()
                         if 'running' in status or 'up' in status:
-                            running_count += 1
-                
-                if running_count == 0:
-                    finished = True
-                    logger.info(f"{STICKERS['complete']} All services completed")
-                    logger.info("")
-                else:
+                            running.append(c)
+                        elif 'exited' in status:
+                            exited.append(c)
+
+                if running:
                     time.sleep(health_interval)
+                else:
+                    finished = True
+
             
             result['logs_captured'] = logs_acc
         
         # STEP 6: Analysis
         logger.info(f"{STICKERS['analysis']} STEP 6: Analyzing results")
-        
+
         if not dry_run:
-            # Get exit codes
-            ps = compose_ps(playwright_compose_file, project_name=project_name_playwright)
-            exit_codes = {}
-            
-            for container in ps:
-                service_name = container.service or ''
-                if service_name in pw_services:
-                    exit_code = getattr(container, 'exit_code', None) or 1
-                    exit_codes[service_name] = exit_code
-            
-            # Check overall success
-            all_success = all(code == 0 for code in exit_codes.values())
-            
-            if all_success:
-                result['success'] = True
-                logger.info(f"{STICKERS['success']} " + "="*50)
-                logger.info(f"{STICKERS['success']} TESTS PASSED")
-                logger.info(f"{STICKERS['success']} Test ID: {test_id}")
-                logger.info(f"{STICKERS['success']} " + "="*50)
+            if not ui :
+                # Get exit codes
+                ps = compose_ps(playwright_compose_file, project_name=project_name_playwright)
+                exit_codes = {}
+                
+                for container in ps:
+                    service_name = container.service or ''
+                    if service_name in pw_services:
+                        exit_code = container.exit_code if container.exit_code is not None else 1  # Default to 1 if unknown
+                        exit_codes[service_name] = exit_code
+                
+                if not exit_codes:
+                    logger.error("No Playwright containers found during analysis — assuming failure")
+                    exit_codes = {pw_services[0]: 1} if pw_services else {'unknown': 1}
+                    result['error'] = 'No containers found for analysis - likely exited with error'
+                
+                # Check overall success
+                all_success = all(code == 0 for code in exit_codes.values())
+                
+                if all_success:
+                    result['success'] = True
+                    logger.info(f"{STICKERS['success']} " + "="*50)
+                    logger.info(f"{STICKERS['success']} TESTS PASSED")
+                    logger.info(f"{STICKERS['success']} Test ID: {test_id}")
+                    logger.info(f"{STICKERS['success']} " + "="*50)
+                else:
+                    result['success'] = False
+                    result['error'] = 'Playwright tests failed' if 'error' not in result else result['error']
+                    logger.error(f"{STICKERS['error']} " + "="*50)
+                    logger.error(f"{STICKERS['error']} TESTS FAILED")
+                    logger.error(f"{STICKERS['error']} Exit codes: {exit_codes}")
+                    logger.error(f"{STICKERS['error']} " + "="*50)
             else:
-                result['success'] = False
-                result['error'] = 'Playwright tests failed'
-                logger.error(f"{STICKERS['error']} " + "="*50)
-                logger.error(f"{STICKERS['error']} TESTS FAILED")
-                logger.error(f"{STICKERS['error']} Exit codes: {exit_codes}")
-                logger.error(f"{STICKERS['error']} " + "="*50)
+                result['success'] = True
+                logger.info(f"{STICKERS['info']} Ui conteiner is Up")
+                
         else:
             result['success'] = True
             logger.info(f"{STICKERS['info']} Analysis skipped (dry run)")
@@ -2477,6 +2539,8 @@ def playwright_test_compose(
         logger.info("")
         
         # Cleanup
+        if ui :
+            keep_compose_up = True
         if not keep_compose_up and not dry_run:
             logger.info(f"{STICKERS['cleanup']} Cleaning up")
             logger.info(f"{STICKERS['info']} Stopping Playwright stack...")
@@ -4628,7 +4692,7 @@ def resolve_conflicts(
     remove_conflicting_containers: bool = False,
     remove_conflicting_networks: bool = False,
     remove_conflicting_volumes: bool = False,
-    force: bool = False,
+    force: bool = True,
     project_name: Optional[str] = None,
     env_file: Optional[str] = None
 ) -> Dict[str, Any]:

{utils_devops-0.1.160.dist-info → utils_devops-0.1.166.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: utils_devops
-Version: 0.1.160
+Version: 0.1.166
 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.160.dist-info → utils_devops-0.1.166.dist-info}/RECORD

@@ -9,7 +9,7 @@ utils_devops/core/strings.py,sha256=8s0GSjcyTKwLjJjsJ_XfOJxPtyb549icDlU9SUxSvHI,
 utils_devops/core/systems.py,sha256=wNbEFUAvbMPdqWN-iXvTzvj5iE9xaWfjZYYvD0EZAH0,47577
 utils_devops/extras/__init__.py,sha256=ZXHeVLHO3_qiW9AY-UQ_YA9cQzmkLGv54a2UbyvtlM0,3571
 utils_devops/extras/aws_ops.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-utils_devops/extras/docker_ops.py,sha256=ow9xa_NA7fIf44vSiTnHRhVBgMXK2m98OoM3syRyEqs,195176
+utils_devops/extras/docker_ops.py,sha256=VGH3SWufYEEr4459Xl_tgJ-rXNu62lFj-hSbtQua39I,197991
 utils_devops/extras/git_ops.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 utils_devops/extras/interaction_ops.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 utils_devops/extras/metrics_ops.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
@@ -19,7 +19,7 @@ utils_devops/extras/notification_ops.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMp
 utils_devops/extras/performance_ops.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 utils_devops/extras/ssh_ops.py,sha256=hTOYzyWmnZWzOLeZbCoZRLxSJiBmr0QgS_87qks-CYk,76305
 utils_devops/extras/vault_ops.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-utils_devops-0.1.160.dist-info/METADATA,sha256=1rf8mMVgKcP4yP4fd__okdptSNhKa5Lir6Z8OQIzQbk,1903
-utils_devops-0.1.160.dist-info/WHEEL,sha256=zp0Cn7JsFoX2ATtOhtaFYIiE2rmFAD4OcMhtUki8W3U,88
-utils_devops-0.1.160.dist-info/entry_points.txt,sha256=ei3B6ZL5yu6dOq-U1r8wsBdkXeg63RAyV7m8_ADaE6k,53
-utils_devops-0.1.160.dist-info/RECORD,,
+utils_devops-0.1.166.dist-info/METADATA,sha256=zkvREOE-NO-qC12A1VoMvJNisJ-rq7MGWZzVsrrKU7k,1903
+utils_devops-0.1.166.dist-info/WHEEL,sha256=zp0Cn7JsFoX2ATtOhtaFYIiE2rmFAD4OcMhtUki8W3U,88
+utils_devops-0.1.166.dist-info/entry_points.txt,sha256=ei3B6ZL5yu6dOq-U1r8wsBdkXeg63RAyV7m8_ADaE6k,53
+utils_devops-0.1.166.dist-info/RECORD,,