X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=manifold%2Fmanifoldproxy.py;h=05486cbaea8a1ffa182870e48cdfa3dbc538eca6;hb=2c2f185061cdd4de59c4181500f11c2ba4b250c6;hp=c444a37990c7ce30508746597fa3d63898c51462;hpb=ec4be8cfef3ed6b3dc1742a95efd014da8f01893;p=myslice.git

diff --git a/manifold/manifoldproxy.py b/manifold/manifoldproxy.py
index c444a379..05486cba 100644
--- a/manifold/manifoldproxy.py
+++ b/manifold/manifoldproxy.py
@@ -1,10 +1,17 @@
 import json
+import os.path
+
 # this is for django objects only
 #from django.core import serializers
-from django.http import HttpResponse, HttpResponseForbidden
+from django.http                import HttpResponse, HttpResponseForbidden
 
-from manifold.manifoldquery import ManifoldQuery
-from manifold.manifoldapi import ManifoldAPI, SessionExpired
+#from manifold.manifoldquery import ManifoldQuery
+from manifold.core.query        import Query
+from manifold.core.result_value import ResultValue
+from manifold.manifoldapi       import ManifoldAPI
+from manifold.manifoldresult    import ManifoldException
+from manifold.util.log          import Log
+from myslice.config             import Config
 
 debug=False
 debug=True
@@ -13,7 +20,15 @@ debug=True
 debug_spin=0
 #debug_spin=1
 
-# turn this on if you want the fastest possible (locally cached) feedback
+# pretend the server only returns - empty lists to 'get' requests - this is to mimick 
+# misconfigurations or expired credentials or similar corner case situations
+debug_empty=False
+#debug_empty=True
+
+# Historically we had a feature for developing without an Internet connection
+# However this won't work anymore as the python layer itself does manifold calls
+# before javascript has a chance to do so.
+# Might still come in handy if you want the fastest possible (locally cached) feedback
 # beware that this is very rough though...
 work_offline=False
 #work_offline=True
@@ -36,16 +51,29 @@ with the query passed using POST"""
     # format_in : how is the query encoded in POST
     # format_out: how to serve the results
     if format != 'json':
-        print "manifoldproxy.api: unexpected format %s -- exiting"%format
+        print "manifoldproxy.proxy: unexpected format %s -- exiting"%format
         return
     try:
         # translate incoming POST request into a query object
         if debug: print 'manifoldproxy.proxy: request.POST',request.POST
-        manifold_query = ManifoldQuery()
+        manifold_query = Query()
+        #manifold_query = ManifoldQuery()
         manifold_query.fill_from_POST(request.POST)
-        offline_filename="offline-%s-%s.json"%(manifold_query.action,manifold_query.subject)
+        offline_filename="%s/../offline-%s-%s.json"%(os.path.dirname(__file__),manifold_query.action,manifold_query.object)
         # retrieve session for request
-        manifold_api_session_auth = request.session['manifold']['auth']
+
+        # We allow some requests to use the ADMIN user account
+        if (manifold_query.get_from() == 'local:user' and manifold_query.get_action() == 'create') \
+                or (manifold_query.get_from() == 'local:platform' and manifold_query.get_action() == 'get'):
+            admin_user, admin_password = Config().manifold_admin_user_password()
+            manifold_api_session_auth = {'AuthMethod': 'password', 'Username': admin_user, 'AuthString': admin_password}
+        else:
+            manifold_api_session_auth = request.session['manifold']['auth']
+
+        if debug_empty and manifold_query.action.lower()=='get':
+            json_answer=json.dumps({'code':0,'value':[]})
+            print "By-passing : debug_empty & 'get' request : returning a fake empty list"
+            return HttpResponse (json_answer, mimetype="application/json")
         ### patch : return the latest one..
         if work_offline:
             # if that won't work then we'll try to update anyways
@@ -57,30 +85,38 @@ with the query passed using POST"""
             except:
                 import traceback
                 traceback.print_exc()
-                print "PROCEEDING"
+                print "Could not run in offline mode, PROCEEDING"
                 pass
                 
         # actually forward
         manifold_api= ManifoldAPI(auth=manifold_api_session_auth)
-        if debug: print 'manifoldproxy.proxy: sending to backend', manifold_query
-        # xxx we should embed the values inside a geni-like wrapper
-        try:
-            answer=manifold_api.send_manifold_query (manifold_query)
-            if debug: 
-                try:        print "received answer from backend with %d rows"%len(answer)
-                except:     print "received answer from backend - can't say len"
-        except SessionExpired,error:
-            answer=[ error.message ] 
-        json_answer=json.dumps(answer)
-        if (debug):
+        if debug: print '===> manifoldproxy.proxy: sending to backend', manifold_query
+        # for the benefit of the python code, manifoldAPI raises an exception if something is wrong
+        # however in this case we want to propagate the complete manifold result to the js world
+
+        result = manifold_api.forward(manifold_query.to_dict())
+
+        # XXX TEMP HACK
+        if 'description' in result and result['description'] \
+                and isinstance(result['description'], (tuple, list, set, frozenset)):
+            result [ 'description' ] = [ ResultValue.to_html (x) for x in result['description'] ]
+
+        json_answer=json.dumps(result)
+        # if in debug mode we save this so we can use offline mode later
+        if debug:
             with (file(offline_filename,"w")) as f:
                 f.write(json_answer)
-        if debug_spin:
+
+        # this is an artificial delay added for debugging purposes only
+        if debug_spin>0:
+            print "Adding additional artificial delay",debug_spin
             import time
             time.sleep(debug_spin)
+
         return HttpResponse (json_answer, mimetype="application/json")
 
-    except:
+    except Exception,e:
+        print "** PROXY ERROR **",e
         import traceback
         traceback.print_exc()