jac-loadtest 0.2.1__tar.gz → 0.2.2__tar.gz

{jac_loadtest-0.2.1 → jac_loadtest-0.2.2}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: jac-loadtest
-Version: 0.2.1
+Version: 0.2.2
 Summary: HAR-based load testing CLI for jac-scale applications
 Requires-Python: >=3.12
 Description-Content-Type: text/markdown

{jac_loadtest-0.2.1 → jac_loadtest-0.2.2}/jac_loadtest/bridge/topology.py

@@ -104,6 +104,8 @@ class TopologyRouter:
     def _build_microservice(cls, config: LoadTestConfig) -> TopologyRouter:
         toml_routes = _load_toml_routes()   # service_name → prefix; {} if unavailable
 
+        routes: list[ServiceRoute]
+
         if config.services_map:
             try:
                 services_json: dict[str, str] = json.loads(config.services_map)
@@ -129,7 +131,7 @@ class TopologyRouter:
                 "[plugins.scale.microservices.routes] in jac.toml. Neither was found."
             )
 
-        routes: list[ServiceRoute] = []
+        routes = []
         missing: list[str] = []
         for name, prefix in toml_routes.items():
             env_var = f"JAC_SV_{name.upper()}_URL"

{jac_loadtest-0.2.1 → jac_loadtest-0.2.2}/jac_loadtest/config.py

@@ -5,12 +5,13 @@ Phase 2 will add jac.toml reading via jac_scale.config_loader.
 """
 from __future__ import annotations
 from dataclasses import dataclass, field
+from typing import Any
 
 
 BUILT_IN_DEFAULTS: dict = {
     "vus": 1,
     "duration": "30s",
-    "iterations": None,
+    "iterations": 1,
     "ramp_up": "0s",
     "timeout": "30s",
     "mode": "monolith",
@@ -36,7 +37,7 @@ class LoadTestConfig:
     # Load shape
     vus: int = 1
     duration: str = "30s"
-    iterations: int | None = None
+    iterations: int  = 1
     ramp_up: str = "0s"
     timeout: str = "30s"
 
@@ -107,7 +108,7 @@ def from_args(args: object) -> LoadTestConfig:
 
     # For toml-sourced fields, use CLI value if provided (not None), else toml value,
     # else built-in default.
-    def resolve(name: str) -> object:
+    def resolve(name: str) -> Any:
         cli_val = getattr(args, name, None)
         if cli_val is not None:
             return cli_val

{jac_loadtest-0.2.1 → jac_loadtest-0.2.2}/jac_loadtest/core/engine.py

@@ -18,14 +18,16 @@ if TYPE_CHECKING:
     from jac_loadtest.core.har_parser import HarEntry
     from jac_loadtest.core.metrics import MetricsCollector
     from jac_loadtest.config import LoadTestConfig
+    from jac_loadtest.bridge.topology import TopologyRouter
+    from jac_loadtest.bridge.auth import AuthProvider
 
 
 async def run_all_vus(
     entries: list[HarEntry],
     config: LoadTestConfig,
     metrics: MetricsCollector,
-    topology: object | None = None,
-    auth_provider: object | None = None,
+    topology: TopologyRouter | None = None,
+    auth_provider: AuthProvider | None = None,
 ) -> None:
     """Spawn N virtual user coroutines and run until duration/iterations/stop signal."""
     stop_requested = asyncio.Event()
@@ -44,6 +46,9 @@ async def run_all_vus(
 
     ramp_up_seconds = parse_duration(config.ramp_up)
 
+    # Limit concurrent logins to avoid exhausting OS sockets when VU count is large.
+    auth_semaphore = asyncio.Semaphore(50)
+
     tasks = [
         asyncio.create_task(
             _run_vu(
@@ -56,6 +61,7 @@ async def run_all_vus(
                 loop=loop,
                 auth_provider=auth_provider,
                 topology=topology,
+                auth_semaphore=auth_semaphore,
             )
         )
         for i in range(config.vus)
@@ -75,8 +81,9 @@ async def _run_vu(
     metrics: MetricsCollector,
     stop_requested: asyncio.Event,
     loop: asyncio.AbstractEventLoop,
-    auth_provider: object | None = None,
-    topology: object | None = None,
+    auth_provider: AuthProvider | None = None,
+    topology: TopologyRouter | None = None,
+    auth_semaphore: asyncio.Semaphore | None = None,
 ) -> None:
     """Single virtual user: wait ramp delay, authenticate, then replay HAR entries."""
     if delay > 0:
@@ -93,7 +100,10 @@ async def _run_vu(
         # Authenticate once before entering the request loop.
         token: str | None = None
         if auth_provider is not None:
-            token = await auth_provider.authenticate(vu_id, session, config.url)
+            if not config.url:
+                raise ValueError("auth_provider requires --url to be set")
+            async with (auth_semaphore or asyncio.Semaphore()):
+                token = await auth_provider.authenticate(vu_id, session, config.url)
 
         while not stop_requested.is_set():
             if loop.time() - t_start >= duration_seconds:
@@ -123,8 +133,8 @@ async def _run_vu(
                     path = _up(entry.url).path
                     if path not in _warned_unrouted:
                         print(
-                            f"Warning: no route for '{path}' — skipping. "
-                            "Add a matching prefix to --services-map or set --url as fallback.",
+                            f"\n\033[33mWarning: no route for '{path}' — skipping. "
+                            "Add a matching prefix to --services-map or set --url as fallback.\033[0m",
                             file=sys.stderr,
                         )
                         _warned_unrouted.add(path)
@@ -145,7 +155,7 @@ async def _send_request(
     config: LoadTestConfig,
     loop: asyncio.AbstractEventLoop,
     token: str | None = None,
-    topology: object | None = None,
+    topology: TopologyRouter | None = None,
 ) -> RequestResult | None:
     """Send one HTTP request and return a RequestResult, or None if no route exists."""
     headers = dict(entry.headers)
@@ -185,6 +195,8 @@ async def _send_request(
                 timestamp=t0,
                 vu_id=vu_id,
                 error_type=None,
+                occurrence=entry.occurrence,
+                total_occurrences=entry.total_occurrences,
             )
 
     except asyncio.TimeoutError:
@@ -197,6 +209,8 @@ async def _send_request(
             timestamp=t0,
             vu_id=vu_id,
             error_type="TIMEOUT",
+            occurrence=entry.occurrence,
+            total_occurrences=entry.total_occurrences,
         )
 
     except aiohttp.ClientConnectorError:
@@ -209,4 +223,6 @@ async def _send_request(
             timestamp=t0,
             vu_id=vu_id,
             error_type="CONNECTION_REFUSED",
+            occurrence=entry.occurrence,
+            total_occurrences=entry.total_occurrences,
         )

{jac_loadtest-0.2.1 → jac_loadtest-0.2.2}/jac_loadtest/core/har_parser.py

@@ -49,6 +49,8 @@ class HarEntry:
     think_time_ms: float
     is_login: bool
     original_url: str
+    occurrence: int = 0
+    total_occurrences: int = 0
 
 
 def _origin(url: str) -> str:
@@ -81,6 +83,22 @@ def _is_unsupported_type(entry: dict) -> bool:
     return url.startswith(("ws://", "wss://"))
 
 
+def _has_missing_body(method: str, raw_headers: list[dict], post_data: dict | None) -> bool:
+    """Return True if a request should have a body but none was captured in the HAR."""
+    if method.upper() not in ("POST", "PUT", "PATCH"):
+        return False
+    content_length = next(
+        (h["value"] for h in raw_headers if h.get("name", "").lower() == "content-length"),
+        "0",
+    )
+    try:
+        has_content = int(content_length) > 0
+    except ValueError:
+        has_content = False
+    body_text = (post_data or {}).get("text")
+    return has_content and not body_text
+
+
 def _has_cache_buster(url: str) -> bool:
     """Return True if the URL contains a stale cache-busting timestamp parameter."""
     qs = parse_qs(urlparse(url).query)
@@ -125,6 +143,7 @@ def parse_har(
     result: list[HarEntry] = []
     warned_unsupported = False
     warned_cache_buster = False
+    warned_missing_body = False
 
     for entry in raw_entries:
         req = entry["request"]
@@ -135,9 +154,9 @@ def parse_har(
         if _is_unsupported_type(entry):
             if not warned_unsupported:
                 print(
-                    "Warning: HAR contains WebSocket, SSE, or non-API entries "
+                    "\n\033[33mWarning: HAR contains WebSocket, SSE, or non-API entries "
                     "(websocket, eventsource, document, etc.). "
-                    "These are skipped automatically.",
+                    "These are skipped automatically.\033[0m",
                     file=sys.stderr,
                 )
                 warned_unsupported = True
@@ -148,9 +167,9 @@ def parse_har(
         if _has_cache_buster(original_url):
             if not warned_cache_buster:
                 print(
-                    "Warning: HAR contains URLs with cache-busting timestamp "
+                    "\n\033[33mWarning: HAR contains URLs with cache-busting timestamp "
                     "parameters (e.g. ?_=<timestamp>). These entries are skipped — "
-                    "the stale timestamp causes the server to reject the request.",
+                    "the stale timestamp causes the server to reject the request.\033[0m",
                     file=sys.stderr,
                 )
                 warned_cache_buster = True
@@ -164,7 +183,21 @@ def parse_har(
         else:
             rewritten_url = original_url  # keep recorded URL; topology handles routing
 
-        headers = _sanitize_headers(req.get("headers", []))
+        raw_headers = req.get("headers", [])
+
+        if _has_missing_body(req["method"], raw_headers, req.get("postData")):
+            if not warned_missing_body:
+                print(
+                    "\n\033[33mWarning: HAR contains POST/PUT/PATCH entries where the request body "
+                    "was not captured (postData missing despite non-zero Content-Length). "
+                    "These entries are skipped — replaying them without a body would cause "
+                    "422 errors. Re-record the HAR to capture the full request body.\033[0m",
+                    file=sys.stderr,
+                )
+                warned_missing_body = True
+            continue
+
+        headers = _sanitize_headers(raw_headers)
 
         post_data = req.get("postData", {}) or {}
         body = post_data.get("text") or None
@@ -188,6 +221,19 @@ def parse_har(
             )
         )
 
+    # Count how many times each path appears so occurrence numbers can be assigned.
+    totals: dict[str, int] = {}
+    for entry in result:
+        path = urlparse(entry.url).path
+        totals[path] = totals.get(path, 0) + 1
+
+    seen: dict[str, int] = {}
+    for entry in result:
+        path = urlparse(entry.url).path
+        seen[path] = seen.get(path, 0) + 1
+        entry.occurrence = seen[path]
+        entry.total_occurrences = totals[path]
+
     return result
 
 
@@ -198,10 +244,10 @@ def _check_version(version: str) -> None:
     """Warn if the HAR version is outside the tested range."""
     if version not in _SUPPORTED_HAR_VERSIONS:
         print(
-            f"Warning: HAR version '{version}' is not tested with this tool "
+            f"\n\033[33mWarning: HAR version '{version}' is not tested with this tool "
             f"(tested: {', '.join(sorted(_SUPPORTED_HAR_VERSIONS))}).\n"
             "Parsing will continue but results may be incomplete or incorrect.\n"
-            "If the output looks wrong, check for a jac-loadtest update.",
+            "If the output looks wrong, check for a jac-loadtest update.\033[0m",
             file=sys.stderr,
         )
 
@@ -214,10 +260,10 @@ def _security_scan(entries: list[dict]) -> None:
             value = hdr.get("value", "")
             if name in ("authorization", "cookie") and value:
                 print(
-                    "Warning: HAR file contains Authorization/Cookie headers from the "
+                    "\n\033[33mWarning: HAR file contains Authorization/Cookie headers from the "
                     "recording session.\nThese headers are stripped before replay, but "
                     "the file itself contains sensitive data.\n"
-                    "Do not commit this HAR file to version control.",
+                    "Do not commit this HAR file to version control.\033[0m",
                     file=sys.stderr,
                 )
                 return

{jac_loadtest-0.2.1 → jac_loadtest-0.2.2}/jac_loadtest/core/metrics.py

@@ -23,6 +23,8 @@ class RequestResult:
     timestamp: float
     vu_id: int
     error_type: str | None  # None | "TIMEOUT" | "CONNECTION_REFUSED" | "DNS_ERROR" | "SSL_ERROR"
+    occurrence: int = 1
+    total_occurrences: int = 1
 
 
 @dataclass
@@ -113,11 +115,15 @@ class MetricsCollector:
             error_breakdown: dict[str, int] = {}
             for r in results:
                 if r.error_type is not None:
-                    key = r.error_type
+                    label = r.error_type
                 elif not (200 <= r.status < 300):
-                    key = str(r.status)
+                    label = str(r.status)
                 else:
                     continue
+                if r.total_occurrences > 1:
+                    key = f"{label} (call #{r.occurrence} of {r.total_occurrences})"
+                else:
+                    key = label
                 error_breakdown[key] = error_breakdown.get(key, 0) + 1
 
             service = results[0].service if results else "monolith"

{jac_loadtest-0.2.1 → jac_loadtest-0.2.2}/jac_loadtest.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: jac-loadtest
-Version: 0.2.1
+Version: 0.2.2
 Summary: HAR-based load testing CLI for jac-scale applications
 Requires-Python: >=3.12
 Description-Content-Type: text/markdown

{jac_loadtest-0.2.1 → jac_loadtest-0.2.2}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "jac-loadtest"
-version = "0.2.1"
+version = "0.2.2"
 description = "HAR-based load testing CLI for jac-scale applications"
 readme = "README.md"
 requires-python = ">=3.12"