X-Git-Url: https://plomlompom.com/repos/feed.xml?a=blobdiff_plain;f=plomtask%2Ftodos.py;h=d53674b6339679fa31ece5f78c0d871cfd90af01;hb=f19823e9e77ae0017022dbfe63f66d2b065ba33a;hp=336ec0350830ce5dfbdf5e85a92b3945608835d9;hpb=54e6c8bccace28583cf9926aa00917a796628a00;p=plomtask diff --git a/plomtask/todos.py b/plomtask/todos.py index 336ec03..d53674b 100644 --- a/plomtask/todos.py +++ b/plomtask/todos.py @@ -1,6 +1,6 @@ """Actionables.""" from __future__ import annotations -from collections import namedtuple +from dataclasses import dataclass from typing import Any from sqlite3 import Row from plomtask.db import DatabaseConnection, BaseModel @@ -10,21 +10,25 @@ from plomtask.exceptions import (NotFoundException, BadFormatException, HandledException) -TodoStepsNode = namedtuple('TodoStepsNode', - ('item', 'is_todo', 'children', 'seen')) +@dataclass +class TodoStepsNode: + """Collects what's useful to know for Todo/Condition tree display.""" + item: Todo | Condition + is_todo: bool + children: list[TodoStepsNode] + seen: bool + hide: bool -class Todo(BaseModel, ConditionsRelations): +class Todo(BaseModel[int], ConditionsRelations): """Individual actionable.""" - # pylint: disable=too-many-instance-attributes - table_name = 'todos' to_save = ['process_id', 'is_done', 'date'] def __init__(self, id_: int | None, process: Process, is_done: bool, date: str) -> None: - self.set_int_id(id_) + super().__init__(id_) self.process = process self._is_done = is_done self.date = date @@ -34,43 +38,36 @@ class Todo(BaseModel, ConditionsRelations): self.enables: list[Condition] = [] self.disables: list[Condition] = [] if not self.id_: - self.conditions = process.conditions[:] - self.enables = process.enables[:] - self.disables = process.disables[:] + self.conditions = self.process.conditions[:] + self.enables = self.process.enables[:] + self.disables = self.process.disables[:] @classmethod def from_table_row(cls, db_conn: DatabaseConnection, row: Row | list[Any]) -> Todo: - """Make from DB row, write to DB cache.""" + """Make from DB row, with dependencies.""" if row[1] == 0: raise NotFoundException('calling Todo of ' 'unsaved Process') row_as_list = list(row) row_as_list[1] = Process.by_id(db_conn, row[1]) todo = super().from_table_row(db_conn, row_as_list) - assert isinstance(todo, Todo) - return todo - - @classmethod - def by_id(cls, db_conn: DatabaseConnection, id_: int) -> Todo: - """Get Todo of .id_=id_ and children (from DB cache if possible).""" - todo, from_cache = super()._by_id(db_conn, id_) - if todo is None: - raise NotFoundException(f'Todo of ID not found: {id_}') - if not from_cache: - for t_id in db_conn.column_where('todo_children', 'child', - 'parent', id_): - todo.children += [cls.by_id(db_conn, t_id)] - for t_id in db_conn.column_where('todo_children', 'parent', - 'child', id_): - todo.parents += [cls.by_id(db_conn, t_id)] - for name in ('conditions', 'enables', 'disables'): - table = f'todo_{name}' - for cond_id in db_conn.column_where(table, 'condition', - 'todo', todo.id_): - target = getattr(todo, name) - target += [Condition.by_id(db_conn, cond_id)] - assert isinstance(todo, Todo) + assert isinstance(todo.id_, int) + for t_id in db_conn.column_where('todo_children', 'child', + 'parent', todo.id_): + # pylint: disable=no-member + todo.children += [cls.by_id(db_conn, t_id)] + for t_id in db_conn.column_where('todo_children', 'parent', + 'child', todo.id_): + # pylint: disable=no-member + todo.parents += [cls.by_id(db_conn, t_id)] + for name in ('conditions', 'enables', 'disables'): + table = f'todo_{name}' + assert isinstance(todo.id_, int) + for cond_id in db_conn.column_where(table, 'condition', + 'todo', todo.id_): + target = getattr(todo, name) + target += [Condition.by_id(db_conn, cond_id)] return todo @classmethod @@ -122,6 +119,16 @@ class Todo(BaseModel, ConditionsRelations): """Return ID of tasked Process.""" return self.process.id_ + @property + def unsatisfied_dependencies(self) -> list[int]: + """Return Process IDs of .process.explicit_steps not in .children.""" + unsatisfied = [s.step_process_id for s in self.process.explicit_steps + if s.parent_step_id is None] + for child_process_id in [c.process.id_ for c in self.children]: + if child_process_id in unsatisfied: + unsatisfied.remove(child_process_id) + return unsatisfied + @property def is_done(self) -> bool: """Wrapper around self._is_done so we can control its setter.""" @@ -139,6 +146,22 @@ class Todo(BaseModel, ConditionsRelations): for condition in self.disables: condition.is_active = False + def adopt_from(self, todos: list[Todo]) -> None: + """As far as possible, fill unsatisfied dependencies from todos.""" + for process_id in self.unsatisfied_dependencies: + for todo in [t for t in todos if t.process.id_ == process_id + and t not in self.children]: + self.add_child(todo) + break + + def make_missing_children(self, db_conn: DatabaseConnection) -> None: + """Fill unsatisfied dependencies with new Todos.""" + for process_id in self.unsatisfied_dependencies: + process = Process.by_id(db_conn, process_id) + todo = self.__class__(None, process, False, self.date) + todo.save(db_conn) + self.add_child(todo) + def get_step_tree(self, seen_todos: set[int], seen_conditions: set[int]) -> TodoStepsNode: """Return tree of depended-on Todos and Conditions.""" @@ -161,21 +184,57 @@ class Todo(BaseModel, ConditionsRelations): and (c not in potentially_enabled)]: children += [make_node(condition)] else: - assert isinstance(step, Condition) seen = step.id_ in seen_conditions seen_conditions.add(step.id_) - return TodoStepsNode(step, is_todo, children, seen) + return TodoStepsNode(step, is_todo, children, seen, False) node = make_node(self) return node + def get_undone_steps_tree(self) -> TodoStepsNode: + """Return tree of depended-on undone Todos and Conditions.""" + + def walk_tree(node: TodoStepsNode) -> None: + if isinstance(node.item, Todo) and node.item.is_done: + node.hide = True + for child in node.children: + walk_tree(child) + + seen_todos: set[int] = set() + seen_conditions: set[int] = set() + step_tree = self.get_step_tree(seen_todos, seen_conditions) + walk_tree(step_tree) + return step_tree + + def get_done_steps_tree(self) -> list[TodoStepsNode]: + """Return tree of depended-on done Todos.""" + + def make_nodes(node: TodoStepsNode) -> list[TodoStepsNode]: + children: list[TodoStepsNode] = [] + if not isinstance(node.item, Todo): + return children + for child in node.children: + children += make_nodes(child) + if node.item.is_done: + node.children = children + return [node] + return children + + seen_todos: set[int] = set() + seen_conditions: set[int] = set() + step_tree = self.get_step_tree(seen_todos, seen_conditions) + nodes = make_nodes(step_tree) + return nodes + def add_child(self, child: Todo) -> None: - """Add child to self.children, guard against recursion""" + """Add child to self.children, avoid recursion, update parenthoods.""" + def walk_steps(node: Todo) -> None: if node.id_ == self.id_: raise BadFormatException('bad child choice causes recursion') for child in node.children: walk_steps(child) + if self.id_ is None: raise HandledException('Can only add children to saved Todos.') if child.id_ is None: @@ -186,13 +245,21 @@ class Todo(BaseModel, ConditionsRelations): self.children += [child] child.parents += [self] + def remove_child(self, child: Todo) -> None: + """Remove child from self.children, update counter relations.""" + if child not in self.children: + raise HandledException('Cannot remove un-parented child.') + self.children.remove(child) + child.parents.remove(self) + def save(self, db_conn: DatabaseConnection) -> None: """Write self and children to DB and its cache.""" if self.process.id_ is None: raise NotFoundException('Process of Todo without ID (not saved?)') self.save_core(db_conn) assert isinstance(self.id_, int) - db_conn.cached_todos[self.id_] = self + db_conn.rewrite_relations('todo_children', 'child', self.id_, + [[p.id_] for p in self.parents]) db_conn.rewrite_relations('todo_children', 'parent', self.id_, [[c.id_] for c in self.children]) db_conn.rewrite_relations('todo_conditions', 'todo', self.id_, @@ -201,3 +268,19 @@ class Todo(BaseModel, ConditionsRelations): [[c.id_] for c in self.enables]) db_conn.rewrite_relations('todo_disables', 'todo', self.id_, [[c.id_] for c in self.disables]) + + def remove(self, db_conn: DatabaseConnection) -> None: + """Remove from DB, including relations.""" + assert isinstance(self.id_, int) + children_to_remove = self.children[:] + parents_to_remove = self.parents[:] + for child in children_to_remove: + self.remove_child(child) + for parent in parents_to_remove: + parent.remove_child(self) + db_conn.delete_where('todo_children', 'parent', self.id_) + db_conn.delete_where('todo_children', 'child', self.id_) + db_conn.delete_where('todo_conditions', 'todo', self.id_) + db_conn.delete_where('todo_enables', 'todo', self.id_) + db_conn.delete_where('todo_disables', 'todo', self.id_) + super().remove(db_conn)