added new cdn and cleaned up

Author: icfly2

neographviz/__init__.py

@@ -1,9 +1,8 @@
 import py2neo
 
-version = py2neo.__version__[0]
-if int(version) == 4:
-    from .vis import *  # as graphviz
-elif int(version) == 3:
-    from .vis_old import *  # vis_old as graphviz
-elif int(version) < 3:
-    raise NotImplementedError(f"Not defined for py2neo version {version} ")
+__version__ = 0.3
+
+if py2neo.__version__[0] >= 4:
+    from .vis import plot_query, get_edges, get_nodes, draw  # as graphviz
+else:
+    raise NotImplementedError("Requires py2neo v4 or (possibly) newer")

neographviz/templates/vis.html

@@ -6,8 +6,9 @@
 
 <div id="main">
   <!-- from output.jsbin.com/pejohi -->
-  <script src="http://www.visjs.org/dist/vis.js"></script>
-  <link href="http://www.visjs.org/dist/vis.css" rel="stylesheet" type="text/css" />
+  <script src="https://cdnjs.cloudflare.com/ajax/libs/vis/4.21.0/vis-network.min.js"></script>
+  <link href="https://cdnjs.cloudflare.com/ajax/libs/vis/4.21.0/vis-network.min.css" rel="stylesheet" type="text/css" />
+
   <div class="graph" id="visualization1"></div>
 
 

neographviz/vis.py

@@ -186,7 +186,6 @@ def draw(
     cache = {}
     nodes = []
     edges = []
-
     for row in data:
         source_node = row[0]
         source_id = row[1]
@@ -198,7 +197,6 @@ def draw(
         if source_info not in nodes:
             nodes.append(source_info)
 
-        #  smooth: {type: 'curvedCW', roundness: 0.2}
         if rel is not None:
             target_info = get_vis_info(target_node, target_id, options)
 
@@ -208,18 +206,13 @@ def draw(
             label = "".join([f"{name} " for name in rel.types()]).strip()
             if len(rel.keys()):
                 # we have keys get the details
-                try:
-                    title = "".join(
-                        [f"{key}:{str(rel[key])} " for key in list(rel.keys())]
-                    ).strip()
-                except:
-                    breakpoint()
+                title = "".join(
+                    [f"{key}:{str(rel[key])} " for key in list(rel.keys())]
+                ).strip()
             else:
                 # there is nothing more to it
                 title = "".join([f"{name} " for name in rel.types()]).strip()
-            # try:
-            #     title = "".join([f"{name}:{value} " for name, value in rel.items()]).strip()
-            # except:
+            
             rdns, cache = roundness(source_info["id"], target_info["id"], cache)
             edges.append(
                 {