X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=manifold%2Fmanifoldapi.py;h=86471eab3d42bb822c3147a5bf62c381a43807f6;hb=fe88de0f7a2d45176733e22f49b5b5686dd5ec17;hp=e482c2dc3eff73f7394d2edd4f93264aa3c47c01;hpb=40978b1456a978c7ea8e61ab9f72f368c7b9d53d;p=myslice.git

diff --git a/manifold/manifoldapi.py b/manifold/manifoldapi.py
index e482c2dc..86471eab 100644
--- a/manifold/manifoldapi.py
+++ b/manifold/manifoldapi.py
@@ -3,41 +3,71 @@ import xmlrpclib
 
 from myslice.config import Config
 
+from manifoldresult import ManifoldResult, ManifoldCode
+
+debug=False
 debug=True
 
 class ManifoldAPI:
 
-  def __init__(self, auth=None, cainfo=None):
-
-    config = Config()
-    self.auth = auth
-    self.cainfo = cainfo
-    self.errors = []
-    self.trace = []
-    self.calls = {}
-    self.multicall = False
-    self.url = config.manifold_url
-    self.server = xmlrpclib.Server(self.url, verbose=False, allow_none=True)
-
-  def __getattr__(self, methodName):
-      def func(*args, **kwds):
-        result=getattr(self.server, methodName)(self.auth, *args, **kwds)
-        ### debug
-        if debug:
-          print '===> backend call',methodName, self.auth, self.url,'->',
-          if not result:                        print "no/empty result"
-          elif isinstance (result,str):         print "result is '%s'"%result
-          elif isinstance (result,list):        print "result is a %d-elts list"%len(result)
-          else:                                 print "dont know how to display result"
-        ###
-        return result
-      return func
-
-  def send_manifold_query (self, manifold_query):
-    (action,method)= (manifold_query.action,manifold_query.method)
-    if action=='get':
-      return self.server.Get(self.auth, method, manifold_query.filters, {}, manifold_query.fields)
-    # xxx...
-    else:
-      print "WARNING: ManifoldAPI.send_manifold_query: only 'get' implemented for now"
-    
+    def __init__(self, auth=None, cainfo=None):
+        
+        config = Config()
+        self.auth = auth
+        self.cainfo = cainfo
+        self.errors = []
+        self.trace = []
+        self.calls = {}
+        self.multicall = False
+        self.url = config.manifold_url
+        self.server = xmlrpclib.Server(self.url, verbose=False, allow_none=True)
+
+    def __repr__ (self): return "ManifoldAPI[%s]"%self.url
+
+    # xxx temporary code for scaffolding a ManifolResult on top of an API that does not expose error info
+    # as of march 2013 we work with an API that essentially either returns the value, or raises 
+    # an xmlrpclib.Fault exception with always the same 8002 code
+    # since most of the time we're getting this kind of issues for expired sessions
+    # (looks like sessions are rather short-lived), for now the choice is to map these errors on 
+    # a SESSION_EXPIRED code
+    def __getattr__(self, methodName):
+        def func(*args, **kwds):
+            if (debug): 
+                print "entering ManifoldAPI.%s"%methodName,
+                print "args",args,
+                print "kwds",kwds
+            try:
+                result=getattr(self.server, methodName)(self.auth, *args, **kwds)
+                if debug:
+                    print '===> backend call',methodName, self.auth, self.url,'->',
+                    if not result:                        print "[no/empty result]"
+                    elif isinstance (result,str):         print "result is '%s'"%result
+                    elif isinstance (result,list):        print "result is a %d-elts list"%len(result)
+                    else:                                 print "[dont know how to display result]"
+                return ManifoldResult (code=ManifoldCode.SUCCESS, value=result)
+            except xmlrpclib.Fault, error:
+                ### xxx this is very rough for now
+                # until we have some agreement about how the API calls should return error conditions
+                # in some less unpolite way than this anoanymous exception, we assume it's a problem with the session
+                # that needs to be refreshed
+                if debug: print "Session Expired"
+                if error.faultCode == 8002:
+                    reason="most likely your session has expired"
+                    reason += " (the manifold API has no unambiguous error reporting mechanism yet)"
+                    return ManifoldResult (code=ManifoldCode.SESSION_EXPIRED, output=reason)
+            except Exception,error:
+                print "ManifoldAPI: unexpected exception",error
+                return ManifoldResult (code=ManifoldResult.UNKNOWN_ERROR, output="%s"%error)
+        return func
+
+    def send_manifold_query (self, query):
+        (action,subject)= (query.action,query.subject)
+        if action=='get':
+            # use self.Get rather than self.server.Get so we catch exceptions as per __getattr__
+            return self.Get(subject, query.filters, query.timestamp, query.fields)
+        if action=='update':
+            return self.Update(subject, query.filters, query.params, query.fields)
+        else:
+            warning="WARNING: ManifoldAPI.send_manifold_query: %s not implemented for now"%action
+            print warning
+            return ManifoldResult(code=ManifoldCode.NOT_IMPLEMENTED, output=warning)