taskcheck 1.6.0__tar.gz → 1.6.2__tar.gz

{taskcheck-1.6.0 → taskcheck-1.6.2}/PKG-INFO

@@ -1,8 +1,8 @@
 Metadata-Version: 2.4
 Name: taskcheck
-Version: 1.6.0
+Version: 1.6.2
 Summary: Automatic scheduler for taskwarrior
-Requires-Python: >=3.11
+Requires-Python: >=3.12
 Description-Content-Type: text/markdown
 Requires-Dist: appdirs>=1.4.4
 Requires-Dist: google-api-python-client>=2.198.0
@@ -60,6 +60,11 @@ It updates Taskwarrior with:
 - `completion_date` → when work is expected to finish
 - a warning when a task will miss its due date
 
+Taskcheck does not allocate work before a task's `wait` date.
+It can allocate work on that date because it plans whole days, not exact start times.
+Reports and timelines ignore saved work dates before `wait`, even when you change `wait` after scheduling.
+If no work fits within the planning period, the next scheduling run clears the task's old schedule fields.
+
 ## Quick start
 
 1. `pipx install taskcheck`
@@ -143,6 +148,10 @@ Before writing a schedule, taskcheck backs up the affected tasks' `scheduled`, `
 
 If a task would finish after its due date, taskcheck retries with a total-urgency override. Each retry moves the task immediately above the task with the smallest greater urgency by adding `urgency_epsilon` (default: `0.1`). At rank 1, it adds epsilon for up to `max_top_urgency_rounds` retries (default: `10`), then tries once at urgency `1000`. If the task is still late, taskcheck stops raising it and optimizes the other overdue tasks.
 
+Each task gets at most `N - 1 + max_top_urgency_rounds` priority increases before the final retry at urgency `1000`.
+Here, `N` is the number of tasks in the schedule.
+This limit stops repeated retries when tasks with competing deadlines keep overtaking each other.
+
 ## Tips and Tricks
 
 - You can exclude a task from being scheduled by removing the `time_map` or `estimated` attributes.

taskcheck-1.6.0/taskcheck.egg-info/PKG-INFO → taskcheck-1.6.2/README.md

@@ -1,18 +1,3 @@
-Metadata-Version: 2.4
-Name: taskcheck
-Version: 1.6.0
-Summary: Automatic scheduler for taskwarrior
-Requires-Python: >=3.11
-Description-Content-Type: text/markdown
-Requires-Dist: appdirs>=1.4.4
-Requires-Dist: google-api-python-client>=2.198.0
-Requires-Dist: google-auth>=2.56.2
-Requires-Dist: google-auth-oauthlib>=1.2.2
-Requires-Dist: icalendar>=6.0.1
-Requires-Dist: random-unicode-emoji>=2.8
-Requires-Dist: requests>=2.32.3
-Requires-Dist: rich>=13.9.4
-
 A Taskwarrior scheduler for people who want a realistic plan, not a manual to-do list.
 It turns tasks, working hours, and calendar blocks into an actionable schedule — then keeps due dates visible.
 
@@ -60,6 +45,11 @@ It updates Taskwarrior with:
 - `completion_date` → when work is expected to finish
 - a warning when a task will miss its due date
 
+Taskcheck does not allocate work before a task's `wait` date.
+It can allocate work on that date because it plans whole days, not exact start times.
+Reports and timelines ignore saved work dates before `wait`, even when you change `wait` after scheduling.
+If no work fits within the planning period, the next scheduling run clears the task's old schedule fields.
+
 ## Quick start
 
 1. `pipx install taskcheck`
@@ -143,6 +133,10 @@ Before writing a schedule, taskcheck backs up the affected tasks' `scheduled`, `
 
 If a task would finish after its due date, taskcheck retries with a total-urgency override. Each retry moves the task immediately above the task with the smallest greater urgency by adding `urgency_epsilon` (default: `0.1`). At rank 1, it adds epsilon for up to `max_top_urgency_rounds` retries (default: `10`), then tries once at urgency `1000`. If the task is still late, taskcheck stops raising it and optimizes the other overdue tasks.
 
+Each task gets at most `N - 1 + max_top_urgency_rounds` priority increases before the final retry at urgency `1000`.
+Here, `N` is the number of tasks in the schedule.
+This limit stops repeated retries when tasks with competing deadlines keep overtaking each other.
+
 ## Tips and Tricks
 
 - You can exclude a task from being scheduled by removing the `time_map` or `estimated` attributes.

{taskcheck-1.6.0 → taskcheck-1.6.2}/pyproject.toml

@@ -1,9 +1,9 @@
 [project]
 name = "taskcheck"
-version = "1.6.0"
+version = "1.6.2"
 description = "Automatic scheduler for taskwarrior"
 readme = "README.md"
-requires-python = ">=3.11"
+requires-python = ">=3.12"
 dependencies = [
   "appdirs>=1.4.4",
   "google-api-python-client>=2.198.0",

{taskcheck-1.6.0 → taskcheck-1.6.2}/taskcheck/agent_blocks.py

@@ -39,7 +39,7 @@ def _eligible(info, pending, date):
     if any(dep in pending for dep in info["task"].get("depends", [])):
         return False
     wait = info["task"].get("wait")
-    if wait and date <= datetime.strptime(wait, "%Y%m%dT%H%M%SZ").date():
+    if wait and date < datetime.strptime(wait, "%Y%m%dT%H%M%SZ").date():
         return False
     return True
 

{taskcheck-1.6.0 → taskcheck-1.6.2}/taskcheck/parallel.py

@@ -58,7 +58,7 @@ def advance_urgency_override(
     for task_uuid in overdue_uuids:
         state = adjustment_states.setdefault(
             task_uuid,
-            {"top_rounds": 0, "fallback_used": False, "exhausted": False},
+            {"top_rounds": 0, "rounds": 0, "fallback_used": False, "exhausted": False},
         )
         if state["exhausted"]:
             continue
@@ -72,7 +72,10 @@ def advance_urgency_override(
             for uuid in task_info
             if uuid != task_uuid and effective_urgency(uuid) > current_urgency
         ]
-        if greater_urgencies:
+        if state["rounds"] >= len(task_info) - 1 + max_top_rounds:
+            urgency_overrides[task_uuid] = 1000.0
+            state["fallback_used"] = True
+        elif greater_urgencies:
             urgency_overrides[task_uuid] = min(greater_urgencies) + epsilon
         elif state["top_rounds"] < max_top_rounds:
             urgency_overrides[task_uuid] = current_urgency + epsilon
@@ -80,6 +83,7 @@ def advance_urgency_override(
         else:
             urgency_overrides[task_uuid] = 1000.0
             state["fallback_used"] = True
+        state["rounds"] += 1
         return task_uuid
     return None
 
@@ -416,7 +420,7 @@ def allocate_time_for_day(
                 continue
 
             wait = info["task"].get("wait")
-            if wait and date <= datetime.strptime(wait, "%Y%m%dT%H%M%SZ").date():
+            if wait and date < datetime.strptime(wait, "%Y%m%dT%H%M%SZ").date():
                 if verbose:
                     print(f"Skipping task {info['task']['id']} due to wait date {wait}")
                 continue
@@ -647,6 +651,16 @@ def update_tasks_with_scheduling_info(task_info, verbose, taskrc):
         scheduling_note = ""
         scheduled_dates = sorted(info["scheduling"].keys())
         if not scheduled_dates:
+            if any(task.get(field) for field in ("scheduled", "completion_date", "scheduling")):
+                subprocess.run(
+                    [
+                        "task", str(task["id"]), "modify",
+                        "scheduled:", "completion_date:", "scheduling:",
+                    ],
+                    stdout=subprocess.DEVNULL,
+                    stderr=subprocess.DEVNULL,
+                    env=get_task_env(taskrc),
+                )
             continue
         start_date = scheduled_dates[0]
         end_date = scheduled_dates[-1]

{taskcheck-1.6.0 → taskcheck-1.6.2}/taskcheck/report.py

@@ -184,6 +184,11 @@ def get_tasks(config, tasks, year, month, day):
     regex = re.compile(rf"{year:04d}-{month:02d}-{day:02d} - ([PDTHM0-9]+)")
     valid_tasks = []
     for task in tasks:
+        wait = task.get("wait")
+        if wait and datetime(year, month, day).date() < datetime.strptime(
+            wait, "%Y%m%dT%H%M%SZ"
+        ).date():
+            continue
         for line in task.get("scheduling", "").split("\n"):
             m = regex.match(line)
             if m:

{taskcheck-1.6.0 → taskcheck-1.6.2}/taskcheck/timeline.py

@@ -37,10 +37,14 @@ def project_color(project, theme):
 
 def parse_scheduling_dates(task):
     dates = []
+    wait = task.get("wait")
+    wait_date = datetime.strptime(wait, "%Y%m%dT%H%M%SZ").date() if wait else None
     for line in task.get("scheduling", "").splitlines():
         match = SCHEDULING_DATE.match(line)
         if match:
-            dates.append(date.fromisoformat(match.group(1)))
+            scheduled_date = date.fromisoformat(match.group(1))
+            if wait_date is None or scheduled_date >= wait_date:
+                dates.append(scheduled_date)
     return sorted(set(dates))
 
 

taskcheck-1.6.0/README.md → taskcheck-1.6.2/taskcheck.egg-info/PKG-INFO

@@ -1,3 +1,18 @@
+Metadata-Version: 2.4
+Name: taskcheck
+Version: 1.6.2
+Summary: Automatic scheduler for taskwarrior
+Requires-Python: >=3.12
+Description-Content-Type: text/markdown
+Requires-Dist: appdirs>=1.4.4
+Requires-Dist: google-api-python-client>=2.198.0
+Requires-Dist: google-auth>=2.56.2
+Requires-Dist: google-auth-oauthlib>=1.2.2
+Requires-Dist: icalendar>=6.0.1
+Requires-Dist: random-unicode-emoji>=2.8
+Requires-Dist: requests>=2.32.3
+Requires-Dist: rich>=13.9.4
+
 A Taskwarrior scheduler for people who want a realistic plan, not a manual to-do list.
 It turns tasks, working hours, and calendar blocks into an actionable schedule — then keeps due dates visible.
 
@@ -45,6 +60,11 @@ It updates Taskwarrior with:
 - `completion_date` → when work is expected to finish
 - a warning when a task will miss its due date
 
+Taskcheck does not allocate work before a task's `wait` date.
+It can allocate work on that date because it plans whole days, not exact start times.
+Reports and timelines ignore saved work dates before `wait`, even when you change `wait` after scheduling.
+If no work fits within the planning period, the next scheduling run clears the task's old schedule fields.
+
 ## Quick start
 
 1. `pipx install taskcheck`
@@ -128,6 +148,10 @@ Before writing a schedule, taskcheck backs up the affected tasks' `scheduled`, `
 
 If a task would finish after its due date, taskcheck retries with a total-urgency override. Each retry moves the task immediately above the task with the smallest greater urgency by adding `urgency_epsilon` (default: `0.1`). At rank 1, it adds epsilon for up to `max_top_urgency_rounds` retries (default: `10`), then tries once at urgency `1000`. If the task is still late, taskcheck stops raising it and optimizes the other overdue tasks.
 
+Each task gets at most `N - 1 + max_top_urgency_rounds` priority increases before the final retry at urgency `1000`.
+Here, `N` is the number of tasks in the schedule.
+This limit stops repeated retries when tasks with competing deadlines keep overtaking each other.
+
 ## Tips and Tricks
 
 - You can exclude a task from being scheduled by removing the `time_map` or `estimated` attributes.

{taskcheck-1.6.0 → taskcheck-1.6.2}/tests/test_parallel.py

@@ -105,6 +105,26 @@ class TestTaskInitialization:
 
 
 class TestTimeAllocation:
+    @pytest.mark.parametrize("agent", [False, True])
+    def test_task_starts_on_wait_date(self, agent):
+        from freezegun import freeze_time
+
+        task = {
+            "id": 1, "uuid": "waiting", "estimated": "PT2H", "time_map": "work",
+            "wait": "20231206T000000Z", "urgency": 10.0,
+        }
+        if agent:
+            task.update(tags=["agent"], agent_weight=25)
+        coeffs = UrgencyCoefficients({"PT2H": 0}, False, 0, 365, 12, 2)
+        with freeze_time("2023-12-05"):
+            with patch("taskcheck.parallel.get_long_range_time_map", return_value=([8.0] * 3, 0.0)):
+                info = initialize_task_info([task], {}, 3, coeffs, [])
+            allocate_time_for_day(info, 0, coeffs, False, 1.0)
+            assert info["waiting"]["scheduling"] == {}
+            allocate_time_for_day(info, 1, coeffs, False, 1.0)
+        assert info["waiting"]["scheduling"] == {"2023-12-06": 2.0}
+        assert info["waiting"]["remaining_hours"] == 0
+
     def test_allocate_time_for_day_single_task(self, sample_config):
         task_info = {
             "task-1": {
@@ -368,6 +388,25 @@ class TestMainSchedulingFunction:
 
 
 class TestAutoAdjustUrgency:
+    def test_competing_overdue_tasks_exhaust_retries(self):
+        task_info = {
+            uuid: {"task": {"uuid": uuid, "urgency": urgency}, "urgency": urgency}
+            for uuid, urgency in (("a", 1.0), ("b", 2.0))
+        }
+        overrides = {}
+        states = {}
+        # Resolving one deadline can make the other task late on the next pass.
+        for index in range(12):
+            overdue = [task_info["a" if index % 2 == 0 else "b"]["task"]]
+            advance_urgency_override(
+                overdue, task_info, overrides, states, epsilon=0.1, max_top_rounds=2
+            )
+        assert advance_urgency_override(
+            [info["task"] for info in task_info.values()],
+            task_info, overrides, states, epsilon=0.1, max_top_rounds=2,
+        ) is None
+        assert overrides == {"a": 1000.0, "b": 1000.0}
+
     def test_urgency_override_moves_up_one_rank_then_uses_bounded_top_rounds(self):
         task_info = {
             "t1": {"task": {"uuid": "t1"}, "urgency": 1.0},

{taskcheck-1.6.0 → taskcheck-1.6.2}/tests/test_report.py

@@ -67,6 +67,15 @@ class TestDateUtilities:
 
 
 class TestTaskFiltering:
+    @pytest.mark.parametrize("day, expected", [(5, []), (6, [1]), (7, [1])])
+    def test_wait_date_overrides_saved_schedule(self, day, expected):
+        task = {
+            "id": 1, "description": "Waiting task", "urgency": 10.0,
+            "wait": "20231206T000000Z",
+            "scheduling": "\n".join(f"2023-12-{d:02d} - PT2H" for d in (5, 6, 7)),
+        }
+        assert [row["id"] for row in get_tasks({}, [task], 2023, 12, day)] == expected
+
     def test_get_tasks_with_scheduling(self, sample_config):
         tasks_with_scheduling = [
             {

{taskcheck-1.6.0 → taskcheck-1.6.2}/tests/test_timeline.py

@@ -23,6 +23,14 @@ def test_parse_scheduling_dates_ignores_invalid_lines():
     assert parse_scheduling_dates(task) == [date(2024, 1, 2), date(2024, 1, 3)]
 
 
+def test_wait_date_overrides_saved_schedule():
+    task = {
+        "wait": "20240103T000000Z",
+        "scheduling": "2024-01-02 - PT2H\n2024-01-03 - PT2H\n2024-01-04 - PT2H",
+    }
+    assert parse_scheduling_dates(task) == [date(2024, 1, 3), date(2024, 1, 4)]
+
+
 def test_day_timeline_groups_projects_and_marks_events():
     tasks = [
         {