Merge pull request #1 from xnuinside/dev

fix case with nested class in parser

Author: xnuinside

README.rst

@@ -28,16 +28,21 @@ Pass '-o' flag if you want only print dependencies in console and don't want gra
 
     cg /path/to/your_python_code -o
 
+If you want to change view and play with graph output - you can check 'vizualyzer.py'
+and play with matplotlib and networkX settings.
 
-Visualisation samples
-*********************
+In default view - red line show dependencies between entities in different modules. Green - entities in module.
+
+.. image:: codegraph/docs/img/graph_visualisation.png
+  :width: 250
+  :alt: Graph visualisation
 
 .. image:: codegraph/docs/img/code_with_trash_module.png
-  :width: 300
+  :width: 250
   :alt: Code with not used module
 
 .. image:: codegraph/docs/img/normal_code.png
-  :width: 300
+  :width: 250
   :alt: Code there all modules linked together
 
 TODO:

codegraph/docs/img/graph_visualisation.png

@@ -1,4 +1,4 @@
-# 'cut of' code from pythons pyclrb
+# 'cut of' code from pythons pyclrb with some additionals
 import io
 import tokenize
 from token import NAME, DEDENT, NL
@@ -19,6 +19,7 @@ def __init__(self, name: Text, file: Text, lineno: int, parent: object):
 
     def _addchild(self, name, obj):
         self.children[name] = obj
+        obj.main = self
 
     def __repr__(self):
         return f"{self.name} <{self.__class__.__name__}: Parent {self.parent}>"
@@ -78,7 +79,7 @@ def _nest_function(ob, func_name, lineno, async_f=False):
 
 def _nest_class(ob, class_name, lineno, super=None):
     "Return a Class after nesting within ob."
-    newclass = Class(ob.module, class_name, super, ob.file, lineno, ob)
+    newclass = Class(class_name, super, ob.file, lineno, ob)
     ob._addchild(class_name, newclass)
     return newclass
 
@@ -94,13 +95,17 @@ def create_objects_array(fname, source):
     try:
         new_lines = 0
         imports = None
+        cur_func = None
         for tokentype, token, start, _end, _line in g:
             if tokentype == DEDENT:
                 lineno, thisindent = start
                 # Close previous nested classes and defs.
                 while stack and stack[-1][1] >= thisindent:
                     if isinstance(stack[-1][0], _Object):
-                        stack[-1][0].endno = lineno -1 - new_lines
+                        if getattr(stack[-1][0], 'main', None):
+                            stack[-1][0].endno = lineno - 1 - new_lines
+                        else:
+                            stack[-1][0].endno = lineno -1 - new_lines
                     del stack[-1]
                 else:
                     if tree:
@@ -152,24 +157,27 @@ def create_objects_array(fname, source):
                 tokentype, func_name, start = next(g)[0:3]
                 if tokentype != NAME:
                     continue  # Skip def with syntax error.
-                cur_func = None
                 if stack:
                     cur_obj = stack[-1][0]
                     cur_func = _nest_function(cur_obj, func_name, lineno)
                     cur_obj.endno = lineno - new_lines
                 else:
-                    tree.append(Function(func_name, fname, lineno))
-                stack.append((cur_func, thisindent))
+                    cur_func = Function(func_name, fname, lineno)
+                    tree.append(cur_func)
+                if cur_func:
+                    stack.append((cur_func, thisindent))
             elif token == 'class':
                 new_lines = 0
                 lineno, thisindent = start
                 # Close previous nested classes and defs.
                 while stack and stack[-1][1] >= thisindent:
                     del stack[-1]
                 tokentype, class_name, start = next(g)[0:3]
+
                 if tokentype != NAME:
                     continue
                 inherit = None
+
                 if stack:
                     cur_obj = stack[-1][0]
                     cur_class = _nest_class(
@@ -189,41 +197,3 @@ def create_objects_array(fname, source):
         tree.append(imports)
     return tree
 
-
-def _getnamelist(g):
-    """Return list of (dotted-name, as-name or None) tuples for token source g.
-    An as-name is the name that follows 'as' in an as clause.
-    """
-    names = []
-    while True:
-        name, token = _getname(g)
-        if not name:
-            break
-        if token == 'as':
-            name2, token = _getname(g)
-        else:
-            name2 = None
-        names.append((name, name2))
-        while token != "," and "\n" not in token:
-            token = next(g)[1]
-        if token != ",":
-            break
-    return names
-
-
-def _getname(g):
-    "Return (dotted-name or None, next-token) tuple for token source g."
-    parts = []
-    tokentype, token = next(g)[0:2]
-    if tokentype != NAME and token != '*':
-        return (None, token)
-    parts.append(token)
-    while True:
-        tokentype, token = next(g)[0:2]
-        if token != '.':
-            break
-        tokentype, token = next(g)[0:2]
-        if tokentype != NAME:
-            break
-        parts.append(token)
-    return (".".join(parts), token)

codegraph/parser.py

@@ -5,21 +5,42 @@
 
 
 def draw_graph(modules_entities: Dict) -> None:
-    gr = nx.Graph()
-    module_edges = []
-    sub_edges = []
+    G = nx.DiGraph()
+    module_edges_all = []
+    sub_edges_all = []
     for module in modules_entities:
+        _module = os.path.basename(module)
+        module_edges = []
         for entity in modules_entities[module]:
-            module_edges.append((os.path.basename(module), entity))
+            sub_edges = []
+            module_edges.append((_module, entity))
             for dep in modules_entities[module][entity]:
                 if '.' in dep:
                     dep = dep.split('.')[1].replace('.', '.py')
                 sub_edges.append((entity, dep))
-        gr.add_edges_from(module_edges)
-        gr.add_edges_from(sub_edges)
-    pos = nx.spring_layout(gr)
-    nx.draw(gr, pos, font_size=12, with_labels=False)
+            G.add_edges_from(sub_edges)
+            sub_edges_all += sub_edges
+        if not modules_entities[module]:
+            G.add_node(_module)
+        G.add_edges_from(module_edges)
+        module_edges_all += module_edges
+    pos = nx.spring_layout(G)
+    module_list = [os.path.basename(module) for module in modules_entities]
+    module_list_labels = {module_name: module_name for module_name in module_list}
+
+    entities_labels = {edge[1]: edge[1] for edge in module_edges_all}
+    nx.draw_networkx_nodes(G, pos, nodelist=module_list,
+                           node_color='#009c2c', node_size=800,  node_shape="s", alpha=0.8)
+    nx.draw(G, pos, node_color='#009c2c', arrows=False,  edge_color='#ffffff',  node_shape="o", alpha=0.8)
+
+    nx.draw_networkx_labels(G, pos, labels=module_list_labels, font_weight='bold', font_size=11)
+    nx.draw_networkx_labels(G, pos, labels=entities_labels, font_weight='bold', font_family='Arial', font_size=10)
+    nx.draw_networkx_edges(G, pos, edgelist=module_edges_all,
+                           edge_color='#009c2c', width=2,
+                           arrows=False, style="dashed", node_size=50)
+    nx.draw_networkx_edges(G, pos, edgelist=sub_edges_all,
+                           edge_color='r', width=2,
+                           arrows=False, style="dashed")
     for p in pos:  # raise text positions
         pos[p][1] += 0.07
-    nx.draw_networkx_labels(gr, pos)
     plt.show()

codegraph/vizualyzer.py

@@ -20,6 +20,11 @@ pytest = "^3.0"
 [tool.poetry.scripts]
 cg = 'codegraph.main:cli'
 
+[tool.poetry-dynamic-versioning]
+enable = true
+vcs = "git"
+style = "pep440"
+
 [build-system]
 requires = ["poetry>=0.12"]
 build-backend = "poetry.masonry.api"