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

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

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: hytek-parser
-Version: 2.0.0
+Version: 2.2.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.0.0 → hytek_parser-2.2.0}/hytek_parser/__init__.py

@@ -1,4 +1,6 @@
 """A Hytek hy3 file parser."""
+from importlib.metadata import version
+
 from .export_xls import ExportXlsParseError, parse_event_export_xls
 from .hy3 import HY3_LINE_PARSERS
 from .hy3_parser import parse_hy3
@@ -15,4 +17,4 @@ __all__ = [
 ]
 __author__ = "Nino Maruszewski"
 __license__ = "MIT"
-__version__ = "2.0.0"
+__version__ = version(__package__)

{hytek_parser-2.0.0 → hytek_parser-2.2.0}/hytek_parser/hy3/_utils.py

@@ -1,4 +1,4 @@
-from typing import Union
+from typing import Optional, Union
 
 from hytek_parser._utils import safe_cast, select_from_enum
 from hytek_parser.hy3.enums import ReplacedTimeTimeCode
@@ -18,3 +18,15 @@ def parse_time(raw_time: str) -> Union[float, ReplacedTimeTimeCode]:
         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.0.0 → hytek_parser-2.2.0}/hytek_parser/hy3/line_parsers/c_team_parsers.py

@@ -26,8 +26,24 @@ def c1_parser(
         # Then truncate to 5 chars
         team_code = "".join(TEAM_CODE_REGEX.findall(team_name.upper()))[:5]
 
+    # LSC code at C1 cols 54-55 (2 chars, e.g. 'NE', 'PC', 'CA');
+    # populates the previously-unset Team.region field.
+    # Bug fix: was extract(54, 3), which grabbed the first letter of the contact
+    # name at col 56, corrupting ~19% of teams' LSC codes.
+    region = extract(line, 54, 2) or None
+
+    # C1 contact name slots: cols 56-85 (contact_name_1) and 86-115 (contact_name_2).
+    # Often identical; blank slot → None.
+    contact_name_1 = extract(line, 56, 30) or None
+    contact_name_2 = extract(line, 86, 30) or None
+
     file.meet.get_or_create_team(
-        name=team_name, short_name=team_short_name, code=team_code
+        name=team_name,
+        short_name=team_short_name,
+        code=team_code,
+        region=region,
+        contact_name_1=contact_name_1,
+        contact_name_2=contact_name_2,
     )
     return file
 
@@ -39,7 +55,11 @@ def c2_parser(
     # Get the last team
     team_code, team = file.meet.last_team
 
-    team.address_1 = extract(line, 3, 60)
+    # C2 has two 30-char address lines: line 1 (cols 3-32) is a free-text
+    # "c/o"/attention line (often a contact person, sometimes the org), line 2
+    # (cols 33-62) is the street. They were previously read as one 60-char blob.
+    team.address_1 = extract(line, 3, 30)
+    team.address_2 = extract(line, 33, 30)
     team.city = extract(line, 63, 30)
     team.state = extract(line, 93, 2)
     team.zip_code = extract(line, 95, 10)
@@ -49,9 +69,6 @@ def c2_parser(
     else:
         team.country = opts["default_country"]
 
-    # TODO: Team region
-    team.region = "Unknown"
-
     file.meet.last_team = (team_code, team)
     return file
 

{hytek_parser-2.0.0 → hytek_parser-2.2.0}/hytek_parser/hy3/line_parsers/d_swimmer_parsers.py

@@ -24,6 +24,15 @@ def d1_parser(
     swimmer.date_of_birth = date_or_none(extract(line, 89, 8))
     swimmer.age = int(extract(line, 97, 3))
 
+    # previously dropped D1 fields. Capture both per spec.
+    # citizenship: cols 113-115 (3 chars). Observed: 'USA' or blank.
+    # status: col 125 (1 char). Athlete status; observed 'N' (Normal) or blank.
+    swimmer.citizenship = extract(line, 113, 3) or None
+    swimmer.status = extract(line, 125, 1) or None
+    # class_year: cols 100-101 (2 chars). "Fr"/"So"/"Jr"/"Sr" school
+    # class in HS-meet exports; other data / blank in club exports.
+    swimmer.class_year = extract(line, 100, 2) or None
+
     swimmer.team_code = team_code
 
     file.meet.add_swimmer(swimmer)

{hytek_parser-2.0.0 → hytek_parser-2.2.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
+from hytek_parser.hy3._utils import parse_time, parse_time_or_none
 from hytek_parser.hy3.enums import (
     Course,
     DisqualificationCode,
@@ -63,6 +63,10 @@ def e1_parser(
     entry_converted_seed_time = parse_time(extract(line, 43, 8))
     entry_converted_seed_time_course = event.course
 
+    # 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
+
     event.get_or_create_entry(
         swimmers=entry_swimmers,
         relay=False,
@@ -71,6 +75,7 @@ def e1_parser(
         seed_course=entry_seed_course,
         converted_seed_time=entry_converted_seed_time,
         converted_seed_time_course=entry_converted_seed_time_course,
+        meet_division=meet_division,
     )
 
     # Update event
@@ -100,7 +105,17 @@ def e2_parser(
     heat_place = safe_cast(int, extract(line, 27, 3))
     overall_place = safe_cast(int, extract(line, 30, 4))
 
-    # Skipping over pad/plunger times since they are not that useful
+    # previously-dropped E2 timing fields.
+    # See spec for column-offset derivation and failure-mode evidence
+    # (touchpad turn-touch misattribution in short SCY sprints).
+    # parse_time_or_none returns None for "0.00" and blank/non-numeric fields.
+    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))
+    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
+
     raw_date = extract(line, 88, 8).strip()
     date_ = datetime.strptime(raw_date, "%m%d%Y").date() if raw_date else None
 
@@ -128,6 +143,12 @@ def e2_parser(
     setattr(entry, f"{prefix}_heat_place", heat_place)
     setattr(entry, f"{prefix}_overall_place", overall_place)
     setattr(entry, f"{prefix}_date", date_)
+    setattr(entry, f"{prefix}_pad_time", pad_time)
+    setattr(entry, f"{prefix}_button_1_time", button_1_time)
+    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}_alt_time_code", alt_time_code)
 
     event.last_entry = entry
     file.meet.last_event = (event_num, event)

{hytek_parser-2.0.0 → hytek_parser-2.2.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
+from hytek_parser.hy3._utils import parse_time, parse_time_or_none
 from hytek_parser.hy3.enums import (
     Course,
     DisqualificationCode,
@@ -107,7 +107,17 @@ def f2_parser(
     heat_place = safe_cast(int, extract(line, 27, 3))
     overall_place = safe_cast(int, extract(line, 30, 4))
 
-    # Skipping over pad/plunger times since they are not that useful
+    # 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.
+    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))
+    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, 111, 1) or None  # F2 offset; observed: 'A'/'K'/blank
+
     raw_date = extract(line, 103, 8).strip()
     date_ = datetime.strptime(raw_date, "%m%d%Y").date() if raw_date else None
 
@@ -135,6 +145,12 @@ def f2_parser(
     setattr(entry, f"{prefix}_heat_place", heat_place)
     setattr(entry, f"{prefix}_overall_place", overall_place)
     setattr(entry, f"{prefix}_date", date_)
+    setattr(entry, f"{prefix}_pad_time", pad_time)
+    setattr(entry, f"{prefix}_button_1_time", button_1_time)
+    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}_alt_time_code", alt_time_code)
 
     event.last_entry = entry
     file.meet.last_event = (event_num, event)

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

@@ -36,6 +36,17 @@ class Swimmer:
     usa_swimming_id: str
     team_code: str  # Team 5-letter code
 
+    # D1 fields previously dropped by the parser
+    citizenship: Optional[str] = None
+    # col 125; athlete status (Hytek MM "Status" field). Raw 1-char code — only
+    # "N" (Normal) or blank observed across ~9.25M records; other GUI statuses
+    # (Impaired/Exhibition/Foreigner/Rookie) never seen in data, so left as a
+    # raw code rather than an enum.
+    status: Optional[str] = None
+    # cols 100-101; "Fr"/"So"/"Jr"/"Sr" school class in HS-meet exports,
+    # other data / blank in club exports.
+    class_year: Optional[str] = None
+
 
 @define
 class Team:
@@ -53,13 +64,15 @@ class Team:
     state: str
     zip_code: str
     country: str
-    region: str
+    region: Optional[str]
 
     # Contact info
     daytime_phone: str
     evening_phone: str
     fax: str
     email: str
+    contact_name_1: Optional[str] = None
+    contact_name_2: Optional[str] = None
 
     # Swimmers
     swimmers: dict[int, Swimmer] = Factory(dict)
@@ -99,6 +112,14 @@ class EventEntry:
     prelim_heat_place: Optional[int] = None
     prelim_overall_place: Optional[int] = None
     prelim_date: Optional[date] = None
+    # E2 fields previously dropped (pad + 3 buttons + backup_4 + alt code)
+    prelim_pad_time: Optional[float] = None
+    prelim_button_1_time: Optional[float] = None
+    prelim_button_2_time: Optional[float] = None
+    prelim_button_3_time: Optional[float] = None
+    prelim_backup_4_time: Optional[float] = None
+    # col 96; semantics unverified — observed 'A'/'K'/blank
+    prelim_alt_time_code: Optional[str] = None
 
     # Swimoff Time info
     swimoff_time: Optional[Union[float, ReplacedTimeTimeCode]] = None
@@ -111,6 +132,14 @@ class EventEntry:
     swimoff_heat_place: Optional[int] = None
     swimoff_overall_place: Optional[int] = None
     swimoff_date: Optional[date] = None
+    # E2 fields previously dropped (pad + 3 buttons + backup_4 + alt code)
+    swimoff_pad_time: Optional[float] = None
+    swimoff_button_1_time: Optional[float] = None
+    swimoff_button_2_time: Optional[float] = None
+    swimoff_button_3_time: Optional[float] = None
+    swimoff_backup_4_time: Optional[float] = None
+    # col 96; semantics unverified — observed 'A'/'K'/blank
+    swimoff_alt_time_code: Optional[str] = None
 
     # Finals time info
     finals_time: Optional[Union[float, ReplacedTimeTimeCode]] = None
@@ -123,11 +152,26 @@ class EventEntry:
     finals_heat_place: Optional[int] = None
     finals_overall_place: Optional[int] = None
     finals_date: Optional[date] = None
+    # E2 fields previously dropped (pad + 3 buttons + backup_4 + alt code)
+    finals_pad_time: Optional[float] = None
+    finals_button_1_time: Optional[float] = None
+    finals_button_2_time: Optional[float] = None
+    finals_button_3_time: Optional[float] = None
+    finals_backup_4_time: Optional[float] = None
+    # col 96; semantics unverified — observed 'A'/'K'/blank
+    finals_alt_time_code: Optional[str] = None
 
     # Relay attribution (moved from Event — set by f1_parser)
     relay_team_id: Optional[str] = None
     relay_swim_team_code: Optional[str] = None
 
+    # Meet Division. The host-configured division label for the
+    # entry: 'JV'/'VR' (varsity-style), classification codes ('A'/'AA'/'AAA'/'BB'),
+    # HS enrollment classes ('5A'/'4A'/'3A'), age-group/level codes ('AG'/'SR'),
+    # 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
+
     def __init__(
         self,
         swimmers: dict[int, Swimmer],
@@ -139,6 +183,7 @@ class EventEntry:
         converted_seed_time_course: Course,
         relay_team_id: Optional[str] = None,
         relay_swim_team_code: Optional[str] = None,
+        meet_division: Optional[str] = None,
     ) -> None:
         self.swimmers = swimmers
         self.relay = relay
@@ -149,6 +194,7 @@ class EventEntry:
         self.converted_seed_time_course = converted_seed_time_course
         self.relay_team_id = relay_team_id
         self.relay_swim_team_code = relay_swim_team_code
+        self.meet_division = meet_division
 
         for course in ("prelim", "swimoff", "finals"):
             setattr(self, f"{course}_time", None)
@@ -161,6 +207,12 @@ class EventEntry:
             setattr(self, f"{course}_heat_place", None)
             setattr(self, f"{course}_overall_place", None)
             setattr(self, f"{course}_date", None)
+            setattr(self, f"{course}_pad_time", None)
+            setattr(self, f"{course}_button_1_time", None)
+            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}_alt_time_code", None)
 
         self.prelim_dq_info = None
         self.swimoff_dq_info = None
@@ -230,6 +282,7 @@ class Event:
         converted_seed_time_course: Course,
         relay_team_id: Optional[str] = None,
         relay_swim_team_code: Optional[str] = None,
+        meet_division: Optional[str] = None,
     ) -> EventEntry:
         """Get an event entry or create one if needed."""
         entry = EventEntry(
@@ -242,6 +295,7 @@ class Event:
             converted_seed_time_course=converted_seed_time_course,
             relay_team_id=relay_team_id,
             relay_swim_team_code=relay_swim_team_code,
+            meet_division=meet_division,
         )
         if self.entries and self.entries[-1].same_swimmer_entry_as(entry):
             # P/F entries always listed together: a swimmer (individuals) or a
@@ -306,7 +360,15 @@ class Meet:
             self.swimmers[swimmer.meet_id] = swimmer
             self.teams[swimmer.team_code].swimmers[swimmer.meet_id] = swimmer
 
-    def get_or_create_team(self, name: str, short_name: str, code: str) -> Team:
+    def get_or_create_team(
+        self,
+        name: str,
+        short_name: str,
+        code: str,
+        region: Optional[str] = None,
+        contact_name_1: Optional[str] = None,
+        contact_name_2: Optional[str] = None,
+    ) -> Team:
         """Get a team or create if needed."""
         if team := self.teams.get(code):
             return team
@@ -319,13 +381,15 @@ class Meet:
                 address_2="N/A",
                 city="N/A",
                 country="N/A",
-                region="N/A",
+                region=region,
                 state="N/A",
                 zip_code="N/A",
                 daytime_phone="N/A",
                 evening_phone="N/A",
                 fax="N/A",
                 email="N/A",
+                contact_name_1=contact_name_1,
+                contact_name_2=contact_name_2,
             )
 
             # Add team, this also updates the teams dict

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

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