fixtureqa 0.3.3__tar.gz → 0.3.5__tar.gz

{fixtureqa-0.3.3/fixtureqa.egg-info → fixtureqa-0.3.5}/PKG-INFO

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

{fixtureqa-0.3.3 → fixtureqa-0.3.5}/fixture/api/routers/sessions.py

@@ -71,15 +71,20 @@ def _check_ownership(sm: SessionManager, session_id: str, user: User) -> Session
     return cfg
 
 
+def _owner_store(us: UserStore, user: User) -> Optional[UserStore]:
+    """Only admin responses carry owner_username (the UI owner badge / Mine filter)."""
+    return us if user.is_admin else None
+
+
 @router.get("/", response_model=list[SessionResponse])
 def list_sessions(sm: SM, us: US, user: CurrentUser):
     configs = sm.list_sessions_for_user(user.uid, is_admin=user.is_admin)
-    user_store = us if user.is_admin else None
+    user_store = _owner_store(us, user)
     return [_session_response(sm, cfg.session_id, user_store) for cfg in configs]
 
 
 @router.post("/", response_model=SessionResponse, status_code=201)
-async def create_session(body: SessionConfigRequest, sm: SM, user: CurrentUser):
+async def create_session(body: SessionConfigRequest, sm: SM, us: US, user: CurrentUser):
     try:
         ct = ConnectionType(body.connection_type)
     except ValueError:
@@ -127,11 +132,11 @@ async def create_session(body: SessionConfigRequest, sm: SM, user: CurrentUser):
         except Exception as e:
             raise HTTPException(status_code=500, detail=f"Session added but failed to start: {e}")
 
-    return _session_response(sm, session_id)
+    return _session_response(sm, session_id, _owner_store(us, user))
 
 
 @router.post("/import", response_model=list[SessionResponse], status_code=201)
-def import_sessions(body: list[SessionConfigRequest], sm: SM, user: CurrentUser):
+def import_sessions(body: list[SessionConfigRequest], sm: SM, us: US, user: CurrentUser):
     """
     Bulk-create sessions from an exported config file.
     Each entry is processed independently; invalid entries are skipped.
@@ -169,20 +174,20 @@ def import_sessions(body: list[SessionConfigRequest], sm: SM, user: CurrentUser)
                 owner_uid=user.uid,
             )
             session_id = sm.add_session(cfg)
-            created.append(_session_response(sm, session_id))
+            created.append(_session_response(sm, session_id, _owner_store(us, user)))
         except Exception:
             pass  # skip invalid / conflicting entries
     return created
 
 
 @router.get("/{session_id}", response_model=SessionResponse)
-def get_session(session_id: str, sm: SM, user: CurrentUser):
+def get_session(session_id: str, sm: SM, us: US, user: CurrentUser):
     _check_ownership(sm, session_id, user)
-    return _session_response(sm, session_id)
+    return _session_response(sm, session_id, _owner_store(us, user))
 
 
 @router.patch("/{session_id}", response_model=SessionResponse)
-def update_session(session_id: str, body: UpdateSessionRequest, sm: SM, user: CurrentUser):
+def update_session(session_id: str, body: UpdateSessionRequest, sm: SM, us: US, user: CurrentUser):
     _check_ownership(sm, session_id, user)
     try:
         sm.update_session(session_id, body)
@@ -190,7 +195,7 @@ def update_session(session_id: str, body: UpdateSessionRequest, sm: SM, user: Cu
         raise HTTPException(status_code=409, detail=str(e))
     except (ValueError, KeyError) as e:
         raise HTTPException(status_code=422, detail=str(e))
-    return _session_response(sm, session_id)
+    return _session_response(sm, session_id, _owner_store(us, user))
 
 
 @router.delete("/{session_id}", status_code=204)
@@ -203,25 +208,26 @@ async def remove_session(session_id: str, sm: SM, user: CurrentUser):
 
 
 @router.post("/{session_id}/start", response_model=SessionResponse)
-async def start_session(session_id: str, sm: SM, user: CurrentUser):
+async def start_session(session_id: str, sm: SM, us: US, user: CurrentUser):
     _check_ownership(sm, session_id, user)
     try:
         await sm.start_session(session_id)
     except RuntimeError as e:
         raise HTTPException(status_code=409, detail=str(e))
-    return _session_response(sm, session_id)
+    return _session_response(sm, session_id, _owner_store(us, user))
 
 
 @router.post("/{session_id}/stop", response_model=SessionResponse)
 async def stop_session(
     session_id: str,
     sm: SM,
+    us: US,
     user: CurrentUser,
     force: bool = Query(default=False),
 ):
     _check_ownership(sm, session_id, user)
     await sm.stop_session(session_id, force=force)
-    return _session_response(sm, session_id)
+    return _session_response(sm, session_id, _owner_store(us, user))
 
 
 @router.post("/{session_id}/send")

{fixtureqa-0.3.3 → fixtureqa-0.3.5}/fixture/core/fix_builder.py

@@ -23,7 +23,7 @@ from fixcore.message import DataDictionary, Group, GroupDef, Message
 SOH = "\x01"
 
 # Tags the transport owns; never copied from the user's raw into the body.
-_CONTROL_TAGS = frozenset({8, 9, 10, 34, 49, 52, 56})
+CONTROL_TAGS = frozenset({8, 9, 10, 34, 49, 52, 56})
 _MSG_TYPE = 35
 _TRANSACT_TIME = 60
 
@@ -57,7 +57,7 @@ def build_message_from_raw(
     if not msg_type:
         raise ValueError("Missing MsgType (tag 35)")
 
-    body = [(t, v) for t, v in pairs if t != _MSG_TYPE and t not in _CONTROL_TAGS]
+    body = [(t, v) for t, v in pairs if t != _MSG_TYPE and t not in CONTROL_TAGS]
     if transact_time is not None and not any(t == _TRANSACT_TIME for t, _ in body):
         body.insert(0, (_TRANSACT_TIME, transact_time))
 

{fixtureqa-0.3.3 → fixtureqa-0.3.5}/fixture/core/perf_payload.py

@@ -28,6 +28,7 @@ from typing import Optional
 
 from fixcore.message.message import Message
 
+from .fix_builder import CONTROL_TAGS
 from .perf_models import RunConfig, ScenarioConfig
 
 _TOKEN_RE = re.compile(r"\{([^}]+)\}")
@@ -94,10 +95,7 @@ class PayloadFactory:
                 tpl = self._ts.get_template(self._uid, tpl_id) if self._ts else None
                 if tpl is None:
                     raise PerfConfigError(f"template {tpl_id!r} not found for scenario {scn.name!r}")
-                try:
-                    fields = {int(k): str(v) for k, v in tpl.get("fields", {}).items()}
-                except (TypeError, ValueError):
-                    raise PerfConfigError(f"template {tpl_id!r} has non-integer tags")
+                fields = self._parse_fields(tpl, tpl_id)
                 self._templates[tpl_id] = fields
                 for val in fields.values():
                     for tok in _tokens(val):
@@ -116,10 +114,7 @@ class PayloadFactory:
         tpl = self._ts.get_template(self._uid, tpl_id) if self._ts else None
         if tpl is None:
             raise PerfConfigError(f"{label} template {tpl_id!r} not found")
-        try:
-            fields = {int(k): str(v) for k, v in tpl.get("fields", {}).items()}
-        except (TypeError, ValueError):
-            raise PerfConfigError(f"{label} template {tpl_id!r} has non-integer tags")
+        fields = self._parse_fields(tpl, tpl_id, label)
         vars_ = self.config.payload.variables
         for val in fields.values():
             for tok in _tokens(val):
@@ -130,6 +125,17 @@ class PayloadFactory:
                     raise PerfConfigError(f"unknown token {{{tok}}} in {label} template {tpl_id!r}")
         return fields
 
+    def _parse_fields(self, tpl: dict, tpl_id: str, label: str = "") -> dict[int, str]:
+        try:
+            fields = {int(k): str(v) for k, v in tpl.get("fields", {}).items()}
+        except (TypeError, ValueError):
+            what = f"{label} template" if label else "template"
+            raise PerfConfigError(f"{what} {tpl_id!r} has non-integer tags")
+        # Templates saved from composed raw keep transport-owned header tags
+        # (8/9/10/34/49/52/56). The session stamps those on send, so copying
+        # them into the body would duplicate them on the wire.
+        return {t: v for t, v in fields.items() if t not in CONTROL_TAGS}
+
     def _validate_token(self, tok: str, scn: ScenarioConfig, tpl_id: str,
                         seen: list[str], vars_: dict) -> None:
         if tok in _SIMPLE or tok in vars_:

{fixtureqa-0.3.3 → fixtureqa-0.3.5/fixtureqa.egg-info}/PKG-INFO

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

{fixtureqa-0.3.3 → fixtureqa-0.3.5}/pyproject.toml

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

{fixtureqa-0.3.3 → fixtureqa-0.3.5}/tests/test_perf_payload.py

@@ -171,6 +171,33 @@ def test_exec_template_cannot_override_standard_tags():
     assert msg.get_field_or(9000, "") == "x"       # custom field preserved
 
 
+def test_transport_tags_stripped_from_templates():
+    # Templates saved from a composed raw message keep header tags the session
+    # stamps on send (8/9/10/34/49/52/56); copying them into the body would
+    # duplicate them on the wire.
+    hdr = {"8": "FIX.4.2", "9": "123", "10": "045", "34": "7",
+           "49": "CLIENT", "52": "20260101-00:00:00", "56": "VENUE"}
+    ts = FakeTemplateStore({
+        "ord": _tpl("ord", {"35": "D", "9001": "x", **hdr}),
+        "exe": _tpl("exe", {"35": "8", "9002": "y", **hdr}),
+        "nos": _tpl("nos", {"35": "D", "9003": "z", **hdr}),
+    })
+    cfg = _config([ScenarioConfig(name="s", weight=1, sequence="parallel", messages=["nos"])],
+                  order_template_id="ord", exec_template_id="exe")
+    f = PayloadFactory(cfg, ts, "u")
+
+    order_msg, _ = f.build_single_order()
+    scn_msg, _ = f.build_template_message("nos", f.new_context(), {})
+    exec_msg = f.build_exec_message({376: "CORR1", 38: "100"}, exec_type="2", ord_status="2",
+                                    last_qty=100, cum_qty=100, leaves_qty=0, px="10")
+    for msg in (order_msg, scn_msg, exec_msg):
+        for tag in (8, 9, 10, 34, 49, 52, 56):
+            assert not msg.has_field(tag), f"transport tag {tag} leaked into body"
+    assert order_msg.get_field_or(9001, "") == "x"
+    assert exec_msg.get_field_or(9002, "") == "y"
+    assert scn_msg.get_field_or(9003, "") == "z"
+
+
 def test_ref_token_rejected_in_standalone_template():
     ts = FakeTemplateStore({"ord": _tpl("ord", {"35": "D", "41": "{ref:x.clordid}"})})
     cfg = _config([], order_template_id="ord")

{fixtureqa-0.3.3 → fixtureqa-0.3.5}/tests/test_sessions.py

@@ -53,6 +53,23 @@ def test_create_session(authed):
     assert "session_id" in body
 
 
+def test_mutating_responses_carry_owner_username_for_admin(authed):
+    # The admin "Mine" filter matches on owner_username client-side; if any
+    # session response omits it, the upserted session vanishes from the list
+    # until a full refetch. Every endpoint must enrich it like GET /sessions/.
+    client, _ = authed
+    created = client.post("/api/sessions/", json=_ini(9876)).json()
+    assert created["owner_username"] == "admin"
+    sid = created["session_id"]
+    assert client.get(f"/api/sessions/{sid}").json()["owner_username"] == "admin"
+    patched = client.patch(f"/api/sessions/{sid}", json={"display_name": "renamed"}).json()
+    assert patched["owner_username"] == "admin"
+    stopped = client.post(f"/api/sessions/{sid}/stop").json()
+    assert stopped["owner_username"] == "admin"
+    imported = client.post("/api/sessions/import", json=[_ini(9877, "A", "B")]).json()
+    assert imported[0]["owner_username"] == "admin"
+
+
 def test_list_sessions(authed):
     client, _ = authed
     client.post("/api/sessions/", json=_ini(9001, "A", "B"))