added basic app cli

rumbc · rumbc · commit 27b8f8621ae0 · 2020-11-05T10:14:44.000+01:00
diff --git a/neographviz/app.py b/neographviz/app.py
@@ -1,6 +1,7 @@
 import sys
+import argparse
 
-from flask import Flask
+from flask import Flask, request
 
 from neographviz import Graph, plot
 
@@ -10,20 +11,22 @@
 @app.route("/")
 def index():
     "Main graph page"
-    out = plot(graph, template_file="vis.html", app=True)
+    query = request.args.get('query', 'match p= ()--() return p limit 25')
+    out = plot(graph, query=query, template_file="vis.html", app=True)
     return out
 
 
 if __name__ == "__main__":
-    options = sys.argv
-    if len(options)==1:
-        graph_host, debug = '', True
-    elif len(options)==2:
-        graph_host, debug = options[1], True
-    elif len(options)==3:
-        _, graph_host, debug = options
-    graph = Graph(graph_host)
-    if bool(debug):
+    parser = argparse.ArgumentParser(description='Launch a graph visalisation app.')
+    parser.add_argument('--debug', type=bool, default='True',
+                    help='Flag for debugging')
+    parser.add_argument('--host', default='', type=str,
+                    help='Path to the graph DB, defaults to localhost')
+    parser.add_argument('--port', default=5000, type=int,
+                help='POrt on which to serve the app')
+    options = parser.parse_args()
+    graph = Graph(options.host)
+    if options.debug:
         app.run(debug=True, port=5000)
     else:
         import waitress
diff --git a/neographviz/templates/index.html b/neographviz/templates/index.html
@@ -47,13 +47,14 @@
 </head>
 
 <body>
-
   {% if app %}
+  <form target="/" method="GET">
+    <input type="text" name="query" sie="100">
+    <input type="submit" name="submit">
+  </form>
+  {% endif %}
 
-    {% block interaction %}{% endblock %}
 
-  {% endif %}
-  
   {% block vis %}{% endblock %}
 </body>
 
diff --git a/neographviz/templates/vis.html b/neographviz/templates/vis.html
@@ -1,7 +1,8 @@
 {% extends "index.html" %}
+{% block vis %}
 
+{% block interaction %}{% endblock %}
 
-{% block vis %}
 {% if nodes %}
 
 <div id="main">
diff --git a/neographviz/vis.py b/neographviz/vis.py
@@ -147,6 +147,7 @@ def vis_network(
             physics=physics,
             node_size=node_size,
             font_size=font_size,
+            app=app
         )
 
 

Original file line number	Diff line number	Diff line change
`@@ -147,6 +147,7 @@ def vis_network(`
`147`	`147`	`physics=physics,`
`148`	`148`	`node_size=node_size,`
`149`	`149`	`font_size=font_size,`
	`150`	`+ app=app`
`150`	`151`	`)`
`151`	`152`
`152`	`153`