fixcore-engine 0.3.0__tar.gz → 0.4.0__tar.gz

{fixcore_engine-0.3.0/fixcore_engine.egg-info → fixcore_engine-0.4.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: fixcore-engine
-Version: 0.3.0
+Version: 0.4.0
 Summary: Pure Python FIX protocol engine
 Author-email: Aidan Chisholm <aidan.chisholm@gmail.com>
 License: MIT License

{fixcore_engine-0.3.0 → fixcore_engine-0.4.0}/fixcore/log/file_log.py

@@ -2,7 +2,7 @@
 
 from __future__ import annotations
 
-from datetime import datetime, timezone
+from datetime import UTC, datetime
 from pathlib import Path
 
 from fixcore.log.base import Log, LogFactory
@@ -20,7 +20,7 @@ def _session_filename(session_id: SessionID) -> str:
 
 
 def _now() -> str:
-    return datetime.now(tz=timezone.utc).strftime("%Y%m%d-%H:%M:%S.%f")[:-3]
+    return datetime.now(tz=UTC).strftime("%Y%m%d-%H:%M:%S.%f")[:-3]
 
 
 class FileLog(Log):

{fixcore_engine-0.3.0 → fixcore_engine-0.4.0}/fixcore/log/screen.py

@@ -3,14 +3,14 @@
 from __future__ import annotations
 
 import sys
-from datetime import datetime, timezone
+from datetime import UTC, datetime
 
 from fixcore.log.base import Log, LogFactory
 from fixcore.session.session_id import SessionID
 
 
 def _now() -> str:
-    return datetime.now(tz=timezone.utc).strftime("%Y%m%d-%H:%M:%S.%f")[:-3]
+    return datetime.now(tz=UTC).strftime("%Y%m%d-%H:%M:%S.%f")[:-3]
 
 
 class ScreenLog(Log):

{fixcore_engine-0.3.0 → fixcore_engine-0.4.0}/fixcore/message/__init__.py

@@ -2,10 +2,17 @@
 
 from fixcore.message.cracker import MessageCracker
 from fixcore.message.data_dictionary import (
-    DataDictionary, FieldDef, GroupDef, MessageDef, load_data_dictionary,
+    DataDictionary,
+    FieldDef,
+    GroupDef,
+    MessageDef,
+    load_data_dictionary,
 )
 from fixcore.message.exceptions import (
-    FieldNotFound, InvalidMessage, UnsupportedMessageType, UnsupportedVersion,
+    FieldNotFound,
+    InvalidMessage,
+    UnsupportedMessageType,
+    UnsupportedVersion,
 )
 from fixcore.message.field import Field, FieldMap, Group
 from fixcore.message.message import Header, Message, Trailer

{fixcore_engine-0.3.0 → fixcore_engine-0.4.0}/fixcore/message/cracker.py

@@ -25,11 +25,12 @@ level::
 
 from __future__ import annotations
 
+from collections.abc import Callable
+
 from fixcore.message.exceptions import UnsupportedMessageType
 from fixcore.message.message import Message
 from fixcore.session.session_id import SessionID
 
-
 # ---------------------------------------------------------------------------
 # MsgType → handler method name registry
 # ---------------------------------------------------------------------------
@@ -230,7 +231,9 @@ class MessageCracker:
 # already have an explicit implementation on the class.
 # ---------------------------------------------------------------------------
 
-def _make_default_handler(name: str):  # noqa: ANN202
+def _make_default_handler(
+    name: str,
+) -> Callable[[MessageCracker, Message, SessionID], None]:
     def handler(self: MessageCracker, message: Message, session_id: SessionID) -> None:
         self.on_message(message, session_id)
     handler.__name__ = name

{fixcore_engine-0.3.0 → fixcore_engine-0.4.0}/fixcore/message/data_dictionary.py

@@ -4,16 +4,22 @@ from __future__ import annotations
 
 import xml.etree.ElementTree as ET
 from dataclasses import dataclass, field
-from functools import lru_cache
+from functools import cache
 from pathlib import Path
+from typing import TYPE_CHECKING
 
 from fixcore.message.exceptions import InvalidMessage
 
+if TYPE_CHECKING:
+    from fixcore.message.message import Message
+
 # SessionRejectReason codes (FIX session-level)
 REJECT_REQUIRED_TAG_MISSING = 1
+REJECT_VALUE_OUT_OF_RANGE = 5
 REJECT_INVALID_MSGTYPE = 11
 
 # Imported here to avoid circular import at module level; also used as constants
+TAG_MSG_TYPE = 35
 TAG_BODY_LENGTH = 9
 TAG_CHECKSUM = 10
 
@@ -37,7 +43,7 @@ class GroupDef:
     number_tag: int                        # NoXxx counter tag (e.g. 78 NoAllocs)
     delimiter: int                         # first expected tag inside each instance
     members: list[int]                     # ordered member tags
-    nested_groups: dict[int, "GroupDef"] = field(default_factory=dict)
+    nested_groups: dict[int, GroupDef] = field(default_factory=dict)
 
 
 @dataclass
@@ -81,7 +87,7 @@ class DataDictionary:
     # ------------------------------------------------------------------
 
     @classmethod
-    def from_xml(cls, path: str | Path) -> "DataDictionary":
+    def from_xml(cls, path: str | Path) -> DataDictionary:
         """Load a DataDictionary from a QuickFIX XML spec file."""
         tree = ET.parse(str(path))
         root = tree.getroot()
@@ -94,7 +100,7 @@ class DataDictionary:
         return dd
 
     @classmethod
-    def from_string(cls, xml_text: str) -> "DataDictionary":
+    def from_string(cls, xml_text: str) -> DataDictionary:
         """Load a DataDictionary from an XML string (useful in tests)."""
         root = ET.fromstring(xml_text)
         dd = cls()
@@ -152,7 +158,9 @@ class DataDictionary:
             name = msg_el.get("name", "")
             cat = msg_el.get("msgcat", "app").lower()
             msg_def = MessageDef(name=name, msg_type=msg_type, msg_cat=cat)
-            self._parse_fields_and_groups(msg_el, msg_def.required, msg_def.optional, msg_def.groups)
+            self._parse_fields_and_groups(
+                msg_el, msg_def.required, msg_def.optional, msg_def.groups
+            )
             self._messages[msg_type] = msg_def
 
     def _parse_fields_and_groups(
@@ -201,7 +209,9 @@ class DataDictionary:
                         delimiter = tag
                     members.append(tag)
                     nested[tag] = self._parse_group(tag, child)
-        return GroupDef(number_tag=number_tag, delimiter=delimiter, members=members, nested_groups=nested)
+        return GroupDef(
+            number_tag=number_tag, delimiter=delimiter, members=members, nested_groups=nested
+        )
 
     def _resolve_tag(self, name: str) -> int | None:
         return self._fields_by_name.get(name)
@@ -232,7 +242,7 @@ class DataDictionary:
     def is_trailer_field(self, tag: int) -> bool:
         return tag in self._trailer
 
-    def validate(self, message: "Message") -> None:  # type: ignore[name-defined]
+    def validate(self, message: Message, *, check_field_values: bool = False) -> None:
         """Validate *message* against this DataDictionary.
 
         Checks:
@@ -240,10 +250,11 @@ class DataDictionary:
         - All required header fields are present
         - All required body fields are present
         - All required trailer fields are present
+        - If *check_field_values* is True, every enum-bearing header/body field
+          carries a value defined in the dictionary (out-of-range → Reject)
 
         Raises :exc:`InvalidMessage` on the first violation found.
         """
-        from fixcore.message.message import Message  # local to avoid circular
 
         msg_type = message.msg_type
         if not msg_type:
@@ -298,6 +309,22 @@ class DataDictionary:
                     ref_tag=tag,
                 )
 
+        # Enum (out-of-range) field-value checks — header + body flat fields.
+        # MsgType is skipped (already validated against the message set above);
+        # tags without a defined enum no-op in validate_field_value.
+        if check_field_values:
+            fields = list(message.header.items()) + list(message.body.items())
+            for tag, value in fields:
+                if tag in COMPUTED_TAGS or tag == TAG_MSG_TYPE:
+                    continue
+                if not self.validate_field_value(tag, value):
+                    name = self._fields_by_number.get(tag, FieldDef(tag, str(tag), "STRING")).name
+                    raise InvalidMessage(
+                        f"Value {value!r} out of range for {name} ({tag})",
+                        reason=REJECT_VALUE_OUT_OF_RANGE,
+                        ref_tag=tag,
+                    )
+
     def validate_field_value(self, tag: int, value: str) -> bool:
         """Return True if *value* is a valid enum for *tag*, or if *tag* has no enum."""
         fd = self._fields_by_number.get(tag)
@@ -310,7 +337,7 @@ class DataDictionary:
 # Cached loading
 # ---------------------------------------------------------------------------
 
-@lru_cache(maxsize=None)
+@cache
 def _load_cached(resolved_path: str) -> DataDictionary:
     return DataDictionary.from_xml(resolved_path)
 

{fixcore_engine-0.3.0 → fixcore_engine-0.4.0}/fixcore/message/field.py

@@ -3,7 +3,7 @@
 from __future__ import annotations
 
 from collections import OrderedDict
-from typing import Iterator
+from collections.abc import Iterator
 
 
 class Field:
@@ -106,7 +106,7 @@ class Group:
         self._fields: dict[int, str] = {}
         # Insertion order for both simple fields and nested-group count tags
         self._order: list[int] = []
-        self._groups: dict[int, list["Group"]] = {}
+        self._groups: dict[int, list[Group]] = {}
 
     # ------------------------------------------------------------------
     # Simple field access (mirrors Message body API)
@@ -131,7 +131,7 @@ class Group:
     # Nested groups
     # ------------------------------------------------------------------
 
-    def add_group(self, count_tag: int, instance: "Group") -> None:
+    def add_group(self, count_tag: int, instance: Group) -> None:
         """Append a nested group instance and update the count field."""
         if count_tag not in self._groups:
             self._order.append(count_tag)
@@ -139,7 +139,7 @@ class Group:
         self._groups[count_tag].append(instance)
         self._fields[count_tag] = str(len(self._groups[count_tag]))
 
-    def get_groups(self, count_tag: int) -> "list[Group]":
+    def get_groups(self, count_tag: int) -> list[Group]:
         return self._groups.get(count_tag, [])
 
     def __repr__(self) -> str:

{fixcore_engine-0.3.0 → fixcore_engine-0.4.0}/fixcore/message/message.py

@@ -213,7 +213,7 @@ class Message:
         cls,
         raw: bytes,
         data_dictionary: DataDictionary | None = None,
-    ) -> "Message":
+    ) -> Message:
         """Parse *raw* SOH-delimited bytes into a Message.
 
         Raises ValueError on malformed input or checksum/body-length mismatch.

{fixcore_engine-0.3.0 → fixcore_engine-0.4.0}/fixcore/session/session.py

@@ -5,10 +5,8 @@ from __future__ import annotations
 import asyncio
 import logging
 import time
-from datetime import datetime, timezone
-from typing import Awaitable, Callable
-
-logger = logging.getLogger(__name__)
+from collections.abc import Awaitable, Callable
+from datetime import UTC, datetime
 
 from fixcore.application import Application
 from fixcore.log.base import Log
@@ -52,9 +50,11 @@ from fixcore.session.state import (
 )
 from fixcore.store.base import MessageStore
 
+logger = logging.getLogger(__name__)
+
 
 def _utc_timestamp() -> str:
-    return datetime.now(tz=timezone.utc).strftime("%Y%m%d-%H:%M:%S")
+    return datetime.now(tz=UTC).strftime("%Y%m%d-%H:%M:%S")
 
 
 # Type alias for the transport-provided send callback
@@ -115,6 +115,11 @@ class Session:
                     f"{session_id}: UseDataDictionary=Y requires DataDictionary=<path>"
                 )
             self._data_dictionary = load_data_dictionary(dd_path)
+        # Reject fields whose value is out of the dictionary's enum range (only
+        # meaningful when a dictionary is loaded). Opt-in, QuickFIX-compatible.
+        self._validate_values: bool = settings.get_bool(
+            session_id, "ValidateFieldsOutOfRange", False
+        )
 
         # Runtime state
         self._state: SessionState = SessionState.DISCONNECTED
@@ -235,11 +240,15 @@ class Session:
             await self._on_reject(msg)
         else:
             if self._state != SessionState.LOGGED_ON:
-                self._log.on_event(f"Received app message {msg_type!r} while not logged on — ignoring")
+                self._log.on_event(
+                    f"Received app message {msg_type!r} while not logged on — ignoring"
+                )
                 return
             if self._data_dictionary is not None:
                 try:
-                    self._data_dictionary.validate(msg)
+                    self._data_dictionary.validate(
+                        msg, check_field_values=self._validate_values
+                    )
                 except InvalidMessage as exc:
                     seq = int(msg.header.get_or(TAG_MSG_SEQ_NUM, "0"))
                     self._log.on_event(f"Rejecting {msg_type!r}: {exc}")

{fixcore_engine-0.3.0 → fixcore_engine-0.4.0}/fixcore/session/session_settings.py

@@ -12,6 +12,13 @@ _DEFAULT_SECTION = "DEFAULT"
 _SESSION_SECTION_PREFIX = "SESSION"
 
 
+class _CaseSensitiveParser(configparser.RawConfigParser):
+    """RawConfigParser that preserves option-name case (QuickFIX keys are CamelCase)."""
+
+    def optionxform(self, optionstr: str) -> str:
+        return optionstr
+
+
 class SessionSettings:
     """Holds per-session and default configuration values.
 
@@ -36,11 +43,14 @@ class SessionSettings:
 
         UseDataDictionary=Y             ; default N — raw FIX, no validation
         DataDictionary=specs/FIX42.xml  ; required when UseDataDictionary=Y
+        ValidateFieldsOutOfRange=Y      ; default N — also reject out-of-range enums
 
     With ``UseDataDictionary=N`` (the default) inbound messages are passed
     through unvalidated.  With ``Y`` the named spec is loaded; inbound
-    application messages are validated and a session-level Reject is returned on
-    failure.
+    application messages are checked for required fields and a session-level
+    Reject is returned on failure.  ``ValidateFieldsOutOfRange=Y`` additionally
+    rejects fields whose value is not a defined enum for that tag (e.g.
+    ``Side=Z``); it only applies when a DataDictionary is loaded.
     """
 
     def __init__(self) -> None:
@@ -53,11 +63,10 @@ class SessionSettings:
     # ------------------------------------------------------------------
 
     @classmethod
-    def from_file(cls, path: str | Path) -> "SessionSettings":
+    def from_file(cls, path: str | Path) -> SessionSettings:
         settings = cls()
         text = Path(path).read_text()
-        parser = configparser.RawConfigParser()
-        parser.optionxform = str  # preserve case
+        parser = _CaseSensitiveParser()
         import io
         parser.read_file(io.StringIO(cls._preprocess(text)))
 
@@ -95,13 +104,12 @@ class SessionSettings:
         return "".join(result)
 
     @classmethod
-    def from_string(cls, text: str) -> "SessionSettings":
+    def from_string(cls, text: str) -> SessionSettings:
         """Parse from a configuration string (useful in tests)."""
         import io
 
         settings = cls()
-        parser = configparser.RawConfigParser()
-        parser.optionxform = str
+        parser = _CaseSensitiveParser()
         parser.read_file(io.StringIO(cls._preprocess(text)))
 
         settings._defaults = dict(parser.defaults())

{fixcore_engine-0.3.0 → fixcore_engine-0.4.0}/fixcore/transport/acceptor.py

@@ -84,7 +84,7 @@ class SocketAcceptor:
             await self._server.wait_closed()
             self._server = None
 
-    async def __aenter__(self) -> "SocketAcceptor":
+    async def __aenter__(self) -> SocketAcceptor:
         await self.start()
         return self
 

{fixcore_engine-0.3.0 → fixcore_engine-0.4.0}/fixcore/transport/initiator.py

@@ -6,8 +6,6 @@ import asyncio
 import logging
 
 from fixcore.application import Application
-
-logger = logging.getLogger(__name__)
 from fixcore.log.base import LogFactory
 from fixcore.session.session import Session
 from fixcore.session.session_id import SessionID
@@ -15,6 +13,8 @@ from fixcore.session.session_settings import SessionSettings
 from fixcore.store.factory import StoreFactory
 from fixcore.transport.framer import MessageFramer
 
+logger = logging.getLogger(__name__)
+
 
 class SocketInitiator:
     """Dials outbound TCP connections for each configured initiator session.
@@ -93,7 +93,7 @@ class SocketInitiator:
             if session.is_logged_on:
                 await session.send_logout()
 
-    async def __aenter__(self) -> "SocketInitiator":
+    async def __aenter__(self) -> SocketInitiator:
         await self.start()
         return self
 
@@ -167,5 +167,5 @@ class SocketInitiator:
         """Sleep for *seconds* but wake immediately if stop is requested."""
         try:
             await asyncio.wait_for(self._stop_event.wait(), timeout=seconds)
-        except asyncio.TimeoutError:
+        except TimeoutError:
             pass

{fixcore_engine-0.3.0 → fixcore_engine-0.4.0/fixcore_engine.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: fixcore-engine
-Version: 0.3.0
+Version: 0.4.0
 Summary: Pure Python FIX protocol engine
 Author-email: Aidan Chisholm <aidan.chisholm@gmail.com>
 License: MIT License

{fixcore_engine-0.3.0 → fixcore_engine-0.4.0}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "fixcore-engine"
-version = "0.3.0"
+version = "0.4.0"
 description = "Pure Python FIX protocol engine"
 readme = "README.md"
 license = { file = "LICENSE" }

{fixcore_engine-0.3.0 → fixcore_engine-0.4.0}/tests/test_cracker.py

@@ -7,9 +7,14 @@ import pytest
 from fixcore.application import Application
 from fixcore.message.cracker import MessageCracker
 from fixcore.message.exceptions import UnsupportedMessageType
-from fixcore.message.message import Message, TAG_BEGIN_STRING, TAG_MSG_TYPE
+from fixcore.message.message import TAG_BEGIN_STRING, TAG_MSG_TYPE, Message
 from fixcore.session.session_id import SessionID
-from fixcore.session.state import TAG_SENDER_COMP_ID, TAG_TARGET_COMP_ID, TAG_MSG_SEQ_NUM, TAG_SENDING_TIME
+from fixcore.session.state import (
+    TAG_MSG_SEQ_NUM,
+    TAG_SENDER_COMP_ID,
+    TAG_SENDING_TIME,
+    TAG_TARGET_COMP_ID,
+)
 
 SID = SessionID("FIX.4.2", "CLIENT", "SERVER")
 
@@ -210,7 +215,9 @@ class TestInstanceRegistration:
         app1.register_instance("D", "on_new_order_single")
 
         # app2 should not have the instance registry
-        assert not hasattr(app2, "_instance_registry") or "D" not in getattr(app2, "_instance_registry", {})
+        assert not hasattr(app2, "_instance_registry") or "D" not in getattr(
+            app2, "_instance_registry", {}
+        )
 
 
 # ---------------------------------------------------------------------------

{fixcore_engine-0.3.0 → fixcore_engine-0.4.0}/tests/test_data_dictionary.py

@@ -6,7 +6,7 @@ import pytest
 
 from fixcore.message.data_dictionary import DataDictionary
 from fixcore.message.exceptions import InvalidMessage
-from fixcore.message.message import Message, TAG_BEGIN_STRING, TAG_MSG_TYPE
+from fixcore.message.message import TAG_BEGIN_STRING, TAG_MSG_TYPE, Message
 
 SPECS = Path(__file__).parent.parent / "specs"
 
@@ -233,6 +233,30 @@ class TestEnumValidation:
     def test_no_enum_always_valid(self):
         assert _dd().validate_field_value(55, "anything")  # Symbol has no enum
 
+    def _make_nos(self, side: str = "1") -> Message:
+        msg = Message()
+        _full_header(msg, "D")
+        msg.set_field(11, "ORD001")             # ClOrdID
+        msg.set_field(21, "1")                  # HandlInst
+        msg.set_field(55, "AAPL")               # Symbol
+        msg.set_field(54, side)                 # Side
+        msg.set_field(40, "2")                  # OrdType — Limit
+        msg.set_field(60, "20240101-09:30:00")  # TransactTime
+        return msg
+
+    def test_validate_rejects_out_of_range_enum(self):
+        with pytest.raises(InvalidMessage, match="out of range") as exc_info:
+            _dd().validate(self._make_nos(side="Z"), check_field_values=True)
+        assert exc_info.value.reason == 5       # value out of range
+        assert exc_info.value.ref_tag == 54     # Side
+
+    def test_validate_accepts_valid_enum(self):
+        _dd().validate(self._make_nos(side="1"), check_field_values=True)  # no raise
+
+    def test_validate_skips_enum_check_by_default(self):
+        # Without check_field_values an out-of-range enum is not rejected.
+        _dd().validate(self._make_nos(side="Z"))  # no raise
+
 
 # ---------------------------------------------------------------------------
 # Full FIX42.xml spec file

{fixcore_engine-0.3.0 → fixcore_engine-0.4.0}/tests/test_file_log.py

@@ -5,7 +5,6 @@ from pathlib import Path
 from fixcore.log.file_log import FileLog, FileLogFactory, _session_filename
 from fixcore.session.session_id import SessionID
 
-
 SID = SessionID("FIX.4.2", "CLIENT", "SERVER")
 SID_Q = SessionID("FIX.4.2", "CLIENT", "SERVER", "Q1")
 
@@ -60,7 +59,7 @@ class TestFileLog:
         log.on_outgoing("msg2")
         log.on_event("disconnect")
         log.close()
-        lines = [l for l in log_file.read_text().splitlines() if l]
+        lines = [ln for ln in log_file.read_text().splitlines() if ln]
         assert len(lines) == 4
 
     def test_appends_across_instances(self, tmp_path):

{fixcore_engine-0.3.0 → fixcore_engine-0.4.0}/tests/test_file_store.py

@@ -1,11 +1,9 @@
 """Tests for FileStore — persistence, recovery, and sequence number durability."""
 
-import pytest
 
 from fixcore.session.session_id import SessionID
 from fixcore.store.file_store import FileStore, _session_prefix
 
-
 SID = SessionID("FIX.4.2", "CLIENT", "SERVER")
 SID_Q = SessionID("FIX.4.2", "CLIENT", "SERVER", "Q1")
 

{fixcore_engine-0.3.0 → fixcore_engine-0.4.0}/tests/test_framer.py

@@ -1,7 +1,12 @@
 """Tests for MessageFramer — stream framing correctness."""
 
-from fixcore.message.message import Message, TAG_BEGIN_STRING, TAG_MSG_TYPE
-from fixcore.session.state import TAG_SENDER_COMP_ID, TAG_TARGET_COMP_ID, TAG_MSG_SEQ_NUM, TAG_SENDING_TIME
+from fixcore.message.message import TAG_BEGIN_STRING, TAG_MSG_TYPE, Message
+from fixcore.session.state import (
+    TAG_MSG_SEQ_NUM,
+    TAG_SENDER_COMP_ID,
+    TAG_SENDING_TIME,
+    TAG_TARGET_COMP_ID,
+)
 from fixcore.transport.framer import MessageFramer
 
 

{fixcore_engine-0.3.0 → fixcore_engine-0.4.0}/tests/test_integration.py

@@ -16,22 +16,21 @@ Scenarios
 from __future__ import annotations
 
 import asyncio
+from collections.abc import Callable
 from pathlib import Path
-from typing import Callable
 
 import pytest
 
 from fixcore.application import Application
 from fixcore.log.base import Log, LogFactory
-from fixcore.log.file_log import FileLog, FileLogFactory
+from fixcore.log.file_log import FileLogFactory
 from fixcore.message.cracker import MessageCracker
 from fixcore.message.exceptions import UnsupportedMessageType
-from fixcore.message.message import Message, TAG_BEGIN_STRING, TAG_MSG_TYPE
+from fixcore.message.message import TAG_BEGIN_STRING, TAG_MSG_TYPE, Message
 from fixcore.session.session import Session
 from fixcore.session.session_id import SessionID
 from fixcore.session.session_settings import SessionSettings
 from fixcore.session.state import (
-    MSG_HEARTBEAT,
     MSG_RESEND_REQUEST,
     MSG_SEQUENCE_RESET,
     TAG_BEGIN_SEQ_NO,
@@ -48,7 +47,6 @@ from fixcore.store.memory import MemoryStore
 from fixcore.transport.acceptor import SocketAcceptor
 from fixcore.transport.initiator import SocketInitiator
 
-
 # ---------------------------------------------------------------------------
 # Shared helpers
 # ---------------------------------------------------------------------------
@@ -568,7 +566,8 @@ class TestMultipleSessions:
 
         class TrackingApp(Application):
             def on_create(self, s): pass
-            def on_logon(self, sid: SessionID): logons[sid.target_comp_id] = logons.get(sid.target_comp_id, 0) + 1
+            def on_logon(self, sid: SessionID):
+                logons[sid.target_comp_id] = logons.get(sid.target_comp_id, 0) + 1
             def on_logout(self, s): pass
             def to_admin(self, m, s): pass
             def to_app(self, m, s): pass

{fixcore_engine-0.3.0 → fixcore_engine-0.4.0}/tests/test_message.py

@@ -2,7 +2,11 @@
 
 import pytest
 
-from fixcore.message.message import Message, TAG_BEGIN_STRING, TAG_MSG_TYPE, TAG_CHECKSUM, TAG_BODY_LENGTH
+from fixcore.message.message import (
+    TAG_BEGIN_STRING,
+    TAG_MSG_TYPE,
+    Message,
+)
 
 
 def _make_heartbeat() -> Message:
@@ -150,6 +154,7 @@ class TestGroups:
 
     def test_decode_with_dd_extracts_groups(self):
         from pathlib import Path
+
         from fixcore.message.data_dictionary import DataDictionary
 
         dd = DataDictionary.from_xml(Path("specs/FIX42.xml"))
@@ -165,6 +170,7 @@ class TestGroups:
 
     def test_roundtrip_with_groups(self):
         from pathlib import Path
+
         from fixcore.message.data_dictionary import DataDictionary
 
         dd = DataDictionary.from_xml(Path("specs/FIX42.xml"))
@@ -182,6 +188,7 @@ class TestGroups:
     def test_empty_group(self):
         """Count tag = 0 produces no instances on decode."""
         from pathlib import Path
+
         from fixcore.message.data_dictionary import DataDictionary
 
         dd = DataDictionary.from_xml(Path("specs/FIX42.xml"))

{fixcore_engine-0.3.0 → fixcore_engine-0.4.0}/tests/test_session.py

@@ -37,9 +37,9 @@ from fixcore.session.state import (
     TAG_REF_SEQ_NUM,
     TAG_REF_TAG_ID,
     TAG_RESET_SEQ_NUM_FLAG,
-    TAG_SESSION_REJECT_REASON,
     TAG_SENDER_COMP_ID,
     TAG_SENDING_TIME,
+    TAG_SESSION_REJECT_REASON,
     TAG_TARGET_COMP_ID,
     TAG_TEST_REQ_ID,
     TAG_TEXT,
@@ -684,14 +684,19 @@ VALIDATING_CFG = (
     + f"DataDictionary={_SPEC_PATH}\n"
 )
 
+# Also reject out-of-range enum values.
+VALIDATING_RANGE_CFG = VALIDATING_CFG + "ValidateFieldsOutOfRange=Y\n"
 
-def _new_order_single(seq: int, *, omit_ord_type: bool = False) -> bytes:
+
+def _new_order_single(
+    seq: int, *, omit_ord_type: bool = False, side: str = "1"
+) -> bytes:
     """Build an inbound NewOrderSingle (msgtype D) with FIX42 required fields."""
     fields = {
         "11": "ORD001",              # ClOrdID
         "21": "1",                   # HandlInst
         "55": "AAPL",                # Symbol
-        "54": "1",                   # Side
+        "54": side,                  # Side
         "60": "20240101-00:00:00",   # TransactTime
         "40": "2",                   # OrdType
     }
@@ -744,6 +749,25 @@ class TestDataDictionaryValidation:
         with pytest.raises(ValueError, match="DataDictionary"):
             _make_session(cfg, SID_CLIENT)
 
+    async def test_out_of_range_enum_rejected_when_enabled(self):
+        session, app, sink = await self._logged_on(VALIDATING_RANGE_CFG)
+        await session.on_data(_new_order_single(2, side="Z"))  # invalid Side
+
+        assert app.from_app_msgs == []
+        assert MSG_REJECT in sink.msg_types()
+        reject = next(m for m in sink.decoded() if m.msg_type == MSG_REJECT)
+        assert reject.get_field(TAG_REF_TAG_ID) == "54"            # Side
+        assert reject.get_field(TAG_SESSION_REJECT_REASON) == "5"  # value out of range
+        await session.on_disconnect()
+
+    async def test_out_of_range_enum_allowed_when_switch_off(self):
+        # ValidateFieldsOutOfRange defaults off — bad enum is delivered as-is.
+        session, app, sink = await self._logged_on(VALIDATING_CFG)
+        await session.on_data(_new_order_single(2, side="Z"))
+        assert len(app.from_app_msgs) == 1
+        assert MSG_REJECT not in sink.msg_types()
+        await session.on_disconnect()
+
 
 # ---------------------------------------------------------------------------
 # Send serialisation (concurrent sends do not interleave)

{fixcore_engine-0.3.0 → fixcore_engine-0.4.0}/tests/test_transport.py

@@ -3,20 +3,17 @@
 from __future__ import annotations
 
 import asyncio
-
-import pytest
+from collections.abc import Callable
 
 from fixcore.application import Application
 from fixcore.log.base import Log, LogFactory
 from fixcore.message.message import Message
 from fixcore.session.session_id import SessionID
 from fixcore.session.session_settings import SessionSettings
-from fixcore.session.state import SessionState
 from fixcore.store.factory import MemoryStoreFactory
 from fixcore.transport.acceptor import SocketAcceptor
 from fixcore.transport.initiator import SocketInitiator
 
-
 # ---------------------------------------------------------------------------
 # Test doubles
 # ---------------------------------------------------------------------------
@@ -91,7 +88,7 @@ async def _free_port() -> int:
         return s.getsockname()[1]
 
 
-async def _wait_for(condition: "Callable[[], bool]", timeout: float = 5.0) -> None:
+async def _wait_for(condition: Callable[[], bool], timeout: float = 5.0) -> None:
     deadline = asyncio.get_event_loop().time() + timeout
     while not condition():
         if asyncio.get_event_loop().time() > deadline: