X-Git-Url: https://plomlompom.com/repos/?a=blobdiff_plain;f=plomtask%2Ftodos.py;h=9b9bc0b95527a901bd5a6008e1707f719df74b06;hb=23012cd370777b60a25839788d131173d2abee91;hp=ff6cdcb1e96144743f828ca5fea14072988be10a;hpb=951d8ad55c0d54286f9c986257a67dfa9710fcf2;p=plomtask diff --git a/plomtask/todos.py b/plomtask/todos.py index ff6cdcb..9b9bc0b 100644 --- a/plomtask/todos.py +++ b/plomtask/todos.py @@ -19,17 +19,15 @@ class TodoStepsNode: seen: 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 @@ -39,43 +37,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 @@ -127,6 +118,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.""" @@ -144,6 +145,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.""" @@ -166,7 +183,6 @@ 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) @@ -206,7 +222,6 @@ class Todo(BaseModel, ConditionsRelations): 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', 'parent', self.id_, [[c.id_] for c in self.children]) db_conn.rewrite_relations('todo_conditions', 'todo', self.id_,