python-library-ff14-the-hunt 0.0.10__tar.gz → 0.0.11__tar.gz

{python_library_ff14_the_hunt-0.0.10 → python_library_ff14_the_hunt-0.0.11}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: python-library-ff14-the-hunt
-Version: 0.0.10
+Version: 0.0.11
 Requires-Python: >=3.10
 Requires-Dist: pydantic>=2.0
 Provides-Extra: dev

{python_library_ff14_the_hunt-0.0.10 → python_library_ff14_the_hunt-0.0.11}/ff14_the_hunt/bear_tracker/spawn_window.py

@@ -85,13 +85,25 @@ def compute_trigger_timer(
     )
 
 
-def is_window_open(timer: TimerDisplay | None) -> bool:
-    return timer is not None and timer.phase == SpawnWindowPhase.OPEN
-
-
-def is_recently_in_window(
-    timer: TimerDisplay | None,
-    *,
+def is_window_open(timer: TimerDisplay | None) -> bool:
+    return timer is not None and timer.phase == SpawnWindowPhase.OPEN
+
+
+def is_window_report_ready(timer: TimerDisplay | None) -> bool:
+    if timer is None:
+        return False
+    if timer.phase == SpawnWindowPhase.CAPPED:
+        return True
+    if timer.phase != SpawnWindowPhase.OPEN:
+        return False
+    if timer.progress_percent is None:
+        return False
+    return timer.progress_percent >= 100.0
+
+
+def is_recently_in_window(
+    timer: TimerDisplay | None,
+    *,
     grace_seconds: float = 900.0,
 ) -> bool:
     if timer is None or timer.phase != SpawnWindowPhase.OPEN:

python_library_ff14_the_hunt-0.0.11/ff14_the_hunt/common/http_request.py

@@ -0,0 +1,3 @@
+from __future__ import annotations
+
+DEFAULT_USER_AGENT = "ff14-the-hunt/0.0.8"

{python_library_ff14_the_hunt-0.0.10 → python_library_ff14_the_hunt-0.0.11}/ff14_the_hunt/locale/cn.py

@@ -121,11 +121,11 @@ def mark_to_display_dict(
         "上次死亡时间": mark.last_death_time,
         "上次标记时间": mark.last_mark_time,
         "失踪计数": mark.missing_counter,
-        "维护计时": mark.is_maintenance,
-        "刚刷新": mark.recently_spawned,
-        "刚开窗": mark.newly_opened,
-        "新检出": mark.newly_spawned,
-    }
+        "维护计时": mark.is_maintenance,
+        "刚刷新": mark.recently_spawned,
+        "开窗100%": mark.newly_opened,
+        "新检出": mark.newly_spawned,
+    }
     if mark.fate_last_seen is not None:
         item["FATE最近发现"] = mark.fate_last_seen
     if mark.fate_last_death is not None:
@@ -153,7 +153,7 @@ def mark_to_display_dict(
                 "像素Y": point.pixel_y,
                 "格点X": point.grid_x,
                 "格点Y": point.grid_y,
-                "可能触发": point.active,
+                "可能触发": point.active,
             }
             for point in mark.spawn_points
         ]

{python_library_ff14_the_hunt-0.0.10 → python_library_ff14_the_hunt-0.0.11}/ff14_the_hunt/locale/en.py

@@ -108,11 +108,11 @@ def mark_to_display_dict(
         "last_death_time": mark.last_death_time,
         "last_mark_time": mark.last_mark_time,
         "missing_counter": mark.missing_counter,
-        "is_maintenance": mark.is_maintenance,
-        "recently_spawned": mark.recently_spawned,
-        "newly_opened": mark.newly_opened,
-        "newly_spawned": mark.newly_spawned,
-    }
+        "is_maintenance": mark.is_maintenance,
+        "recently_spawned": mark.recently_spawned,
+        "newly_opened": mark.newly_opened,
+        "newly_spawned": mark.newly_spawned,
+    }
     if mark.fate_last_seen is not None:
         item["fate_last_seen"] = mark.fate_last_seen
     if mark.fate_last_death is not None:

{python_library_ff14_the_hunt-0.0.10 → python_library_ff14_the_hunt-0.0.11}/ff14_the_hunt/models.py

@@ -58,7 +58,7 @@ class MapCoordinate(BaseModel):
         default=None,
         description="区域原图上的 Y 像素；norm_y * 图高",
     )
-    active: bool | None = Field(default=None, description="是否仍是可能触发点位")
+    active: bool | None = Field(default=None, description="是否仍是可能触发点位")
 
 
 class SpawnMapLayout(BaseModel):
@@ -127,7 +127,7 @@ class HuntMarkRecord(BaseModel):
     fate_timer: TimerDisplay | None = None
     spawn_points: list[MapCoordinate] = Field(
         default_factory=list,
-        description="仅刚刷新记录填充；只保留可能触发点位",
+        description="仅刚刷新记录填充；只保留可能触发点位",
     )
     spawn_map_layout: SpawnMapLayout | None = Field(
         default=None,
@@ -137,15 +137,15 @@ class HuntMarkRecord(BaseModel):
         default=None,
         description="仅刚刷新且启用区域原图时填充",
     )
-    recently_spawned: bool = False
+    recently_spawned: bool = False
     newly_opened: bool = Field(
         default=False,
-        description="First reported trigger-window open event in this polling session.",
-    )
-    newly_spawned: bool = Field(
-        default=False,
-        description="First report-worthy event in this polling session.",
+        description="First reported 100-percent trigger-window event in this polling session.",
     )
+    newly_spawned: bool = Field(
+        default=False,
+        description="First report-worthy event in this polling session.",
+    )
     raw_timer: dict[str, Any] = Field(default_factory=dict)
 
 
@@ -197,10 +197,10 @@ class HuntCrawlPacket(BaseModel):
     marks: list[HuntMarkRecord] = Field(default_factory=list, description="解析后的狩猎记录")
     query: HuntQueryFilter = Field(description="本次爬取使用的筛选条件")
 
-    @property
-    def newly_spawned_marks(self) -> list[HuntMarkRecord]:
-        return [mark for mark in self.marks if mark.newly_spawned]
-
-    @property
-    def newly_opened_marks(self) -> list[HuntMarkRecord]:
-        return [mark for mark in self.marks if mark.newly_opened]
+    @property
+    def newly_spawned_marks(self) -> list[HuntMarkRecord]:
+        return [mark for mark in self.marks if mark.newly_spawned]
+
+    @property
+    def newly_opened_marks(self) -> list[HuntMarkRecord]:
+        return [mark for mark in self.marks if mark.newly_opened]

{python_library_ff14_the_hunt-0.0.10 → python_library_ff14_the_hunt-0.0.11}/ff14_the_hunt/poll/spawn_dedup.py

@@ -1,41 +1,43 @@
-from __future__ import annotations
-
-from ff14_the_hunt.models import HuntMarkRecord, SpawnWindowPhase
-
-SpawnCycleKey = tuple[str, str, float | None]
-
-
-def spawn_cycle_key(mark: HuntMarkRecord) -> SpawnCycleKey:
-    """Return the per-hunt death cycle used for one-shot reports."""
-    return (mark.hunt_key, mark.world_name, mark.last_death_time)
-
-
-class SpawnReportTracker:
-    """Track one-shot report events across polling rounds."""
-
-    def __init__(self) -> None:
-        self._reported_spawn_cycles: set[SpawnCycleKey] = set()
-        self._reported_open_cycles: set[SpawnCycleKey] = set()
-
-    def apply(self, marks: list[HuntMarkRecord]) -> None:
-        for mark in marks:
-            cycle = spawn_cycle_key(mark)
-            mark.newly_opened = self._should_report_open_window(mark, cycle)
-            mark.newly_spawned = self._should_report_spawn(mark, cycle) or mark.newly_opened
-
+from __future__ import annotations
+
+from ff14_the_hunt.bear_tracker.spawn_window import is_window_report_ready
+from ff14_the_hunt.models import HuntMarkRecord
+
+SpawnCycleKey = tuple[str, str, float | None]
+
+
+def spawn_cycle_key(mark: HuntMarkRecord) -> SpawnCycleKey:
+    """Return the per-hunt death cycle used for one-shot reports."""
+    return (mark.hunt_key, mark.world_name, mark.last_death_time)
+
+
+class SpawnReportTracker:
+    """Track one-shot report events across polling rounds."""
+
+    def __init__(self) -> None:
+        self._reported_spawn_cycles: set[SpawnCycleKey] = set()
+        self._reported_open_cycles: set[SpawnCycleKey] = set()
+
+    def apply(self, marks: list[HuntMarkRecord]) -> None:
+        for mark in marks:
+            cycle = spawn_cycle_key(mark)
+            mark.newly_opened = self._should_report_open_window(mark, cycle)
+            mark.newly_spawned = self._should_report_spawn(mark, cycle) or mark.newly_opened
+
     def _should_report_spawn(self, mark: HuntMarkRecord, cycle: SpawnCycleKey) -> bool:
         if not mark.recently_spawned:
             return False
+        if not is_window_report_ready(mark.trigger_timer):
+            return False
         if cycle in self._reported_spawn_cycles:
             return False
-        self._reported_spawn_cycles.add(cycle)
-        return True
-
+        self._reported_spawn_cycles.add(cycle)
+        return True
+
     def _should_report_open_window(self, mark: HuntMarkRecord, cycle: SpawnCycleKey) -> bool:
-        trigger = mark.trigger_timer
-        if trigger is None or trigger.phase != SpawnWindowPhase.OPEN:
+        if not is_window_report_ready(mark.trigger_timer):
             return False
         if cycle in self._reported_open_cycles:
             return False
-        self._reported_open_cycles.add(cycle)
-        return True
+        self._reported_open_cycles.add(cycle)
+        return True

{python_library_ff14_the_hunt-0.0.10 → python_library_ff14_the_hunt-0.0.11}/ff14_the_hunt/spawn_map/attach.py

@@ -2,7 +2,8 @@ from __future__ import annotations
 
 from typing import Any
 
-from ff14_the_hunt.bear_tracker.resources import BearResources
+from ff14_the_hunt.bear_tracker.resources import BearResources
+from ff14_the_hunt.bear_tracker.spawn_window import is_window_report_ready
 from ff14_the_hunt.bear_tracker.spawn_points import list_map_coordinates
 from ff14_the_hunt.models import HuntMarkRecord
 
@@ -13,25 +14,29 @@ from ff14_the_hunt.spawn_map.region_fetch import RegionMapFetcher
 from ff14_the_hunt.spawn_map.region_image import build_region_map_image
 
 
-def _spawn_entry_for_record(
-    record: HuntMarkRecord,
-    resources: BearResources,
-) -> dict[str, Any] | None:
+def _spawn_entry_for_record(
+    record: HuntMarkRecord,
+    resources: BearResources,
+) -> dict[str, Any] | None:
     meta = resources.hunt_meta(record.hunt_key)
     map_key = resources.spawn_map_key(record.hunt_key, meta)
     if not map_key:
         return None
-    return resources.spawn_point.get(map_key)
-
-
-def populate_spawn_points(
+    return resources.spawn_point.get(map_key)
+
+
+def should_attach_spawn_details(record: HuntMarkRecord) -> bool:
+    return is_window_report_ready(record.trigger_timer)
+
+
+def populate_spawn_points(
     record: HuntMarkRecord,
     *,
     resources: BearResources,
     spawn_states: dict[str, Any] | None,
 ) -> None:
     """为刚刷新记录填充 ``spawn_points`` 与 ``spawn_map_layout``。"""
-    if not record.recently_spawned:
+    if not should_attach_spawn_details(record):
         record.spawn_points = []
         record.spawn_map_layout = None
         record.region_map = None
@@ -49,7 +54,7 @@ def attach_region_map(
 ) -> None:
     """拉取站点区域原图，并补全刷点像素坐标。"""
     record.region_map = None
-    if not record.recently_spawned or not record.spawn_points:
+    if not should_attach_spawn_details(record) or not record.spawn_points:
         return
     region = resolve_region_name(record.region)
     if not region:
@@ -80,7 +85,7 @@ def enrich_recent_spawn_details(
         for row in timer_rows
     }
     for record in records:
-        if not record.recently_spawned:
+        if not should_attach_spawn_details(record):
             record.spawn_points = []
             record.spawn_map_layout = None
             record.region_map = None

{python_library_ff14_the_hunt-0.0.10 → python_library_ff14_the_hunt-0.0.11}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "hatchling.build"
 
 [project]
 name = "python-library-ff14-the-hunt"
-version = "0.0.10"
+version = "0.0.11"
 requires-python = ">=3.10"
 dependencies = [
     "pydantic>=2.0",

{python_library_ff14_the_hunt-0.0.10 → python_library_ff14_the_hunt-0.0.11}/tests/test_spawn_dedup.py

@@ -1,42 +1,44 @@
-from ff14_the_hunt.bear_tracker.timer_theme import build_timer_display
-from ff14_the_hunt.models import (
-    HuntCrawlPacket,
-    HuntMarkRecord,
-    HuntQueryFilter,
-    SpawnWindowPhase,
-    TimerBarColor,
-    TimerKind,
-)
-from ff14_the_hunt.poll.spawn_dedup import SpawnReportTracker, spawn_cycle_key
-
-
-def _mark(
-    *,
-    hunt_key: str = "Foo",
-    world: str = "Bar",
+from ff14_the_hunt.bear_tracker.timer_theme import build_timer_display
+from ff14_the_hunt.models import (
+    HuntCrawlPacket,
+    HuntMarkRecord,
+    HuntQueryFilter,
+    SpawnWindowPhase,
+    TimerBarColor,
+    TimerKind,
+)
+from ff14_the_hunt.poll.spawn_dedup import SpawnReportTracker, spawn_cycle_key
+
+
+def _mark(
+    *,
+    hunt_key: str = "Foo",
+    world: str = "Bar",
     last_death: float = 1000.0,
     recently: bool = True,
     phase: SpawnWindowPhase | None = None,
+    progress_percent: float | None = None,
 ) -> HuntMarkRecord:
-    trigger_timer = None
-    if phase is not None:
-        trigger_timer = build_timer_display(
-            kind=TimerKind.TRIGGER,
-            phase=phase,
-            bar_color=TimerBarColor.SUCCESS
-            if phase == SpawnWindowPhase.OPEN
-            else TimerBarColor.ERROR,
+    trigger_timer = None
+    if phase is not None:
+        trigger_timer = build_timer_display(
+            kind=TimerKind.TRIGGER,
+            phase=phase,
+            bar_color=TimerBarColor.SUCCESS
+            if phase == SpawnWindowPhase.OPEN
+            else TimerBarColor.ERROR,
             counts_up=phase == SpawnWindowPhase.OPEN,
+            progress_percent=progress_percent,
             summary="test",
         )
-    return HuntMarkRecord(
-        hunt_key=hunt_key,
-        hunt_name=hunt_key,
-        world_name=world,
-        last_death_time=last_death,
-        recently_spawned=recently,
-        trigger_timer=trigger_timer,
-    )
+    return HuntMarkRecord(
+        hunt_key=hunt_key,
+        hunt_name=hunt_key,
+        world_name=world,
+        last_death_time=last_death,
+        recently_spawned=recently,
+        trigger_timer=trigger_timer,
+    )
 
 
 def test_spawn_cycle_key_uses_last_death() -> None:
@@ -44,29 +46,58 @@ def test_spawn_cycle_key_uses_last_death() -> None:
     assert spawn_cycle_key(mark) == ("Foo", "Bar", 42.0)
 
 
-def test_tracker_marks_first_recent_as_new() -> None:
-    tracker = SpawnReportTracker()
-    marks = [_mark()]
-    tracker.apply(marks)
-    assert marks[0].newly_spawned is True
+def test_tracker_marks_first_recent_as_new() -> None:
+    tracker = SpawnReportTracker()
+    marks = [
+        _mark(
+            phase=SpawnWindowPhase.OPEN,
+            progress_percent=100.0,
+        )
+    ]
+    tracker.apply(marks)
+    assert marks[0].newly_spawned is True
 
 
-def test_tracker_skips_repeat_within_same_cycle() -> None:
-    tracker = SpawnReportTracker()
-    first = [_mark()]
-    tracker.apply(first)
-    second = [_mark()]
-    tracker.apply(second)
-    assert second[0].newly_spawned is False
-    assert second[0].recently_spawned is True
+def test_tracker_skips_repeat_within_same_cycle() -> None:
+    tracker = SpawnReportTracker()
+    first = [
+        _mark(
+            phase=SpawnWindowPhase.OPEN,
+            progress_percent=100.0,
+        )
+    ]
+    tracker.apply(first)
+    second = [
+        _mark(
+            phase=SpawnWindowPhase.OPEN,
+            progress_percent=100.0,
+        )
+    ]
+    tracker.apply(second)
+    assert second[0].newly_spawned is False
+    assert second[0].recently_spawned is True
 
 
-def test_tracker_reports_again_after_new_death_cycle() -> None:
-    tracker = SpawnReportTracker()
-    tracker.apply([_mark(last_death=10.0)])
-    later = [_mark(last_death=20.0)]
-    tracker.apply(later)
-    assert later[0].newly_spawned is True
+def test_tracker_reports_again_after_new_death_cycle() -> None:
+    tracker = SpawnReportTracker()
+    tracker.apply(
+        [
+            _mark(
+                last_death=10.0,
+                phase=SpawnWindowPhase.OPEN,
+                progress_percent=100.0,
+            )
+        ]
+    )
+    later = [
+        _mark(
+            last_death=20.0,
+            phase=SpawnWindowPhase.OPEN,
+            progress_percent=100.0,
+        )
+    ]
+    tracker.apply(later)
+    assert later[0].newly_spawned is True
 
 
 def test_tracker_clears_newly_when_not_recent() -> None:
@@ -76,37 +107,105 @@ def test_tracker_clears_newly_when_not_recent() -> None:
     assert marks[0].newly_spawned is False
 
 
-def test_tracker_marks_first_open_window_as_new() -> None:
+def test_tracker_does_not_report_recent_before_100_percent() -> None:
     tracker = SpawnReportTracker()
-    marks = [_mark(recently=False, phase=SpawnWindowPhase.OPEN)]
+    marks = [
+        _mark(
+            recently=True,
+            phase=SpawnWindowPhase.OPEN,
+            progress_percent=99.0,
+        )
+    ]
     tracker.apply(marks)
-    assert marks[0].newly_opened is True
-    assert marks[0].newly_spawned is True
-
-    packet = HuntCrawlPacket(
-        crawled_at=1.0,
-        next_fetch_at=2.0,
-        marks=marks,
-        query=HuntQueryFilter(),
-    )
-    assert packet.newly_opened_marks == marks
-    assert packet.newly_spawned_marks == marks
+    assert marks[0].newly_opened is False
+    assert marks[0].newly_spawned is False
+
+
+def test_tracker_does_not_report_open_window_before_100_percent() -> None:
+    tracker = SpawnReportTracker()
+    marks = [
+        _mark(
+            recently=False,
+            phase=SpawnWindowPhase.OPEN,
+            progress_percent=99.0,
+        )
+    ]
+    tracker.apply(marks)
+    assert marks[0].newly_opened is False
+    assert marks[0].newly_spawned is False
 
 
+def test_tracker_marks_first_100_percent_open_window_as_new() -> None:
+    tracker = SpawnReportTracker()
+    marks = [
+        _mark(
+            recently=False,
+            phase=SpawnWindowPhase.OPEN,
+            progress_percent=100.0,
+        )
+    ]
+    tracker.apply(marks)
+    assert marks[0].newly_opened is True
+    assert marks[0].newly_spawned is True
+
+    packet = HuntCrawlPacket(
+        crawled_at=1.0,
+        next_fetch_at=2.0,
+        marks=marks,
+        query=HuntQueryFilter(),
+    )
+    assert packet.newly_opened_marks == marks
+    assert packet.newly_spawned_marks == marks
+
+
 def test_tracker_skips_repeat_open_window_cycle() -> None:
     tracker = SpawnReportTracker()
-    first = [_mark(recently=False, phase=SpawnWindowPhase.OPEN)]
+    first = [
+        _mark(
+            recently=False,
+            phase=SpawnWindowPhase.OPEN,
+            progress_percent=100.0,
+        )
+    ]
     tracker.apply(first)
-    second = [_mark(recently=False, phase=SpawnWindowPhase.OPEN)]
-    tracker.apply(second)
-    assert second[0].newly_opened is False
-    assert second[0].newly_spawned is False
-
-
+    second = [
+        _mark(
+            recently=False,
+            phase=SpawnWindowPhase.OPEN,
+            progress_percent=100.0,
+        )
+    ]
+    tracker.apply(second)
+    assert second[0].newly_opened is False
+    assert second[0].newly_spawned is False
+
+
 def test_tracker_reports_spawn_after_open_window_cycle() -> None:
     tracker = SpawnReportTracker()
-    tracker.apply([_mark(recently=False, phase=SpawnWindowPhase.OPEN)])
-    later = [_mark(recently=True, phase=SpawnWindowPhase.OPEN)]
+    tracker.apply(
+        [
+            _mark(
+                recently=False,
+                phase=SpawnWindowPhase.OPEN,
+                progress_percent=100.0,
+            )
+        ]
+    )
+    later = [
+        _mark(
+            recently=True,
+            phase=SpawnWindowPhase.OPEN,
+            progress_percent=100.0,
+        )
+    ]
     tracker.apply(later)
     assert later[0].newly_opened is False
     assert later[0].newly_spawned is True
+
+
+def test_tracker_marks_capped_window_as_new() -> None:
+    tracker = SpawnReportTracker()
+    marks = [_mark(recently=False, phase=SpawnWindowPhase.CAPPED)]
+    tracker.apply(marks)
+    assert marks[0].newly_opened is True
+    assert marks[0].newly_spawned is True

python_library_ff14_the_hunt-0.0.11/tests/test_spawn_map_data.py

@@ -0,0 +1,194 @@
+import base64
+import struct
+import zlib
+
+from ff14_the_hunt.bear_tracker.resources import BearResources
+from ff14_the_hunt.bear_tracker.timer_theme import build_timer_display
+from ff14_the_hunt.models import (
+    HuntMarkRecord,
+    MapCoordinate,
+    SpawnWindowPhase,
+    TimerBarColor,
+    TimerKind,
+)
+from ff14_the_hunt.spawn_map.coordinates import with_pixel_coordinates
+from ff14_the_hunt.spawn_map.attach import enrich_recent_spawn_details
+from ff14_the_hunt.spawn_map.layout import layout_from_spawn_entry
+from ff14_the_hunt.spawn_map.png_meta import read_png_dimensions
+
+
+def _minimal_png(width: int, height: int) -> bytes:
+    signature = b"\x89PNG\r\n\x1a\n"
+    ihdr = struct.pack(">IIBBBBB", width, height, 8, 2, 0, 0, 0)
+    ihdr_chunk = (
+        b"IHDR"
+        + ihdr
+        + struct.pack(">I", zlib.crc32(b"IHDR" + ihdr) & 0xFFFFFFFF)
+    )
+    ihdr_len = struct.pack(">I", len(ihdr))
+    return signature + ihdr_len + ihdr_chunk
+
+
+def test_read_png_dimensions() -> None:
+    data = _minimal_png(2048, 1024)
+    assert read_png_dimensions(data) == (2048, 1024)
+
+
+def test_layout_from_spawn_entry() -> None:
+    layout = layout_from_spawn_entry(
+        {
+            "Dimensions": [41, 41],
+            "DisplayPoints": 8,
+            "Version": 21,
+        },
+    )
+    assert layout is not None
+    assert layout.grid_scale == 41.0
+    assert layout.display_points == 8
+    assert layout.version == 21
+
+
+def test_with_pixel_coordinates() -> None:
+    points = [
+        MapCoordinate(point_key="SpawnPoint01", x=0.5, y=0.25),
+    ]
+    enriched = with_pixel_coordinates(points, image_width=2000, image_height=1000)
+    assert enriched[0].pixel_x == 1000.0
+    assert enriched[0].pixel_y == 250.0
+
+
+def test_region_map_image_url_encodes_special_characters() -> None:
+    from ff14_the_hunt.spawn_map.region_fetch import region_map_image_url
+
+    url = region_map_image_url("https://tracker.beartoolkit.com", "Yak T'el")
+    assert (
+        url
+        == "https://tracker.beartoolkit.com/static/images/HuntRegions/Yak%20T%27el.png"
+    )
+    plain = region_map_image_url("https://tracker.beartoolkit.com", "Shaaloani")
+    assert plain == "https://tracker.beartoolkit.com/static/images/HuntRegions/Shaaloani.png"
+
+
+def test_build_region_map_image_round_trip() -> None:
+    from ff14_the_hunt.spawn_map.region_fetch import RegionMapFetcher
+    from ff14_the_hunt.spawn_map.region_image import build_region_map_image
+
+    png = _minimal_png(100, 80)
+    fetcher = RegionMapFetcher(site_root="https://tracker.beartoolkit.com")
+    fetcher._cache["Shaaloani"] = png
+    image = build_region_map_image(region="Shaaloani", fetcher=fetcher)
+    assert image is not None
+    assert image.width == 100
+    assert image.height == 80
+    assert base64.b64decode(image.data_base64) == png
+
+
+def test_open_window_before_100_percent_does_not_attach_spawn_details() -> None:
+    resources = _spawn_detail_resources()
+    mark = _open_window_mark(progress_percent=99.0)
+    enrich_recent_spawn_details(
+        [mark],
+        [_timer_row()],
+        resources=resources,
+        fetcher=None,
+        load_spawn_states=lambda _row, _resources: {},
+        include_region_map=False,
+    )
+
+    assert mark.spawn_points == []
+    assert mark.spawn_map_layout is None
+    assert mark.region_map is None
+
+
+def test_recent_before_100_percent_does_not_attach_spawn_details() -> None:
+    resources = _spawn_detail_resources()
+    mark = _open_window_mark(progress_percent=99.0)
+    mark.recently_spawned = True
+    enrich_recent_spawn_details(
+        [mark],
+        [_timer_row()],
+        resources=resources,
+        fetcher=None,
+        load_spawn_states=lambda _row, _resources: {},
+        include_region_map=False,
+    )
+
+    assert mark.spawn_points == []
+    assert mark.spawn_map_layout is None
+    assert mark.region_map is None
+
+
+def test_100_percent_open_window_attaches_spawn_details_and_region_map() -> None:
+    from ff14_the_hunt.spawn_map.region_fetch import RegionMapFetcher
+
+    resources = _spawn_detail_resources()
+    mark = _open_window_mark(progress_percent=100.0)
+    fetcher = RegionMapFetcher(site_root="https://tracker.beartoolkit.com")
+    fetcher._cache["Living Memory"] = _minimal_png(100, 80)
+    enrich_recent_spawn_details(
+        [mark],
+        [_timer_row()],
+        resources=resources,
+        fetcher=fetcher,
+        load_spawn_states=lambda _row, _resources: {
+            "SpawnPoint01": {"State": False, "Verified": True},
+        },
+        include_region_map=True,
+    )
+
+    assert [point.point_key for point in mark.spawn_points] == ["SpawnPoint02"]
+    assert mark.spawn_points[0].pixel_x is not None
+    assert mark.spawn_points[0].pixel_y is not None
+    assert mark.region_map is not None
+
+
+def _spawn_detail_resources() -> BearResources:
+    return BearResources(
+        {
+            "DatabaseHunt": {
+                "The Forecaster": {
+                    "Patch": "DT",
+                    "Region": "Living Memory",
+                    "Rank": 3,
+                    "RespawnTimer": [46.0, 2.0],
+                },
+            },
+            "SpawnPoint": {
+                "The Forecaster": {
+                    "Dimensions": [41, 41],
+                    "DisplayPoints": 2,
+                    "SpawnPoint01": [1, 1],
+                    "SpawnPoint02": [21, 21],
+                },
+            },
+            "DataCenters": {},
+        },
+    )
+
+
+def _timer_row() -> dict:
+    return {
+        "huntKey": "The Forecaster",
+        "huntName": "The Forecaster",
+        "worldName": "Test",
+        "lastDeathTime": 1000.0,
+    }
+
+
+def _open_window_mark(*, progress_percent: float) -> HuntMarkRecord:
+    return HuntMarkRecord(
+        hunt_key="The Forecaster",
+        hunt_name="The Forecaster",
+        world_name="Test",
+        region="Living Memory",
+        patch="DT",
+        last_death_time=1000.0,
+        trigger_timer=build_timer_display(
+            kind=TimerKind.TRIGGER,
+            phase=SpawnWindowPhase.OPEN,
+            bar_color=TimerBarColor.SUCCESS,
+            counts_up=True,
+            progress_percent=progress_percent,
+            summary="test",
+        ),
+    )

python_library_ff14_the_hunt-0.0.10/ff14_the_hunt/common/http_request.py

@@ -1,3 +0,0 @@
-from __future__ import annotations
-
-DEFAULT_USER_AGENT = "ff14-the-hunt/0.0.9"

python_library_ff14_the_hunt-0.0.10/tests/test_spawn_map_data.py

@@ -1,74 +0,0 @@
-import base64
-import struct
-import zlib
-
-from ff14_the_hunt.models import MapCoordinate
-from ff14_the_hunt.spawn_map.coordinates import with_pixel_coordinates
-from ff14_the_hunt.spawn_map.layout import layout_from_spawn_entry
-from ff14_the_hunt.spawn_map.png_meta import read_png_dimensions
-
-
-def _minimal_png(width: int, height: int) -> bytes:
-    signature = b"\x89PNG\r\n\x1a\n"
-    ihdr = struct.pack(">IIBBBBB", width, height, 8, 2, 0, 0, 0)
-    ihdr_chunk = (
-        b"IHDR"
-        + ihdr
-        + struct.pack(">I", zlib.crc32(b"IHDR" + ihdr) & 0xFFFFFFFF)
-    )
-    ihdr_len = struct.pack(">I", len(ihdr))
-    return signature + ihdr_len + ihdr_chunk
-
-
-def test_read_png_dimensions() -> None:
-    data = _minimal_png(2048, 1024)
-    assert read_png_dimensions(data) == (2048, 1024)
-
-
-def test_layout_from_spawn_entry() -> None:
-    layout = layout_from_spawn_entry(
-        {
-            "Dimensions": [41, 41],
-            "DisplayPoints": 8,
-            "Version": 21,
-        },
-    )
-    assert layout is not None
-    assert layout.grid_scale == 41.0
-    assert layout.display_points == 8
-    assert layout.version == 21
-
-
-def test_with_pixel_coordinates() -> None:
-    points = [
-        MapCoordinate(point_key="SpawnPoint01", x=0.5, y=0.25),
-    ]
-    enriched = with_pixel_coordinates(points, image_width=2000, image_height=1000)
-    assert enriched[0].pixel_x == 1000.0
-    assert enriched[0].pixel_y == 250.0
-
-
-def test_region_map_image_url_encodes_special_characters() -> None:
-    from ff14_the_hunt.spawn_map.region_fetch import region_map_image_url
-
-    url = region_map_image_url("https://tracker.beartoolkit.com", "Yak T'el")
-    assert (
-        url
-        == "https://tracker.beartoolkit.com/static/images/HuntRegions/Yak%20T%27el.png"
-    )
-    plain = region_map_image_url("https://tracker.beartoolkit.com", "Shaaloani")
-    assert plain == "https://tracker.beartoolkit.com/static/images/HuntRegions/Shaaloani.png"
-
-
-def test_build_region_map_image_round_trip() -> None:
-    from ff14_the_hunt.spawn_map.region_fetch import RegionMapFetcher
-    from ff14_the_hunt.spawn_map.region_image import build_region_map_image
-
-    png = _minimal_png(100, 80)
-    fetcher = RegionMapFetcher(site_root="https://tracker.beartoolkit.com")
-    fetcher._cache["Shaaloani"] = png
-    image = build_region_map_image(region="Shaaloani", fetcher=fetcher)
-    assert image is not None
-    assert image.width == 100
-    assert image.height == 80
-    assert base64.b64decode(image.data_base64) == png