refactor and update

Pipfile

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

Pipfile.lock

@@ -1,7 +1,7 @@
 {
     "_meta": {
         "hash": {
-            "sha256": "b3ad133b7dbeaf9a10743bb8a6ee428061387fbe5770d1779ad72fe9acf3b79b"
+            "sha256": "dd62beb31967a9cc4e0ebbf1f5ac1078db8868bb4cad3527adc3f9480d298529"
         },
         "pipfile-spec": 6,
         "requires": {
@@ -21,7 +21,7 @@
                 "sha256:0c724848ae53410c13fa28be2b3b9a9dcb7b5caa1a70f7f217bd663bb419935a",
                 "sha256:d87d9372e63b48cd96b2a6415f0cf9457f50162ab79dc7a31cd7e024dd840026"
             ],
-            "markers": "python_full_version >= '3.7.0'",
+            "markers": "python_version >= '3.7'",
             "version": "==4.2.0"
         },
         "appnope": {
@@ -124,7 +124,7 @@
                 "sha256:08a1fe86d253b5c88c92cc3d810fd8048a16d15762e1e5b74d502256e5926aa1",
                 "sha256:c6d6cc054bdc9c83b48b8083e236e5f00f238428666d2ce2e083eaa5fd568565"
             ],
-            "markers": "python_full_version >= '3.7.0'",
+            "markers": "python_version >= '3.7'",
             "version": "==5.0.0"
         },
         "blinker": {
@@ -133,6 +133,14 @@
             ],
             "version": "==1.4"
         },
+        "branca": {
+            "hashes": [
+                "sha256:781ff32bf82979584b0004bd84c254cfccda26bc31b2f7333346d03fb7b97741",
+                "sha256:e6f2f7eba7dd368ceef8f63822b867f5e11d4d3abdd099a787db9ed2b7065ae1"
+            ],
+            "markers": "python_version >= '3.5'",
+            "version": "==0.5.0"
+        },
         "cachetools": {
             "hashes": [
                 "sha256:6a94c6402995a99c3970cc7e4884bb60b4a8639938157eeed436098bf9831757",
@@ -217,7 +225,7 @@
                 "sha256:7682dc8afb30297001674575ea00d1814d808d6a36af415a82bd481d37ba7b8e",
                 "sha256:bb4d8133cb15a609f44e8213d9b391b0809795062913b383c62be0ee95b1db48"
             ],
-            "markers": "python_full_version >= '3.7.0'",
+            "markers": "python_version >= '3.7'",
             "version": "==8.1.3"
         },
         "commonmark": {
@@ -248,7 +256,7 @@
                 "sha256:e3513399177dd37af4c1332df52da5da1d0c387e5927dc4c0709e26ee7302e8f",
                 "sha256:eb1946efac0c0c3d411cea0b5ac772fbde744109fd9520fb0c5a51979faf05ad"
             ],
-            "markers": "python_full_version >= '3.7.0'",
+            "markers": "python_version >= '3.7'",
             "version": "==1.6.0"
         },
         "decorator": {
@@ -289,6 +297,14 @@
             ],
             "version": "==2.15.3"
         },
+        "folium": {
+            "hashes": [
+                "sha256:e856ae1de0b322a719b01ceed64ea16f6f011bd28ed22e954a7f7884313da672",
+                "sha256:e91e57d8298f3ccf4cce3c5e065bea6eb17033e3c5432b8a22214009c266b2ab"
+            ],
+            "index": "pypi",
+            "version": "==0.12.1.post1"
+        },
         "gitdb": {
             "hashes": [
                 "sha256:8033ad4e853066ba6ca92050b9df2f89301b8fc8bf7e9324d412a63f8bf1a8fd",
@@ -302,7 +318,7 @@
                 "sha256:1c885ce809e8ba2d88a29befeb385fcea06338d3640712b59ca623c220bb5704",
                 "sha256:5b68b000463593e05ff2b261acff0ff0972df8ab1b70d3cdbd41b546c8b8fc3d"
             ],
-            "markers": "python_full_version >= '3.7.0'",
+            "markers": "python_version >= '3.7'",
             "version": "==3.1.27"
         },
         "idna": {
@@ -318,7 +334,7 @@
                 "sha256:5d26852efe48c0a32b0509ffbc583fda1a2266545a78d104a6f4aff3db17d700",
                 "sha256:c58c8eb8a762858f49e18436ff552e83914778e50e9d2f1660535ffb364552ec"
             ],
-            "markers": "python_full_version >= '3.7.0'",
+            "markers": "python_version >= '3.7'",
             "version": "==4.11.4"
         },
         "importlib-resources": {
@@ -372,7 +388,7 @@
                 "sha256:31351a702a408a9e7595a8fc6150fc3f43bb6bf7e319770cbc0db9df9437e852",
                 "sha256:6088930bfe239f0e6710546ab9c19c9ef35e29792895fed6e6e31a023a182a61"
             ],
-            "markers": "python_full_version >= '3.7.0'",
+            "markers": "python_version >= '3.7'",
             "version": "==3.1.2"
         },
         "jsonpickle": {
@@ -388,7 +404,7 @@
                 "sha256:1c92d2db1900b668201f1797887d66453ab1fbfea51df8e4b46236689c427baf",
                 "sha256:9d6397ba4a6c0bf0300736057f649e3e12ecbc07d3e81a0dacb72de4e9801957"
             ],
-            "markers": "python_full_version >= '3.7.0'",
+            "markers": "python_version >= '3.7'",
             "version": "==4.6.0"
         },
         "jupyter-client": {
@@ -396,7 +412,7 @@
                 "sha256:05d4ff6a0ade25138c6bb0fbeac7ddc26b5fe835e7dd816b64b4a45b931bdc0b",
                 "sha256:404abe552540aff3527e66e16beb114b6b4ff58479d51a301f4eb9701e4f52ef"
             ],
-            "markers": "python_full_version >= '3.7.0'",
+            "markers": "python_version >= '3.7'",
             "version": "==7.3.1"
         },
         "jupyter-core": {
@@ -404,7 +420,7 @@
                 "sha256:a6de44b16b7b31d7271130c71a6792c4040f077011961138afed5e5e73181aec",
                 "sha256:e7f5212177af7ab34179690140f188aa9bf3d322d8155ed972cbded19f55b6f3"
             ],
-            "markers": "python_full_version >= '3.7.0'",
+            "markers": "python_version >= '3.7'",
             "version": "==4.10.0"
         },
         "jupyterlab-pygments": {
@@ -412,7 +428,7 @@
                 "sha256:2405800db07c9f770863bcf8049a529c3dd4d3e28536638bd7c1c01d2748309f",
                 "sha256:7405d7fde60819d905a9fa8ce89e4cd830e318cdad22a0030f7a901da705585d"
             ],
-            "markers": "python_full_version >= '3.7.0'",
+            "markers": "python_version >= '3.7'",
             "version": "==0.2.2"
         },
         "jupyterlab-widgets": {
@@ -466,7 +482,7 @@
                 "sha256:f121a1420d4e173a5d96e47e9a0c0dcff965afdf1626d28de1460815f7c4ee7a",
                 "sha256:fc7b548b17d238737688817ab67deebb30e8073c95749d55538ed473130ec0c7"
             ],
-            "markers": "python_full_version >= '3.7.0'",
+            "markers": "python_version >= '3.7'",
             "version": "==2.1.1"
         },
         "matplotlib-inline": {
@@ -489,7 +505,7 @@
                 "sha256:cdef7757cead1735d2c70cc66095b072dced8a1e6d1c7639ef90cd3e04a11f2e",
                 "sha256:f251bba200a2b401a061dfd700a7a70b5772f664fb49d4a2d3e5536ec0e98c76"
             ],
-            "markers": "python_full_version >= '3.7.0'",
+            "markers": "python_version >= '3.7'",
             "version": "==0.6.4"
         },
         "nbconvert": {
@@ -497,7 +513,7 @@
                 "sha256:223e46e27abe8596b8aed54301fadbba433b7ffea8196a68fd7b1ff509eee99d",
                 "sha256:c56dd0b8978a1811a5654f74c727ff16ca87dd5a43abd435a1c49b840fcd8360"
             ],
-            "markers": "python_full_version >= '3.7.0'",
+            "markers": "python_version >= '3.7'",
             "version": "==6.5.0"
         },
         "nbformat": {
@@ -505,7 +521,7 @@
                 "sha256:0d6072aaec95dddc39735c144ee8bbc6589c383fb462e4058abc855348152dad",
                 "sha256:44ba5ca6acb80c5d5a500f1e5b83ede8cbe364d5a495c4c8cf60aaf1ba656501"
             ],
-            "markers": "python_full_version >= '3.7.0'",
+            "markers": "python_version >= '3.7'",
             "version": "==5.4.0"
         },
         "nest-asyncio": {
@@ -529,7 +545,7 @@
                 "sha256:709b1856a564fe53054796c80e17a67262071c86bfbdfa6b96aaa346113c555a",
                 "sha256:b4a6baf2eba21ce67a0ca11a793d1781b06b8078f34d06c710742e55f3eee505"
             ],
-            "markers": "python_full_version >= '3.7.0'",
+            "markers": "python_version >= '3.7'",
             "version": "==6.4.11"
         },
         "numpy": {
@@ -705,7 +721,7 @@
                 "sha256:f3f6a6034140e9e17e9abc175fc7a266a6e63652028e157750bd98e804a8ed9a",
                 "sha256:ffde4c6fabb52891d81606411cbfaf77756e3b561b566efd270b3ed3791fde4e"
             ],
-            "markers": "python_full_version >= '3.7.0'",
+            "markers": "python_version >= '3.7'",
             "version": "==9.1.1"
         },
         "prometheus-client": {
@@ -751,7 +767,7 @@
                 "sha256:e250a42f15bf9d5b09fe1b293bdba2801cd520a9f5ea2d7fb7536d4441811d20",
                 "sha256:ff8d8fa42675249bb456f5db06c00de6c2f4c27a065955917b28c4f15978b9c3"
             ],
-            "markers": "python_full_version >= '3.7.0'",
+            "markers": "python_version >= '3.7'",
             "version": "==3.20.1"
         },
         "psutil": {
@@ -840,7 +856,7 @@
                 "sha256:ece333706a94c1221ced8b299042f85fd88b5db802d71be70024433ddf3aecab",
                 "sha256:edad25522ad509e534400d6ab98cf1872d30c31bc5e947712bfd57def7af15bb"
             ],
-            "markers": "python_full_version >= '3.7.0'",
+            "markers": "python_version >= '3.7'",
             "version": "==8.0.0"
         },
         "pycparser": {
@@ -855,7 +871,7 @@
                 "sha256:7fc49b00840608068b930f9269169c7c9f3198b8b4635c934ba6d887c4e54503",
                 "sha256:907601c99f7510e16d27d7cb62bfa145216d166a2b5c9c50cfe2b65b032ebd2e"
             ],
-            "markers": "python_full_version >= '3.7.0'",
+            "markers": "python_version >= '3.7'",
             "version": "==0.7.1"
         },
         "pygments": {
@@ -906,7 +922,7 @@
                 "sha256:f87cc2863ef33c709e237d4b5f4502a62a00fab450c9e020892e8e2ede5847f5",
                 "sha256:fd8da6d0124efa2f67d86fa70c851022f87c98e205f0594e1fae044e7119a5a6"
             ],
-            "markers": "python_full_version >= '3.7.0'",
+            "markers": "python_version >= '3.7'",
             "version": "==0.18.1"
         },
         "python-dateutil": {
@@ -1012,7 +1028,7 @@
                 "sha256:4c586de507202505346f3e32d1363eb9ed6932f0c2f63184dea88983ff4971e2",
                 "sha256:d2bbd99c320a2532ac71ff6a3164867884357da3e3301f0240090c5d2fdac7ec"
             ],
-            "markers": "python_full_version >= '3.6.3' and python_full_version < '4.0.0'",
+            "markers": "python_version < '4' and python_full_version >= '3.6.3'",
             "version": "==12.4.4"
         },
         "semver": {
@@ -1074,7 +1090,7 @@
                 "sha256:0d5f126fbfdb5887b25ae7d9d07b0d716b1cc0ccaacc71c1f3c14d228e065197",
                 "sha256:ab4eeedccfcc1e6134bfee86106af90852c69d602884ea3a1e8ca6d4486e9bfe"
             ],
-            "markers": "python_full_version >= '3.7.0'",
+            "markers": "python_version >= '3.7'",
             "version": "==0.15.0"
         },
         "tinycss2": {
@@ -1153,7 +1169,7 @@
                 "sha256:1530d04badddc6a73d50b7ee34667d4b96914da352109117b4280cb56523a51b",
                 "sha256:74803a1baa59af70f023671d86d5c7a834c931186df26d50d362ee6a1ff021fd"
             ],
-            "markers": "python_full_version >= '3.7.0'",
+            "markers": "python_version >= '3.7'",
             "version": "==5.2.2.post1"
         },
         "typing-extensions": {
@@ -1185,7 +1201,7 @@
                 "sha256:44ece4d53fb1706f667c9bd1c648f5469a2ec925fcf3a776667042d645472c14",
                 "sha256:aabaf16477806a5e1dd19aa41f8c2b7950dd3c746362d7e3223dbe6de6ac448e"
             ],
-            "markers": "python_version >= '2.7' and python_version not in '3.0, 3.1, 3.2, 3.3, 3.4' and python_full_version < '4.0.0'",
+            "markers": "python_version >= '2.7' and python_version not in '3.0, 3.1, 3.2, 3.3, 3.4' and python_version < '4'",
             "version": "==1.26.9"
         },
         "validators": {
@@ -1268,7 +1284,7 @@
                 "sha256:7682dc8afb30297001674575ea00d1814d808d6a36af415a82bd481d37ba7b8e",
                 "sha256:bb4d8133cb15a609f44e8213d9b391b0809795062913b383c62be0ee95b1db48"
             ],
-            "markers": "python_full_version >= '3.7.0'",
+            "markers": "python_version >= '3.7'",
             "version": "==8.1.3"
         },
         "coverage": {

app.py

@@ -17,42 +17,48 @@ st.markdown(
 owner = st.text_input("Enter GitHub username", value="cyyeh")
 repo = st.text_input("Enter GitHib repo name", value="py-code-analyzer")
 path = st.text_input(
-    "Enter target directory path, if the value is empty, then the target directory will be the root directory",
+    "Enter target directory path. Default: the target directory will be the root directory",
     value="py_code_analyzer",
 )
+ref = st.text_input(
+    "Enter the name of the commit/branch/tag. Default: the repository's default branch",
+)
+clicked_ok_button = st.button("OK")
+st.markdown("---")
 
 
-@st.cache
-def get_python_files(owner, repo, path):
-    return CodeFetcher().get_python_files(owner, repo, path)
+def get_python_files(owner, repo, path, ref=""):
+    return CodeFetcher().get_python_files(owner, repo, path, ref=ref)
 
 
-@st.cache(allow_output_mutation=True)
 def generate_imports_graph(python_files):
     return CodeImportsAnalyzer(python_files).analyze().generate_imports_graph()
 
 
-@st.cache
 def generate_graph_visualization_file(imports_graph):
     ImportsGraphVisualizer().visualize(imports_graph)
 
 
-@st.cache
 def read_graph_visualization_file():
     return open("nx.html", "r", encoding="utf-8").read()
 
 
-if owner and repo:
-    with st.spinner("Please wait..."):
-        generate_graph_visualization_file(
-            generate_imports_graph(get_python_files(owner, repo, path))
-        )
-        graph_visualization_file = read_graph_visualization_file()
+if clicked_ok_button and owner and repo:
+    with st.spinner("Getting python files..."):
+        python_files = get_python_files(owner, repo, path, ref=ref)
+
+    with st.spinner("Generating imports graph..."):
+        imports_graph = generate_imports_graph(python_files)
 
-    st.download_button(
-        "Download the result file",
-        graph_visualization_file,
-        file_name="result.html",
-        mime="text/html",
-    )
-    components.html(graph_visualization_file, height=800, scrolling=True)
+    with st.spinner("Generating graph visualization file..."):
+        generate_graph_visualization_file(imports_graph)
+
+    with st.spinner("Showing the graph..."):
+        graph_visualization_file = read_graph_visualization_file()
+        st.download_button(
+            "Download the result file",
+            graph_visualization_file,
+            file_name="result.html",
+            mime="text/html",
+        )
+        components.html(graph_visualization_file, height=600, scrolling=True)

py_code_analyzer/code_fetcher.py

@@ -7,7 +7,7 @@ import requests
 
 # to increase api rate limiting
 # https://docs.github.com/en/rest/overview/resources-in-the-rest-api#rate-limiting
-USER = os.environ.get("PERSONAL_ACCESS_TOKEN", "")
+USER = os.environ.get("USER", "")
 PERSONAL_ACCESS_TOKEN = os.environ.get("PERSONAL_ACCESS_TOKEN", "")
 
 
@@ -32,18 +32,21 @@ class CodeFetcher:
             api_url += f"?ref={ref}"
 
         python_files = []
-        api_results = requests.get(api_url).json()
+        api_results = requests.get(
+            api_url, headers={"Accept": "application/vnd.github.v3+json"}
+        ).json()
 
         for result in api_results:
-            if result["type"] == "file" and result["name"].endswith(".py"):
-                python_files.append(result)
-            elif (
-                recursive
-                and result["type"] == "dir"
-                and not result["name"].startswith(".")
-            ):
-                python_files += cls.get_python_files(
-                    owner, repo, path=result["path"], recursive=recursive
-                )
+            if type(result) is dict:
+                if result["type"] == "file" and result["name"].endswith(".py"):
+                    python_files.append(result)
+                elif (
+                    recursive
+                    and result["type"] == "dir"
+                    and not result["name"].startswith(".")
+                ):
+                    python_files += cls.get_python_files(
+                        owner, repo, path=result["path"], recursive=recursive
+                    )
 
         return python_files

py_code_analyzer/imports_graph_visualizer.py

@@ -1,3 +1,5 @@
+"""This file generates a pyvis graph locally given a networkx graph
+"""
 import networkx as nx
 
 from pyvis import Network

pyvis/pyvis/templates/template.html

@@ -346,6 +346,7 @@
         nodeColors = {};
           allNodes = nodes.get({ returnType: "Object" });
           for (var nodeId in allNodes) {
+            console.log(allNodes[nodeId].color);
             nodeColors[nodeId] = allNodes[nodeId].color;
           }