Add from_json, a buncha server/client stuff

abp/clifford.py

@@ -9,7 +9,7 @@ from functools import reduce
 import itertools as it
 import numpy as np
 from tqdm import tqdm
-import argparse
+#import argparse
 
 import qi
 
@@ -122,27 +122,28 @@ def get_cz_table(unitaries):
 
 # First try to load tables from cache. If that fails, build them from
 # scratch and store in /tmp/
-os.chdir(tempfile.gettempdir())
+tempdir = tempfile.gettempdir()
+temp = lambda filename: os.path.join(tempdir, filename)
 try:
     if __name__ == "__main__":
         raise IOError
 
     # Parse command line args
-    parser = argparse.ArgumentParser()
-    parser.add_argument("-l", "--legacy", help="Use legacy CZ table", action="store_true", default=False)
-    args = parser.parse_args()
-    legacy_cz = args.legacy
-
-    unitaries = np.load("unitaries.npy")
-    conjugation_table = np.load("conjugation_table.npy")
-    times_table = np.load("times_table.npy")
+    #parser = argparse.ArgumentParser()
+    #parser.add_argument("-l", "--legacy", help="Use legacy CZ table", action="store_true", default=False)
+    #args = parser.parse_args()
+    legacy_cz = False
+
+    unitaries = np.load(temp("unitaries.npy"))
+    conjugation_table = np.load(temp("conjugation_table.npy"))
+    times_table = np.load(temp("times_table.npy"))
     if legacy_cz:
         import anders_cz
         cz_table = anders_cz.cz_table
     else:
-        cz_table = np.load("cz_table.npy")
+        cz_table = np.load(temp("cz_table.npy"))
 
-    with open("by_name.json") as f:
+    with open(temp("by_name.json")) as f:
         by_name = json.load(f)
 
 
@@ -156,10 +157,11 @@ except IOError:
     cz_table = get_cz_table(unitaries)
 
     # Write it all to disk
-    np.save("unitaries.npy", unitaries)
-    np.save("conjugation_table.npy", conjugation_table)
-    np.save("times_table.npy", times_table)
-    np.save("cz_table.npy", cz_table)
+    np.save(temp("unitaries.npy"), unitaries)
+    np.save(temp("conjugation_table.npy"), conjugation_table)
+    np.save(temp("times_table.npy"), times_table)
+    np.save(temp("cz_table.npy"), cz_table)
 
-    with open("by_name.json", "wb") as f:
+    with open(temp("by_name.json"), "wb") as f:
         json.dump(by_name, f)
+

abp/graphstate.py

@@ -159,7 +159,15 @@ class GraphState(object):
         """ Convert the graph to JSON form """
         meta = {key: value for key, value in self.meta.items()}
         edge = self.edgelist()
-        return json.dumps({"nodes": self.vops, "edges": edge, "meta": meta})
+        return {"nodes": self.vops, "edges": edge, "meta": meta}
+
+    def from_json(self, data):
+        """ Reconstruct from JSON """
+        self.__init__([])
+        self.vops = data["nodes"]
+        self.meta = data["meta"]
+        self.ngbh = {key: set() for key in self.vops}
+        self.add_edges(data["edges"])
 
     def to_networkx(self):
         """ Convert the graph to a networkx graph """
@@ -222,3 +230,6 @@ class GraphState(object):
             rows.append(s)
         return " \n".join(rows) + " \n"
 
+    def __eq__(self, other):
+        """ Check equality between graphs """
+        return self.ngbh == other.ngbh and self.vops == other.vops

examples/client.py

@@ -0,0 +1,8 @@
+import requests
+import abp, json
+
+s = requests.Session()
+output = json.loads(s.get("http://localhost:5000/state").content)
+print output
+state = json.loads(s.post("http://localhost:5000/state").content)
+

server/server.py

@@ -1,48 +1,27 @@
-import urlparse
-from BaseHTTPServer import BaseHTTPRequestHandler
-from SimpleHTTPServer import SimpleHTTPRequestHandler
-import SocketServer
-import sys, json, time, os
-from graphstate import GraphState
-import requests
+from flask import Flask, request, render_template, jsonify
+import abp
 
+graphstate = abp.GraphState()
+app = Flask(__name__)
 
-class VizHandler(SimpleHTTPRequestHandler):
+@app.route("/")
+def index():
+    return render_template("index.html")
 
-    """ Handles requests to the server """
+@app.route("/state")
+def state():
+    if request.method == "GET":
+        return jsonify(graphstate.to_json())
+    elif request.method == "POST":
+        graphstate.from_json(request.data)
+        return jsonify(graphstate.to_json())
 
-    def get_state(self):
-        """ Get the current graphstate state """
-        self.send_response(200)
-        self.send_header('Content-Type', 'application/json')
-        self.end_headers()
-        self.wfile.write(state.to_json())
+@app.route("/state")
+def state():
+    return jsonify(graphstate.to_json())
 
-    def do_GET(self, *args, **kwargs):
-        """ Someone belled the server """
-        parsed_path = urlparse.urlparse(self.path)
-        if parsed_path.path == "/state":
-            return self.get_state()
-        else:
-            return SimpleHTTPRequestHandler.do_GET(self, *args, **kwargs)
+if __name__ == "__main__":
+    app.debug = True
+    app.run(host="0.0.0.0")
 
 
-class Server(SocketServer.TCPServer):
-
-    """ Serves the good stuff """
-    allow_reuse_address = True
-
-    def __init__(self, port=8000):
-        self.port = port
-        self.state = None
-        SocketServer.TCPServer.__init__(self, ("127.0.0.1", self.port), VizHandler)
-        print "Serving on port {} (Press CTRL-C to quit)".format(self.port)
-        self.serve_forever()
-
-
-if __name__ == '__main__':
-    os.chdir(os.path.join(sys.path[0], "../static"))
-    server = Server()
-    server.shutdown()
-
-    requests.get("http://localhost:8000/state")

server/static/index.html → server/templates/index.html

@@ -9,16 +9,17 @@
 </head>
 
 <body>
-<script type="text/javascript" src="three.js"></script>
-<script type="text/javascript" src="libs.js"></script>
-<script type="text/javascript" src="materials.js"></script>
-<script type="text/javascript" src="poll.js"></script>
-<script type="text/javascript" src="grid.js"></script>
-<script type="text/javascript" src="curve.js"></script>
-<script type="text/javascript" src="main.js"></script>
+<script type="text/javascript" src="/static/three.js"></script>
+<script type="text/javascript" src="/static/libs.js"></script>
+<script type="text/javascript" src="/static/materials.js"></script>
+<script type="text/javascript" src="/static/poll.js"></script>
+<script type="text/javascript" src="/static/grid.js"></script>
+<script type="text/javascript" src="/static/curve.js"></script>
+<script type="text/javascript" src="/static/main.js"></script>
 <img id="ball" src="data:image/png;base64,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"/
  style=display:none;>
 
+<div id=test>Hello World</div>
 <div id=infoholder class=hidden>
 </div>
 </body>

tests/test_json.py

@@ -10,6 +10,9 @@ def test_json_basic():
     js = g.to_json()
     assert "edges" in js
     assert "nodes" in js
-    json.loads(js)
+    e = GraphState()
+    assert e != g
+    e.from_json(js)
+    assert e == g