diff --git a/README.md b/README.md index 2c87753..e113da0 100644 --- a/README.md +++ b/README.md @@ -8,8 +8,6 @@ Create a graph from the links on a website and the following sites. ### Pip Dependencies -- networkx -- pandas - pyvis You can install those dependencies with diff --git a/lib/graph.py b/lib/graph.py index 2c8c61e..34c76aa 100644 --- a/lib/graph.py +++ b/lib/graph.py @@ -1,13 +1,16 @@ -from networkx import from_pandas_edgelist -from pandas import DataFrame + from pyvis.network import Network -def pyvis_graph_from_pandas_DF(pandas_df:DataFrame, source_column:str="link1", target_column:str="link2", heading:str=None) -> Network: +from .linkmap import LinkMap + + +def pyvis_graph_from_linkmap(linkmap:LinkMap, heading:str=None) -> Network: - nx = from_pandas_edgelist(pandas_df, source=source_column, target=target_column) pyvis_net = Network(bgcolor="#222222", font_color="#fafafa", width="100%", height="95%", directed=True) - pyvis_net.from_nx(nx, default_node_size=8) + + pyvis_net.add_nodes(linkmap.links, size=[8]*len(linkmap.links)) + pyvis_net.add_edges(linkmap.link_connections) if heading != None: pyvis_net.heading = heading + """ diff --git a/lib/linkmap2pandasdf.py b/lib/linkmap2pandasdf.py deleted file mode 100644 index 8be8200..0000000 --- a/lib/linkmap2pandasdf.py +++ /dev/null @@ -1,21 +0,0 @@ - - -from pandas import DataFrame -from .linkmap import LinkMap - - -def linkmap2pandasDF(linkmap:LinkMap) -> DataFrame: - - data_connections = { - "link1": [], - "link2": [] - } - - for c in linkmap.link_connections: - link1, link2 = c - data_connections["link1"].append(link1) - data_connections["link2"].append(link2) - - df = DataFrame(data=data_connections) - - return df diff --git a/linkmapy.py b/linkmapy.py index 1bd520b..fb7617d 100755 --- a/linkmapy.py +++ b/linkmapy.py @@ -1,9 +1,8 @@ #!/usr/bin/env python3 from lib.args import argparser -from lib.graph import pyvis_graph_from_pandas_DF +from lib.graph import pyvis_graph_from_linkmap from lib.linkmap_from_sitelinks import LinkMapFromSitelinksGenerator -from lib.linkmap2pandasdf import linkmap2pandasDF if __name__ == "__main__": @@ -27,6 +26,5 @@ if __name__ == "__main__": else: - pandasDF = linkmap2pandasDF(nm.get_linkmap()) - pyvis_network_graph = pyvis_graph_from_pandas_DF(pandasDF, heading=starturl) + pyvis_network_graph = pyvis_graph_from_linkmap(nm.get_linkmap(), heading=starturl) pyvis_network_graph.show("output.html") diff --git a/pip-dependencies.txt b/pip-dependencies.txt index d6414ee..1d03319 100644 --- a/pip-dependencies.txt +++ b/pip-dependencies.txt @@ -1,3 +1 @@ -networkx -pandas pyvis \ No newline at end of file