taskcheck 0.3.2__tar.gz → 0.3.2.post2__tar.gz

{taskcheck-0.3.2/taskcheck.egg-info → taskcheck-0.3.2.post2}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: taskcheck
-Version: 0.3.2
+Version: 0.3.2.post2
 Summary: Automatic scheduler for taskwarrior
 Requires-Python: >=3.11
 Description-Content-Type: text/markdown
@@ -144,3 +144,7 @@ additional_attributes_unplanned = ["due", "urgency"] # additional attributes to
 -i, --install: install taskcheck configuration
 -r, --report: show tasks planned until a certain time
 ```
+
+## TODO
+
+- [ ] Consider due dates are nearer while planning in the future

{taskcheck-0.3.2 → taskcheck-0.3.2.post2}/README.md

@@ -131,3 +131,7 @@ additional_attributes_unplanned = ["due", "urgency"] # additional attributes to
 -i, --install: install taskcheck configuration
 -r, --report: show tasks planned until a certain time
 ```
+
+## TODO
+
+- [ ] Consider due dates are nearer while planning in the future

{taskcheck-0.3.2 → taskcheck-0.3.2.post2}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "taskcheck"
-version = "0.3.2"
+version = "0.3.2-2"
 description = "Automatic scheduler for taskwarrior"
 readme = "README.md"
 requires-python = ">=3.11"

{taskcheck-0.3.2 → taskcheck-0.3.2.post2}/taskcheck/__main__.py

@@ -2,7 +2,6 @@ import tomllib
 import argparse
 
 from taskcheck.parallel import check_tasks_parallel
-from taskcheck.sequential import check_tasks_sequentially
 from taskcheck.common import config_dir
 
 arg_parser = argparse.ArgumentParser()

{taskcheck-0.3.2 → taskcheck-0.3.2.post2}/taskcheck/parallel.py

@@ -64,9 +64,7 @@ def compute_estimated_urgency(remaining_hours, urgency_coefficients):
         key=lambda x: abs(pdth_to_hours(x) - remaining_hours),
     )
     coefficient = urgency_coefficients.estimated[closest_match]
-    # Compute the urgency
-    estimated_urgency = coefficient * remaining_hours
-    return estimated_urgency
+    return coefficient
 
 
 def check_tasks_parallel(config, verbose=False):
@@ -82,10 +80,7 @@ def check_tasks_parallel(config, verbose=False):
     )
 
     for day_offset in range(days_ahead):
-        date = today + timedelta(days=day_offset)
-        allocate_time_for_day(
-            task_info, day_offset, date, urgency_coefficients, verbose
-        )
+        allocate_time_for_day(task_info, day_offset, urgency_coefficients, verbose)
 
     update_tasks_with_scheduling_info(task_info, verbose)
 
@@ -120,10 +115,11 @@ def initialize_task_info(tasks, time_maps, days_ahead, urgency_coefficients, cal
     return task_info
 
 
-def allocate_time_for_day(task_info, day_offset, date, urgency_coefficients, verbose):
+def allocate_time_for_day(task_info, day_offset, urgency_coefficients, verbose):
+    date = datetime.today().date() + timedelta(days=day_offset)
     total_available_hours = compute_total_available_hours(task_info, day_offset)
-    if verbose:
-        print(f"Day {date}, total available hours: {total_available_hours:.2f}")
+    # if verbose:
+    #     print(f"Day {date}, total available hours: {total_available_hours:.2f}")
     if total_available_hours <= 0:
         return
 
@@ -134,7 +130,7 @@ def allocate_time_for_day(task_info, day_offset, date, urgency_coefficients, ver
         recompute_urgencies(tasks_remaining, urgency_coefficients)
         sorted_task_ids = sorted(
             tasks_remaining.keys(),
-            key=lambda x: (tasks_remaining[x]["urgency"], x),
+            key=lambda x: tasks_remaining[x]["urgency"],
             reverse=True,
         )
 
@@ -146,6 +142,23 @@ def allocate_time_for_day(task_info, day_offset, date, urgency_coefficients, ver
             info = tasks_remaining[uuid]
             if any(d in tasks_remaining for d in info["task"].get("depends", [])):
                 # cannot execute this task until all its dependencies are completed
+                if verbose:
+                    print(
+                        "Skipping task",
+                        info["task"]["id"],
+                        "due to dependency on:",
+                        [
+                            tasks_remaining[_d]["task"]["id"]
+                            for _d in info["task"].get("depends", [])
+                            if _d in tasks_remaining
+                        ],
+                    )
+                continue
+
+            wait = info["task"].get("wait")
+            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
             allocation = allocate_time_to_task(info, day_offset, day_remaining_hours)
             if allocation > 0:
@@ -155,7 +168,7 @@ def allocate_time_for_day(task_info, day_offset, date, urgency_coefficients, ver
                 update_task_scheduling(info, allocation, date_str)
                 if verbose:
                     print(
-                        f"Allocated {allocation:.2f} hours to task {info['task']['id']} on {date}"
+                        f"Allocated {allocation:.2f} hours to task {info['task']['id']} on {date} with urgency {info['urgency']:.2f} and estimated-related urgency {info['estimated_urgency']:.2f}"
                     )
                 if (
                     info["remaining_hours"] <= 0
@@ -166,8 +179,8 @@ def allocate_time_for_day(task_info, day_offset, date, urgency_coefficients, ver
                 break
         if not allocated:
             break
-    if verbose and day_remaining_hours > 0:
-        print(f"Unused time on {date}: {day_remaining_hours:.2f} hours")
+    # if verbose and day_remaining_hours > 0:
+    #     print(f"Unused time on {date}: {day_remaining_hours:.2f} hours")
 
 
 def compute_total_available_hours(task_info, day_offset):
@@ -207,8 +220,17 @@ def recompute_urgencies(tasks_remaining, urgency_coefficients):
         if started_by_scheduler and not started_by_user:
             # If the task was started by the scheduler, apply the active task coefficient
             info["urgency"] += urgency_coefficients.active
+            info["started"] = False
 
     if urgency_coefficients.inherit:
+        # Build reverse dependencies mapping
+        reverse_deps = {}  # Map from task_uuid to list of tasks that depend on it
+        for task_uuid, info in tasks_remaining.items():
+            for dep_uuid in info["task"].get("depends", []):
+                if dep_uuid not in reverse_deps:
+                    reverse_deps[dep_uuid] = []
+                reverse_deps[dep_uuid].append(task_uuid)
+
         # Define a recursive function to compute the maximum urgency
         def get_max_urgency(info, visited):
             task_uuid = info["task"]["uuid"]
@@ -217,8 +239,8 @@ def recompute_urgencies(tasks_remaining, urgency_coefficients):
             # Start with the current task's urgency
             urgency = info["urgency"]
             visited[task_uuid] = urgency  # Mark as visited
-            # Recursively compute urgencies of dependents
-            for dep_uuid in info["task"].get("depends", []):
+            # Recursively compute urgencies of tasks that depend on this task
+            for dep_uuid in reverse_deps.get(task_uuid, []):
                 if dep_uuid in tasks_remaining:
                     dep_info = tasks_remaining[dep_uuid]
                     dep_urgency = get_max_urgency(dep_info, visited)
@@ -226,7 +248,7 @@ def recompute_urgencies(tasks_remaining, urgency_coefficients):
             visited[task_uuid] = urgency  # Update with the maximum urgency found
             return urgency
 
-        # Update urgencies based on dependents
+        # Update urgencies based on tasks that depend on them
         for info in tasks_remaining.values():
             visited = {}  # Reset visited dictionary for each task
             max_urgency = get_max_urgency(info, visited)
@@ -248,9 +270,10 @@ def allocate_time_to_task(info, day_offset, day_remaining_hours):
     if allocation <= 0.05:
         return 0
 
+    if info["remaining_hours"] == info["task"]["estimated"]:
+        info["started"] = True
     info["remaining_hours"] -= allocation
     info["task_time_map"][day_offset] -= allocation
-    info["started"] = True
 
     return allocation
 

{taskcheck-0.3.2 → taskcheck-0.3.2.post2/taskcheck.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: taskcheck
-Version: 0.3.2
+Version: 0.3.2.post2
 Summary: Automatic scheduler for taskwarrior
 Requires-Python: >=3.11
 Description-Content-Type: text/markdown
@@ -144,3 +144,7 @@ additional_attributes_unplanned = ["due", "urgency"] # additional attributes to
 -i, --install: install taskcheck configuration
 -r, --report: show tasks planned until a certain time
 ```
+
+## TODO
+
+- [ ] Consider due dates are nearer while planning in the future