python-library-ff14-the-hunt 0.0.6__tar.gz → 0.0.7__tar.gz

{python_library_ff14_the_hunt-0.0.6 → python_library_ff14_the_hunt-0.0.7}/.cursor/skills/ff14_the_hunt-package-preload/SKILL.md

@@ -1,25 +1,25 @@
----
-name: ff14-the-hunt-package-preload
-description: ff14_the_hunt 包：会话预加载；改本包源码前 Read。
----
-
-# ff14_the_hunt · 会话预加载
-
-## 初始化加载（Session preload）
-
-在 **`packages/ff14_the_hunt/`** 下改源码、测试或 `pyproject.toml` 时，按序 **Read**：
-
-1. `~/.cursor/skills/project-skill-manifest-policy/SKILL.md`
-2. `~/.cursor/skills/forbidden-doc-comment-vocabulary/SKILL.md`
-3. `~/.cursor/skills/markdown-authoring-zh/SKILL.md`
-4. `~/.cursor/skills/python-project-ai/SKILL.md`
-5. `~/.cursor/skills/python-doc-comments/SKILL.md`
-6. `~/.cursor/skills/agent-codegen-self-review/SKILL.md`
-7. `.cursor/skills/ff14_the_hunt-package-design/SKILL.md`
-8. `.cursor/skills/ff14_the_hunt-package-changelog/SKILL.md`
-
-整库约定见仓库根 `.cursor/skills/python-library-session-manifest/SKILL.md`。
-
-## 用过的 skill（追加记录）
-
-（初始为空。）
+---
+name: ff14-the-hunt-package-preload
+description: ff14_the_hunt 包：会话预加载；改本包源码前 Read。
+---
+
+# ff14_the_hunt · 会话预加载
+
+## 初始化加载（Session preload）
+
+在 **`packages/ff14_the_hunt/`** 下改源码、测试或 `pyproject.toml` 时，按序 **Read**：
+
+1. `~/.cursor/skills/project-skill-manifest-policy/SKILL.md`
+2. `~/.cursor/skills/forbidden-doc-comment-vocabulary/SKILL.md`
+3. `~/.cursor/skills/markdown-authoring-zh/SKILL.md`
+4. `~/.cursor/skills/python-project-ai/SKILL.md`
+5. `~/.cursor/skills/python-doc-comments/SKILL.md`
+6. `~/.cursor/skills/agent-codegen-self-review/SKILL.md`
+7. `.cursor/skills/ff14_the_hunt-package-design/SKILL.md`
+8. `.cursor/skills/ff14_the_hunt-package-changelog/SKILL.md`
+
+整库约定见仓库根 `.cursor/skills/python-library-session-manifest/SKILL.md`。
+
+## 用过的 skill（追加记录）
+
+（初始为空。）

{python_library_ff14_the_hunt-0.0.6 → python_library_ff14_the_hunt-0.0.7}/PKG-INFO

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

{python_library_ff14_the_hunt-0.0.6 → python_library_ff14_the_hunt-0.0.7}/README.md

@@ -66,9 +66,9 @@ example.bat
 | --- | --- |
 | `POST /api/syncSession` | 狩猎库、刷点坐标、数据中心/世界列表 |
 | `POST /api/lastDeathTimers` | 计时行；`RankType` 为 `aRank` / `sRank` / `fate` |
-| `POST /api/querySpawnPoints` | 刚刷新记录的各刷点存活状态（需 `LastDeath`） |
+| `POST /api/querySpawnPoints` | 刚刷新记录的非触发点认证状态（需 `LastDeath`） |
 
-刚刷新记录才填充 ``spawn_points``、``spawn_map_layout`` 与 ``region_map``。包内不标点、不裁剪；``region_map`` 为站点 ``HuntRegions`` 原图 base64。刷点含 ``地图X/Y``、``格点X/Y``、``像素X/Y``（按原图尺寸算好）；``地图布局`` 含格点尺度与归一化公式。默认 ``include_spawn_maps=True`` 拉取原图。示例 ``python -m example`` 将 PNG 写入 ``example/output/maps/``，JSON 用 ``区域地图.地图文件`` 引用。
+刚刷新记录才填充 ``spawn_points``、``spawn_map_layout`` 与 ``region_map``。包内不标点、不裁剪；``region_map`` 为站点 ``HuntRegions`` 原图 base64。刷点仅保留未被 Sonar 或玩家认证为非触发的绿色候选点，含 ``地图X/Y``、``格点X/Y``、``像素X/Y``（按原图尺寸算好）；``地图布局`` 含格点尺度与归一化公式。默认 ``include_spawn_maps=True`` 拉取原图。示例 ``python -m example`` 将 PNG 写入 ``example/output/maps/``，JSON 用 ``区域地图.地图文件`` 引用。
 
 `QueryDeathTimers` 为世界名列表（由所选数据中心展开）。
 

{python_library_ff14_the_hunt-0.0.6 → python_library_ff14_the_hunt-0.0.7}/ff14_the_hunt/bear_tracker/enrich.py

@@ -7,10 +7,9 @@ from ff14_the_hunt.models import HuntMarkRecord, HuntQueryFilter
 
 from ff14_the_hunt.bear_tracker.fate_timer import compute_fate_timer
 from ff14_the_hunt.bear_tracker.resources import BearResources
-from ff14_the_hunt.bear_tracker.spawn_window import (
-    compute_trigger_timer,
-    is_recently_in_window,
-)
+from ff14_the_hunt.bear_tracker.spawn_window import (
+    compute_trigger_timer,
+)
 
 
 def mark_has_display_timer(record: HuntMarkRecord) -> bool:
@@ -88,13 +87,10 @@ def build_hunt_record(
         now=now,
     )
 
-    recently = is_recently_in_window(trigger, grace_seconds=recent_grace_seconds)
-    if last_mark and now is not None:
-        if now - float(last_mark) <= recent_grace_seconds:
-            recently = True
-    elif last_mark:
-        if time.time() - float(last_mark) <= recent_grace_seconds:
-            recently = True
+    recently = False
+    if last_mark:
+        reference_now = time.time() if now is None else now
+        recently = reference_now - float(last_mark) <= recent_grace_seconds
 
     region = meta.get("Region", "")
     return HuntMarkRecord(

{python_library_ff14_the_hunt-0.0.6 → python_library_ff14_the_hunt-0.0.7}/ff14_the_hunt/bear_tracker/spawn_points.py

@@ -40,21 +40,17 @@ def list_map_coordinates(
         grid_y = float(raw[1])
         norm_x = (grid_x - 1.0) / scale
         norm_y = (grid_y - 1.0) / scale
-        state = None
-        if api_states and key in api_states:
-            entry = api_states[key]
-            if isinstance(entry, dict):
-                state_val = entry.get("State")
-                if state_val is not None:
-                    state = bool(state_val)
+        state = None
+        if api_states is not None:
+            state = key not in api_states
         coordinates.append(
             MapCoordinate(
                 point_key=key,
                 x=norm_x,
                 y=norm_y,
-                grid_x=grid_x,
-                grid_y=grid_y,
-                active=state,
-            )
-        )
+                grid_x=grid_x,
+                grid_y=grid_y,
+                active=state,
+            )
+        )
     return coordinates

{python_library_ff14_the_hunt-0.0.6 → python_library_ff14_the_hunt-0.0.7}/ff14_the_hunt/ff14_the_hunt.py

@@ -67,7 +67,7 @@ class FF14TheHunt:
             min_wakeup_seconds: 全未开窗时睡到最近开窗的下限（秒），默认 2 分钟。
             poll_interval_seconds: 已废弃；等同 ``fallback_poll_interval_seconds``。
             recent_grace_seconds: 「刚刷新」宽限秒数。
-            include_spawn_states: 已废弃；刚刷新记录的存活点会在补全刷点时自动查询。
+            include_spawn_states: 已废弃；刚刷新记录的候选点会在补全刷点时自动查询。
             include_spawn_maps: 为刚刷新记录拉取站点区域原图 PNG base64。
             include_untimed_marks: 是否保留无计时的占位行（SS 级噬灵王、维护占位等）。
         """

{python_library_ff14_the_hunt-0.0.6 → python_library_ff14_the_hunt-0.0.7}/ff14_the_hunt/locale/cn.py

@@ -152,7 +152,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.6 → python_library_ff14_the_hunt-0.0.7}/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="querySpawnPoints 返回的存活点位状态")
+    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,

{python_library_ff14_the_hunt-0.0.6 → python_library_ff14_the_hunt-0.0.7}/ff14_the_hunt/spawn_map/points.py

@@ -3,12 +3,10 @@ from __future__ import annotations
 from ff14_the_hunt.models import MapCoordinate
 
 
-def select_display_spawn_points(points: list[MapCoordinate]) -> list[MapCoordinate]:
-    """刚刷新记录上要展示的刷点；有存活点时只保留存活点。"""
+def select_display_spawn_points(points: list[MapCoordinate]) -> list[MapCoordinate]:
+    """刚刷新记录上只展示仍可能触发的绿色候选点。"""
     active = [point for point in points if point.active is True]
-    if active:
-        return active
-    return list(points)
+    return active
 
 
 def resolve_region_name(region: str | list[str]) -> str:

{python_library_ff14_the_hunt-0.0.6 → python_library_ff14_the_hunt-0.0.7}/pyproject.toml

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

python_library_ff14_the_hunt-0.0.7/tests/test_recent_spawn_detection.py

@@ -0,0 +1,59 @@
+from ff14_the_hunt.bear_tracker.enrich import build_hunt_record
+from ff14_the_hunt.bear_tracker.resources import BearResources
+from ff14_the_hunt.models import HuntQueryFilter
+
+
+_RESOURCES = BearResources(
+    {
+        "DatabaseHunt": {
+            "Sansheya": {
+                "Patch": "DT",
+                "Region": "Shaaloani",
+                "Rank": 3,
+                "RespawnTimer": [46.0, 2.0],
+            },
+        },
+        "SpawnPoint": {},
+        "DataCenters": {},
+    },
+)
+
+
+def _row(**overrides) -> dict:
+    row = {
+        "huntKey": "Sansheya",
+        "huntName": "Sansheya",
+        "worldName": "Test",
+        "isMaint": False,
+        "lastDeathTime": 1_000_000.0,
+    }
+    row.update(overrides)
+    return row
+
+
+def test_open_window_without_last_mark_is_not_recently_spawned() -> None:
+    record = build_hunt_record(
+        timer_row=_row(),
+        resources=_RESOURCES,
+        query=HuntQueryFilter(),
+        now=1_000_000.0 + 46 * 3600 + 60,
+        recent_grace_seconds=900.0,
+    )
+
+    assert record is not None
+    assert record.trigger_timer is not None
+    assert record.recently_spawned is False
+
+
+def test_recent_last_mark_is_recently_spawned() -> None:
+    now = 1_000_000.0 + 46 * 3600 + 60
+    record = build_hunt_record(
+        timer_row=_row(lastMarkTime=now - 30),
+        resources=_RESOURCES,
+        query=HuntQueryFilter(),
+        now=now,
+        recent_grace_seconds=900.0,
+    )
+
+    assert record is not None
+    assert record.recently_spawned is True

python_library_ff14_the_hunt-0.0.7/tests/test_spawn_map_points.py

@@ -0,0 +1,44 @@
+from ff14_the_hunt.models import MapCoordinate
+from ff14_the_hunt.bear_tracker.spawn_points import list_map_coordinates
+from ff14_the_hunt.spawn_map.points import select_display_spawn_points
+
+
+def test_select_display_spawn_points_keeps_only_possible_points() -> None:
+    points = [
+        MapCoordinate(point_key="SpawnPoint01", x=0.1, y=0.2, active=False),
+        MapCoordinate(point_key="SpawnPoint02", x=0.3, y=0.4, active=True),
+    ]
+    selected = select_display_spawn_points(points)
+    assert len(selected) == 1
+    assert selected[0].point_key == "SpawnPoint02"
+
+
+def test_select_display_spawn_points_does_not_fallback_to_excluded_points() -> None:
+    points = [
+        MapCoordinate(point_key="SpawnPoint01", x=0.1, y=0.2, active=None),
+        MapCoordinate(point_key="SpawnPoint02", x=0.3, y=0.4, active=False),
+    ]
+    selected = select_display_spawn_points(points)
+    assert selected == []
+
+
+def test_list_map_coordinates_marks_unreported_points_as_possible() -> None:
+    points = list_map_coordinates(
+        {
+            "Dimensions": [41, 41],
+            "DisplayPoints": 3,
+            "SpawnPoint01": [1, 1],
+            "SpawnPoint02": [2, 2],
+            "SpawnPoint03": [3, 3],
+        },
+        api_states={
+            "SpawnPoint01": {"State": True, "Verified": True},
+            "SpawnPoint02": {"State": False, "Verified": True},
+        },
+    )
+
+    assert [(point.point_key, point.active) for point in points] == [
+        ("SpawnPoint01", False),
+        ("SpawnPoint02", False),
+        ("SpawnPoint03", True),
+    ]

python_library_ff14_the_hunt-0.0.6/tests/test_spawn_map_points.py

@@ -1,21 +0,0 @@
-from ff14_the_hunt.models import MapCoordinate
-from ff14_the_hunt.spawn_map.points import select_display_spawn_points
-
-
-def test_select_display_spawn_points_prefers_active() -> None:
-    points = [
-        MapCoordinate(point_key="SpawnPoint01", x=0.1, y=0.2, active=False),
-        MapCoordinate(point_key="SpawnPoint02", x=0.3, y=0.4, active=True),
-    ]
-    selected = select_display_spawn_points(points)
-    assert len(selected) == 1
-    assert selected[0].point_key == "SpawnPoint02"
-
-
-def test_select_display_spawn_points_keeps_all_when_no_active() -> None:
-    points = [
-        MapCoordinate(point_key="SpawnPoint01", x=0.1, y=0.2, active=None),
-        MapCoordinate(point_key="SpawnPoint02", x=0.3, y=0.4, active=False),
-    ]
-    selected = select_display_spawn_points(points)
-    assert len(selected) == 2