update pyvis

.gitignore

@@ -2,4 +2,5 @@
 .coverage
 *.txt
 *.html
-.env
+.env
+lib/

.gitmodules

@@ -0,0 +1,3 @@
+[submodule "pyvis"]
+	path = pyvis
+	url = https://github.com/mrceresa/pyvis

.pre-commit-config.yaml

@@ -5,21 +5,21 @@ repos:
         name: isort
         stages: [commit]
         language: system
-        entry: pipenv run isort
+        entry: pipenv run isort py_code_analyzer
         types: [python]
 
       - id: black
         name: black
         stages: [commit]
         language: system
-        entry: pipenv run black
+        entry: pipenv run black py_code_analyzer
         types: [python]
 
       - id: flake8
         name: flake8
         stages: [commit]
         language: system
-        entry: pipenv run flake8
+        entry: pipenv run flake8 py_code_analyzer
         types: [python]
         exclude: setup.py
 
@@ -27,7 +27,7 @@ repos:
         name: mypy
         stages: [commit]
         language: system
-        entry: pipenv run mypy
+        entry: pipenv run mypy py_code_analyzer
         types: [python]
         pass_filenames: false
 
@@ -35,13 +35,13 @@ repos:
       #   name: pytest
       #   stages: [commit]
       #   language: system
-      #   entry: pipenv run pytest
+      #   entry: pipenv run pytest py_code_analyzer
       #   types: [python]
 
       # - id: pytest-cov
       #   name: pytest
       #   stages: [push]
       #   language: system
-      #   entry: pipenv run pytest --cov
+      #   entry: pipenv run pytest --cov py_code_analyzer
       #   types: [python]
       #   pass_filenames: false

Makefile

@@ -4,8 +4,8 @@ run:
 format:
 	pipenv run black py_code_analyzer && \
 	pipenv run isort py_code_analyzer && \
-	pipenv run flake8 && \
-	pipenv run mypy
+	pipenv run flake8 py_code_analyzer && \
+	pipenv run mypy py_code_analyzer
 
 test:
 	pipenv run pytest --cov

Pipfile

@@ -7,8 +7,8 @@ name = "pypi"
 streamlit = "*"
 requests = "*"
 networkx = "*"
-pyvis = "*"
 orjson = "*"
+pyvis = {editable = true, path = "./pyvis"}
 
 [dev-packages]
 black = "*"

Pipfile.lock

@@ -1,7 +1,7 @@
 {
     "_meta": {
         "hash": {
-            "sha256": "0006fdd10642d6c40ca9dc5aaaa8f3d586465b1f5c1a306b70eb71b3559d707f"
+            "sha256": "b3ad133b7dbeaf9a10743bb8a6ee428061387fbe5770d1779ad72fe9acf3b79b"
         },
         "pipfile-spec": 6,
         "requires": {
@@ -21,7 +21,7 @@
                 "sha256:0c724848ae53410c13fa28be2b3b9a9dcb7b5caa1a70f7f217bd663bb419935a",
                 "sha256:d87d9372e63b48cd96b2a6415f0cf9457f50162ab79dc7a31cd7e024dd840026"
             ],
-            "markers": "python_version >= '3.7'",
+            "markers": "python_full_version >= '3.7.0'",
             "version": "==4.2.0"
         },
         "appnope": {
@@ -124,7 +124,7 @@
                 "sha256:08a1fe86d253b5c88c92cc3d810fd8048a16d15762e1e5b74d502256e5926aa1",
                 "sha256:c6d6cc054bdc9c83b48b8083e236e5f00f238428666d2ce2e083eaa5fd568565"
             ],
-            "markers": "python_version >= '3.7'",
+            "markers": "python_full_version >= '3.7.0'",
             "version": "==5.0.0"
         },
         "blinker": {
@@ -217,7 +217,7 @@
                 "sha256:7682dc8afb30297001674575ea00d1814d808d6a36af415a82bd481d37ba7b8e",
                 "sha256:bb4d8133cb15a609f44e8213d9b391b0809795062913b383c62be0ee95b1db48"
             ],
-            "markers": "python_version >= '3.7'",
+            "markers": "python_full_version >= '3.7.0'",
             "version": "==8.1.3"
         },
         "commonmark": {
@@ -248,7 +248,7 @@
                 "sha256:e3513399177dd37af4c1332df52da5da1d0c387e5927dc4c0709e26ee7302e8f",
                 "sha256:eb1946efac0c0c3d411cea0b5ac772fbde744109fd9520fb0c5a51979faf05ad"
             ],
-            "markers": "python_version >= '3.7'",
+            "markers": "python_full_version >= '3.7.0'",
             "version": "==1.6.0"
         },
         "decorator": {
@@ -302,7 +302,7 @@
                 "sha256:1c885ce809e8ba2d88a29befeb385fcea06338d3640712b59ca623c220bb5704",
                 "sha256:5b68b000463593e05ff2b261acff0ff0972df8ab1b70d3cdbd41b546c8b8fc3d"
             ],
-            "markers": "python_version >= '3.7'",
+            "markers": "python_full_version >= '3.7.0'",
             "version": "==3.1.27"
         },
         "idna": {
@@ -318,7 +318,7 @@
                 "sha256:5d26852efe48c0a32b0509ffbc583fda1a2266545a78d104a6f4aff3db17d700",
                 "sha256:c58c8eb8a762858f49e18436ff552e83914778e50e9d2f1660535ffb364552ec"
             ],
-            "markers": "python_version >= '3.7'",
+            "markers": "python_full_version >= '3.7.0'",
             "version": "==4.11.4"
         },
         "importlib-resources": {
@@ -372,7 +372,7 @@
                 "sha256:31351a702a408a9e7595a8fc6150fc3f43bb6bf7e319770cbc0db9df9437e852",
                 "sha256:6088930bfe239f0e6710546ab9c19c9ef35e29792895fed6e6e31a023a182a61"
             ],
-            "markers": "python_version >= '3.7'",
+            "markers": "python_full_version >= '3.7.0'",
             "version": "==3.1.2"
         },
         "jsonpickle": {
@@ -388,7 +388,7 @@
                 "sha256:1c92d2db1900b668201f1797887d66453ab1fbfea51df8e4b46236689c427baf",
                 "sha256:9d6397ba4a6c0bf0300736057f649e3e12ecbc07d3e81a0dacb72de4e9801957"
             ],
-            "markers": "python_version >= '3.7'",
+            "markers": "python_full_version >= '3.7.0'",
             "version": "==4.6.0"
         },
         "jupyter-client": {
@@ -396,7 +396,7 @@
                 "sha256:05d4ff6a0ade25138c6bb0fbeac7ddc26b5fe835e7dd816b64b4a45b931bdc0b",
                 "sha256:404abe552540aff3527e66e16beb114b6b4ff58479d51a301f4eb9701e4f52ef"
             ],
-            "markers": "python_version >= '3.7'",
+            "markers": "python_full_version >= '3.7.0'",
             "version": "==7.3.1"
         },
         "jupyter-core": {
@@ -404,7 +404,7 @@
                 "sha256:a6de44b16b7b31d7271130c71a6792c4040f077011961138afed5e5e73181aec",
                 "sha256:e7f5212177af7ab34179690140f188aa9bf3d322d8155ed972cbded19f55b6f3"
             ],
-            "markers": "python_version >= '3.7'",
+            "markers": "python_full_version >= '3.7.0'",
             "version": "==4.10.0"
         },
         "jupyterlab-pygments": {
@@ -412,7 +412,7 @@
                 "sha256:2405800db07c9f770863bcf8049a529c3dd4d3e28536638bd7c1c01d2748309f",
                 "sha256:7405d7fde60819d905a9fa8ce89e4cd830e318cdad22a0030f7a901da705585d"
             ],
-            "markers": "python_version >= '3.7'",
+            "markers": "python_full_version >= '3.7.0'",
             "version": "==0.2.2"
         },
         "jupyterlab-widgets": {
@@ -466,7 +466,7 @@
                 "sha256:f121a1420d4e173a5d96e47e9a0c0dcff965afdf1626d28de1460815f7c4ee7a",
                 "sha256:fc7b548b17d238737688817ab67deebb30e8073c95749d55538ed473130ec0c7"
             ],
-            "markers": "python_version >= '3.7'",
+            "markers": "python_full_version >= '3.7.0'",
             "version": "==2.1.1"
         },
         "matplotlib-inline": {
@@ -489,7 +489,7 @@
                 "sha256:cdef7757cead1735d2c70cc66095b072dced8a1e6d1c7639ef90cd3e04a11f2e",
                 "sha256:f251bba200a2b401a061dfd700a7a70b5772f664fb49d4a2d3e5536ec0e98c76"
             ],
-            "markers": "python_version >= '3.7'",
+            "markers": "python_full_version >= '3.7.0'",
             "version": "==0.6.4"
         },
         "nbconvert": {
@@ -497,7 +497,7 @@
                 "sha256:223e46e27abe8596b8aed54301fadbba433b7ffea8196a68fd7b1ff509eee99d",
                 "sha256:c56dd0b8978a1811a5654f74c727ff16ca87dd5a43abd435a1c49b840fcd8360"
             ],
-            "markers": "python_version >= '3.7'",
+            "markers": "python_full_version >= '3.7.0'",
             "version": "==6.5.0"
         },
         "nbformat": {
@@ -505,7 +505,7 @@
                 "sha256:0d6072aaec95dddc39735c144ee8bbc6589c383fb462e4058abc855348152dad",
                 "sha256:44ba5ca6acb80c5d5a500f1e5b83ede8cbe364d5a495c4c8cf60aaf1ba656501"
             ],
-            "markers": "python_version >= '3.7'",
+            "markers": "python_full_version >= '3.7.0'",
             "version": "==5.4.0"
         },
         "nest-asyncio": {
@@ -518,18 +518,18 @@
         },
         "networkx": {
             "hashes": [
-                "sha256:51d6ae63c24dcd33901357688a2ad20d6bcd38f9a4c5307720048d3a8081059c",
-                "sha256:ae99c9b0d35e5b4a62cf1cfea01e5b3633d8d02f4a0ead69685b6e7de5b85eab"
+                "sha256:67fab04a955a73eb660fe7bf281b6fa71a003bc6e23a92d2f6227654c5223dbe",
+                "sha256:f151edac6f9b0cf11fecce93e236ac22b499bb9ff8d6f8393b9fef5ad09506cc"
             ],
             "index": "pypi",
-            "version": "==2.8.2"
+            "version": "==2.8.3"
         },
         "notebook": {
             "hashes": [
                 "sha256:709b1856a564fe53054796c80e17a67262071c86bfbdfa6b96aaa346113c555a",
                 "sha256:b4a6baf2eba21ce67a0ca11a793d1781b06b8078f34d06c710742e55f3eee505"
             ],
-            "markers": "python_version >= '3.7'",
+            "markers": "python_full_version >= '3.7.0'",
             "version": "==6.4.11"
         },
         "numpy": {
@@ -705,7 +705,7 @@
                 "sha256:f3f6a6034140e9e17e9abc175fc7a266a6e63652028e157750bd98e804a8ed9a",
                 "sha256:ffde4c6fabb52891d81606411cbfaf77756e3b561b566efd270b3ed3791fde4e"
             ],
-            "markers": "python_version >= '3.7'",
+            "markers": "python_full_version >= '3.7.0'",
             "version": "==9.1.1"
         },
         "prometheus-client": {
@@ -751,7 +751,7 @@
                 "sha256:e250a42f15bf9d5b09fe1b293bdba2801cd520a9f5ea2d7fb7536d4441811d20",
                 "sha256:ff8d8fa42675249bb456f5db06c00de6c2f4c27a065955917b28c4f15978b9c3"
             ],
-            "markers": "python_version >= '3.7'",
+            "markers": "python_full_version >= '3.7.0'",
             "version": "==3.20.1"
         },
         "psutil": {
@@ -840,7 +840,7 @@
                 "sha256:ece333706a94c1221ced8b299042f85fd88b5db802d71be70024433ddf3aecab",
                 "sha256:edad25522ad509e534400d6ab98cf1872d30c31bc5e947712bfd57def7af15bb"
             ],
-            "markers": "python_version >= '3.7'",
+            "markers": "python_full_version >= '3.7.0'",
             "version": "==8.0.0"
         },
         "pycparser": {
@@ -855,7 +855,7 @@
                 "sha256:7fc49b00840608068b930f9269169c7c9f3198b8b4635c934ba6d887c4e54503",
                 "sha256:907601c99f7510e16d27d7cb62bfa145216d166a2b5c9c50cfe2b65b032ebd2e"
             ],
-            "markers": "python_version >= '3.7'",
+            "markers": "python_full_version >= '3.7.0'",
             "version": "==0.7.1"
         },
         "pygments": {
@@ -906,7 +906,7 @@
                 "sha256:f87cc2863ef33c709e237d4b5f4502a62a00fab450c9e020892e8e2ede5847f5",
                 "sha256:fd8da6d0124efa2f67d86fa70c851022f87c98e205f0594e1fae044e7119a5a6"
             ],
-            "markers": "python_version >= '3.7'",
+            "markers": "python_full_version >= '3.7.0'",
             "version": "==0.18.1"
         },
         "python-dateutil": {
@@ -933,11 +933,8 @@
             "version": "==0.1.0.post0"
         },
         "pyvis": {
-            "hashes": [
-                "sha256:29b94d0a10a01ac790d262318680369baa9e5eb8524c355758f1c3799f0c3965"
-            ],
-            "index": "pypi",
-            "version": "==0.2.1"
+            "editable": true,
+            "path": "./pyvis"
         },
         "pyzmq": {
             "hashes": [
@@ -1077,7 +1074,7 @@
                 "sha256:0d5f126fbfdb5887b25ae7d9d07b0d716b1cc0ccaacc71c1f3c14d228e065197",
                 "sha256:ab4eeedccfcc1e6134bfee86106af90852c69d602884ea3a1e8ca6d4486e9bfe"
             ],
-            "markers": "python_version >= '3.7'",
+            "markers": "python_full_version >= '3.7.0'",
             "version": "==0.15.0"
         },
         "tinycss2": {
@@ -1156,7 +1153,7 @@
                 "sha256:1530d04badddc6a73d50b7ee34667d4b96914da352109117b4280cb56523a51b",
                 "sha256:74803a1baa59af70f023671d86d5c7a834c931186df26d50d362ee6a1ff021fd"
             ],
-            "markers": "python_version >= '3.7'",
+            "markers": "python_full_version >= '3.7.0'",
             "version": "==5.2.2.post1"
         },
         "typing-extensions": {
@@ -1271,7 +1268,7 @@
                 "sha256:7682dc8afb30297001674575ea00d1814d808d6a36af415a82bd481d37ba7b8e",
                 "sha256:bb4d8133cb15a609f44e8213d9b391b0809795062913b383c62be0ee95b1db48"
             ],
-            "markers": "python_version >= '3.7'",
+            "markers": "python_full_version >= '3.7.0'",
             "version": "==8.1.3"
         },
         "coverage": {

py_code_analyzer/code_imports_analyzer.py

@@ -28,16 +28,16 @@ class CodeImportsAnalyzer:
             self.generic_visit(node)
 
     def __init__(self, python_files):
-        self.imports = []
+        self.python_imports = []
         self.imports_graph = nx.DiGraph()  # imports_graph is a directed graph
         self.python_files = python_files
-        self._node_visitor = CodeImportsAnalyzer._NodeVisitor(self.imports)
+        self._node_visitor = CodeImportsAnalyzer._NodeVisitor(self.python_imports)
 
     def analyze(self):
         for python_file in self.python_files:
             program = requests.get(python_file["download_url"]).text
             tree = ast.parse(program)
-            self.imports += [
+            self.python_imports += [
                 {
                     "file_name": python_file["name"],
                     "file_path": python_file["path"],
@@ -47,17 +47,38 @@ class CodeImportsAnalyzer:
             self._node_visitor.visit(tree)
         return self
 
+    def _add_edges(self, nodes):
+        for first_node, second_node in zip(nodes, nodes[1:]):
+            self.imports_graph.add_edge(first_node, second_node)
+
     def generate_imports_graph(self):
-        for _import in self.imports:
-            _nodes = _import["file_path"].split("/")
+        for python_import in self.python_imports:
+            _nodes = python_import["file_path"].split("/")
             if len(_nodes):
+                # generate graph based on file_path
+                # node/edge relationship means file/folder structure
                 if len(_nodes) > 1:
-                    for first_node, second_node in zip(_nodes, _nodes[1:]):
-                        self.imports_graph.add_edge(first_node, second_node)
+                    # make last node and second last node as one node
+                    # to solve the issue of duplicated file names using only last node
+                    if len(_nodes) >= 3:
+                        _nodes[-2] = _nodes[-2] + "/" + _nodes[-1]
+                        del _nodes[-1]
+                    self._add_edges(_nodes)
                 else:
                     self.imports_graph.add_node(_nodes[0])
 
+                # generate graph based on imported modules in each file
+                for _import in python_import["imports"]:
+                    if _import["module"] is None:
+                        _import_names = _import["name"].split(".")
+                        _new_nodes = _import_names + [_nodes[-1]]
+                        self._add_edges(_new_nodes)
+                    else:
+                        _import_names = _import["module"].split(".") + [_import["name"]]
+                        _new_nodes = _import_names + [_nodes[-1]]
+                        self._add_edges(_new_nodes)
+
         return self.imports_graph
 
     def report(self):
-        pprint(self.imports)
+        pprint(self.python_imports)

py_code_analyzer/imports_graph_visualizer.py

@@ -1,5 +1,6 @@
 import networkx as nx
-from pyvis.network import Network
+
+from pyvis import Network
 
 
 class ImportsGraphVisualizer:
@@ -8,10 +9,25 @@ class ImportsGraphVisualizer:
         cls,
         imports_graph: nx.Graph,
         directed: bool = True,
+        layout: bool = True,  # Use hierarchical if True
+        neighborhood_highlight: bool = True,
+        select_menu: bool = True,
         width: int = 100,
-        height: int = 100,
+        height: int = 800,
+        show_buttons: bool = False,
         display_html_name: str = "nx.html",
     ):
-        _pyvis_network = Network(f"{width}%", f"{height}%", directed=directed)
+        _pyvis_network = Network(
+            width=f"{width}%",
+            height=f"{height}px",
+            directed=directed,
+            layout=layout,
+            neighborhood_highlight=neighborhood_highlight,
+            select_menu=select_menu,
+        )
+        _pyvis_network.toggle_hide_edges_on_drag(True)
+
         _pyvis_network.from_nx(imports_graph)
+        if show_buttons:
+            _pyvis_network.show_buttons()
         _pyvis_network.show(display_html_name)

pyvis

@@ -0,0 +1 @@
+Subproject commit 1e03c6f09b3756ac398fb05541f4cee1337ed5a8