# Manifold API Python interface
-import xmlrpclib
+import copy, xmlrpclib
from myslice.config import Config
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
+ config = Config()
+ self.url = config.manifold_url()
self.server = xmlrpclib.Server(self.url, verbose=False, allow_none=True)
def __repr__ (self): return "ManifoldAPI[%s]"%self.url
+ def _print_value (self, value):
+ print "+++",'value',
+ if isinstance (value,list): print "[%d]"%len(value),
+ elif isinstance (value,dict): print "{%d}"%len(value),
+ print mytruncate (value,80)
+
# a one-liner to give a hint of what the return value looks like
def _print_result (self, result):
if not result: print "[no/empty result]"
print "result is a dict with %d keys : %s"%(len(result),result.keys())
for (k,v) in result.iteritems():
if v is None: continue
- print '+++',k,':',mytruncate (v,60)
+ if k=='value': self._print_value(v)
+ else: print '+++',k,':',mytruncate (v,30)
else: print "[dont know how to display result] %s"%result
# xxx temporary code for scaffolding a ManifolResult on top of an API that does not expose error info
# 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
try:
if debug:
- print "====> ManifoldAPI.%s"%methodName,"auth",self.auth,"args",args,"kwds",kwds
- result=getattr(self.server, methodName)(self.auth, *args, **kwds)
+ print "====> 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
+ annotations = {
+ 'authentication': self.auth
+ }
+ args += (annotations,)
+ result=getattr(self.server, methodName)(*args, **kwds)
+ print "%s%r" %(methodName, args)
+
if debug:
- print '<==== backend call %s(*%s,**%s) returned'%(methodName,args,kwds),
- print '.ctd. Authmethod=',self.auth['AuthMethod'], self.url,'->',
+ print '<= result=',
self._print_result(result)
- print '===== ManifoldAPI call done'
+ print '<==== backend call %s returned'%(repr()),
return ResultValue(**result)
except Exception,error:
+ print "** MANIFOLD API ERROR **"
+ 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 "** MANIFOLD API ERROR **"
- print "====> ERROR On ManifoldAPI.%s"%methodName,"auth",self.auth,"args",args,"kwds",kwds
- import traceback
- traceback.print_exc()
- if debug: print "KO (unexpected exception)",error
- raise ManifoldException ( ManifoldResult (code=ManifoldCode.UNKNOWN_ERROR, output="%s"%error) )
+ print "<==== ERROR On ManifoldAPI.%s"%repr()
+ raise ManifoldException ( ManifoldResult (code=ManifoldCode.SERVER_UNREACHABLE, output="%s"%error) )
return func
-def execute_query(request, query):
- if not 'manifold' in request.session or not 'auth' in request.session['manifold']:
- print "W: Using hardcoded demo account for execute_query"
- manifold_api_session_auth = {'AuthMethod': 'password', 'Username': 'demo', 'AuthString': 'demo'}
- else:
- manifold_api_session_auth = request.session['manifold']['auth']
+def _execute_query(request, query, manifold_api_session_auth):
manifold_api = ManifoldAPI(auth=manifold_api_session_auth)
print "-"*80
print query
result = manifold_api.forward(query.to_dict())
if result['code'] == 2:
raise Exception, 'Error running query: %r' % result
+
+ if result['code'] == 1:
+ print "WARNING"
+ print result['description']
# XXX Handle errors
#Error running query: {'origin': [0, 'XMLRPCAPI'], 'code': 2, 'description': 'No such session: No row was found for one()', 'traceback': 'Traceback (most recent call last):\n File "/usr/local/lib/python2.7/dist-packages/manifold/core/xmlrpc_api.py", line 68, in xmlrpc_forward\n user = Auth(auth).check()\n File "/usr/local/lib/python2.7/dist-packages/manifold/auth/__init__.py", line 245, in check\n return self.auth_method.check()\n File "/usr/local/lib/python2.7/dist-packages/manifold/auth/__init__.py", line 95, in check\n raise AuthenticationFailure, "No such session: %s" % e\nAuthenticationFailure: No such session: No row was found for one()\n', 'type': 2, 'ts': None, 'value': None}
-
return result['value']
+
+def execute_query(request, query):
+ if not 'manifold' in request.session or not 'auth' in request.session['manifold']:
+ 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_auth = {'AuthMethod': 'password', 'Username': admin_user, 'AuthString': admin_password}
+ return _execute_query(request, query, admin_auth)
git://git.onelab.eu / myslice.git / blobdiff