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

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

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: hytek-parser
-Version: 2.4.0
+Version: 3.0.1
 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-3.0.1}/hytek_parser/_utils.py

@@ -143,11 +143,17 @@ def int_or_none(value:str|None) -> int|None:
     return int(value) if value and value.isdigit() else None
 
 def date_or_none(value: str|None) -> date|None:
-    """Safely return either a date from a numeric string value, or None
+    """Safely return either a valid date from a numeric string value, or None
     
     Args:
         value (str|None): The value to cast to date 
     
     Returns:
-        date|None: Either the parsed date value or None"""
-    return datetime.strptime(value, "%m%d%Y").date() if value and value.isnumeric() else None
+        date|None: The parsed date, or None for blank, malformed, or invalid values"""
+    if not value or not value.isnumeric():
+        return None
+    try:
+        return datetime.strptime(value, "%m%d%Y").date()
+    except ValueError:
+        # Some Meet Manager exports contain numeric but impossible dates.
+        return None

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

@@ -1,7 +1,12 @@
-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._utils import (
+    date_or_none,
+    extract,
+    get_age_group,
+    safe_cast,
+    select_from_enum,
+)
 from hytek_parser.hy3._utils import parse_reaction_time, parse_time, parse_time_or_none
 from hytek_parser.hy3.enums import (
     Course,
@@ -12,6 +17,7 @@ from hytek_parser.hy3.enums import (
     Stroke,
     WithTimeTimeCode,
 )
+from hytek_parser.hy3.line_parsers.h_dq_parsers import LAST_DQ_SLOT_KEY
 from hytek_parser.hy3.schemas import DisqualificationInfo, ParsedHytekFile
 
 
@@ -26,7 +32,7 @@ def e1_parser(
     # Event info
     event_gender = select_from_enum(Gender, extract(line, 14, 1))
     event_gender_age = select_from_enum(GenderAge, extract(line, 15, 1))
-    distance = safe_cast(int, extract(line, 16, 6))
+    distance = safe_cast(float, extract(line, 16, 6))
     stroke = select_from_enum(Stroke, extract(line, 22, 1))
     age_min, age_max = get_age_group(
         age_min=safe_cast(int, extract(line, 23, 3)),
@@ -120,8 +126,7 @@ def e2_parser(
     # 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
+    date_ = date_or_none(extract(line, 88, 8).strip())
 
     # Get entry
     event_num, event = file.meet.last_event
@@ -155,6 +160,12 @@ def e2_parser(
     setattr(entry, f"{prefix}_reaction_time", reaction_time)
     setattr(entry, f"{prefix}_alt_time_code", alt_time_code)
 
+    # Anchor the H1 reason / H2 detail lines that follow to this DQ slot (see
+    # h_dq_parsers). File position is the only signal that survives a same-code
+    # prelim+finals double-DQ; clear it on a non-DQ result so a later orphaned
+    # H1/H2 does not attach to a stale slot.
+    opts[LAST_DQ_SLOT_KEY] = f"{prefix}_dq_info" if dq_info is not None else None
+
     event.last_entry = entry
     file.meet.last_event = (event_num, event)
 

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

@@ -1,7 +1,12 @@
-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._utils import (
+    date_or_none,
+    extract,
+    get_age_group,
+    safe_cast,
+    select_from_enum,
+)
 from hytek_parser.hy3._utils import parse_reaction_time, parse_time, parse_time_or_none
 from hytek_parser.hy3.enums import (
     Course,
@@ -11,6 +16,7 @@ from hytek_parser.hy3.enums import (
     Stroke,
     WithTimeTimeCode,
 )
+from hytek_parser.hy3.line_parsers.h_dq_parsers import LAST_DQ_SLOT_KEY
 from hytek_parser.hy3.schemas import (
     DisqualificationInfo,
     Gender,
@@ -30,7 +36,7 @@ def f1_parser(
     # Get event info
     event_gender = select_from_enum(Gender, extract(line, 14, 1))
     event_gender_age = select_from_enum(GenderAge, extract(line, 15, 1))
-    distance = safe_cast(int, extract(line, 16, 6))
+    distance = safe_cast(float, extract(line, 16, 6))
     stroke = select_from_enum(Stroke, extract(line, 22, 1))
 
     # Have to set these now since swimmer ages are not available yet
@@ -124,8 +130,7 @@ def f2_parser(
         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
+    date_ = date_or_none(extract(line, 103, 8).strip())
 
     # Get entry
     event_num, event = file.meet.last_event
@@ -159,6 +164,12 @@ def f2_parser(
     setattr(entry, f"{prefix}_reaction_times", reaction_times)
     setattr(entry, f"{prefix}_alt_time_code", alt_time_code)
 
+    # Anchor the H1 reason / H2 detail lines that follow to this DQ slot (see
+    # h_dq_parsers). File position is the only signal that survives a same-code
+    # prelim+finals double-DQ; clear it on a non-DQ result so a later orphaned
+    # H1/H2 does not attach to a stale slot.
+    opts[LAST_DQ_SLOT_KEY] = f"{prefix}_dq_info" if dq_info is not None else None
+
     event.last_entry = entry
     file.meet.last_event = (event_num, event)
 

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

@@ -0,0 +1,75 @@
+from typing import Any
+
+from hytek_parser._utils import extract
+from hytek_parser.hy3.schemas import ParsedHytekFile
+
+# Key under which the E2/F2 result parser records the DQ slot it just populated,
+# so the H1 reason line and H2 detail line that immediately follow attach to that
+# same slot. A swim DQ'd in both prelims and finals resolves to ONE shared entry
+# with two populated slots; the result line preceding each round's H1/H2 in file
+# order is the authoritative anchor for which slot those detail lines belong to.
+# This holds even when both rounds carry the SAME DQ code (e.g. a false start in
+# both prelims and finals): matching on the code alone cannot tell the two slots
+# apart, but file position always can.
+LAST_DQ_SLOT_KEY = "_last_dq_slot"
+
+
+def h1_parser(
+    line: str, file: ParsedHytekFile, opts: dict[str, Any]
+) -> ParsedHytekFile:
+    """Parse an H1 line: the DQ reason string, routed to its own DQ slot.
+
+    Attaches the reason to the slot the immediately-preceding E2/F2 result line
+    populated (recorded in ``opts`` under ``LAST_DQ_SLOT_KEY``). That result line
+    is the authoritative anchor: a swim DQ'd in both prelims and finals carries
+    two populated slots on one shared entry, and file position — not the DQ code —
+    tells the two H1s apart, including when both rounds share the same code.
+
+    No-op when no slot is anchored or the anchored slot is unpopulated — the DQ
+    status and code are recorded by the E2/F2 result line regardless, so only the
+    human-readable reason string is ever at stake. Leaves the anchor in place so
+    the H2 detail line that follows attaches to the same slot.
+    """
+    event_num, event = file.meet.last_event
+    entry = event.last_entry
+
+    info_str = extract(line, 5, 124)  # Whitespace is stripped
+
+    slot = opts.get(LAST_DQ_SLOT_KEY)
+    if slot is not None:
+        info = getattr(entry, slot)
+        if info is not None:
+            info.info_str = info_str
+
+    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 to the same slot the preceding E2/F2 result line anchored
+    (``LAST_DQ_SLOT_KEY``) — the slot h1_parser also wrote to. H2 cannot
+    self-identify its slot: its own 2-char code is the stroke/leg infraction (e.g.
+    "2L"), not the slot's ``DisqualificationCode`` (e.g. the relay-leg code "6A"),
+    so the anchor is the only reliable signal. No-op when no slot is anchored or
+    the anchored slot is unpopulated.
+    """
+    event_num, event = file.meet.last_event
+    entry = event.last_entry
+
+    detail = extract(line, 5, 124) or None
+
+    slot = opts.get(LAST_DQ_SLOT_KEY)
+    if slot is not None:
+        info = getattr(entry, slot)
+        if info is not None:
+            info.info_str_detail = detail
+
+    event.last_entry = entry
+    file.meet.last_event = (event_num, event)
+    return file

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

@@ -264,7 +264,7 @@ class Event:
 
     # ID info
     number: str
-    distance: int
+    distance: float
     stroke: Stroke
     course: Course
     date_: Optional[date]
@@ -432,7 +432,7 @@ class Meet:
     def get_or_create_event(
         self,
         number: str,
-        distance: int,
+        distance: float,
         stroke: Stroke,
         course: Course,
         gender: Gender,

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

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

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

@@ -1,81 +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
-
-    # 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