utils_devops 0.1.158__tar.gz → 0.1.159__tar.gz

{utils_devops-0.1.158 → utils_devops-0.1.159}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: utils_devops
-Version: 0.1.158
+Version: 0.1.159
 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.158 → utils_devops-0.1.159}/pyproject.toml

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "utils_devops"
-version = "0.1.158"  # Bumped for new string features + diffing
+version = "0.1.159"  # 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.158 → utils_devops-0.1.159}/src/utils_devops/extras/docker_ops.py

@@ -8,7 +8,6 @@ import json
 import os
 import re
 from logging import Logger
-import re
 import sys
 import tarfile
 import tempfile
@@ -618,7 +617,7 @@ def compose_restart(compose_file: str, remove_volumes: bool = False,
 
 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", "--format", "json"], project_name , env_file)
+    result = run_compose_command(compose_file, ["ps" ,"-a", "--format", "json"], project_name , env_file)
     
     containers = []
     try:
@@ -909,7 +908,7 @@ def check_health_from_compose_ps(compose_file: str) -> Dict[str, Any]:
     """
     try:
         # Run docker compose ps with JSON format
-        result = run_compose_command(compose_file, ["ps", "--format", "json"])
+        result = run_compose_command(compose_file, ["ps","-a", "--format", "json"])
         if result.rc != 0:
             return {"healthy": False, "error": f"docker compose ps failed: {result.stderr}"}
        
@@ -2220,8 +2219,7 @@ def playwright_test_compose(
     pull_missing: bool = True,
     no_build: bool = True,
     no_pull: bool = True,
-    keep_up: bool = False,
-    # Keep services up after each test_compose call so we can sequence them
+    keep_compose_up: bool = False,
     dry_run: bool = False,
     project_name: Optional[str] = None,
     logger: Optional[logger] = None,
@@ -2231,7 +2229,6 @@ def playwright_test_compose(
     application compose and a separate Playwright compose. This function reuses the
     existing `test_compose` function to perform validation, startup and health checks for
     the application compose.
-
     Behavior summary:
     1. Validate inputs and (optionally) update version as in test_compose.
     2. Set STATIC_CAPTCHA=true in the system process environment (without modifying the file).
@@ -2241,13 +2238,11 @@ def playwright_test_compose(
     5. Follow logs (simulating -f) for the Playwright service(s) while polling the compose state
        to detect completion, and determine pass/fail from exit status and log patterns.
     6. Return a detailed result dict similar in structure to test_compose.
-
     Notes:
     - Reuses `test_compose` for application startup and health checks.
     - Sets STATIC_CAPTCHA in the process environment only (os.environ).
     - Does not automatically bring services down; that is left to the caller.
     - Success is determined by all containers exiting with code 0 and/or presence of success patterns in logs.
-
     Returns:
         Dict with keys: test_id, success, steps, app_result, logs_captured, duration, error
     """
@@ -2263,6 +2258,8 @@ def playwright_test_compose(
         "duration": 0.0,
         "error": None,
     }
+    #project_name_playwright = f"playwright-{test_id[:8]}"
+    project_name_playwright = project_name
     try:
         logger.info(f"▶️ Playwright test workflow starting ({test_id})")
         logger.info(f" Compose files: app={compose_file} playwright={playwright_compose_file}")
@@ -2316,14 +2313,13 @@ def playwright_test_compose(
             logger.info(" Application stack is up and healthy")
         else:
             logger.info("Step 3: application start skipped (dry run)")
-        # Step 4: Start Playwright compose using compose_up
+        # Step 4: Start Playwright compose using compose_up with unique project name
         logger.info("Step 4: bringing up Playwright runner stack with compose_up")
         if not dry_run:
             up_success = compose_up(
                 playwright_compose_file,
                 services=playwright_services,
-                project_name=project_name,
-                # Assume detached by default or add param if needed; help shows no param for detached, perhaps always detached
+                project_name=project_name_playwright,
             )
             if not up_success:
                 raise DockerOpsError("Playwright compose_up failed")
@@ -2338,11 +2334,12 @@ def playwright_test_compose(
             deadline = time.time() + health_timeout
             finished = False
             timed_out = False
+            time.sleep(5)  # Give time for container to start producing logs
             while not finished and not timed_out:
                 # Fetch current log snapshot
                 for svc in pw_services:
                     try:
-                        lines = [l.text for l in compose_logs(playwright_compose_file, services=[svc], tail=log_tail)]
+                        lines = [l.message for l in compose_logs(playwright_compose_file, services=[svc], tail=log_tail, project_name=project_name_playwright,follow=True)]
                     except Exception as e:
                         lines = [f"Error fetching logs: {str(e)}"]
                     # Append new unique lines
@@ -2351,7 +2348,7 @@ def playwright_test_compose(
                             logs_acc[svc].append(ln)
                             logger.info(f"[{svc}] {ln}")  # Simulate real-time logging
                 # Check if all services have exited
-                ps = compose_ps(playwright_compose_file, project_name=project_name)
+                ps = compose_ps(playwright_compose_file, project_name=project_name_playwright)
                 running = any(
                     'running' in (c.status or '').lower() or 'up' in (c.status or '').lower()
                     for c in ps if (c.service or '') in pw_services
@@ -2376,7 +2373,7 @@ def playwright_test_compose(
         logger.info("Step 6: analyzing Playwright runner outcome")
         if not dry_run:
             # Get exit codes
-            ps = compose_ps(playwright_compose_file, project_name=project_name)
+            ps = compose_ps(playwright_compose_file, project_name=project_name_playwright)
             exit_codes = {}
             for c in ps:
                 if (c.service or '') in pw_services:
@@ -2402,9 +2399,10 @@ def playwright_test_compose(
         else:
             result['success'] = True  # Assume success in dry run
         result['duration'] = (dt_ops.current_datetime() - start_time).total_seconds()
-        if not keep_up :
+        if not keep_compose_up :
             compose_down(
                 compose_file=playwright_compose_file,
+                project_name=project_name_playwright
             )
             logger.info("Playwright compose down")
             compose_down(
@@ -2416,9 +2414,10 @@ def playwright_test_compose(
         result['duration'] = (dt_ops.current_datetime() - start_time).total_seconds()
         result['error'] = str(e)
         logger.error(f"Playwright test workflow failed ({test_id}): {e}")
-        if not keep_up :
+        if not keep_compose_up :
             compose_down(
                 compose_file=playwright_compose_file,
+                project_name=project_name_playwright
             )
             logger.info("Playwright compose down")
             compose_down(