pyDiffTools 0.1.27__tar.gz → 0.1.28__tar.gz

{pydifftools-0.1.27/pyDiffTools.egg-info → pydifftools-0.1.28}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: pyDiffTools
-Version: 0.1.27
+Version: 0.1.28
 Summary: Diff tools
 Author: J M Franck
 License: Copyright (c) 2015, jmfranck

{pydifftools-0.1.27 → pydifftools-0.1.28/pyDiffTools.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: pyDiffTools
-Version: 0.1.27
+Version: 0.1.28
 Summary: Diff tools
 Author: J M Franck
 License: Copyright (c) 2015, jmfranck

{pydifftools-0.1.27 → pydifftools-0.1.28}/pydifftools/flowchart/graph.py

@@ -321,8 +321,7 @@ def _node_text_with_due(node, depends_on_undated_parent=False):
 
     # Completed tasks should always show their calendar date so the original
     # deadline remains visible even if it was today or overdue when finished.
-    style_name = str(node.get("style", ""))
-    is_completed = "complete" in style_name
+    is_completed = node_is_completed(node)
     # Replace the actual date with high-visibility notices when the deadline
     # is today or overdue.  These are rendered in a bold 12 pt font so they are
     # immediately noticeable in the diagram.  Completed tasks skip these
@@ -367,6 +366,68 @@ def _node_text_with_due(node, depends_on_undated_parent=False):
     return formatted
 
 
+def node_is_completed(node):
+    return "complete" in str(node.get("style", ""))
+
+
+def node_is_endpoint(node):
+    return "endpoint" in str(node.get("style", ""))
+
+
+def trace_ancestors(
+    data,
+    start_name,
+    stop_at=None,
+    include_stopped=False,
+    skip_over=None,
+):
+    ancestors = []
+    nodes = data.get("nodes", {})
+    if start_name not in nodes:
+        return ancestors
+    ancestors_to_visit = list(nodes[start_name].get("parents", []))
+    already_seen = set([start_name])
+    while ancestors_to_visit:
+        ancestor = ancestors_to_visit.pop()
+        if ancestor in already_seen:
+            continue
+        already_seen.add(ancestor)
+        if ancestor not in nodes:
+            continue
+        ancestor_node = nodes[ancestor]
+        if stop_at is not None and stop_at(ancestor, ancestor_node):
+            if include_stopped:
+                ancestors.append(ancestor)
+            continue
+        if skip_over is not None and skip_over(ancestor, ancestor_node):
+            for parent in ancestor_node.get("parents", []):
+                ancestors_to_visit.append(parent)
+            continue
+        ancestors.append(ancestor)
+        for parent in ancestor_node.get("parents", []):
+            ancestors_to_visit.append(parent)
+    return ancestors
+
+
+def endpoint_projects(data):
+    endpoints = set()
+    for name, node_data in data.get("nodes", {}).items():
+        if node_is_endpoint(node_data):
+            endpoints.add(name)
+
+    projects = {}
+    for endpoint in sorted(endpoints):
+        projects[endpoint] = [endpoint]
+        projects[endpoint].extend(
+            trace_ancestors(
+                data,
+                endpoint,
+                stop_at=lambda name, _node: name in endpoints,
+            )
+        )
+    return projects
+
+
 def _node_label(text, wrap_width=55):
     if text is None:
         return ""
@@ -415,6 +476,8 @@ def _append_node(
     if node_has_due:
         for parent in node.get("parents", []):
             parent_node = data["nodes"].get(parent, {})
+            if node_is_completed(parent_node):
+                continue
             parent_due = parent_node.get("due")
             if parent_due is None or not str(parent_due).strip():
                 depends_on_undated_parent = True
@@ -586,6 +649,65 @@ def yaml_to_dot(data, wrap_width=55, order_by_date=False):
     return "\n".join(lines)
 
 
+def _filter_nodes_for_dot(
+    data, node_names, include_completed_endpoint_ancestors=False
+):
+    nodes = data.get("nodes", {})
+    included = []
+    included_set = set()
+
+    def include_node(name):
+        if name not in included_set:
+            included.append(name)
+            included_set.add(name)
+
+    for name in node_names:
+        if name not in nodes:
+            continue
+        if node_is_completed(nodes[name]):
+            continue
+        include_node(name)
+
+    if include_completed_endpoint_ancestors:
+        for name in list(included):
+            completed_endpoint_ancestors = trace_ancestors(
+                data,
+                name,
+                stop_at=lambda _name, node: node_is_endpoint(node),
+                include_stopped=True,
+                skip_over=lambda _name, node: (
+                    node_is_completed(node) and not node_is_endpoint(node)
+                ),
+            )
+            for ancestor in completed_endpoint_ancestors:
+                if ancestor not in nodes:
+                    continue
+                if node_is_completed(nodes[ancestor]) and node_is_endpoint(
+                    nodes[ancestor]
+                ):
+                    include_node(ancestor)
+
+    data_for_dot = {"nodes": {}, "styles": {}}
+    if "styles" in data:
+        data_for_dot["styles"] = data["styles"]
+    for name in included:
+        data_for_dot["nodes"][name] = dict(nodes[name])
+    for name in data_for_dot["nodes"]:
+        if "children" in data_for_dot["nodes"][name]:
+            data_for_dot["nodes"][name]["children"] = [
+                child
+                for child in data_for_dot["nodes"][name]["children"]
+                if child in included_set
+            ]
+        if "parents" in data_for_dot["nodes"][name]:
+            data_for_dot["nodes"][name]["parents"] = [
+                parent
+                for parent in data_for_dot["nodes"][name]["parents"]
+                if parent in included_set
+            ]
+    return data_for_dot
+
+
 def save_graph_yaml(path, data):
     # Ensure stored dates are normalized before writing.
     _normalize_graph_dates(data)
@@ -610,6 +732,7 @@ def write_dot_from_yaml(
     old_data=None,
     validate_due_dates=False,
     filter_task=None,
+    filter_completed=False,
     resolve_due_date_conflict=None,
 ):
     data = load_graph_yaml(str(yaml_path), old_data=old_data)
@@ -755,40 +878,14 @@ def write_dot_from_yaml(
                 )
         # Include the target task alongside its ancestors in the filtered view.
         ancestors = set([filter_task])
-        parents_to_check = list(data["nodes"][filter_task]["parents"])
-        while parents_to_check:
-            parent = parents_to_check.pop()
-            if parent in ancestors:
-                continue
-            ancestors.add(parent)
-            if parent in data["nodes"] and "parents" in data["nodes"][parent]:
-                for grandparent in data["nodes"][parent]["parents"]:
-                    parents_to_check.append(grandparent)
-        incomplete_ancestors = set()
-        for name in ancestors:
-            if name not in data["nodes"]:
-                continue
-            if "complete" in str(data["nodes"][name].get("style", "")):
-                continue
-            incomplete_ancestors.add(name)
-        data_for_dot = {"nodes": {}, "styles": {}}
-        if "styles" in data:
-            data_for_dot["styles"] = data["styles"]
-        for name in incomplete_ancestors:
-            data_for_dot["nodes"][name] = dict(data["nodes"][name])
-        for name in data_for_dot["nodes"]:
-            if "children" in data_for_dot["nodes"][name]:
-                data_for_dot["nodes"][name]["children"] = [
-                    child
-                    for child in data_for_dot["nodes"][name]["children"]
-                    if child in incomplete_ancestors
-                ]
-            if "parents" in data_for_dot["nodes"][name]:
-                data_for_dot["nodes"][name]["parents"] = [
-                    parent
-                    for parent in data_for_dot["nodes"][name]["parents"]
-                    if parent in incomplete_ancestors
-                ]
+        ancestors.update(trace_ancestors(data, filter_task))
+        data_for_dot = _filter_nodes_for_dot(data, ancestors)
+    elif filter_completed:
+        data_for_dot = _filter_nodes_for_dot(
+            data,
+            data.get("nodes", {}).keys(),
+            include_completed_endpoint_ancestors=True,
+        )
     dot_str = yaml_to_dot(
         data_for_dot, wrap_width=wrap_width, order_by_date=order_by_date
     )

{pydifftools-0.1.27 → pydifftools-0.1.28}/pydifftools/flowchart/watch_graph.py

@@ -26,7 +26,7 @@ from pydifftools.browser_lifecycle import (
     browser_window_is_alive,
     close_browser_window,
 )
-from .graph import EmptyGraphYamlError, write_dot_from_yaml
+from .graph import EmptyGraphYamlError, endpoint_projects, write_dot_from_yaml
 
 
 def _reload_svg(driver, svg_src) -> None:
@@ -236,35 +236,48 @@ def _watch_view_state_from_params(params):
     # reliably switch back to the overview without depending on prior state.
     order_by_date = False
     target_task = None
+    filter_completed = False
+    if "p" in params:
+        p_value = params["p"][-1]
+        filter_completed = p_value in ("1", "true", "yes", "on", "")
     if "d" in params:
         d_value = params["d"][-1]
         order_by_date = d_value in ("1", "true", "yes", "on", "")
+        if order_by_date:
+            filter_completed = False
     if "t" in params:
         t_value = params["t"][-1]
         if t_value is not None and str(t_value) != "":
             target_task = str(t_value)
             order_by_date = False
-    return order_by_date, target_task
+            filter_completed = False
+    return order_by_date, target_task, filter_completed
 
 
-def _watch_footer_links(order_by_date, target_task=None):
+def _watch_footer_links(
+    order_by_date, target_task=None, filter_completed=False
+):
     links = []
-    if order_by_date:
-        links.append(("/", "project overview"))
-    else:
+    if not order_by_date:
         links.append(("/?d=1", "date-ordered"))
-        if target_task is not None and str(target_task).strip():
-            links.append(("/", "project overview"))
+    if not filter_completed:
+        links.append(("/?p=1", "full plan"))
+    if order_by_date or filter_completed:
+        links.append(("/", "project overview"))
+    elif target_task is not None and str(target_task).strip():
+        links.append(("/", "project overview"))
     return links
 
 
-def _watch_html(svg_url, order_by_date, target_task=None):
+def _watch_html(
+    svg_url, order_by_date, target_task=None, filter_completed=False
+):
     # Keep the SVG as the page's main content so browser zoom behavior matches
     # the original watcher experience (the graph scales, not just footer text).
     footer_html = " | ".join(
         f"<a href='{footer_url}'>{footer_label}</a>"
         for footer_url, footer_label in _watch_footer_links(
-            order_by_date, target_task
+            order_by_date, target_task, filter_completed
         )
     )
     return (
@@ -406,6 +419,7 @@ def build_graph(
     order_by_date=False,
     prev_data=None,
     target_task=None,
+    filter_completed=False,
     resolve_due_date_conflict=None,
 ):
     # Graphviz is required for dot -> svg rendering.
@@ -422,6 +436,7 @@ def build_graph(
         old_data=prev_data,
         validate_due_dates=True,
         filter_task=target_task,
+        filter_completed=filter_completed,
         resolve_due_date_conflict=resolve_due_date_conflict,
     )
     subprocess.run(
@@ -437,37 +452,10 @@ def build_graph(
     _svg_add_task_links(svg_root, namespace)
 
     if not order_by_date:
-        # In dependency view mode, each node explicitly tagged with
-        # ``style: endpoint`` defines a project color. A project includes the
-        # endpoint plus ancestors, but stops before any ancestor that is
-        # itself an endpoint.
-        endpoints = set()
-        for name, node_data in data["nodes"].items():
-            if node_data.get("style") == "endpoint":
-                endpoints.add(name)
-
-        projects = {}
-        for endpoint in sorted(endpoints):
-            projects[endpoint] = [endpoint]
-            ancestors_to_visit = []
-            if "parents" in data["nodes"][endpoint]:
-                for parent in data["nodes"][endpoint]["parents"]:
-                    ancestors_to_visit.append(parent)
-            already_seen = set([endpoint])
-            while ancestors_to_visit:
-                ancestor = ancestors_to_visit.pop()
-                if ancestor in already_seen:
-                    continue
-                already_seen.add(ancestor)
-                if ancestor in endpoints:
-                    continue
-                projects[endpoint].append(ancestor)
-                if (
-                    ancestor in data["nodes"]
-                    and "parents" in data["nodes"][ancestor]
-                ):
-                    for parent in data["nodes"][ancestor]["parents"]:
-                        ancestors_to_visit.append(parent)
+        # In dependency view mode, each endpoint style defines a project
+        # color. A project includes the endpoint plus ancestors, but stops
+        # before any ancestor that is itself an endpoint.
+        projects = endpoint_projects(data)
 
         title_to_group = {}
         node_title_to_group = {}
@@ -664,7 +652,11 @@ class GraphEventHandler(FileSystemEventHandler):
         self.data = data
         self.resolve_due_date_conflict = resolve_due_date_conflict
         if state is None:
-            self.state = {"order_by_date": False, "target_task": None}
+            self.state = {
+                "order_by_date": False,
+                "target_task": None,
+                "filter_completed": False,
+            }
         else:
             self.state = state
         self.debounce = debounce
@@ -686,6 +678,8 @@ class GraphEventHandler(FileSystemEventHandler):
                     build_kwargs["resolve_due_date_conflict"] = (
                         self.resolve_due_date_conflict
                     )
+                if self.state["filter_completed"]:
+                    build_kwargs["filter_completed"] = True
                 self.data = build_graph(
                     self.yaml_file,
                     self.dot_file,
@@ -775,21 +769,30 @@ class FlowchartPreviewServer:
                 params = urllib.parse.parse_qs(
                     parsed.query, keep_blank_values=True
                 )
-                order_by_date, target_task = _watch_view_state_from_params(
-                    params
-                )
+                (
+                    order_by_date,
+                    target_task,
+                    filter_completed,
+                ) = _watch_view_state_from_params(params)
 
                 if (
                     order_by_date != event_handler.state["order_by_date"]
                     or target_task != event_handler.state["target_task"]
+                    or filter_completed
+                    != event_handler.state["filter_completed"]
                 ):
                     event_handler.state["order_by_date"] = order_by_date
                     event_handler.state["target_task"] = target_task
+                    event_handler.state["filter_completed"] = (
+                        filter_completed
+                    )
                     build_kwargs = {}
                     if event_handler.resolve_due_date_conflict is not None:
                         build_kwargs["resolve_due_date_conflict"] = (
                             event_handler.resolve_due_date_conflict
                         )
+                    if event_handler.state["filter_completed"]:
+                        build_kwargs["filter_completed"] = True
                     event_handler.data = build_graph(
                         event_handler.yaml_file,
                         event_handler.dot_file,
@@ -805,6 +808,7 @@ class FlowchartPreviewServer:
                     "/graph.svg",
                     event_handler.state["order_by_date"],
                     event_handler.state["target_task"],
+                    event_handler.state["filter_completed"],
                 )
                 body_bytes = body.encode("utf-8")
                 _send_preview_response(
@@ -850,10 +854,11 @@ class FlowchartPreviewServer:
         "wrap_width": "Line wrap width used when generating node labels",
         "d": "Render nodes by date without showing connections",
         "t": "Task name to focus on (show incomplete ancestor tasks only)",
+        "p": "Render the full plan with completed tasks filtered out",
     },
     filename_extensions={"yaml": (".yaml", ".yml")},
 )
-def wgrph(yaml, wrap_width=55, d=False, t=None):
+def wgrph(yaml, wrap_width=55, d=False, t=None, p=False):
     # Selenium is only required when actually launching the watcher, so it is
     # imported here to avoid breaking the command-line tools when the optional
     # dependency is not installed.
@@ -875,7 +880,11 @@ def wgrph(yaml, wrap_width=55, d=False, t=None):
 
     # The browser now drives filtering/date-mode by GET query parameters
     # handled by the local preview server. Keep Python state in sync there.
-    initial_state = {"order_by_date": False, "target_task": None}
+    initial_state = {
+        "order_by_date": False,
+        "target_task": None,
+        "filter_completed": False,
+    }
 
     # Build the default dependency graph first. Optional -t / -d args are then
     # applied by requesting server URLs with query parameters.
@@ -887,7 +896,7 @@ def wgrph(yaml, wrap_width=55, d=False, t=None):
         initial_state["order_by_date"],
         None,
         initial_state["target_task"],
-        _resolve_due_date_conflict_with_qt,
+        resolve_due_date_conflict=_resolve_due_date_conflict_with_qt,
     )
 
     options = Options()
@@ -921,6 +930,8 @@ def wgrph(yaml, wrap_width=55, d=False, t=None):
         )
     elif d:
         driver.get(preview_server.base_url + "?d=1")
+    elif p:
+        driver.get(preview_server.base_url + "?p=1")
 
     observer = Observer()
     observer.schedule(event_handler, yaml_file.parent, recursive=False)

{pydifftools-0.1.27 → pydifftools-0.1.28}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "pyDiffTools"
-version = "0.1.27"
+version = "0.1.28"
 authors = [{ name = "J M Franck" }]
 description = "Diff tools"
 readme = "README.rst"