hytek-parser 2.2.0__tar.gz → 2.4.0__tar.gz

{hytek_parser-2.2.0 → hytek_parser-2.4.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: hytek-parser
-Version: 2.2.0
+Version: 2.4.0
 Summary: Parsers for the files produced by Hytek's Meet Manager.
 Home-page: https://www.github.com/SwimComm/hytek-parser
 License: MIT

hytek_parser-2.4.0/hytek_parser/hy3/_utils.py

@@ -0,0 +1,69 @@
+import math
+from typing import Optional, Union
+
+from hytek_parser._utils import safe_cast, select_from_enum
+from hytek_parser.hy3.enums import ReplacedTimeTimeCode
+
+
+def parse_time(raw_time: str) -> Union[float, ReplacedTimeTimeCode]:
+    """Parse a time into either a number or time code.
+
+    Args:
+        raw_time (str): The time string extracted from the Hytek file.
+
+    Returns:
+        Union[float, ReplacedTimeTimeCode]: Either a numerical time or a time code.
+    """
+    if (casted := safe_cast(float, raw_time, default=-1)) != -1:
+        # Number
+        return casted
+    else:
+        return select_from_enum(ReplacedTimeTimeCode, raw_time)
+
+
+def parse_time_or_none(raw_time: str) -> Optional[float]:
+    """Parse a timing field where 0.00/blank means 'not recorded'.
+
+    Unlike parse_time (which returns 0.0 for "0.00" and a ReplacedTimeTimeCode
+    for blank/non-numeric input), this returns None unless the value is a
+    positive float. Used for pad and backup-button times, where an unused
+    slot is written as 0.00 and should surface as None rather than 0.0.
+    """
+    val = parse_time(raw_time)
+    return val if isinstance(val, float) and val > 0.0 else None
+
+
+def parse_reaction_time(raw: str) -> Optional[float]:
+    """Parse a reaction/takeoff-time column (E2 col 83-87, F2 col 83-102).
+
+    NEGATIVE VALUES ARE MEANINGFUL and load-bearing here: a relay takeover slot
+    records an early exchange as a negative number (7,868 values corpus-wide).
+    ``parse_time_or_none`` requires > 0.0 and would silently destroy every one
+    of them -- do not substitute it.
+
+    Sentinels, all meaning "not recorded": blank, 0.00 in any sign spelling,
+    and the literal NRT ("No Reaction Time") that Meet Manager writes into
+    takeover slots when the exchange was not measured.
+
+    Values above the plausible reaction range are returned unchanged. A
+    minority of files put something else in these columns; its meaning is
+    unresolved, and filtering it here would make it permanently invisible.
+    """
+    val = raw.strip()
+    if not val or val.upper() == "NRT":
+        return None
+    try:
+        num = float(val)
+    except ValueError:
+        # Observed malformed forms: a bare "+" sign, stray high bytes.
+        return None
+    if not math.isfinite(num):
+        # float() accepts "nan"/"inf"/"-inf", all five characters or fewer,
+        # so they fit this column like any other token. Neither is a
+        # reaction time -- and a bare int() downstream would raise on them
+        # (ValueError on nan, OverflowError on inf) instead of yielding None
+        # like every other malformed token, dropping the whole file.
+        return None
+    # float() maps "0.00", "+0.00" and "-0.00" all to zero; all three are the
+    # "not recorded" sentinel.
+    return None if num == 0.0 else num

{hytek_parser-2.2.0 → hytek_parser-2.4.0}/hytek_parser/hy3/enums.py

@@ -12,6 +12,25 @@ class Gender(Enum):
     FEMALE = "F"
     UNKNOWN = "U"
 
+    @classmethod
+    def _missing_(cls, value):
+        # Hy-Tek exporters occasionally emit a lowercase sex byte. Case is
+        # not meaningful in this column, and UNKNOWN specifically means
+        # "the file did not say" -- so a lowercase 'm' has to resolve to
+        # MALE rather than become indistinguishable from a blank column.
+        #
+        # Retry ONLY when upcasing changes the value. Without that guard an
+        # unrecognized uppercase byte re-enters this hook with an identical
+        # value and recurses forever.
+        #
+        # _missing_ rather than aenum's native _missing_value_: both work
+        # here, but _missing_ is also the stdlib hook, so it keeps working
+        # if the enum base ever changes. _missing_value_ would silently
+        # become a no-op and reintroduce the bug with no signal.
+        if isinstance(value, str) and value.upper() != value:
+            return cls(value.upper())
+        return None
+
 
 class Stroke(Enum):
     """Types of swimming strokes."""
@@ -23,6 +42,18 @@ class Stroke(Enum):
     BREASTSTROKE = "C", "3", 3
     BUTTERFLY = "D", "4", 4
     MEDLEY = "E", "5", 5
+    # Diving. Hy-Tek encodes the BOARD in the stroke column:
+    #   F = 1-metre springboard, G = 3-metre springboard, H = platform.
+    # Verified on a multi-conference corpus: the chars nest strictly
+    # (F, then F+G, then F+G+H -- never G without F, never H without G),
+    # carry the same dive count within a meet, and their median scores
+    # ascend with degree of difficulty.
+    # Without these members all three fall through select_from_enum() to
+    # UNKNOWN, which is the catch-all for any unrecognized byte -- making
+    # diving indistinguishable from file corruption.
+    DIVING_1M = "F"
+    DIVING_3M = "G"
+    DIVING_PLATFORM = "H"
 
     UNKNOWN = "U", "0", 0
 

{hytek_parser-2.2.0 → hytek_parser-2.4.0}/hytek_parser/hy3/line_parsers/__init__.py

@@ -9,7 +9,7 @@ from .d_swimmer_parsers import d1_parser
 from .e_event_parsers import e1_parser, e2_parser
 from .f_relay_parsers import f1_parser, f2_parser, f3_parser
 from .g_split_parsers import g1_parser
-from .h_dq_parsers import h1_parser
+from .h_dq_parsers import h1_parser, h2_parser
 
 __all__ = ["HY3_LINE_PARSERS"]
 
@@ -38,4 +38,5 @@ HY3_LINE_PARSERS: dict[
     "G1": g1_parser,
     # DQ info
     "H1": h1_parser,
+    "H2": h2_parser,
 }

{hytek_parser-2.2.0 → hytek_parser-2.4.0}/hytek_parser/hy3/line_parsers/b_meet_parsers.py

@@ -33,6 +33,8 @@ def b2_parser(
     meet.masters = extract(line, 94, 2) == "06"
     meet.type_ = select_from_enum(MeetType, extract(line, 97, 2))
     meet.course = select_from_enum(Course, extract(line, 99, 1))
+    meet.notes = extract(line, 3, 45) or None
+    meet.sanction_number = extract(line, 109, 20) or None
 
     file.meet = meet
     return file

{hytek_parser-2.2.0 → hytek_parser-2.4.0}/hytek_parser/hy3/line_parsers/e_event_parsers.py

@@ -2,7 +2,7 @@ from datetime import datetime
 from typing import Any
 
 from hytek_parser._utils import extract, get_age_group, safe_cast, select_from_enum
-from hytek_parser.hy3._utils import parse_time, parse_time_or_none
+from hytek_parser.hy3._utils import parse_reaction_time, parse_time, parse_time_or_none
 from hytek_parser.hy3.enums import (
     Course,
     DisqualificationCode,
@@ -66,8 +66,9 @@ def e1_parser(
     # Meet Division: col 77-79 in most MM versions, col 92-93 in MM4/MM5-7.0Fa.
     # The two are mutually exclusive; col 77 takes precedence.
     meet_division = extract(line, 77, 3) or extract(line, 92, 2) or None
+    exhibition = extract(line, 84, 1) == "X"
 
-    event.get_or_create_entry(
+    entry = event.get_or_create_entry(
         swimmers=entry_swimmers,
         relay=False,
         event_number=entry_event_number,
@@ -76,6 +77,7 @@ def e1_parser(
         converted_seed_time=entry_converted_seed_time,
         converted_seed_time_course=entry_converted_seed_time_course,
         meet_division=meet_division,
+        exhibition=exhibition,
     )
 
     # Update event
@@ -115,6 +117,8 @@ def e2_parser(
     button_3_time = parse_time_or_none(extract(line, 55, 8))
     backup_4_time = parse_time_or_none(extract(line, 75, 8))
     alt_time_code = extract(line, 96, 1) or None  # observed: 'A' / 'K' / blank
+    # col 83-87. Signed; sentinels are blank / 0.00 in any sign spelling.
+    reaction_time = parse_reaction_time(extract(line, 83, 5))
 
     raw_date = extract(line, 88, 8).strip()
     date_ = datetime.strptime(raw_date, "%m%d%Y").date() if raw_date else None
@@ -148,6 +152,7 @@ def e2_parser(
     setattr(entry, f"{prefix}_button_2_time", button_2_time)
     setattr(entry, f"{prefix}_button_3_time", button_3_time)
     setattr(entry, f"{prefix}_backup_4_time", backup_4_time)
+    setattr(entry, f"{prefix}_reaction_time", reaction_time)
     setattr(entry, f"{prefix}_alt_time_code", alt_time_code)
 
     event.last_entry = entry

{hytek_parser-2.2.0 → hytek_parser-2.4.0}/hytek_parser/hy3/line_parsers/f_relay_parsers.py

@@ -2,7 +2,7 @@ from datetime import datetime
 from typing import Any
 
 from hytek_parser._utils import extract, get_age_group, safe_cast, select_from_enum
-from hytek_parser.hy3._utils import parse_time, parse_time_or_none
+from hytek_parser.hy3._utils import parse_reaction_time, parse_time, parse_time_or_none
 from hytek_parser.hy3.enums import (
     Course,
     DisqualificationCode,
@@ -108,9 +108,11 @@ def f2_parser(
     overall_place = safe_cast(int, extract(line, 30, 4))
 
     # previously-dropped F2 timing fields. The five timing-column
-    # offsets are IDENTICAL to e2_parser; only alt_time_code differs because F2
-    # has a 15-column gap before its date field (date at col 103, not 88).
-    # F2 alt_time_code lives at col 111, not col 96.
+    # offsets are IDENTICAL to e2_parser. F2 then carries FOUR reaction-time
+    # slots at cols 83-102 (5 chars each) where E2 carries one at 83-87, which
+    # is why F2's date sits at col 103 and its alt_time_code at col 111.
+    # Slot 1 is the leadoff block start; slots 2-4 are exchange takeovers and
+    # are legitimately negative when a swimmer leaves early.
     pad_time      = parse_time_or_none(extract(line, 63, 12))
     button_1_time = parse_time_or_none(extract(line, 39, 8))
     button_2_time = parse_time_or_none(extract(line, 47, 8))
@@ -118,6 +120,10 @@ def f2_parser(
     backup_4_time = parse_time_or_none(extract(line, 75, 8))
     alt_time_code = extract(line, 111, 1) or None  # F2 offset; observed: 'A'/'K'/blank
 
+    reaction_times = [
+        parse_reaction_time(extract(line, 83 + 5 * i, 5)) for i in range(4)
+    ]
+
     raw_date = extract(line, 103, 8).strip()
     date_ = datetime.strptime(raw_date, "%m%d%Y").date() if raw_date else None
 
@@ -150,6 +156,7 @@ def f2_parser(
     setattr(entry, f"{prefix}_button_2_time", button_2_time)
     setattr(entry, f"{prefix}_button_3_time", button_3_time)
     setattr(entry, f"{prefix}_backup_4_time", backup_4_time)
+    setattr(entry, f"{prefix}_reaction_times", reaction_times)
     setattr(entry, f"{prefix}_alt_time_code", alt_time_code)
 
     event.last_entry = entry
@@ -172,7 +179,14 @@ def f3_parser(
             # Out of swimmers
             break
 
-        swimmer = file.meet.swimmers[swimmer_meet_id]
+        swimmer = file.meet.swimmers.get(swimmer_meet_id)
+        if swimmer is None:
+            # The F3 leg references a swimmer meet-id with no D1 roster record in
+            # this file — seen in some incomplete meet exports (e.g. relay legs for
+            # athletes the roster section omits). Skip the leg rather than raising a
+            # KeyError; the relay keeps its other legs. Mirrors the tolerance the
+            # empty-swimmers and absent-leg-1 cases already get below.
+            continue
         swimmer_leg = safe_cast(int, extract(line, 15 + offset, 1))
 
         # Hy-Tek encodes legs 1..8; preserve the leg number as-is.

hytek_parser-2.4.0/hytek_parser/hy3/line_parsers/h_dq_parsers.py

@@ -0,0 +1,81 @@
+from typing import Any
+
+from hytek_parser._utils import extract, select_from_enum
+from hytek_parser.hy3.enums import DisqualificationCode
+from hytek_parser.hy3.schemas import ParsedHytekFile
+
+
+def h1_parser(
+    line: str, file: ParsedHytekFile, opts: dict[str, Any]
+) -> ParsedHytekFile:
+    """Parse a G1 split time entry."""
+    # Get event
+    event_num, event = file.meet.last_event
+    entry = event.last_entry
+
+    # Get dq code and message
+    dq_code = select_from_enum(DisqualificationCode, extract(line, 3, 2))
+    dq_info = extract(line, 5, 124)  # Whitespace is stripped
+
+    # No-op if the entry carries no DQ slot to attach to — mirrors h2_parser.
+    # An H1 can appear whose last_entry is not the DQ'd swim it describes (e.g. a
+    # relay DQ, or a non-DQ entry emitted between the DQ result and its H1); skip
+    # the detail rather than raising. The DQ result itself is unaffected, only the
+    # human-readable reason string is dropped.
+    if not (entry.prelim_dq_info or entry.swimoff_dq_info or entry.finals_dq_info):
+        return file
+
+    if entry.finals_dq_info:
+        # DQ happened in prelims
+        assert (
+            entry.finals_dq_info.code == dq_code
+        ), "DQ Codes should match in the H1 line"
+
+        entry.finals_dq_info.info_str = dq_info
+    elif entry.swimoff_dq_info:
+        # DQ happened in prelims
+        assert (
+            entry.swimoff_dq_info.code == dq_code
+        ), "DQ Codes should match in the H1 line"
+
+        entry.swimoff_dq_info.info_str = dq_info
+    elif entry.prelim_dq_info:
+        # DQ happened in prelims
+        assert (
+            entry.prelim_dq_info.code == dq_code
+        ), "DQ Codes should match in the H1 line"
+
+        entry.prelim_dq_info.info_str = dq_info
+
+    event.last_entry = entry
+    file.meet.last_event = (event_num, event)
+
+    return file
+
+
+def h2_parser(
+    line: str, file: ParsedHytekFile, opts: dict[str, Any]
+) -> ParsedHytekFile:
+    """Parse an H2 line: the specific, human-readable DQ infraction detail.
+
+    Attaches the detail text to whichever DQ slot the preceding H1 populated
+    (finals -> swimoff -> prelim), mirroring h1_parser's resolution. Unlike H1,
+    the H2 2-char code is NOT asserted against the DQ code (it is a stroke/leg
+    sub-classification, not the same DisqualificationCode). No-op if no DQ slot
+    is set.
+    """
+    event_num, event = file.meet.last_event
+    entry = event.last_entry
+
+    detail = extract(line, 5, 124) or None
+
+    if entry.finals_dq_info:
+        entry.finals_dq_info.info_str_detail = detail
+    elif entry.swimoff_dq_info:
+        entry.swimoff_dq_info.info_str_detail = detail
+    elif entry.prelim_dq_info:
+        entry.prelim_dq_info.info_str_detail = detail
+
+    event.last_entry = entry
+    file.meet.last_event = (event_num, event)
+    return file

{hytek_parser-2.2.0 → hytek_parser-2.4.0}/hytek_parser/hy3/schemas.py

@@ -1,5 +1,5 @@
 from datetime import date, datetime
-from typing import Optional, Union
+from typing import List, Optional, Union
 
 from attrs import Factory, define, field
 
@@ -84,6 +84,7 @@ class DisqualificationInfo:
 
     code: DisqualificationCode
     info_str: Optional[str] = None
+    info_str_detail: Optional[str] = None
 
 
 @define(init=False)
@@ -118,6 +119,8 @@ class EventEntry:
     prelim_button_2_time: Optional[float] = None
     prelim_button_3_time: Optional[float] = None
     prelim_backup_4_time: Optional[float] = None
+    prelim_reaction_time: Optional[float] = None
+    prelim_reaction_times: Optional[List[Optional[float]]] = None
     # col 96; semantics unverified — observed 'A'/'K'/blank
     prelim_alt_time_code: Optional[str] = None
 
@@ -138,6 +141,8 @@ class EventEntry:
     swimoff_button_2_time: Optional[float] = None
     swimoff_button_3_time: Optional[float] = None
     swimoff_backup_4_time: Optional[float] = None
+    swimoff_reaction_time: Optional[float] = None
+    swimoff_reaction_times: Optional[List[Optional[float]]] = None
     # col 96; semantics unverified — observed 'A'/'K'/blank
     swimoff_alt_time_code: Optional[str] = None
 
@@ -158,6 +163,8 @@ class EventEntry:
     finals_button_2_time: Optional[float] = None
     finals_button_3_time: Optional[float] = None
     finals_backup_4_time: Optional[float] = None
+    finals_reaction_time: Optional[float] = None
+    finals_reaction_times: Optional[List[Optional[float]]] = None
     # col 96; semantics unverified — observed 'A'/'K'/blank
     finals_alt_time_code: Optional[str] = None
 
@@ -171,6 +178,7 @@ class EventEntry:
     # or numeric ('0'/'1'/'2'/'3'). Stored at cols 77-79 in most MM versions,
     # cols 92-93 in MM4/MM5-7.0Fa (read with col-77 precedence).
     meet_division: Optional[str] = None
+    exhibition: bool = False
 
     def __init__(
         self,
@@ -184,6 +192,7 @@ class EventEntry:
         relay_team_id: Optional[str] = None,
         relay_swim_team_code: Optional[str] = None,
         meet_division: Optional[str] = None,
+        exhibition: bool = False,
     ) -> None:
         self.swimmers = swimmers
         self.relay = relay
@@ -195,6 +204,7 @@ class EventEntry:
         self.relay_team_id = relay_team_id
         self.relay_swim_team_code = relay_swim_team_code
         self.meet_division = meet_division
+        self.exhibition = exhibition
 
         for course in ("prelim", "swimoff", "finals"):
             setattr(self, f"{course}_time", None)
@@ -212,6 +222,8 @@ class EventEntry:
             setattr(self, f"{course}_button_2_time", None)
             setattr(self, f"{course}_button_3_time", None)
             setattr(self, f"{course}_backup_4_time", None)
+            setattr(self, f"{course}_reaction_time", None)
+            setattr(self, f"{course}_reaction_times", None)
             setattr(self, f"{course}_alt_time_code", None)
 
         self.prelim_dq_info = None
@@ -283,6 +295,7 @@ class Event:
         relay_team_id: Optional[str] = None,
         relay_swim_team_code: Optional[str] = None,
         meet_division: Optional[str] = None,
+        exhibition: bool = False,
     ) -> EventEntry:
         """Get an event entry or create one if needed."""
         entry = EventEntry(
@@ -296,6 +309,7 @@ class Event:
             relay_team_id=relay_team_id,
             relay_swim_team_code=relay_swim_team_code,
             meet_division=meet_division,
+            exhibition=exhibition,
         )
         if self.entries and self.entries[-1].same_swimmer_entry_as(entry):
             # P/F entries always listed together: a swimmer (individuals) or a
@@ -342,6 +356,12 @@ class Meet:
     swimmers: dict[int, Swimmer]
     events: dict[str, Event]
 
+    # Extended info (optional; populated by later parser stages). Kept at the
+    # end of the field block (not next to `facility`/`country`) because attrs
+    # forbids a defaulted field preceding the non-default fields above.
+    sanction_number: Optional[str] = None
+    notes: Optional[str] = None
+
     # Bookeeping
     _last_team: tuple[str, Team] = field(default=None)
     _last_event: tuple[str, Event] = field(default=None)

{hytek_parser-2.2.0 → hytek_parser-2.4.0}/pyproject.toml

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "hytek-parser"
-version = "2.2.0"
+version = "2.4.0"
 description = "Parsers for the files produced by Hytek's Meet Manager."
 license = "MIT"
 authors = ["Nino Maruszewski <nino.maruszewski@hotmail.com>"]

hytek_parser-2.2.0/hytek_parser/hy3/_utils.py

@@ -1,32 +0,0 @@
-from typing import Optional, Union
-
-from hytek_parser._utils import safe_cast, select_from_enum
-from hytek_parser.hy3.enums import ReplacedTimeTimeCode
-
-
-def parse_time(raw_time: str) -> Union[float, ReplacedTimeTimeCode]:
-    """Parse a time into either a number or time code.
-
-    Args:
-        raw_time (str): The time string extracted from the Hytek file.
-
-    Returns:
-        Union[float, ReplacedTimeTimeCode]: Either a numerical time or a time code.
-    """
-    if (casted := safe_cast(float, raw_time, default=-1)) != -1:
-        # Number
-        return casted
-    else:
-        return select_from_enum(ReplacedTimeTimeCode, raw_time)
-
-
-def parse_time_or_none(raw_time: str) -> Optional[float]:
-    """Parse a timing field where 0.00/blank means 'not recorded'.
-
-    Unlike parse_time (which returns 0.0 for "0.00" and a ReplacedTimeTimeCode
-    for blank/non-numeric input), this returns None unless the value is a
-    positive float. Used for pad and backup-button times, where an unused
-    slot is written as 0.00 and should surface as None rather than 0.0.
-    """
-    val = parse_time(raw_time)
-    return val if isinstance(val, float) and val > 0.0 else None

hytek_parser-2.2.0/hytek_parser/hy3/line_parsers/h_dq_parsers.py

@@ -1,49 +0,0 @@
-from typing import Any
-
-from hytek_parser._utils import extract, select_from_enum
-from hytek_parser.hy3.enums import DisqualificationCode
-from hytek_parser.hy3.schemas import ParsedHytekFile
-
-
-def h1_parser(
-    line: str, file: ParsedHytekFile, opts: dict[str, Any]
-) -> ParsedHytekFile:
-    """Parse a G1 split time entry."""
-    # Get event
-    event_num, event = file.meet.last_event
-    entry = event.last_entry
-
-    # Get dq code and message
-    dq_code = select_from_enum(DisqualificationCode, extract(line, 3, 2))
-    dq_info = extract(line, 5, 124)  # Whitespace is stripped
-
-    assert (
-        entry.prelim_dq_info or entry.swimoff_dq_info or entry.finals_dq_info
-    ), "There must be a DQ for there to be an H1 line"
-
-    if entry.finals_dq_info:
-        # DQ happened in prelims
-        assert (
-            entry.finals_dq_info.code == dq_code
-        ), "DQ Codes should match in the H1 line"
-
-        entry.finals_dq_info.info_str = dq_info
-    elif entry.swimoff_dq_info:
-        # DQ happened in prelims
-        assert (
-            entry.swimoff_dq_info.code == dq_code
-        ), "DQ Codes should match in the H1 line"
-
-        entry.swimoff_dq_info.info_str = dq_info
-    elif entry.prelim_dq_info:
-        # DQ happened in prelims
-        assert (
-            entry.prelim_dq_info.code == dq_code
-        ), "DQ Codes should match in the H1 line"
-
-        entry.prelim_dq_info.info_str = dq_info
-
-    event.last_entry = entry
-    file.meet.last_event = (event_num, event)
-
-    return file