fixtureqa 0.4.22__tar.gz → 0.4.23__tar.gz

{fixtureqa-0.4.22/fixtureqa.egg-info → fixtureqa-0.4.23}/PKG-INFO

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

{fixtureqa-0.4.22 → fixtureqa-0.4.23}/fixture/api/routers/messages.py

@@ -4,6 +4,7 @@ from typing import Annotated, Optional
 from fastapi import APIRouter, Depends, HTTPException, Query
 from fastapi.responses import StreamingResponse
 
+from ...core.message_store import MessageStore
 from ...core.models import SessionConfig
 from ...core.session_manager import SessionManager
 from ...core.user_store import User
@@ -16,6 +17,20 @@ SM = Annotated[SessionManager, Depends(get_session_manager)]
 OwnedSession = Annotated[SessionConfig, Depends(get_owned_session)]
 
 
+def _to_response(e) -> MessageEntryResponse:
+    return MessageEntryResponse(
+        id=e.id,
+        direction=e.direction,
+        admin=e.admin,
+        seq_num=e.seq_num,
+        msg_type=e.msg_type,
+        msg_type_name=e.msg_type_name,
+        ts=e.timestamp.isoformat(),
+        fields={str(k): v for k, v in e.fields.items()},
+        raw=e.raw,
+    )
+
+
 @router.get("/{session_id}/messages", response_model=list[MessageEntryResponse])
 def get_messages(
     session_id: str,
@@ -44,20 +59,30 @@ def get_messages(
         before_id=before_id,
     )
 
-    return [
-        MessageEntryResponse(
-            id=e.id,
-            direction=e.direction,
-            admin=e.admin,
-            seq_num=e.seq_num,
-            msg_type=e.msg_type,
-            msg_type_name=e.msg_type_name,
-            ts=e.timestamp.isoformat(),
-            fields={str(k): v for k, v in e.fields.items()},
-            raw=e.raw,
-        )
-        for e in entries
-    ]
+    return [_to_response(e) for e in entries]
+
+
+@router.get("/{session_id}/messages/search", response_model=list[MessageEntryResponse])
+def search_messages(
+    session_id: str,
+    _cfg: OwnedSession,
+    sm: SM,
+    q: str = Query(..., min_length=1, description="substring or regex query over raw FIX"),
+    regex: bool = Query(default=False, description="treat q as a regular expression"),
+    limit: int = Query(default=1000, ge=1, le=5000),
+):
+    """Search the session's full messages.db history (not just the loaded page).
+    Matches against the raw FIX with SOH normalised to '|'. Returns the most
+    recent `limit` matches, oldest-first."""
+    writer = sm.message_writer
+    if writer is None:
+        return []  # message persistence disabled globally — nothing in messages.db
+    store = MessageStore(session_id, writer)
+    try:
+        entries = store.search_entries(q, regex=regex, limit=limit)
+    except ValueError as e:
+        raise HTTPException(status_code=400, detail=str(e))
+    return [_to_response(e) for e in entries]
 
 
 @router.get("/{session_id}/messages/export")

{fixtureqa-0.4.22 → fixtureqa-0.4.23}/fixture/core/message_store.py

@@ -12,6 +12,7 @@ inserts so the I/O thread is never blocked by SQLite.
 import json
 import logging
 import queue
+import re
 import sqlite3
 import threading
 from concurrent.futures import Future
@@ -78,6 +79,12 @@ def _entry_to_row(session_id: str, entry: LogEntry) -> tuple:
     )
 
 
+def _like_escape(s: str) -> str:
+    """Escape LIKE wildcards so a substring query matches literally (paired
+    with ESCAPE '\\' in the SQL)."""
+    return s.replace("\\", "\\\\").replace("%", "\\%").replace("_", "\\_")
+
+
 def _row_to_entry(row) -> LogEntry:
     row_id, _, ts, direction, admin, seq_num, mt, mt_name, raw, fields_json = row
     return LogEntry(
@@ -364,6 +371,56 @@ class MessageStore:
 
         return [_row_to_entry(r) for r in rows]
 
+    def search_entries(
+        self,
+        query: str,
+        *,
+        regex: bool = False,
+        limit: int = 1000,
+    ) -> list[LogEntry]:
+        """Search this session's persisted messages by raw content — the whole
+        messages.db history for the session, not just a loaded page.
+
+        The haystack is the raw FIX with SOH normalised to '|' (so a typed
+        'tag=value' matches and the pattern lines up with the on-screen view).
+        text mode: case-insensitive substring via LIKE. regex mode: Python re
+        (case-insensitive) via a per-connection REGEXP function. Returns up to
+        `limit` most-recent matches, oldest-first. Raises ValueError on an
+        invalid regex (the route maps it to a 400)."""
+        query = query.strip()
+        if not query:
+            return []
+
+        hay = "replace(raw, char(1), '|')"
+        select = (
+            "SELECT id, session_id, ts, direction, admin, seq_num, "
+            "msg_type, msg_type_name, raw, fields_json FROM messages "
+            "WHERE session_id = ?"
+        )
+        params: list = [self._session_id]
+
+        with closing(_connect(self._db_path)) as conn:
+            if regex:
+                try:
+                    rx = re.compile(query, re.IGNORECASE)
+                except re.error as e:
+                    raise ValueError(f"invalid regex: {e}") from e
+                conn.create_function(
+                    "re_match", 1,
+                    lambda v: 1 if v is not None and rx.search(v) else 0,
+                    deterministic=True,
+                )
+                cond = f"re_match({hay})"
+            else:
+                cond = f"{hay} LIKE ? ESCAPE '\\'"
+                params.append(f"%{_like_escape(query)}%")
+            sql = (f"SELECT * FROM ({select} AND {cond} ORDER BY id DESC LIMIT ?) "
+                   "ORDER BY id ASC")
+            params.append(limit)
+            rows = conn.execute(sql, params).fetchall()
+
+        return [_row_to_entry(r) for r in rows]
+
     def __len__(self) -> int:
         with closing(_connect(self._db_path)) as conn:
             row = conn.execute(

{fixtureqa-0.4.22 → fixtureqa-0.4.23}/fixture/core/models.py

@@ -108,3 +108,8 @@ class SessionState:
     message_log: Optional[MessageLog] = field(default=None)  # set by Session on init
     status_changed_at: Optional[float] = None  # time.time() of last status transition
     last_heartbeat_at: Optional[float] = None  # time.time() of last inbound Heartbeat
+    # >0 while one or more perf runs drive this session: the run generates its
+    # own acks/fills, so venue auto-responses must stay silent to avoid
+    # duplicate/conflicting ExecReports corrupting the measurement. Counter (not
+    # bool) so overlapping runs nest. Runtime-only — never persisted.
+    perf_active: int = 0

{fixtureqa-0.4.22 → fixtureqa-0.4.23}/fixture/core/perf_engine.py

@@ -232,8 +232,10 @@ class PerfRun:
                 "inbound 35=F from the external client is still answered")
         if self._has_client:
             self._client_sub = self._sm.subscribe_session(self.config.client_session_id)
+            self._sm.mark_perf_active(self.config.client_session_id)
         if self._has_venue:
             self._venue_sub = self._sm.subscribe_session(self.config.venue_session_id)
+            self._sm.mark_perf_active(self.config.venue_session_id)
         self._writer.write_run(self._run_record())
         self._main = asyncio.create_task(self._run())
 
@@ -296,8 +298,10 @@ class PerfRun:
         self._venue_sends.clear()
         if self._client_sub:
             self._client_sub.close()
+            self._sm.unmark_perf_active(self.config.client_session_id)
         if self._venue_sub:
             self._venue_sub.close()
+            self._sm.unmark_perf_active(self.config.venue_session_id)
         if self._latency_csv is not None:
             # Correlator is cancelled (no more enqueues); drain + gzip-finalize
             # off-loop — close() joins the writer thread.

{fixtureqa-0.4.22 → fixtureqa-0.4.23}/fixture/core/session.py

@@ -286,8 +286,12 @@ class Session:
                 self.state.last_recv_seq_num = entry.seq_num
                 if entry.msg_type == "0":  # Heartbeat
                     self.state.last_heartbeat_at = time.time()
+                # Stay silent while a perf run drives this session — the run
+                # generates its own acks/fills, so an auto-response here would
+                # double up and corrupt the measurement.
                 if (entry.msg_type == "D" and not entry.admin
-                        and self.config.session_role.value == "venue"):
+                        and self.config.session_role.value == "venue"
+                        and self.state.perf_active == 0):
                     self._schedule_venue_responses(entry.fields)
 
         self._event_handler(event)

{fixtureqa-0.4.22 → fixtureqa-0.4.23}/fixture/core/session_manager.py

@@ -223,6 +223,23 @@ class SessionManager:
                 if not subs:
                     self._session_subs.pop(sub.session_id, None)
 
+    def mark_perf_active(self, session_id: str) -> None:
+        """A perf run started driving this session — suppress its venue
+        auto-responses (the run owns the acks/fills) until unmarked. Counter,
+        so overlapping runs nest. Mirror with unmark_perf_active()."""
+        with self._lock:
+            session = self._sessions.get(session_id)
+        if session is not None:
+            session.state.perf_active += 1
+
+    def unmark_perf_active(self, session_id: str) -> None:
+        """A perf run stopped driving this session. Tolerates a session removed
+        mid-run (lookup may miss) and never underflows below zero."""
+        with self._lock:
+            session = self._sessions.get(session_id)
+        if session is not None:
+            session.state.perf_active = max(0, session.state.perf_active - 1)
+
     # ------------------------------------------------------------------
     # Internal
     # ------------------------------------------------------------------