diff --git a/earned_time/DOCS-progress.md b/earned_time/DOCS-progress.md index 25f6aab..9cfe7d8 100644 --- a/earned_time/DOCS-progress.md +++ b/earned_time/DOCS-progress.md @@ -82,13 +82,29 @@ The focus earner already paid N/M floored; it now calls the same arithmetic A bad row among good rows is skipped, not fatal. +## The review: no row, no pay (from `REVIEW_PROGRESS_FROM`) + +kuhy's rule (2026-11-22): the review top-up pays in equal slices, `bonus * done +// target`, the writer freezing the target at the day's first review. From +`REVIEW_PROGRESS_FROM` (2026-11-24, the day after the 2026-11-23 release; a rule +that lowers pay never lands on its deploy day) the review differs from the other +earners: + +- a credited review (a yes) pays only by its row: `done` of `target` of 20 + minutes, never more than 20; the gaming twin is 0 as ever, and a sick day adds + the same minutes on top of 20:00; +- a credited review with no row pays **0**, not the flat 20, and logs a warning; +- a row that fails verification (bad signature, edited, wrong day or source, + unreadable numbers) is no row, so it pays 0 too. This is deliberate: fail + closed, visible in the log, never a flat 20 for a row nobody can vouch for; +- a no or `None` pays 0 whatever a row says: the guard's accepted submission, not + the row, is the evidence that a review happened (`DOCS-review.md`). + +Before `REVIEW_PROGRESS_FROM` the review pays as in 0.23.0 (a yes pays 20, a no +0) and ignores every progress row. + ## Not credits A `progress` row has `amount` 0 and its own kind. `done_today`, `credit_units`, `first_credit_at` and `maturity` never see it, so it cannot earn a bonus, mature a gate or start a penalty. - -## Open question - -What a paid review pays when no progress row exists is unchanged (the full 20 -minutes, today's rule); kuhy has not decided otherwise. diff --git a/earned_time/README.md b/earned_time/README.md index eada4d4..797d66d 100644 --- a/earned_time/README.md +++ b/earned_time/README.md @@ -126,8 +126,10 @@ and the rules are in [DOCS-review.md](DOCS-review.md). A gate signs "done N of target M for day D" and `resolve(..., progress=)` pays a no that share of a yes (`60 * 1 // 3 = 20`), for shutdown, gaming and sick days, from the day's last good row. A yes pays full and "could not check" -nothing, as ever; with no row anywhere every output is 0.23.0's. The row, the -reader and every fail-closed case are in [DOCS-progress.md](DOCS-progress.md). +nothing, as ever; with no row anywhere every output is 0.23.0's, the review +excepted. The row, the reader and every fail-closed case are in +[DOCS-progress.md](DOCS-progress.md). The review differs from `REVIEW_PROGRESS_FROM` (2026-11-24): a credited review +pays only by its row (`20 * done // target`), and with no verified row pays 0. ## Gate maturity (0.6.0) @@ -166,7 +168,7 @@ How far to trust a gate, computed from its ledger by `maturity()`, is in - `progress_map(day, home, key_file, *, earners=None, gate_off=()) -> dict[str, Progress]`, `read_progress(earner, ledger, key_file, day, *, gate_off=False) -> Progress | None`, `Progress(done, target)`, - `Earner.progress_source`, `Term.progress` (0.24.0). + `Earner.progress_source`, `Term.progress`, `REVIEW_PROGRESS_FROM` (0.24.0). ## The workout ledger diff --git a/earned_time/earned_time/__init__.py b/earned_time/earned_time/__init__.py index cf3d3e7..800e8b7 100644 --- a/earned_time/earned_time/__init__.py +++ b/earned_time/earned_time/__init__.py @@ -57,6 +57,7 @@ from earned_time._ladder import ( ANKI_WAIVED_FROM, LADDER, LADDER_FROM, + REVIEW_PROGRESS_FROM, SHUTDOWN_CEILING_MINUTES, TUTOR_FROM, TUTOR_LADDER, @@ -147,6 +148,7 @@ __all__ = [ "REVIEW", "REVIEW_FROM", "REVIEW_LEDGER", + "REVIEW_PROGRESS_FROM", "REVIEW_SHUTDOWN_MINUTES", "REVIEW_SOURCE", "SHUTDOWN_BASE_MINUTES", diff --git a/earned_time/earned_time/_ladder.py b/earned_time/earned_time/_ladder.py index d5742b7..b78a251 100644 --- a/earned_time/earned_time/_ladder.py +++ b/earned_time/earned_time/_ladder.py @@ -55,6 +55,11 @@ ANKI_WAIVED_FROM: Final = date(2026, 10, 9) # screen-locker's late-credit rule shipped (46393fa, 2026-10-17): an 18:00 # floor without it locked out a credit landing after the shutdown. UNIFIED_FROM: Final = date(2026, 10, 18) +# From this day a credited LeetCode review with no verified progress row pays +# nothing, and with one pays ``bonus * done // target`` (0.24.0). It lowers +# pay, so it lands the day after the release (2026-11-23), never on it. Before +# it the review pays exactly as in 0.23.0, a row or not. +REVIEW_PROGRESS_FROM: Final = date(2026, 11, 24) _SLEEP_MINUTES: Final = 8 * 60 _DAY_MINUTES: Final = 24 * 60 diff --git a/earned_time/earned_time/_resolve.py b/earned_time/earned_time/_resolve.py index eb741f4..77bfe2f 100644 --- a/earned_time/earned_time/_resolve.py +++ b/earned_time/earned_time/_resolve.py @@ -27,11 +27,12 @@ from typing import TYPE_CHECKING, Final from earned_time._floor import gaming_cut, is_penalised, shutdown_floor from earned_time._gaming import gaming_enforced -from earned_time._ladder import shutdown_ceiling_for +from earned_time._ladder import REVIEW_PROGRESS_FROM, shutdown_ceiling_for from earned_time._leisure import base_minutes, ceiling_minutes, is_leisure from earned_time._registry import all_earners, earners_for from earned_time._resolution import Base, Resolution, Term -from earned_time._share import gaming_share, shutdown_share +from earned_time._review import ReviewEarner +from earned_time._share import review_term, share_term from earned_time._sick import sick_or if TYPE_CHECKING: @@ -113,23 +114,24 @@ def _term( """``item``'s term on ``day``; no answer at all is logged and earns nothing. Progress pays only a no (``0``/``False``): a yes pays in full as ever and - ``None`` ("could not check") earns nothing, row or no row. + ``None`` ("could not check") earns nothing, row or no row. The review is + the exception (:func:`~earned_time._share.review_term`): from + ``REVIEW_PROGRESS_FROM`` only a yes pays, and only by its row; before it + progress is ignored (0.23.0). """ if item.name not in answers: _logger.warning( "No answer for the %s earner; it earns nothing today", item.label ) units = _units(answers.get(item.name)) + if isinstance(item, ReviewEarner): + if day >= REVIEW_PROGRESS_FROM: + return review_term(item, units, day, progress) + progress = None no = units is not None and units < 1 share = (progress or {}).get(item.name) if no else None if share is not None: - return Term( - item, - units, - gaming_share(item, share), - shutdown_share(item, share, day), - share, - ) + return share_term(item, units, day, share) count = units or 0 return Term( earner=item, diff --git a/earned_time/earned_time/_share.py b/earned_time/earned_time/_share.py index 444d498..1a81466 100644 --- a/earned_time/earned_time/_share.py +++ b/earned_time/earned_time/_share.py @@ -8,16 +8,21 @@ share: the focus earner's minutes and the gates' signed progress alike. from __future__ import annotations -from typing import TYPE_CHECKING +import logging +from typing import TYPE_CHECKING, Final from earned_time._ladder import shutdown_minutes_for +from earned_time._resolution import Term if TYPE_CHECKING: + from collections.abc import Mapping from datetime import date from earned_time._policy import Earner from earned_time._progress import Progress +_logger: Final = logging.getLogger(__name__) + def share_minutes(full: int, done: int, target: int) -> int: """``full * done // target``, ``done`` clamped to ``[0, target]``. @@ -43,3 +48,40 @@ def shutdown_share(item: Earner, progress: Progress, day: date) -> int: return share_minutes( shutdown_minutes_for(item, day), progress.done, progress.target ) + + +def share_term(item: Earner, units: int | None, day: date, share: Progress) -> Term: + """``item``'s term on ``day`` when it is paid as a share of ``share``.""" + return Term( + item, + units, + gaming_share(item, share), + shutdown_share(item, share, day), + share, + ) + + +def review_term( + item: Earner, + units: int | None, + day: date, + progress: Mapping[str, Progress] | None, +) -> Term: + """The review's term from ``REVIEW_PROGRESS_FROM``: a credited review needs a row. + + Only a credited review (a yes) pays, and then ``bonus * done // target`` of + the signed row, never more than the full bonus. A yes with no row pays 0: + a row that fails verification is no row, so it pays 0 too (fail closed, + logged). A no and ``None`` pay 0 whatever a row says, since the guard's + accepted submission, not the row, is the evidence a review happened. + """ + share = (progress or {}).get(item.name) if units else None + if units and share is None: + _logger.warning( + "%s credited with no progress row on %s; it pays nothing", + item.label, + day, + ) + if share is None: + return Term(item, units, 0, 0) + return share_term(item, units, day, share) diff --git a/earned_time/earned_time/tests/_golden_0_23_0.json b/earned_time/earned_time/tests/_golden_0_23_0.json index b5b517e..72a9382 100644 --- a/earned_time/earned_time/tests/_golden_0_23_0.json +++ b/earned_time/earned_time/tests/_golden_0_23_0.json @@ -1,118 +1,118 @@ { - "default|2026-09-25": "d5979f10258f71c6f5cd260ad0322b85a2fc6a6a37daf3f66b5e88e403ce5dc5", - "default|2026-09-26": "dbef32ae2e44f810457a2d8610158fe28238835ecf2d090ac4bbd5a919e701e8", - "default|2026-10-01": "4e22126dd25c1122dee871989e059f32464422b527f5fcb799a8bbb732497497", - "default|2026-10-05": "24414c7ce713131d552e98e1416b9829412e40902e318c0a2710274940b6582f", - "default|2026-10-06": "745a60043a5a7ad0d0542af2d7c0789298d08098e83b143889f0f902a25fb9c3", - "default|2026-10-08": "275c28712ee1f572c527299e2bcaca45a17e2ebc72046de193f0e59667245b4b", - "default|2026-10-09": "1035a892e1dc16b4857d455a51ecc1e9ad2544ff196e2fb2f0c923155ea9269c", - "default|2026-10-10": "20621ebccd4ac601d85acc22f07126fe566103b5b19967116991a9289991d6b7", - "default|2026-10-17": "590d3ec70bf86126cab0344beb8be26a0c4b6370119375095fd7c363c13f6470", - "default|2026-10-18": "3d896c49e432f4f084da7e641a7ad6b41b62a583f587c3047a112ae4dc554372", - "default|2026-11-01": "fa00273b89a31779a1984941eb7d982e40970be8c440e93c38bcb2117d52d36d", - "default|2026-11-08": "82ff6c26f6d0c354852f8c3e7c0b3a28f0bc7fbd33af001b992b6c374b937ed4", - "default|2026-11-14": "95bbfcb5bf25f9f49f8487efad5cbb52cce9282251f283f54d3266647a24e6fa", - "default|2026-11-15": "de061cd23f3aca9e5683f7407be497bcb635d63e39c2c521206ef51874531e45", - "default|2026-11-16": "f9f4203012c609f443a555a54a992bdb49bab735ab9cbdb5dd2038458e038283", - "default|2026-11-17": "416630114779c76670126c8b72e9cd58f4b7b72f20c6481fbd6ac4034e9b72e4", - "default|2026-11-18": "71d8dba9daa713f36eb39dd8cb0da68dd41b6e92fd0b26bc7ce4f9f1513daac4", - "default|2026-11-19": "89de5b7902c05a1fe76803606d5dd427af26de0574fa9478c3741de7ac4f9f5e", - "default|2026-11-20": "43f2bcc8ed42ee51a2709be1ca5e538d8f3aac7d390279f540f95ee17af9473e", - "default|2026-11-21": "39fd48906c41982b4cbf1508c19680e13296e11135586cae7bb5bfd003d271da", - "default|2026-11-22": "90442925d88982f99ac7cf13256d33d677f8e43d73d1c680a5f99b37d2ddbcb7", - "default|2026-11-23": "6606c5fbd9b5e74431a6a9ba6b58f09ca1c71eb1c37e960d68cbd65b075617f3", - "default|2026-11-24": "0fab42a2f77a5f2bb821263b4e518274d3e674747654ca8a1bb22aac862e3e5d", - "default|2026-11-25": "17db03c1e31139f0b3dbbfa958e41367404853e90ed79a9c88feef427507ac12", - "default|2026-11-26": "fb390158553c04ad578667f1564e5fd6ebba8e2b23f5df04bd35b77fc3e1f85c", - "default|2026-11-27": "a45fc6e3b6c14a9bdfbf80f262f5d33b025965ff93803f60e959a18bc959cde4", - "default|2026-12-25": "c59ddad74c85b8e5169e4ba4ffae26c89cfe94732c701df45ed1d9babd0c0a64", - "default|2027-01-01": "2db1833cec98ff85dc0e3ff808c9ef193e42af23ffc9913a689d60e63fc4c387", - "default|2027-01-02": "f27171dbcb0afed62c3c3dea013fbfb5c3b3baeb56eadf734e6ad0b4b1cdc972", - "focus|2026-09-25": "d5979f10258f71c6f5cd260ad0322b85a2fc6a6a37daf3f66b5e88e403ce5dc5", - "focus|2026-09-26": "dbef32ae2e44f810457a2d8610158fe28238835ecf2d090ac4bbd5a919e701e8", - "focus|2026-10-01": "4e22126dd25c1122dee871989e059f32464422b527f5fcb799a8bbb732497497", - "focus|2026-10-05": "24414c7ce713131d552e98e1416b9829412e40902e318c0a2710274940b6582f", - "focus|2026-10-06": "745a60043a5a7ad0d0542af2d7c0789298d08098e83b143889f0f902a25fb9c3", - "focus|2026-10-08": "275c28712ee1f572c527299e2bcaca45a17e2ebc72046de193f0e59667245b4b", - "focus|2026-10-09": "1035a892e1dc16b4857d455a51ecc1e9ad2544ff196e2fb2f0c923155ea9269c", - "focus|2026-10-10": "bd737f83f7fa5e4102f7569b3a7fb812eaa0bcf40962f8574c3113e340a79e70", - "focus|2026-10-17": "c7ff06df21447e99a5b294518dfd5894daa0849eb3070ea3410a6bf2bd484111", - "focus|2026-10-18": "123a39d01c7357dec4619727b2bf73c26b124a474dc617941846b5215bd06cc5", - "focus|2026-11-01": "ecdc41b29f7f9080786cb381b635741d59986809dd0704f30883fa332ded4360", - "focus|2026-11-08": "6f04e00b4d78fc09ab04f30be5be5183e8027bf8c9fcc13f59a1538bbdee2b3b", - "focus|2026-11-14": "3a4f25853003afce725ba6fad82b70c3215f5f6b4e1c5cf8d30bc9ac56244fa0", - "focus|2026-11-15": "16ace51d54a9061bf46774f1e68bc6645368e5a840be7e7872564dc29e6465c0", - "focus|2026-11-16": "bf6f84c43b9151df924e256bc3428bb9bbb89d3955f53bad4805280370b09a2a", - "focus|2026-11-17": "266ea63e52649e8c99f0303cd4b62822d9bb959f11c70b164d1c0b269a89f5ea", - "focus|2026-11-18": "80810b3477afa7d451602bf6c069bc2b6e5899554f1860098f581051f6d6dc2a", - "focus|2026-11-19": "db9eee4e86164768f3490ea87f3227b8a650dcc5115e8f6c2343314bbd6ce3a5", - "focus|2026-11-20": "19ad7d5b809ff2e45b24c0210c7d646685c9603a6571f910f0164841f5602c37", - "focus|2026-11-21": "601f04bbd20441e3e6698a34f8ae33e010f8500123a1df6870d8582f7d64e447", - "focus|2026-11-22": "9c8817239021615b856eca46d84af0b62cf4a35285857aa959700b004ac4f45e", - "focus|2026-11-23": "e9404c84795b66c5b17728feb99e4570820e17cbffcb4d11a081cfa4e20521d9", - "focus|2026-11-24": "61825a9809de16d8bf59e2e70cc9d7f0944ba763cd8ea6559e7ea84eee991475", - "focus|2026-11-25": "b3fa9185f5dee9df052186a4a68afe1d996f0e9706e2de1625a5317130bc5059", - "focus|2026-11-26": "8019bcfb6b4c34882f13a25cc51e50a3938f32411a9c9f7137815be7e84157d7", - "focus|2026-11-27": "31795afe07f6b6a88baaf89f3812ac6394a869aa034ea7e505bd99706401e636", - "focus|2026-12-25": "db50479ffa793c333baa983cb4753d72cc4247f81542dd9948c3a72779ce0c53", - "focus|2027-01-01": "e902b44a24ac77e50789b0d460c095e6763ca508797ad2731708fa14f7a5d384", - "focus|2027-01-02": "ad21a2539e50303a3c28f329bcd19aa1b3cdc88d01a25de721c92096dae1ce99", - "legacy|2026-09-25": "d5979f10258f71c6f5cd260ad0322b85a2fc6a6a37daf3f66b5e88e403ce5dc5", - "legacy|2026-09-26": "dbef32ae2e44f810457a2d8610158fe28238835ecf2d090ac4bbd5a919e701e8", - "legacy|2026-10-01": "4e22126dd25c1122dee871989e059f32464422b527f5fcb799a8bbb732497497", - "legacy|2026-10-05": "24414c7ce713131d552e98e1416b9829412e40902e318c0a2710274940b6582f", - "legacy|2026-10-06": "745a60043a5a7ad0d0542af2d7c0789298d08098e83b143889f0f902a25fb9c3", - "legacy|2026-10-08": "275c28712ee1f572c527299e2bcaca45a17e2ebc72046de193f0e59667245b4b", - "legacy|2026-10-09": "2b5fb5c0f9bf3a4631c80ae2efb2cdc594763ec570cc094704ae2739cf3df150", - "legacy|2026-10-10": "cbc35da122acec19a7eee1ab0e37fa70924ff39b8ded4e0b7e4d7fd8c2cbe459", - "legacy|2026-10-17": "d687d087d85206e909b8b2deb466abf673147df23b428eeeebd38a7ae2ac59ad", - "legacy|2026-10-18": "4514f9d56c4a811724ba9713773e13a2af5074819ad20a1c3a79261dfb21e242", - "legacy|2026-11-01": "61a3161ddd39183f4951aae7b6918ab4e0ccf9462391a9e3c752c5adb9b081d5", - "legacy|2026-11-08": "34e0d74573b635f080299a072fc11456fd9448ab420f2a15b8cf9b85d83434b9", - "legacy|2026-11-14": "520bf1f006cafe0314ecb66e8ff2efcee5d333a2460c5a106c48d473c97b4b80", - "legacy|2026-11-15": "128309ec209bea89907880b4917adaeff4349df297789adf46cdec1dd365c0f8", - "legacy|2026-11-16": "2fe908c5f4f5e3dea92e53f88adbc5c44292b23f6166d8d2211657be543592cc", - "legacy|2026-11-17": "68a378804b51e74f93eb8e9cea737f17bafaf4d8b3582bbb0cda1f587183a39c", - "legacy|2026-11-18": "f8638a6b302d430813afe1500ee2d1c583deb5fb3710bca201f2551e5868b09d", - "legacy|2026-11-19": "23f219575fcc0227a3065d972b5f5777d02867f8b7d1722f7480496c21281fcb", - "legacy|2026-11-20": "83405fea6c8bd58a9756a027207edcd2f9cda37253a36ecda771ce375c469d9e", - "legacy|2026-11-21": "ccefec48376ec2983f70b48eefb03bf4c7858dd5ecf89d6ea68c6caf4eebce52", - "legacy|2026-11-22": "74fa20db1b9ad54034ae331e8e383afe49cd325c9c0c2123e41ad81188ed6704", - "legacy|2026-11-23": "b280ae281fc74d0ff3c6cca3ac720b39f16f286711ce0558d7bd9cd666064514", - "legacy|2026-11-24": "d10b1c62a9b3108601375b51bcb19a6171e404b4d787a724ce7819aba9dee127", - "legacy|2026-11-25": "0dd2c361c31809bb7ad45db247bd87c11858e2baaa0c76e307f17b5799c06cc4", - "legacy|2026-11-26": "ab64833e0624ab99018d4d947ec6a07d59f515b6f7ca71b5d82b66eeb6df60a8", - "legacy|2026-11-27": "3f115a8b773aac85f714b36aae4fdb988d1d939a81d5c7d9474c2d0825092774", - "legacy|2026-12-25": "351426011def5d7f18c1605ec9baa549dcce76a2c5f360f7598330b71d38313d", - "legacy|2027-01-01": "d8a36c6bea32939787ba42144cc4e8eb2eb7837e109f5efd649f3e877f9f954e", - "legacy|2027-01-02": "fb7b2bee44f6a2c32f38ef7b911e1cee4ca8dd6d78fba626c1724b3ab78b81ec", - "tutor|2026-09-25": "20bef4cc33e99150b682c1d95b875c9cfd28f91ceee98e1ef535b836c3c4f52f", - "tutor|2026-09-26": "63d8533206bd4f0bf5cbcfae1f2616415a761ec47517bd886354ec423d9833c1", - "tutor|2026-10-01": "5e77e89e108d380d50aa0cc18cf8959c9531bb653c378f969bbebcb68e7b43cc", - "tutor|2026-10-05": "e552a8f912ffaf3ac701bc6c43bd793a35bfe12d222e00120ac6aa77e1e81762", - "tutor|2026-10-06": "696c340c5c86e107439f6dc3fbe61bea226f2593f31f0a5785f0822e395493e3", - "tutor|2026-10-08": "c49cb68a23e92411738664e4010c7f7870b0e14bf7a8e56bce82a637b9ce62c5", - "tutor|2026-10-09": "ac727597998ffca9f78fe122546f1d4e3caaa9b71161b061137b469cc536ba67", - "tutor|2026-10-10": "20621ebccd4ac601d85acc22f07126fe566103b5b19967116991a9289991d6b7", - "tutor|2026-10-17": "590d3ec70bf86126cab0344beb8be26a0c4b6370119375095fd7c363c13f6470", - "tutor|2026-10-18": "3d896c49e432f4f084da7e641a7ad6b41b62a583f587c3047a112ae4dc554372", - "tutor|2026-11-01": "fa00273b89a31779a1984941eb7d982e40970be8c440e93c38bcb2117d52d36d", - "tutor|2026-11-08": "82ff6c26f6d0c354852f8c3e7c0b3a28f0bc7fbd33af001b992b6c374b937ed4", - "tutor|2026-11-14": "95bbfcb5bf25f9f49f8487efad5cbb52cce9282251f283f54d3266647a24e6fa", - "tutor|2026-11-15": "de061cd23f3aca9e5683f7407be497bcb635d63e39c2c521206ef51874531e45", - "tutor|2026-11-16": "f9f4203012c609f443a555a54a992bdb49bab735ab9cbdb5dd2038458e038283", - "tutor|2026-11-17": "416630114779c76670126c8b72e9cd58f4b7b72f20c6481fbd6ac4034e9b72e4", - "tutor|2026-11-18": "71d8dba9daa713f36eb39dd8cb0da68dd41b6e92fd0b26bc7ce4f9f1513daac4", - "tutor|2026-11-19": "89de5b7902c05a1fe76803606d5dd427af26de0574fa9478c3741de7ac4f9f5e", - "tutor|2026-11-20": "43f2bcc8ed42ee51a2709be1ca5e538d8f3aac7d390279f540f95ee17af9473e", - "tutor|2026-11-21": "39fd48906c41982b4cbf1508c19680e13296e11135586cae7bb5bfd003d271da", - "tutor|2026-11-22": "90442925d88982f99ac7cf13256d33d677f8e43d73d1c680a5f99b37d2ddbcb7", - "tutor|2026-11-23": "6679f84c03a5fe1aaf32dc17f70a2dc80a47212deb980d9d3b5179b8448007c6", - "tutor|2026-11-24": "4959850db79e70ebe57b4fa02d278367c0da6f0acf3f9025804bdfa6912b1b6f", - "tutor|2026-11-25": "047a58fcacabdeecf6807aa9425cd01bf10f1bf9e81787894031597647f16bd2", - "tutor|2026-11-26": "51bfd3b993519a766dc80b970619318955f27d739b14220f59e8af060c8380a0", - "tutor|2026-11-27": "5382d19c7635caa6b285de2820baf70df320f42764e282eb57267340afaad471", - "tutor|2026-12-25": "786053a1c98d38984ee5a8a4d6140f6f5e0d38f53df4f1ee09ef1e9569693442", - "tutor|2027-01-01": "af65fe00513b98a604671a3980085bbcfaffb9365e35c5594357829f671c5bc1", - "tutor|2027-01-02": "699ab7775e270d33585fb01ede7596834a39e4aac4b2d53156e47b1fcdb99436" +"default|2026-09-25": "d5979f10258f71c6f5cd260ad0322b85a2fc6a6a37daf3f66b5e88e403ce5dc5", +"default|2026-09-26": "dbef32ae2e44f810457a2d8610158fe28238835ecf2d090ac4bbd5a919e701e8", +"default|2026-10-01": "4e22126dd25c1122dee871989e059f32464422b527f5fcb799a8bbb732497497", +"default|2026-10-05": "24414c7ce713131d552e98e1416b9829412e40902e318c0a2710274940b6582f", +"default|2026-10-06": "745a60043a5a7ad0d0542af2d7c0789298d08098e83b143889f0f902a25fb9c3", +"default|2026-10-08": "275c28712ee1f572c527299e2bcaca45a17e2ebc72046de193f0e59667245b4b", +"default|2026-10-09": "1035a892e1dc16b4857d455a51ecc1e9ad2544ff196e2fb2f0c923155ea9269c", +"default|2026-10-10": "20621ebccd4ac601d85acc22f07126fe566103b5b19967116991a9289991d6b7", +"default|2026-10-17": "590d3ec70bf86126cab0344beb8be26a0c4b6370119375095fd7c363c13f6470", +"default|2026-10-18": "3d896c49e432f4f084da7e641a7ad6b41b62a583f587c3047a112ae4dc554372", +"default|2026-11-01": "fa00273b89a31779a1984941eb7d982e40970be8c440e93c38bcb2117d52d36d", +"default|2026-11-08": "82ff6c26f6d0c354852f8c3e7c0b3a28f0bc7fbd33af001b992b6c374b937ed4", +"default|2026-11-14": "95bbfcb5bf25f9f49f8487efad5cbb52cce9282251f283f54d3266647a24e6fa", +"default|2026-11-15": "de061cd23f3aca9e5683f7407be497bcb635d63e39c2c521206ef51874531e45", +"default|2026-11-16": "f9f4203012c609f443a555a54a992bdb49bab735ab9cbdb5dd2038458e038283", +"default|2026-11-17": "416630114779c76670126c8b72e9cd58f4b7b72f20c6481fbd6ac4034e9b72e4", +"default|2026-11-18": "71d8dba9daa713f36eb39dd8cb0da68dd41b6e92fd0b26bc7ce4f9f1513daac4", +"default|2026-11-19": "89de5b7902c05a1fe76803606d5dd427af26de0574fa9478c3741de7ac4f9f5e", +"default|2026-11-20": "43f2bcc8ed42ee51a2709be1ca5e538d8f3aac7d390279f540f95ee17af9473e", +"default|2026-11-21": "39fd48906c41982b4cbf1508c19680e13296e11135586cae7bb5bfd003d271da", +"default|2026-11-22": "90442925d88982f99ac7cf13256d33d677f8e43d73d1c680a5f99b37d2ddbcb7", +"default|2026-11-23": "6606c5fbd9b5e74431a6a9ba6b58f09ca1c71eb1c37e960d68cbd65b075617f3", +"default|2026-11-24": "427b689f8e0931ea09254bfb518a790ddefc00fa1ce1fb13b0281f7bde6cbb47", +"default|2026-11-25": "387960d1560514130f792581afd82e49e17e6253dc7ec7df326b664b6e910c4c", +"default|2026-11-26": "ba5fa2369f422283795973929fef3b1c129474f565078adec2ce46dd52a085ff", +"default|2026-11-27": "c5178b0a166b8034bb2afa9521f3b90c9714356c5cdb154e82789892da1549d7", +"default|2026-12-25": "3bb71f9165f0d7b9939f3ee765b33b44f4dfb49b349ad501973187f421de930e", +"default|2027-01-01": "a527db8c78abefa1713cbbd1854da5405d68eaf108094ebd00824a31bfd02507", +"default|2027-01-02": "b19381c6d2e1ddd94d8a9e9d4f30a85962e8a3141207cfacaa860fd8a5af617b", +"focus|2026-09-25": "d5979f10258f71c6f5cd260ad0322b85a2fc6a6a37daf3f66b5e88e403ce5dc5", +"focus|2026-09-26": "dbef32ae2e44f810457a2d8610158fe28238835ecf2d090ac4bbd5a919e701e8", +"focus|2026-10-01": "4e22126dd25c1122dee871989e059f32464422b527f5fcb799a8bbb732497497", +"focus|2026-10-05": "24414c7ce713131d552e98e1416b9829412e40902e318c0a2710274940b6582f", +"focus|2026-10-06": "745a60043a5a7ad0d0542af2d7c0789298d08098e83b143889f0f902a25fb9c3", +"focus|2026-10-08": "275c28712ee1f572c527299e2bcaca45a17e2ebc72046de193f0e59667245b4b", +"focus|2026-10-09": "1035a892e1dc16b4857d455a51ecc1e9ad2544ff196e2fb2f0c923155ea9269c", +"focus|2026-10-10": "bd737f83f7fa5e4102f7569b3a7fb812eaa0bcf40962f8574c3113e340a79e70", +"focus|2026-10-17": "c7ff06df21447e99a5b294518dfd5894daa0849eb3070ea3410a6bf2bd484111", +"focus|2026-10-18": "123a39d01c7357dec4619727b2bf73c26b124a474dc617941846b5215bd06cc5", +"focus|2026-11-01": "ecdc41b29f7f9080786cb381b635741d59986809dd0704f30883fa332ded4360", +"focus|2026-11-08": "6f04e00b4d78fc09ab04f30be5be5183e8027bf8c9fcc13f59a1538bbdee2b3b", +"focus|2026-11-14": "3a4f25853003afce725ba6fad82b70c3215f5f6b4e1c5cf8d30bc9ac56244fa0", +"focus|2026-11-15": "16ace51d54a9061bf46774f1e68bc6645368e5a840be7e7872564dc29e6465c0", +"focus|2026-11-16": "bf6f84c43b9151df924e256bc3428bb9bbb89d3955f53bad4805280370b09a2a", +"focus|2026-11-17": "266ea63e52649e8c99f0303cd4b62822d9bb959f11c70b164d1c0b269a89f5ea", +"focus|2026-11-18": "80810b3477afa7d451602bf6c069bc2b6e5899554f1860098f581051f6d6dc2a", +"focus|2026-11-19": "db9eee4e86164768f3490ea87f3227b8a650dcc5115e8f6c2343314bbd6ce3a5", +"focus|2026-11-20": "19ad7d5b809ff2e45b24c0210c7d646685c9603a6571f910f0164841f5602c37", +"focus|2026-11-21": "601f04bbd20441e3e6698a34f8ae33e010f8500123a1df6870d8582f7d64e447", +"focus|2026-11-22": "9c8817239021615b856eca46d84af0b62cf4a35285857aa959700b004ac4f45e", +"focus|2026-11-23": "e9404c84795b66c5b17728feb99e4570820e17cbffcb4d11a081cfa4e20521d9", +"focus|2026-11-24": "1659bf90ace7713910f941ea6a872e740f8c8130bfd886143ddee5ff5f3bb21d", +"focus|2026-11-25": "2f0ae0b3892fd26d8c2376d0629aa2414a5d192169ff36beb4c09e879d2483de", +"focus|2026-11-26": "a706d2f25df525a3023677de18e9e68f68bf13be3fea5b6925bb96f6e287c715", +"focus|2026-11-27": "dc9bd93cef5acc080d61242c0b36ec8986f1e17d4db9a068cc8d24318536e00d", +"focus|2026-12-25": "0562f87b3326ad18de00d15bbe438c331ebf86755c2f189017e86baef730af4c", +"focus|2027-01-01": "8fb10422496f3b11deacfe4f5d126d67b02121048e2b278ac7cbce553cbd7038", +"focus|2027-01-02": "b72518c6a21ba3894fb6ea8da831fa6866a28b38f1026936688a714fa7776da9", +"legacy|2026-09-25": "d5979f10258f71c6f5cd260ad0322b85a2fc6a6a37daf3f66b5e88e403ce5dc5", +"legacy|2026-09-26": "dbef32ae2e44f810457a2d8610158fe28238835ecf2d090ac4bbd5a919e701e8", +"legacy|2026-10-01": "4e22126dd25c1122dee871989e059f32464422b527f5fcb799a8bbb732497497", +"legacy|2026-10-05": "24414c7ce713131d552e98e1416b9829412e40902e318c0a2710274940b6582f", +"legacy|2026-10-06": "745a60043a5a7ad0d0542af2d7c0789298d08098e83b143889f0f902a25fb9c3", +"legacy|2026-10-08": "275c28712ee1f572c527299e2bcaca45a17e2ebc72046de193f0e59667245b4b", +"legacy|2026-10-09": "2b5fb5c0f9bf3a4631c80ae2efb2cdc594763ec570cc094704ae2739cf3df150", +"legacy|2026-10-10": "cbc35da122acec19a7eee1ab0e37fa70924ff39b8ded4e0b7e4d7fd8c2cbe459", +"legacy|2026-10-17": "d687d087d85206e909b8b2deb466abf673147df23b428eeeebd38a7ae2ac59ad", +"legacy|2026-10-18": "4514f9d56c4a811724ba9713773e13a2af5074819ad20a1c3a79261dfb21e242", +"legacy|2026-11-01": "61a3161ddd39183f4951aae7b6918ab4e0ccf9462391a9e3c752c5adb9b081d5", +"legacy|2026-11-08": "34e0d74573b635f080299a072fc11456fd9448ab420f2a15b8cf9b85d83434b9", +"legacy|2026-11-14": "520bf1f006cafe0314ecb66e8ff2efcee5d333a2460c5a106c48d473c97b4b80", +"legacy|2026-11-15": "128309ec209bea89907880b4917adaeff4349df297789adf46cdec1dd365c0f8", +"legacy|2026-11-16": "2fe908c5f4f5e3dea92e53f88adbc5c44292b23f6166d8d2211657be543592cc", +"legacy|2026-11-17": "68a378804b51e74f93eb8e9cea737f17bafaf4d8b3582bbb0cda1f587183a39c", +"legacy|2026-11-18": "f8638a6b302d430813afe1500ee2d1c583deb5fb3710bca201f2551e5868b09d", +"legacy|2026-11-19": "23f219575fcc0227a3065d972b5f5777d02867f8b7d1722f7480496c21281fcb", +"legacy|2026-11-20": "83405fea6c8bd58a9756a027207edcd2f9cda37253a36ecda771ce375c469d9e", +"legacy|2026-11-21": "ccefec48376ec2983f70b48eefb03bf4c7858dd5ecf89d6ea68c6caf4eebce52", +"legacy|2026-11-22": "74fa20db1b9ad54034ae331e8e383afe49cd325c9c0c2123e41ad81188ed6704", +"legacy|2026-11-23": "b280ae281fc74d0ff3c6cca3ac720b39f16f286711ce0558d7bd9cd666064514", +"legacy|2026-11-24": "d10b1c62a9b3108601375b51bcb19a6171e404b4d787a724ce7819aba9dee127", +"legacy|2026-11-25": "0dd2c361c31809bb7ad45db247bd87c11858e2baaa0c76e307f17b5799c06cc4", +"legacy|2026-11-26": "ab64833e0624ab99018d4d947ec6a07d59f515b6f7ca71b5d82b66eeb6df60a8", +"legacy|2026-11-27": "3f115a8b773aac85f714b36aae4fdb988d1d939a81d5c7d9474c2d0825092774", +"legacy|2026-12-25": "351426011def5d7f18c1605ec9baa549dcce76a2c5f360f7598330b71d38313d", +"legacy|2027-01-01": "d8a36c6bea32939787ba42144cc4e8eb2eb7837e109f5efd649f3e877f9f954e", +"legacy|2027-01-02": "fb7b2bee44f6a2c32f38ef7b911e1cee4ca8dd6d78fba626c1724b3ab78b81ec", +"tutor|2026-09-25": "20bef4cc33e99150b682c1d95b875c9cfd28f91ceee98e1ef535b836c3c4f52f", +"tutor|2026-09-26": "63d8533206bd4f0bf5cbcfae1f2616415a761ec47517bd886354ec423d9833c1", +"tutor|2026-10-01": "5e77e89e108d380d50aa0cc18cf8959c9531bb653c378f969bbebcb68e7b43cc", +"tutor|2026-10-05": "e552a8f912ffaf3ac701bc6c43bd793a35bfe12d222e00120ac6aa77e1e81762", +"tutor|2026-10-06": "696c340c5c86e107439f6dc3fbe61bea226f2593f31f0a5785f0822e395493e3", +"tutor|2026-10-08": "c49cb68a23e92411738664e4010c7f7870b0e14bf7a8e56bce82a637b9ce62c5", +"tutor|2026-10-09": "ac727597998ffca9f78fe122546f1d4e3caaa9b71161b061137b469cc536ba67", +"tutor|2026-10-10": "20621ebccd4ac601d85acc22f07126fe566103b5b19967116991a9289991d6b7", +"tutor|2026-10-17": "590d3ec70bf86126cab0344beb8be26a0c4b6370119375095fd7c363c13f6470", +"tutor|2026-10-18": "3d896c49e432f4f084da7e641a7ad6b41b62a583f587c3047a112ae4dc554372", +"tutor|2026-11-01": "fa00273b89a31779a1984941eb7d982e40970be8c440e93c38bcb2117d52d36d", +"tutor|2026-11-08": "82ff6c26f6d0c354852f8c3e7c0b3a28f0bc7fbd33af001b992b6c374b937ed4", +"tutor|2026-11-14": "95bbfcb5bf25f9f49f8487efad5cbb52cce9282251f283f54d3266647a24e6fa", +"tutor|2026-11-15": "de061cd23f3aca9e5683f7407be497bcb635d63e39c2c521206ef51874531e45", +"tutor|2026-11-16": "f9f4203012c609f443a555a54a992bdb49bab735ab9cbdb5dd2038458e038283", +"tutor|2026-11-17": "416630114779c76670126c8b72e9cd58f4b7b72f20c6481fbd6ac4034e9b72e4", +"tutor|2026-11-18": "71d8dba9daa713f36eb39dd8cb0da68dd41b6e92fd0b26bc7ce4f9f1513daac4", +"tutor|2026-11-19": "89de5b7902c05a1fe76803606d5dd427af26de0574fa9478c3741de7ac4f9f5e", +"tutor|2026-11-20": "43f2bcc8ed42ee51a2709be1ca5e538d8f3aac7d390279f540f95ee17af9473e", +"tutor|2026-11-21": "39fd48906c41982b4cbf1508c19680e13296e11135586cae7bb5bfd003d271da", +"tutor|2026-11-22": "90442925d88982f99ac7cf13256d33d677f8e43d73d1c680a5f99b37d2ddbcb7", +"tutor|2026-11-23": "6679f84c03a5fe1aaf32dc17f70a2dc80a47212deb980d9d3b5179b8448007c6", +"tutor|2026-11-24": "4959850db79e70ebe57b4fa02d278367c0da6f0acf3f9025804bdfa6912b1b6f", +"tutor|2026-11-25": "047a58fcacabdeecf6807aa9425cd01bf10f1bf9e81787894031597647f16bd2", +"tutor|2026-11-26": "51bfd3b993519a766dc80b970619318955f27d739b14220f59e8af060c8380a0", +"tutor|2026-11-27": "5382d19c7635caa6b285de2820baf70df320f42764e282eb57267340afaad471", +"tutor|2026-12-25": "786053a1c98d38984ee5a8a4d6140f6f5e0d38f53df4f1ee09ef1e9569693442", +"tutor|2027-01-01": "af65fe00513b98a604671a3980085bbcfaffb9365e35c5594357829f671c5bc1", +"tutor|2027-01-02": "699ab7775e270d33585fb01ede7596834a39e4aac4b2d53156e47b1fcdb99436" } diff --git a/earned_time/earned_time/tests/_grid_dump.py b/earned_time/earned_time/tests/_grid_dump.py index 9800a1a..121c320 100644 --- a/earned_time/earned_time/tests/_grid_dump.py +++ b/earned_time/earned_time/tests/_grid_dump.py @@ -52,6 +52,11 @@ DAYS = tuple( sorted({*SPOTS, *(date(2026, 11, 14) + timedelta(days=n) for n in range(14))}) ) OPTIONS: tuple[int | None, ...] = (None, 0, 1, 60) +# From this day a credited review with no progress row pays nothing, which is +# not 0.23.0's answer (REVIEW_PROGRESS_FROM, a literal: 0.23.0 has no such name). +# From it the review is only asked "no" and "could not check", which agree. +REVIEW_PROGRESS_FROM = date(2026, 11, 24) +REVIEW_OPTIONS: tuple[int | None, ...] = (None, 0) def _registry(mode: str, day: date) -> tuple[earned_time.Earner, ...]: @@ -67,7 +72,11 @@ def _lines(mode: str, day: date, extra: dict[str, object]) -> list[str]: names = [e.name for e in registry] explicit = None if mode == "default" else registry out = [repr(earned_time.base_for(day, explicit))] - for values in itertools.product(OPTIONS, repeat=len(names)): + options = [ + REVIEW_OPTIONS if name == "review" and day >= REVIEW_PROGRESS_FROM else OPTIONS + for name in names + ] + for values in itertools.product(*options): answers = dict(zip(names, values, strict=True)) for sick, leisure in ((False, None), (True, None), (False, True)): res = earned_time.resolve( diff --git a/earned_time/earned_time/tests/test_progress_dark.py b/earned_time/earned_time/tests/test_progress_dark.py index 817c032..850bb81 100644 --- a/earned_time/earned_time/tests/test_progress_dark.py +++ b/earned_time/earned_time/tests/test_progress_dark.py @@ -5,6 +5,8 @@ over a grid of answers, sick and leisure switches, produced by 0.23.0 itself (``_grid_dump.py``). The live oracle re-derives it from an installed 0.23.0 when the interpreter has one, in a subprocess so ``sys.path`` stays untouched. +The one exception is the review from ``REVIEW_PROGRESS_FROM``: a credited +review with no row pays nothing, so the grid asks it only no or unknown there. """ from __future__ import annotations diff --git a/earned_time/earned_time/tests/test_progress_resolve.py b/earned_time/earned_time/tests/test_progress_resolve.py index 4684495..0365058 100644 --- a/earned_time/earned_time/tests/test_progress_resolve.py +++ b/earned_time/earned_time/tests/test_progress_resolve.py @@ -106,13 +106,12 @@ def test_the_share_uses_the_ladder_rung_not_the_old_pay() -> None: def test_the_review_pays_a_share_of_its_top_up() -> None: - answers = {**NOTHING, "review": False} - shown = resolve(answers, DAY, progress={"review": Progress(1, 2)}) - assert shown.term("review").shutdown_minutes == 10 - paid = resolve( - {**NOTHING, "review": True}, DAY, progress={"review": Progress(1, 2)} - ) - assert paid.term("review").shutdown_minutes == 20 + half = {"review": Progress(1, 2)} + paid = resolve({**NOTHING, "review": True}, DAY, progress=half) + assert paid.term("review").shutdown_minutes == 10 + # The review's own rule (test_review_progress.py): a no pays nothing. + unpaid = resolve({**NOTHING, "review": False}, DAY, progress=half) + assert unpaid.term("review").shutdown_minutes == 0 def test_a_progress_for_an_earner_not_in_the_registry_is_ignored() -> None: diff --git a/earned_time/earned_time/tests/test_review_progress.py b/earned_time/earned_time/tests/test_review_progress.py new file mode 100644 index 0000000..50421ae --- /dev/null +++ b/earned_time/earned_time/tests/test_review_progress.py @@ -0,0 +1,175 @@ +# Copyright (c) 2026 Krzysztof Rudnicki +"""The review's partial pay: from REVIEW_PROGRESS_FROM no row means no pay.""" + +from __future__ import annotations + +from datetime import date, timedelta +import logging +from typing import TYPE_CHECKING + +import pytest + +from earned_time import ( + REVIEW, + REVIEW_FROM, + REVIEW_PROGRESS_FROM, + REVIEW_SHUTDOWN_MINUTES, + Progress, + progress_map, + resolve, +) +from earned_time.tests._progress_rows import ( + home_ledger, + progress, + tampered, + write, +) + +if TYPE_CHECKING: + from pathlib import Path + +NOTHING: dict[str, int | bool | None] = { + "workout": 0, + "leetcode": False, + "reading": False, + "tutor": 0, +} +ON = date(2026, 11, 24) +DAYS = [ON, ON + timedelta(days=1), date(2027, 1, 1)] +Share = dict[str, Progress] + + +def _review( + answer: int | None, + day: date, + *, + sick: bool = False, + progress: Share | None = None, +) -> int: + answers = {**NOTHING, "review": answer} + return resolve(answers, day, sick=sick, progress=progress).shutdown_minutes + + +def _paid(day: date, share: Share | None = None, *, sick: bool = False) -> int: + """What the credited review adds to the day's shutdown over no review.""" + got = _review(1, day, sick=sick, progress=share) + return got - _review(0, day, sick=sick, progress=share) + + +def test_the_switch_is_the_day_after_the_release() -> None: + assert date(2026, 11, 24) == REVIEW_PROGRESS_FROM + assert REVIEW_FROM + timedelta(days=1) == REVIEW_PROGRESS_FROM + + +def test_before_the_switch_the_review_pays_as_in_0_23_0() -> None: + day = REVIEW_PROGRESS_FROM - timedelta(days=1) + assert _paid(day) == REVIEW_SHUTDOWN_MINUTES + # A row changes nothing yet: a yes pays full, a no pays nothing. + half: Share = {"review": Progress(1, 2)} + assert _paid(day, half) == REVIEW_SHUTDOWN_MINUTES + assert _review(0, day, progress=half) == _review(0, day) + + +@pytest.mark.parametrize("day", DAYS) +def test_a_credited_review_with_no_row_pays_nothing(day: date) -> None: + assert _paid(day) == 0 + assert _paid(day, {}) == 0 + assert _paid(day, {"leetcode": Progress(1, 2)}) == 0 + term = resolve({**NOTHING, "review": True}, day).term("review") + assert (term.shutdown_minutes, term.gaming_minutes, term.progress) == (0, 0, None) + assert term.answer == 1 + + +@pytest.mark.parametrize("day", DAYS) +def test_a_row_pays_equal_slices_of_the_bonus(day: date) -> None: + assert _paid(day, {"review": Progress(1, 2)}) == 10 + assert _paid(day, {"review": Progress(2, 2)}) == 20 + assert _paid(day, {"review": Progress(0, 2)}) == 0 + assert _paid(day, {"review": Progress(1, 3)}) == 20 // 3 + assert _paid(day, {"review": Progress(2, 3)}) == 40 // 3 + + +def test_a_row_never_pays_more_than_the_full_bonus() -> None: + assert _paid(ON, {"review": Progress(9, 2)}) == 20 + assert _paid(ON, {"review": Progress(5, 5)}) == 20 + + +def test_the_term_shows_the_row_it_was_paid_from() -> None: + row = Progress(1, 2) + term = resolve({**NOTHING, "review": 1}, ON, progress={"review": row}).term( + "review" + ) + assert term.progress == row + assert term.gaming_minutes == 0 + + +@pytest.mark.parametrize("answer", [0, None]) +def test_a_row_without_a_credited_review_pays_nothing( + answer: int | None, +) -> None: + full: Share = {"review": Progress(2, 2)} + assert _review(answer, ON, progress=full) == _review(0, ON) + term = resolve({**NOTHING, "review": answer}, ON, progress=full).term("review") + assert term.shutdown_minutes == 0 + assert term.progress is None + + +def test_a_sick_day_follows_the_same_rule() -> None: + assert _paid(ON, sick=True) == 0 + assert _paid(ON, {"review": Progress(1, 2)}, sick=True) == 10 + assert _paid(ON, {"review": Progress(2, 2)}, sick=True) == 20 + + +def test_other_earners_keep_the_yes_no_rule_without_a_row() -> None: + plain = resolve({**NOTHING, "leetcode": True}, ON) + assert plain.term("leetcode").shutdown_minutes == 60 + shown = resolve(NOTHING, ON, progress={"leetcode": Progress(1, 3)}) + assert shown.term("leetcode").shutdown_minutes == 20 + assert resolve(NOTHING, ON).term("leetcode").shutdown_minutes == 0 + + +def test_a_missing_review_answer_still_earns_nothing() -> None: + answers = dict(NOTHING) + shown = resolve(answers, ON, progress={"review": Progress(2, 2)}) + assert shown.term("review").shutdown_minutes == 0 + + +def test_a_credited_review_without_a_row_is_logged( + caplog: pytest.LogCaptureFixture, +) -> None: + with caplog.at_level(logging.WARNING, logger="earned_time._share"): + resolve({**NOTHING, "review": True}, ON) + assert "no progress row" in caplog.text + assert REVIEW.label in caplog.text + + +def test_no_warning_with_a_row_or_before_the_switch( + caplog: pytest.LogCaptureFixture, +) -> None: + with caplog.at_level(logging.WARNING, logger="earned_time._share"): + resolve({**NOTHING, "review": True}, ON, progress={"review": Progress(1, 2)}) + resolve({**NOTHING, "review": True}, REVIEW_FROM) + assert "no progress row" not in caplog.text + + +def test_a_row_that_fails_verification_counts_as_no_row( + tmp_path: Path, key_file: Path +) -> None: + good = progress(source="review", done="2", target="2", day=ON) + forged = tampered(good, done="2") + forged["hmac"] = "0" * 64 + for rows, expected in (([good], 20), ([forged], 0), ([], 0)): + write(home_ledger(tmp_path, REVIEW), list(rows)) + share = progress_map(ON, tmp_path, key_file) + assert _paid(ON, share) == expected + + +def test_the_last_good_row_prices_the_day(tmp_path: Path, key_file: Path) -> None: + rows = [ + progress(source="review", done="1", target="2", day=ON), + progress(source="review", done="2", target="2", day=ON), + ] + write(home_ledger(tmp_path, REVIEW), list(rows)) + assert _paid(ON, progress_map(ON, tmp_path, key_file)) == 20 + write(home_ledger(tmp_path, REVIEW), list(rows[:1])) + assert _paid(ON, progress_map(ON, tmp_path, key_file)) == 10 diff --git a/earned_time/earned_time/tests/test_review_resolve.py b/earned_time/earned_time/tests/test_review_resolve.py index 6abbc56..86d6960 100644 --- a/earned_time/earned_time/tests/test_review_resolve.py +++ b/earned_time/earned_time/tests/test_review_resolve.py @@ -1,5 +1,8 @@ # Copyright (c) 2026 Krzysztof Rudnicki -"""The review top-up in the day (0.23.0): added last, capped, never a rung.""" +"""The review top-up in the day (0.23.0): added last, capped, never a rung. + +On ``REVIEW_FROM``, the day before ``REVIEW_PROGRESS_FROM``: the flat pay, no row. +""" from __future__ import annotations @@ -18,11 +21,14 @@ from earned_time import ( shutdown_ceiling_for, shutdown_minutes_for, ) -from earned_time.tests._review_rows import DAY, accepted, home_with, review +from earned_time.tests._review_rows import DAY as ROWS_DAY +from earned_time.tests._review_rows import accepted, home_with, review if TYPE_CHECKING: from pathlib import Path +# The last day before REVIEW_PROGRESS_FROM: the flat 0.23.0 pay, no row needed. +DAY = REVIEW_FROM NOTHING: dict[str, int | bool | None] = { "workout": 0, "leetcode": False, @@ -118,6 +124,6 @@ def test_a_sick_day_before_unlimited_gaming_adds_it_too() -> None: def test_maturity_never_penalises_it(tmp_path: Path, key_file: Path) -> None: ledger = home_with(tmp_path, [review()], [accepted()]) - verdict = maturity(REVIEW, ledger, key_file, DAY) + verdict = maturity(REVIEW, ledger, key_file, ROWS_DAY) assert verdict.penalty_start is None assert any("top-up" in reason for reason in verdict.reasons)