summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorLV-426 <lv-426@taproot.org.il>2015-05-23 17:18:36 +0300
committerAlon Levy <alon@pobox.com>2015-07-06 12:33:52 +0300
commit79db3a33ad1fd5e91eeb9e9a8f06be11c5886e61 (patch)
treeb339848903af04944c97d172f5f42417937f9876 /src
parentba7f391b7a6fee01cd72df39a2beeffc971d6b65 (diff)
rz_api_rest: reorder
Diffstat (limited to 'src')
-rw-r--r--src/server/rz_api_rest.py96
1 files changed, 48 insertions, 48 deletions
diff --git a/src/server/rz_api_rest.py b/src/server/rz_api_rest.py
index 81d92f19..09497198 100644
--- a/src/server/rz_api_rest.py
+++ b/src/server/rz_api_rest.py
@@ -103,6 +103,54 @@ def diff_commit__set():
assert False
+@common_rest_req_exception_handler
+def diff_commit__topo():
+ """
+ REST API wrapper around diff_commit__topo():
+ - extract topo_diff from request
+ - handle success/error outcomes
+ """
+ def sanitize_input(req):
+ rzdoc_name = request.get_json().get('rzdoc_name')
+ topo_diff_dict = request.get_json()['topo_diff']
+ topo_diff = Topo_Diff.from_json_dict(topo_diff_dict)
+
+ sanitize_input__topo_diff(topo_diff)
+ return rzdoc_name, topo_diff
+
+ rzdoc_name, topo_diff = sanitize_input(request)
+ if topo_diff.is_empty():
+ return common_resp_handle__client_error()
+
+ ctx = __context__common(rzdoc_name)
+ kernel = flask.current_app.kernel
+ _, commit_ret = kernel.diff_commit__topo(topo_diff, ctx)
+ return common_resp_handle__success(data=commit_ret)
+
+@common_rest_req_exception_handler
+def diff_commit__attr():
+ """
+ commit a graph attribute diff
+ """
+ def sanitize_input(req):
+ rzdoc_name = request.get_json().get('rzdoc_name')
+ attr_diff_dict = request.get_json()['attr_diff']
+ attr_diff = Attr_Diff.from_json_dict(attr_diff_dict)
+
+ sanitize_input__attr_diff(attr_diff)
+
+ return rzdoc_name, attr_diff;
+
+ rzdoc_name, attr_diff = sanitize_input(request)
+ validate_obj__attr_diff(attr_diff)
+ ctx = __context__common(rzdoc_name)
+ kernel = flask.current_app.kernel
+ _, commit_ret = kernel.diff_commit__attr(attr_diff, ctx)
+ return common_resp_handle__success(data=commit_ret)
+
+def diff_commit__vis():
+ pass
+
def load_link_set_by_link_ptr_set():
def deserialize_param_set(param_json):
@@ -155,54 +203,6 @@ def match_node_set_by_attr_filter_map(attr_filter_map):
assert False
-@common_rest_req_exception_handler
-def diff_commit__topo():
- """
- REST API wrapper around diff_commit__topo():
- - extract topo_diff from request
- - handle success/error outcomes
- """
- def sanitize_input(req):
- rzdoc_name = request.get_json().get('rzdoc_name')
- topo_diff_dict = request.get_json()['topo_diff']
- topo_diff = Topo_Diff.from_json_dict(topo_diff_dict)
-
- sanitize_input__topo_diff(topo_diff)
- return rzdoc_name, topo_diff
-
- rzdoc_name, topo_diff = sanitize_input(request)
- if topo_diff.is_empty():
- return common_resp_handle__client_error()
-
- ctx = __context__common(rzdoc_name)
- kernel = flask.current_app.kernel
- _, commit_ret = kernel.diff_commit__topo(topo_diff, ctx)
- return common_resp_handle__success(data=commit_ret)
-
-@common_rest_req_exception_handler
-def diff_commit__attr():
- """
- commit a graph attribute diff
- """
- def sanitize_input(req):
- rzdoc_name = request.get_json().get('rzdoc_name')
- attr_diff_dict = request.get_json()['attr_diff']
- attr_diff = Attr_Diff.from_json_dict(attr_diff_dict)
-
- sanitize_input__attr_diff(attr_diff)
-
- return rzdoc_name, attr_diff;
-
- rzdoc_name, attr_diff = sanitize_input(request)
- validate_obj__attr_diff(attr_diff)
- ctx = __context__common(rzdoc_name)
- kernel = flask.current_app.kernel
- _, commit_ret = kernel.diff_commit__attr(attr_diff, ctx)
- return common_resp_handle__success(data=commit_ret)
-
-def diff_commit__vis():
- pass
-
def rzdoc__via_rz_url(rzdoc_name=None):
return rz_mainpage(rzdoc_name)