fixtureqa 0.4.20__tar.gz → 0.4.21__tar.gz

{fixtureqa-0.4.20/fixtureqa.egg-info → fixtureqa-0.4.21}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: fixtureqa
-Version: 0.4.20
+Version: 0.4.21
 Summary: FIXture — FIX Protocol Testing Tool
 Requires-Python: >=3.10
 License-File: LICENSE

{fixtureqa-0.4.20 → fixtureqa-0.4.21}/fixture/api/routers/perf.py

@@ -212,13 +212,18 @@ def run_export(run_id: str, reg: REG, pw: PW, _admin: Admin,
 
 @router.get("/runs/{run_id}/chart")
 async def run_chart(run_id: str, reg: REG, _admin: Admin,
-                    metric: str = Query("one_way"), agg: str = Query("both")):
+                    metric: str = Query("one_way"), agg: str = Query("both"),
+                    scale: str = Query("log")):
     """Per-message latency chart (PNG) from the run's recorded csv.gz. Rendered
-    off-loop on first request and cached per (metric, agg) — the CSV is immutable
-    once the run finishes. Needs record_latency; 404 otherwise, 409 while live."""
-    if metric not in ("one_way", "round_trip", "both") or agg not in ("scatter", "percentile", "both"):
+    off-loop on first request and cached per (metric, agg, scale) — the CSV is
+    immutable once the run finishes. Needs record_latency; 404 otherwise, 409
+    while live."""
+    if (metric not in ("one_way", "round_trip", "both")
+            or agg not in ("scatter", "percentile", "both")
+            or scale not in ("log", "linear")):
         raise HTTPException(status_code=422,
-                            detail="metric must be one_way|round_trip|both; agg must be scatter|percentile|both")
+                            detail="metric must be one_way|round_trip|both; "
+                                   "agg must be scatter|percentile|both; scale must be log|linear")
     if not reg.exists(run_id):
         raise HTTPException(status_code=404, detail="Run not found")
     if _run_is_live(reg, run_id):
@@ -234,13 +239,13 @@ async def run_chart(run_id: str, reg: REG, _admin: Admin,
     one_way_label = None
     if st is not None and st.mode not in ("loopback", "manager"):
         one_way_label = "one-way (tag-60 wire send → recv; needs synced clocks)"
-    out_path = f"{csv_path[:-len('.csv.gz')]}_{metric}_{agg}.png"
+    out_path = f"{csv_path[:-len('.csv.gz')]}_{metric}_{agg}_{scale}.png"
     if not os.path.exists(out_path):
         try:
             await asyncio.to_thread(
                 render_latency_chart, csv_path, out_path,
-                metric=metric, agg=agg, title=f"Per-message latency — {run_id}",
-                one_way_label=one_way_label)
+                metric=metric, agg=agg, logy=(scale == "log"),
+                title=f"Per-message latency — {run_id}", one_way_label=one_way_label)
         except ValueError as e:
             # No chartable points (e.g. recording produced only un-latencied rows).
             raise HTTPException(status_code=404, detail=str(e))

{fixtureqa-0.4.20 → fixtureqa-0.4.21}/fixture/core/perf_charts.py

@@ -53,10 +53,25 @@ def _pctl(sorted_vals: list[float], q: float) -> float:
     return sorted_vals[i]
 
 
+def _humanize_us(v, _pos=None) -> str:
+    """Format a microsecond value as a self-describing tick label, picking the
+    unit per tick so a log axis spanning µs→s reads '500µs / 1ms / 10ms / 1s'
+    instead of 10^1 / 10^2. Handles negatives (tag-60 clock skew)."""
+    if v == 0:
+        return "0"
+    sign, a = ("-" if v < 0 else ""), abs(v)
+    if a < 1_000:
+        return f"{sign}{a:g}µs"
+    if a < 1_000_000:
+        return f"{sign}{a / 1_000:g}ms"
+    return f"{sign}{a / 1_000_000:g}s"
+
+
 def _read_points(csv_gz_path: str, metric: str):
-    """Group (x_seconds_since_start, y_ms) points by kind from the gz CSV for one
-    metric ('one_way' or 'round_trip'): y = that latency column, x = its send
-    column rebased to seconds since the first send."""
+    """Group (x_seconds_since_start, y_microseconds) points by kind from the gz
+    CSV for one metric ('one_way' or 'round_trip'): y = that latency column (raw
+    µs — the axis humanizes per tick), x = its send column rebased to seconds
+    since the first send."""
     y_col, x_col, _ = _METRIC[metric]
     by_kind: dict[str, list[tuple[float, float]]] = defaultdict(list)
     t0: Optional[float] = None
@@ -68,11 +83,11 @@ def _read_points(csv_gz_path: str, metric: str):
                 continue
             try:
                 x = float(xraw)
-                y_ms = float(yraw) / 1000.0
+                y_us = float(yraw)
             except ValueError:
                 continue
             t0 = x if t0 is None else min(t0, x)
-            by_kind[r.get("kind") or "unknown"].append((x, y_ms))
+            by_kind[r.get("kind") or "unknown"].append((x, y_us))
     if t0 is not None:
         for pts in by_kind.values():
             pts[:] = [(x - t0, y) for (x, y) in pts]
@@ -98,15 +113,25 @@ def _draw(ax, by_kind, agg: str, bucket_s: float, logy: bool, ylabel: str, title
                        color=color, label=None if agg == "both" else kind,
                        edgecolors="none")
         if agg in ("percentile", "both"):
-            bx, p50, p99 = _bucketed(pts, bucket_s)
+            bx, p50, p99, pmax = _bucketed(pts, bucket_s)
             if bx:
                 ax.plot(bx, p50, color=color, lw=1.6, label=f"{kind} p50")
                 ax.plot(bx, p99, color=color, lw=1.0, ls="--", alpha=0.7,
                         label=f"{kind} p99")
+                # p100 / worst-case per bucket — the outlier envelope (faint dots)
+                ax.plot(bx, pmax, color=color, lw=0.8, ls=":", alpha=0.55,
+                        label=f"{kind} max")
+    from matplotlib.ticker import FuncFormatter, LogLocator, NullFormatter
     ax.set_xlabel("run time (s, from first send)")
     ax.set_ylabel(ylabel + ("  [log]" if logy else ""))
     if logy:
         ax.set_yscale("log")
+        # 1-2-5 per decade as labelled ticks (so narrow ranges still get several
+        # labels); finer minors as unlabelled gridlines.
+        ax.yaxis.set_major_locator(LogLocator(base=10, subs=(1.0, 2.0, 5.0)))
+        ax.yaxis.set_minor_locator(LogLocator(base=10, subs=tuple(x / 10 for x in range(10, 100))))
+        ax.yaxis.set_minor_formatter(NullFormatter())
+    ax.yaxis.set_major_formatter(FuncFormatter(_humanize_us))
     ax.grid(True, which="both", ls=":", alpha=0.4)
     ax.legend(loc="upper left", fontsize=8, ncol=2, framealpha=0.85)
     ax.set_title(title)
@@ -147,7 +172,7 @@ def render_latency_chart(csv_gz_path: str, out_path: str, *, metric: str = "one_
     base = title or "Per-message latency"
     for ax, (m, by_kind) in zip(axes, panels):
         label = one_way_label if (m == "one_way" and one_way_label) else _METRIC[m][2]
-        _draw(ax, by_kind, agg, bucket_s, logy, f"latency (ms) — {label}",
+        _draw(ax, by_kind, agg, bucket_s, logy, f"latency — {label}",
               base if len(panels) == 1 else f"{base} — {label}")
     fig.tight_layout()
     fig.savefig(out_path)
@@ -155,16 +180,18 @@ def render_latency_chart(csv_gz_path: str, out_path: str, *, metric: str = "one_
 
 
 def _bucketed(sorted_pts: list[tuple[float, float]], bucket_s: float):
-    """Per-bucket (center_x, p50, p99) over fixed-width time buckets."""
+    """Per-bucket (center_x, p50, p99, max) over fixed-width time buckets
+    (max = p100, the worst-case latency in the bucket)."""
     if bucket_s <= 0:
         bucket_s = 1.0
     buckets: dict[int, list[float]] = defaultdict(list)
     for x, y in sorted_pts:
         buckets[int(x // bucket_s)].append(y)
-    bx, p50, p99 = [], [], []
+    bx, p50, p99, pmax = [], [], [], []
     for b in sorted(buckets):
         ys = sorted(buckets[b])
         bx.append((b + 0.5) * bucket_s)
         p50.append(_pctl(ys, 0.50))
         p99.append(_pctl(ys, 0.99))
-    return bx, p50, p99
+        pmax.append(ys[-1])
+    return bx, p50, p99, pmax