fixtureqa 0.9.2__tar.gz → 0.9.3__tar.gz

{fixtureqa-0.9.2/fixtureqa.egg-info → fixtureqa-0.9.3}/PKG-INFO

@@ -1,10 +1,10 @@
 Metadata-Version: 2.4
 Name: fixtureqa
-Version: 0.9.2
+Version: 0.9.3
 Summary: FIXture — FIX Protocol Testing Tool
 Requires-Python: >=3.10
 License-File: LICENSE
-Requires-Dist: fixcore-engine==0.9.1
+Requires-Dist: fixcore-engine==0.9.2
 Requires-Dist: fastapi>=0.111.0
 Requires-Dist: uvicorn[standard]>=0.29.0
 Requires-Dist: websockets>=12.0

fixtureqa-0.9.3/fixture/core/fix_builder.py

@@ -0,0 +1,69 @@
+"""
+Group-aware construction of outbound FIX messages from a raw string.
+
+The naive path — parse_raw() into a {tag: value} dict, then set_field() per tag —
+collapses repeating groups: duplicate member tags (e.g. three NoAllocs rows) all
+overwrite down to the last value, while the NoXxx count survives as a literal. So
+the wire ends up claiming N instances but carrying only one.
+
+This builder instead keeps fields in order and hands them to fixcore's
+``Message.from_fields`` (the lenient, fields-based counterpart to ``decode``),
+which splits repeating groups using each group's spec definition when a
+DataDictionary is supplied — the same code path the engine uses to decode
+inbound messages, so the two can't drift. Header / seqnum / checksum tags are
+dropped here; the session stamps them on send.
+
+Without a DataDictionary (or for a count tag the spec doesn't define) it falls
+back to flat fields — no worse than before, but standard groups now round-trip.
+"""
+from __future__ import annotations
+
+from typing import Optional
+
+from fixcore.message import DataDictionary, 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})
+_MSG_TYPE = 35
+_TRANSACT_TIME = 60
+
+
+def _ordered_pairs(raw: str) -> list[tuple[int, str]]:
+    """Parse raw FIX into an ORDERED list of (tag, value), preserving duplicates."""
+    norm = raw if SOH in raw else raw.replace("|", SOH)
+    pairs: list[tuple[int, str]] = []
+    for part in norm.split(SOH):
+        if "=" not in part:
+            continue
+        tag_str, _, value = part.partition("=")
+        try:
+            pairs.append((int(tag_str), value))
+        except ValueError:
+            continue
+    return pairs
+
+
+def build_message_from_raw(
+    raw: str,
+    data_dictionary: Optional[DataDictionary] = None,
+    *,
+    transact_time: Optional[str] = None,
+) -> Message:
+    """Build a fixcore Message from raw FIX, preserving repeating-group structure
+    when *data_dictionary* is supplied. Injects TransactTime(60) when
+    *transact_time* is given and absent. Raises ValueError if MsgType is missing."""
+    pairs = _ordered_pairs(raw)
+    msg_idx = next((i for i, (t, _) in enumerate(pairs) if t == _MSG_TYPE), None)
+    if msg_idx is None:
+        raise ValueError("Missing MsgType (tag 35)")
+
+    # Drop transport-owned tags; MsgType (35) stays — from_fields routes it to
+    # the header. The session stamps the control tags on send.
+    fields = [(t, v) for t, v in pairs if t not in CONTROL_TAGS]
+    if transact_time is not None and not any(t == _TRANSACT_TIME for t, _ in fields):
+        idx = next(i for i, (t, _) in enumerate(fields) if t == _MSG_TYPE)
+        fields.insert(idx + 1, (_TRANSACT_TIME, transact_time))
+
+    return Message.from_fields(fields, data_dictionary)

{fixtureqa-0.9.2 → fixtureqa-0.9.3/fixtureqa.egg-info}/PKG-INFO

@@ -1,10 +1,10 @@
 Metadata-Version: 2.4
 Name: fixtureqa
-Version: 0.9.2
+Version: 0.9.3
 Summary: FIXture — FIX Protocol Testing Tool
 Requires-Python: >=3.10
 License-File: LICENSE
-Requires-Dist: fixcore-engine==0.9.1
+Requires-Dist: fixcore-engine==0.9.2
 Requires-Dist: fastapi>=0.111.0
 Requires-Dist: uvicorn[standard]>=0.29.0
 Requires-Dist: websockets>=12.0

{fixtureqa-0.9.2 → fixtureqa-0.9.3}/fixtureqa.egg-info/requires.txt

@@ -1,4 +1,4 @@
-fixcore-engine==0.9.1
+fixcore-engine==0.9.2
 fastapi>=0.111.0
 uvicorn[standard]>=0.29.0
 websockets>=12.0

{fixtureqa-0.9.2 → fixtureqa-0.9.3}/pyproject.toml

@@ -4,13 +4,13 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "fixtureqa"
-version = "0.9.2"
+version = "0.9.3"
 description = "FIXture — FIX Protocol Testing Tool"
 requires-python = ">=3.10"
 dependencies = [
     # 0.7.1 owns the tzdata dependency (zoneinfo for the TimeZone schedule key),
     # so it's no longer declared here — fixcore is the only code using ZoneInfo.
-    "fixcore-engine==0.9.1",
+    "fixcore-engine==0.9.2",
     "fastapi>=0.111.0",
     "uvicorn[standard]>=0.29.0",
     "websockets>=12.0",

fixtureqa-0.9.2/fixture/core/fix_builder.py

@@ -1,132 +0,0 @@
-"""
-Group-aware construction of outbound FIX messages from a raw string.
-
-The naive path — parse_raw() into a {tag: value} dict, then set_field() per tag —
-collapses repeating groups: duplicate member tags (e.g. three NoAllocs rows) all
-overwrite down to the last value, while the NoXxx count survives as a literal. So
-the wire ends up claiming N instances but carrying only one.
-
-This builder instead keeps fields in order and, when a DataDictionary is given,
-splits repeating groups using each group's spec definition (delimiter + member
-tags, nested groups supported) into proper fixcore Group instances. Header /
-seqnum / checksum tags are dropped — the session stamps them on send.
-
-Without a DataDictionary (or for a count tag the spec doesn't define) it falls
-back to flat fields — no worse than before, but standard groups now round-trip.
-"""
-from __future__ import annotations
-
-from typing import Optional
-
-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})
-_MSG_TYPE = 35
-_TRANSACT_TIME = 60
-
-
-def _ordered_pairs(raw: str) -> list[tuple[int, str]]:
-    """Parse raw FIX into an ORDERED list of (tag, value), preserving duplicates."""
-    norm = raw if SOH in raw else raw.replace("|", SOH)
-    pairs: list[tuple[int, str]] = []
-    for part in norm.split(SOH):
-        if "=" not in part:
-            continue
-        tag_str, _, value = part.partition("=")
-        try:
-            pairs.append((int(tag_str), value))
-        except ValueError:
-            continue
-    return pairs
-
-
-def build_message_from_raw(
-    raw: str,
-    data_dictionary: Optional[DataDictionary] = None,
-    *,
-    transact_time: Optional[str] = None,
-) -> Message:
-    """Build a fixcore Message from raw FIX, preserving repeating-group structure
-    when *data_dictionary* is supplied. Injects TransactTime(60) when
-    *transact_time* is given and absent. Raises ValueError if MsgType is missing."""
-    pairs = _ordered_pairs(raw)
-    msg_type = next((v for t, v in pairs if t == _MSG_TYPE), None)
-    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]
-    if transact_time is not None and not any(t == _TRANSACT_TIME for t, _ in body):
-        body.insert(0, (_TRANSACT_TIME, transact_time))
-
-    msg = Message()
-    msg.header.set(_MSG_TYPE, msg_type)
-
-    group_defs: dict[int, GroupDef] = {}
-    if data_dictionary is not None:
-        try:
-            group_defs = data_dictionary.message_def(msg_type).groups
-        except Exception:
-            group_defs = {}
-
-    _populate(msg, body, group_defs)
-    return msg
-
-
-def _populate(msg: Message, body: list[tuple[int, str]],
-              group_defs: dict[int, GroupDef]) -> None:
-    pos, n = 0, len(body)
-    while pos < n:
-        tag, value = body[pos]
-        gd = group_defs.get(tag)
-        if gd is not None:
-            count = int(value) if value.lstrip("-").isdigit() else 0
-            pos += 1
-            instances, pos = _extract(body, pos, gd, count)
-            if instances:
-                for inst in instances:
-                    msg.add_group(tag, inst)   # keeps the count field in sync
-            else:
-                msg.set_field(tag, str(count))  # nothing matched — keep the count
-        else:
-            msg.set_field(tag, value)
-            pos += 1
-
-
-def _extract(body: list[tuple[int, str]], pos: int, gd: GroupDef,
-             count: int) -> tuple[list[Group], int]:
-    """Pull up to *count* group instances starting at *pos*. An instance begins at
-    the group's delimiter tag and runs until the delimiter repeats or a non-member
-    tag appears; nested groups recurse."""
-    members = set(gd.members) | {gd.delimiter}
-    nested = gd.nested_groups
-    instances: list[Group] = []
-    n = len(body)
-    while pos < n and len(instances) < count:
-        tag, value = body[pos]
-        if tag != gd.delimiter:
-            break  # not the start of an instance — group is done
-        inst = Group()
-        inst.set_field(tag, value)
-        pos += 1
-        while pos < n:
-            t2, v2 = body[pos]
-            if t2 == gd.delimiter:
-                break  # next instance
-            ng = nested.get(t2)
-            if ng is not None:
-                c2 = int(v2) if v2.lstrip("-").isdigit() else 0
-                pos += 1
-                sub, pos = _extract(body, pos, ng, c2)
-                for s in sub:
-                    inst.add_group(t2, s)
-                continue
-            if t2 in members:
-                inst.set_field(t2, v2)
-                pos += 1
-            else:
-                break  # field outside the group — instance ends
-        instances.append(inst)
-    return instances, pos