# Manifold API Python interface
import copy, xmlrpclib
-from myslice.config import Config
+from myslice.configengine import ConfigEngine
from django.contrib import messages
from manifoldresult import ManifoldResult, ManifoldCode, ManifoldException
debug=False
debug=True
+debug_deep=False
+#debug_deep=True
+########## ugly stuff for hopefully nicer debug messages
def mytruncate (obj, l):
# we will add '..'
l1=l-2
repr="%s"%obj
return (repr[:l1]+'..') if len(repr)>l1 else repr
+from time import time, gmtime, strftime
+from math import trunc
+def mytime (start=None):
+ gm=gmtime()
+ t=time()
+ msg=strftime("%H:%M:%S-", gmtime())+"%03d"%((t-trunc(t))*1000)
+ if start is not None: msg += " (%03fs)"%(t-start)
+ return t,msg
+##########
+
class ManifoldAPI:
- def __init__(self, auth=None, cainfo=None):
+ def __init__ (self, auth=None, cainfo=None):
self.auth = auth
self.cainfo = cainfo
self.trace = []
self.calls = {}
self.multicall = False
- config = Config()
- self.url = config.manifold_url()
+ self.url = ConfigEngine().manifold_url()
self.server = xmlrpclib.Server(self.url, verbose=False, allow_none=True)
def __repr__ (self): return "ManifoldAPI[%s]"%self.url
else: print '+++',k,':',mytruncate (v,30)
else: print "[dont know how to display result] %s"%result
+ # how to display a call
+ def _repr_query (self,methodName, query):
+ try: action=query['action']
+ except: action="???"
+ try: subject=query['object']
+ except: subject="???"
+ # most of the time, we run 'forward'
+ if methodName=='forward': return "forward(%s(%s))"%(action,subject)
+ else: return "%s(%s)"%(action,subject)
+
# 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
# a SESSION_EXPIRED code
def __getattr__(self, methodName):
def func(*args, **kwds):
- # how to display a call
- def repr ():
- # most of the time, we run 'forward'
- if methodName=='forward':
- try: action="forward(%s)"%args[0]['action']
- except: action="forward(??)"
- else: action=methodName
- return action
+ # shorthand
+ def repr(): return self._repr_query (methodName, args[0])
try:
if debug:
- print "====> ManifoldAPI.%s"%repr(),"url",self.url
+ start,msg = mytime()
+ print "====>",msg,"ManifoldAPI.%s"%repr(),"url",self.url
# No password in the logs
logAuth = copy.copy(self.auth)
- if 'AuthString' in logAuth:
- logAuth['AuthString']="XXX"
- print "=> auth",logAuth
- print "=> args",args,"kwds",kwds
+ for obfuscate in ['Authring','session']:
+ if obfuscate in logAuth: logAuth[obfuscate]="XXX"
+ if debug_deep: print "=> auth",logAuth
+ if debug_deep: print "=> args",args,"kwds",kwds
annotations = {
'authentication': self.auth
}
if debug:
print '<= result=',
self._print_result(result)
- print '<==== backend call %s returned'%(repr()),
+ end,msg = mytime(start)
+ print "<====",msg,"backend call %s returned"%(repr())
return ResultValue(**result)
except Exception,error:
print "** MANIFOLD API ERROR **"
- if "Connection refused" in error:
- raise ManifoldException ( ManifoldResult (code=ManifoldCode.SERVER_UNREACHABLE,
- output="%s answered %s"%(self.url,error)))
- # otherwise
if debug:
print "===== xmlrpc catch-all exception:",error
import traceback
traceback.print_exc(limit=3)
+ if "Connection refused" in error:
+ raise ManifoldException ( ManifoldResult (code=ManifoldCode.SERVER_UNREACHABLE,
+ output="%s answered %s"%(self.url,error)))
+ # otherwise
print "<==== ERROR On ManifoldAPI.%s"%repr()
raise ManifoldException ( ManifoldResult (code=ManifoldCode.SERVER_UNREACHABLE, output="%s"%error) )
print "-"*80
result = manifold_api.forward(query.to_dict())
if result['code'] == 2:
- raise Exception, 'Error running query: %r' % result
+ # this is gross; at the very least we need to logout()
+ # but most importantly there is a need to refine that test, since
+ # code==2 does not necessarily mean an expired session
+ # XXX only if we know it is the issue
+ del request.session['manifold']
+ # Flush django session
+ request.session.flush()
+ #raise Exception, 'Error running query: %r' % result
if result['code'] == 1:
print "WARNING"
def execute_query(request, query):
if not 'manifold' in request.session or not 'auth' in request.session['manifold']:
+ request.session.flush()
raise Exception, "User not authenticated"
manifold_api_session_auth = request.session['manifold']['auth']
return _execute_query(request, query, manifold_api_session_auth)
def execute_admin_query(request, query):
- config = Config()
- admin_user, admin_password = config.manifold_admin_user_password()
+ admin_user, admin_password = ConfigEngine().manifold_admin_user_password()
admin_auth = {'AuthMethod': 'password', 'Username': admin_user, 'AuthString': admin_password}
return _execute_query(request, query, admin_auth)
git://git.onelab.eu / myslice.git / blobdiff