2f65c0178c
Fixes 9 numbered findings + 7 minor fixes from the whole-plan review of the MyWhoosh/Garmin service clients (Plan 3): Garmin uploader (app/garmin/uploader.py): - Detect Garmin-rejected imports (failures without successes) and raise new GarminImportRejected instead of reporting them as successful. - Reclassify 429/rate-limit/500 login failures as transient instead of falling through to permanent auth errors; unrecognized login failures are now treated as transient (retryable) rather than GarminAuthError. - Mirror the auth-token check from the login branch into the import branch so 401-at-import-time raises GarminAuthError instead of propagating raw. - Add common GarminError base class, hoist transient-token tuple to a shared module constant, check response.status_code==409 before the duplicate substring fallback, and create the tokenstore dir 0o700. MyWhoosh client (app/mywhoosh/client.py): - Add optional max_pages bound to list_activities pagination. - Add aclose()/__aenter__/__aexit__ so the client's own httpx.AsyncClient gets closed, while never closing an injected client. - Guard the two remaining unguarded JSON-decode paths (login body, download-fit metadata) so malformed bodies raise MyWhooshIntegrationError instead of raw ValueError/AttributeError. - Row-level malformation (missing id/activityFileId, unparseable startDatetime) is now skipped rather than aborting the whole page; envelope-shape failures still raise. id/activityFileId checks use explicit None/"" comparisons instead of Python falsiness. - Replace asserts in _authenticated_post with explicit exceptions; restrict the reauth retry to 401 only, treat 403 as immediately terminal; naive startDatetime values are now treated as already-UTC instead of host-local. MyWhoosh tokenstore (app/mywhoosh/tokenstore.py): - load() now treats any corrupt/malformed token file (bad JSON, missing keys, OS errors) as "absent" instead of raising, so a bad cache no longer permanently wedges a user. pyproject.toml: - Tighten garminconnect pin to >=0.3.10,<1 (import_activity requires 0.3.10+). Adds/updates tests across tests/mywhoosh/ and tests/garmin/ covering all of the above, including a fake client that wraps GarminUploadBlocked in a plain RuntimeError to mirror the real garminconnect library's MFA error wrapping. Co-Authored-By: Claude Sonnet 5 <noreply@anthropic.com>
272 lines
11 KiB
Python
272 lines
11 KiB
Python
import json
|
|
from datetime import datetime, timezone
|
|
|
|
import httpx
|
|
import pytest
|
|
|
|
from app.mywhoosh.client import MyWhooshClient, MyWhooshIntegrationError
|
|
from app.mywhoosh.models import MyWhooshActivity, MyWhooshToken
|
|
from app.mywhoosh.tokenstore import MyWhooshTokenStore
|
|
|
|
|
|
@pytest.mark.asyncio
|
|
async def test_list_activities_paginates_and_normalizes(tmp_path) -> None:
|
|
calls = []
|
|
|
|
async def handler(request: httpx.Request) -> httpx.Response:
|
|
calls.append(str(request.url))
|
|
if request.url.path.endswith("/activities"):
|
|
payload = json.loads(request.content)
|
|
page = payload["page"]
|
|
result = {
|
|
"data": {
|
|
"totalPages": 2,
|
|
"results": [
|
|
{
|
|
"id": f"a-{page}",
|
|
"title": f"Ride {page}",
|
|
"activityFileId": f"f-{page}",
|
|
"startDatetime": "2026-08-15T06:00:00.000Z",
|
|
}
|
|
],
|
|
}
|
|
}
|
|
return httpx.Response(200, json=result)
|
|
raise AssertionError(request.url)
|
|
|
|
store = MyWhooshTokenStore(tmp_path / "mywhoosh.json")
|
|
store.save(MyWhooshToken(access_token="cached", refresh_token=None, whoosh_id=None))
|
|
client = MyWhooshClient(store, http_client=httpx.AsyncClient(transport=httpx.MockTransport(handler)))
|
|
|
|
activities = await client.list_activities("rider@example.com", "secret")
|
|
|
|
assert activities == [
|
|
MyWhooshActivity(
|
|
id="a-1",
|
|
title="Ride 1",
|
|
activity_file_id="f-1",
|
|
started_at=datetime(2026, 8, 15, 6, 0, 0, tzinfo=timezone.utc),
|
|
),
|
|
MyWhooshActivity(
|
|
id="a-2",
|
|
title="Ride 2",
|
|
activity_file_id="f-2",
|
|
started_at=datetime(2026, 8, 15, 6, 0, 0, tzinfo=timezone.utc),
|
|
),
|
|
]
|
|
activity_calls = [c for c in calls if c.endswith("/activities")]
|
|
assert len(activity_calls) == 2
|
|
|
|
|
|
@pytest.mark.asyncio
|
|
async def test_list_activities_reauthenticates_once_on_expired_token(tmp_path) -> None:
|
|
activity_call_count = 0
|
|
login_call_count = 0
|
|
|
|
async def handler(request: httpx.Request) -> httpx.Response:
|
|
nonlocal activity_call_count, login_call_count
|
|
if request.url.path.endswith("/activities"):
|
|
activity_call_count += 1
|
|
if activity_call_count == 1:
|
|
return httpx.Response(401, json={"message": "expired"})
|
|
return httpx.Response(
|
|
200,
|
|
json={
|
|
"data": {
|
|
"totalPages": 1,
|
|
"results": [
|
|
{
|
|
"id": "a-1",
|
|
"title": "Ride 1",
|
|
"activityFileId": "f-1",
|
|
"startDatetime": "2026-08-15T06:00:00.000Z",
|
|
}
|
|
],
|
|
}
|
|
},
|
|
)
|
|
if request.url.path.endswith("/login"):
|
|
login_call_count += 1
|
|
return httpx.Response(
|
|
200,
|
|
json={
|
|
"Success": True,
|
|
"AccessToken": "fresh-access",
|
|
"RefreshToken": "fresh-refresh",
|
|
"WhooshId": "w-1",
|
|
},
|
|
)
|
|
raise AssertionError(request.url)
|
|
|
|
store = MyWhooshTokenStore(tmp_path / "mywhoosh.json")
|
|
store.save(MyWhooshToken(access_token="stale", refresh_token=None, whoosh_id=None))
|
|
client = MyWhooshClient(store, http_client=httpx.AsyncClient(transport=httpx.MockTransport(handler)))
|
|
|
|
activities = await client.list_activities("rider@example.com", "secret")
|
|
|
|
assert len(activities) == 1
|
|
assert activities[0].id == "a-1"
|
|
assert login_call_count == 1
|
|
assert activity_call_count == 2
|
|
assert store.load().access_token == "fresh-access"
|
|
|
|
|
|
@pytest.mark.asyncio
|
|
async def test_download_fit_fetches_signed_url_bytes(tmp_path) -> None:
|
|
fit_bytes = b"\x0e\x10\x8b\x08.FIT" + b"\x00" * 20
|
|
|
|
async def handler(request: httpx.Request) -> httpx.Response:
|
|
if request.url.path.endswith("/download-activity-file"):
|
|
payload = json.loads(request.content)
|
|
assert payload == {"fileId": "f-1"}
|
|
return httpx.Response(200, json={"data": "https://signed.example/activity.fit"})
|
|
if str(request.url) == "https://signed.example/activity.fit":
|
|
return httpx.Response(200, content=fit_bytes)
|
|
raise AssertionError(request.url)
|
|
|
|
store = MyWhooshTokenStore(tmp_path / "mywhoosh.json")
|
|
store.save(MyWhooshToken(access_token="cached", refresh_token=None, whoosh_id=None))
|
|
client = MyWhooshClient(store, http_client=httpx.AsyncClient(transport=httpx.MockTransport(handler)))
|
|
|
|
result = await client.download_fit("f-1", "rider@example.com", "secret")
|
|
|
|
assert result == fit_bytes
|
|
|
|
|
|
@pytest.mark.asyncio
|
|
async def test_list_activities_skips_row_missing_stable_id(tmp_path) -> None:
|
|
async def handler(request: httpx.Request) -> httpx.Response:
|
|
if request.url.path.endswith("/activities"):
|
|
return httpx.Response(
|
|
200,
|
|
json={
|
|
"data": {
|
|
"totalPages": 1,
|
|
"results": [
|
|
{
|
|
"title": "Ride without id",
|
|
"activityFileId": "f-1",
|
|
"startDatetime": "2026-08-15T06:00:00.000Z",
|
|
},
|
|
{
|
|
"id": "a-2",
|
|
"title": "Ride with id",
|
|
"activityFileId": "f-2",
|
|
"startDatetime": "2026-08-15T06:00:00.000Z",
|
|
},
|
|
],
|
|
}
|
|
},
|
|
)
|
|
raise AssertionError(request.url)
|
|
|
|
store = MyWhooshTokenStore(tmp_path / "mywhoosh.json")
|
|
store.save(MyWhooshToken(access_token="cached", refresh_token=None, whoosh_id=None))
|
|
client = MyWhooshClient(store, http_client=httpx.AsyncClient(transport=httpx.MockTransport(handler)))
|
|
|
|
activities = await client.list_activities("rider@example.com", "secret")
|
|
|
|
assert [a.id for a in activities] == ["a-2"]
|
|
|
|
|
|
@pytest.mark.asyncio
|
|
async def test_list_activities_skips_row_with_unparseable_start_datetime(tmp_path) -> None:
|
|
async def handler(request: httpx.Request) -> httpx.Response:
|
|
if request.url.path.endswith("/activities"):
|
|
return httpx.Response(
|
|
200,
|
|
json={
|
|
"data": {
|
|
"totalPages": 1,
|
|
"results": [
|
|
{
|
|
"id": "a-1",
|
|
"title": "Ride with bad date",
|
|
"activityFileId": "f-1",
|
|
"startDatetime": "not-a-date",
|
|
},
|
|
{
|
|
"id": "a-2",
|
|
"title": "Ride with good date",
|
|
"activityFileId": "f-2",
|
|
"startDatetime": "2026-08-15T06:00:00.000Z",
|
|
},
|
|
],
|
|
}
|
|
},
|
|
)
|
|
raise AssertionError(request.url)
|
|
|
|
store = MyWhooshTokenStore(tmp_path / "mywhoosh.json")
|
|
store.save(MyWhooshToken(access_token="cached", refresh_token=None, whoosh_id=None))
|
|
client = MyWhooshClient(store, http_client=httpx.AsyncClient(transport=httpx.MockTransport(handler)))
|
|
|
|
activities = await client.list_activities("rider@example.com", "secret")
|
|
|
|
assert [a.id for a in activities] == ["a-2"]
|
|
|
|
|
|
@pytest.mark.asyncio
|
|
async def test_list_activities_raises_integration_error_on_envelope_shape_failure(tmp_path) -> None:
|
|
async def handler(request: httpx.Request) -> httpx.Response:
|
|
if request.url.path.endswith("/activities"):
|
|
return httpx.Response(200, json={"data": {"totalPages": 1}})
|
|
raise AssertionError(request.url)
|
|
|
|
store = MyWhooshTokenStore(tmp_path / "mywhoosh.json")
|
|
store.save(MyWhooshToken(access_token="cached", refresh_token=None, whoosh_id=None))
|
|
client = MyWhooshClient(store, http_client=httpx.AsyncClient(transport=httpx.MockTransport(handler)))
|
|
|
|
with pytest.raises(MyWhooshIntegrationError):
|
|
await client.list_activities("rider@example.com", "secret")
|
|
|
|
|
|
@pytest.mark.asyncio
|
|
async def test_list_activities_respects_max_pages(tmp_path) -> None:
|
|
calls = []
|
|
|
|
async def handler(request: httpx.Request) -> httpx.Response:
|
|
if request.url.path.endswith("/activities"):
|
|
payload = json.loads(request.content)
|
|
page = payload["page"]
|
|
calls.append(page)
|
|
result = {
|
|
"data": {
|
|
"totalPages": 5,
|
|
"results": [
|
|
{
|
|
"id": f"a-{page}",
|
|
"title": f"Ride {page}",
|
|
"activityFileId": f"f-{page}",
|
|
"startDatetime": "2026-08-15T06:00:00.000Z",
|
|
}
|
|
],
|
|
}
|
|
}
|
|
return httpx.Response(200, json=result)
|
|
raise AssertionError(request.url)
|
|
|
|
store = MyWhooshTokenStore(tmp_path / "mywhoosh.json")
|
|
store.save(MyWhooshToken(access_token="cached", refresh_token=None, whoosh_id=None))
|
|
client = MyWhooshClient(store, http_client=httpx.AsyncClient(transport=httpx.MockTransport(handler)))
|
|
|
|
activities = await client.list_activities("rider@example.com", "secret", max_pages=1)
|
|
|
|
assert calls == [1]
|
|
assert [a.id for a in activities] == ["a-1"]
|
|
|
|
|
|
@pytest.mark.asyncio
|
|
async def test_download_fit_raises_integration_error_on_invalid_json(tmp_path) -> None:
|
|
async def handler(request: httpx.Request) -> httpx.Response:
|
|
if request.url.path.endswith("/download-activity-file"):
|
|
return httpx.Response(200, content=b"not json", headers={"content-type": "application/json"})
|
|
raise AssertionError(request.url)
|
|
|
|
store = MyWhooshTokenStore(tmp_path / "mywhoosh.json")
|
|
store.save(MyWhooshToken(access_token="cached", refresh_token=None, whoosh_id=None))
|
|
client = MyWhooshClient(store, http_client=httpx.AsyncClient(transport=httpx.MockTransport(handler)))
|
|
|
|
with pytest.raises(MyWhooshIntegrationError):
|
|
await client.download_fit("f-1", "rider@example.com", "secret")
|