fixtureqa 0.4.8__tar.gz → 0.4.9__tar.gz

{fixtureqa-0.4.8/fixtureqa.egg-info → fixtureqa-0.4.9}/PKG-INFO

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

{fixtureqa-0.4.8 → fixtureqa-0.4.9}/fixture/core/perf_engine.py

@@ -206,7 +206,7 @@ class PerfRun:
             # client mode, count-bounded: external venue may never fill — bounded settle.
             deadline = time.perf_counter() + max(_GRACE_DRAIN_S,
                                                  self.config.test.scenario_timeout_ms / 1000.0)
-            while self._pending and time.perf_counter() < deadline:
+            while self._pending and time.perf_counter() < deadline and not self._stopped_by_user:
                 await asyncio.sleep(0.02)
         else:
             await asyncio.sleep(_GRACE_DRAIN_S)
@@ -252,7 +252,9 @@ class PerfRun:
         last_activity = time.perf_counter()
         while True:
             now = time.perf_counter()
-            if not self._pending or now >= cap:
+            # Stop pressed mid-drain must win immediately — the backlog gets
+            # finalized as lost instead of ground through at the fill rate.
+            if self._stopped_by_user or not self._pending or now >= cap:
                 break
             cur_sent = self.stats.fills_sent + self.stats.acks_sent
             if cur_sent != last_sent:

{fixtureqa-0.4.8 → fixtureqa-0.4.9}/fixture/core/perf_store.py

@@ -6,6 +6,7 @@ parameter is unused.
 from __future__ import annotations
 
 import os
+import uuid
 from typing import Optional
 
 from .json_store import JsonListStore
@@ -28,8 +29,24 @@ class PerfStore(JsonListStore):
         return item["config"] if item else None
 
     def save(self, config: dict) -> str:
-        item = self.create_item("", {"name": config.get("name", ""), "config": config})
-        return item["config_id"]
+        """Upsert by name: saving a config whose name already exists overwrites
+        it in place (same config_id), so the dropdown never accumulates
+        duplicates. Pre-existing duplicates of that name are collapsed into the
+        first one. One locked load-modify-save so the find+replace is atomic."""
+        name = config.get("name", "")
+        with self._lock:
+            items = self._load("")
+            existing = [it for it in items if it.get("name") == name]
+            if existing:
+                keep = existing[0]
+                keep["config"] = config
+                items = [it for it in items if it.get("name") != name or it is keep]
+                self._save("", items)
+                return keep["config_id"]
+            item = {"name": name, "config": config, "config_id": str(uuid.uuid4())}
+            items.append(item)
+            self._save("", items)
+            return item["config_id"]
 
     def delete(self, config_id: str) -> bool:
         return self.delete_item("", config_id)

{fixtureqa-0.4.8 → fixtureqa-0.4.9/fixtureqa.egg-info}/PKG-INFO

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

{fixtureqa-0.4.8 → fixtureqa-0.4.9}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "fixtureqa"
-version = "0.4.8"
+version = "0.4.9"
 description = "FIXture — FIX Protocol Testing Tool"
 requires-python = ">=3.10"
 dependencies = [

{fixtureqa-0.4.8 → fixtureqa-0.4.9}/tests/test_perf_api.py

@@ -113,6 +113,35 @@ def test_perf_configs_crud(authed):
     assert client.get(f"/api/perf/configs/{cid}").status_code == 404
 
 
+def test_perf_config_save_same_name_overwrites(authed):
+    client, _ = authed
+    body = _run_body("c", "v")
+    body["name"] = "upsert-me"
+    cid1 = client.post("/api/perf/configs", json=body).json()["config_id"]
+    body["rate"]["orders_per_window"] = 99            # same name, new content
+    cid2 = client.post("/api/perf/configs", json=body).json()["config_id"]
+    assert cid2 == cid1                               # overwrote in place
+    names = [c["name"] for c in client.get("/api/perf/configs").json()]
+    assert names.count("upsert-me") == 1              # no duplicate dropdown rows
+    got = client.get(f"/api/perf/configs/{cid1}").json()
+    assert got["rate"]["orders_per_window"] == 99     # latest content won
+    client.delete(f"/api/perf/configs/{cid1}")
+
+
+def test_perf_store_collapses_legacy_duplicates(tmp_path):
+    # Duplicates saved before the upsert fix collapse into the first entry the
+    # next time that name is saved.
+    from fixture.core.perf_store import PerfStore
+    store = PerfStore(str(tmp_path))
+    a = store.create_item("", {"name": "dup", "config": {"name": "dup", "v": 1}})
+    store.create_item("", {"name": "dup", "config": {"name": "dup", "v": 2}})
+    assert sum(c["name"] == "dup" for c in store.list()) == 2
+    cid = store.save({"name": "dup", "v": 3})
+    assert cid == a["config_id"]                      # first entry keeps its id
+    assert sum(c["name"] == "dup" for c in store.list()) == 1
+    assert store.get(cid)["v"] == 3
+
+
 def test_perf_run_rejects_unstarted_session(authed):
     client, _ = authed
     port = _free_port()

{fixtureqa-0.4.8 → fixtureqa-0.4.9}/tests/test_perf_engine.py

@@ -699,6 +699,27 @@ async def test_venue_answers_inbound_amend():
     assert run.stats.amends_received == 1
 
 
+async def test_stop_during_drain_wins_immediately():
+    # Starved fill leg → the post-duration drain would grind for minutes
+    # (cap ≈ 2× backlog/fill_rate). Stop pressed mid-drain must end the run
+    # promptly, finalizing the backlog as lost, not wait out the drain.
+    cfg = _cfg(
+        rate=RateConfig(orders_per_window=50, order_window_ms=100,   # ~500/s in
+                        fills_per_window=1, fill_window_ms=1000),    # 1 fill/s out
+        test=RunTestConfig(duration=1),
+    )
+    run = _run(cfg)
+    run.start()
+    await asyncio.sleep(1.3)                        # duration fired → inside drain
+    assert run.status == "running"                  # still draining the backlog
+    t0 = time.perf_counter()
+    await asyncio.wait_for(run.stop(), timeout=10)
+    assert time.perf_counter() - t0 < 5             # did not ride out the drain
+    assert run.status == "stopped"
+    assert not run._pending                         # backlog finalized
+    assert run.stats.orders_sent > run.stats.completions   # it really was starved
+
+
 async def test_venue_amend_without_pending_replace():
     run = _run(_cfg(amend=AmendConfig(enabled=True)))
     await run._handle_amend({35: "G", 11: "NEW-2", 41: "OLD-2", 376: "VC2",