invocation-tree 0.0.36__tar.gz → 0.0.38__tar.gz

{invocation_tree-0.0.36 → invocation_tree-0.0.38}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: invocation_tree
-Version: 0.0.36
+Version: 0.0.38
 Summary: Generates an invocation tree of functions calls.
 Author-email: Bas Terwijn <bterwijn@gmail.com>
 License-Expression: BSD-2-Clause

{invocation_tree-0.0.36 → invocation_tree-0.0.38}/invocation_tree/__init__.py

@@ -2,7 +2,7 @@
 # Copyright (c) 2023, Bas Terwijn.
 # SPDX-License-Identifier: BSD-2-Clause
 
-from graphviz import Digraph
+from graphviz import Digraph, Source
 import html
 import sys
 import difflib 
@@ -10,7 +10,7 @@ import functools
 
 import invocation_tree.regex_set as regset
 
-__version__ = "0.0.36"
+__version__ = "0.0.38"
 __author__ = 'Bas Terwijn'
 
 # colors dark
@@ -27,6 +27,13 @@ color_paused_dark = '#779977'
 color_active_dark = '#1d1d1d'
 color_returned_dark = '#997777'
 
+# color placeholders
+foreground_color_PH = '<foreground_color_PH>'
+background_color_PH = '<background_color_PH>'
+color_paused_PH = '<color_paused_PH>'
+color_active_PH = '<color_active_PH>'
+color_returned_PH = '<color_returned_PH>'
+
 
 def highlight_diff(str1, str2):
     matcher = difflib.SequenceMatcher(None, str1, str2)
@@ -133,6 +140,7 @@ class Invocation_Tree:
         self.is_highlighted = False
         self.graph = None
         self.prev_global_tracer = None
+        self.uncolored_graph = None
         
     def __repr__(self):
         return f'Invocation_Tree(filename={repr(self.filename)}, show={self.show}, block={self.block}, each_line={self.each_line}, gifcount={self.gifcount})'
@@ -224,14 +232,14 @@ class Invocation_Tree:
             tree_node.is_returned = is_returned
         return_value = tree_node.return_value
         border = 1
-        color = self.color_paused
+        color = color_paused_PH
         if active:
-            color = self.color_active
+            color = color_active_PH
             border = 3
         if is_returned:
-            color = self.color_returned
-        alignment = 'ALIGN="left" BALIGN="LEFT"'
-        table = f'<\n<TABLE BORDER="{str(border)}" COLOR="{self.foreground_color}" CELLBORDER="0" CELLSPACING="0" BGCOLOR="{color}">\n  <TR>'
+            color = color_returned_PH
+        alignment = 'ALIGN="LEFT" BALIGN="LEFT"'
+        table = f'<\n<TABLE BORDER="{str(border)}" COLOR={foreground_color_PH} CELLBORDER="0" CELLSPACING="0" BGCOLOR={color}>\n  <TR>'
         class_fun_name = get_class_function_name(tree_node.frame)
         local_vars = tree_node.frame.f_locals
         hightlighted_content = self.get_hightlighted_content(tree_node, class_fun_name, class_fun_name, use_old_content)
@@ -270,29 +278,59 @@ class Invocation_Tree:
                 return '.'.join(splits)
         return self.filename
         
-    def create_graph(self):
+    def graph_header(self):
         graphviz_graph_attr = {
             'fontname': self.fontname, 
             'fontsize': str(self.fontsize), 
-            'fontcolor': self.foreground_color, 
-            'bgcolor': self.background_color,
+            'fontcolor': foreground_color_PH, 
+            'bgcolor': background_color_PH,
             }
         graphviz_node_attr = {
             'fontname': self.fontname, 
             'fontsize': str(self.fontsize), 
             'shape':'plaintext',
-            'fontcolor': self.foreground_color
+            'fontcolor': foreground_color_PH
             }
         graphviz_edge_attr = {
             'fontname': self.fontname, 
             'fontsize': str(self.fontsize),
-            'fontcolor': self.foreground_color, 
-            'color': self.foreground_color
+            'fontcolor': foreground_color_PH, 
+            'color': foreground_color_PH
             }
         graph = Digraph('invocation_tree',
                 graph_attr=graphviz_graph_attr,
                 node_attr=graphviz_node_attr,
                 edge_attr=graphviz_edge_attr)
+        return graph
+
+    def build_graph_from_nodes(self):
+        # add nodes and edges to graph
+        graph = self.graph_header()
+        for nid, table in self.node_id_to_table.items():
+            graph.node(nid, label=table)
+        for nid1, nid2 in self.edges:
+            graph.edge(nid1, nid2)
+        return graph
+
+    def recolor_last_graph(self):
+        if not self.uncolored_graph:
+            return self.uncolored_graph
+        graph_str = self.uncolored_graph.source
+
+        def replace_color(token, value):
+            return graph_str.replace(f'{token}', f'"{value}"')
+
+        graph_str = replace_color(foreground_color_PH, self.foreground_color)
+        graph_str = replace_color(background_color_PH, self.background_color)
+        graph_str = replace_color(color_paused_PH, self.color_paused)
+        graph_str = replace_color(color_active_PH, self.color_active)
+        graph_str = replace_color(color_returned_PH, self.color_returned)
+        graph = Source(graph_str)
+        graph.engine = self.uncolored_graph.engine
+        graph.format = self.uncolored_graph.format
+        return graph
+
+    def create_graph(self):
         # update returned nodes
         for node in self.prev_returned:
             self.update_node(node, use_old_content=True)
@@ -312,11 +350,8 @@ class Invocation_Tree:
                 self.update_node(node, active=False, use_old_content=True)
         self.prev_paused = self.paused.copy()
         self.paused = []
-        # add nodes and edges to graph
-        for nid, table in self.node_id_to_table.items():
-            graph.node(nid, label=table)
-        for nid1, nid2 in self.edges:
-            graph.edge(nid1, nid2)
+        self.uncolored_graph = self.build_graph_from_nodes()
+        graph = self.recolor_last_graph()
         return graph
         
     def render_graph(self, graph):

{invocation_tree-0.0.36 → invocation_tree-0.0.38}/invocation_tree.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: invocation_tree
-Version: 0.0.36
+Version: 0.0.38
 Summary: Generates an invocation tree of functions calls.
 Author-email: Bas Terwijn <bterwijn@gmail.com>
 License-Expression: BSD-2-Clause

{invocation_tree-0.0.36 → invocation_tree-0.0.38}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "invocation_tree"
-version = "0.0.36"
+version = "0.0.38"
 description = "Generates an invocation tree of functions calls."
 authors = [
     {name = "Bas Terwijn", email = "bterwijn@gmail.com"}