import os
import re
import types
-import hashlib
import apiclient
-import apiclient.discovery
+from apiclient import discovery as apiclient_discovery
+from apiclient import errors as apiclient_errors
import config
import errors
import util
-services = {}
+_logger = logging.getLogger('arvados.api')
class CredentialsFromToken(object):
def __init__(self, api_token):
# Monkey patch discovery._cast() so objects and arrays get serialized
# with json.dumps() instead of str().
-_cast_orig = apiclient.discovery._cast
+_cast_orig = apiclient_discovery._cast
def _cast_objects_too(value, schema_type):
global _cast_orig
if (type(value) != type('') and
return json.dumps(value)
else:
return _cast_orig(value, schema_type)
-apiclient.discovery._cast = _cast_objects_too
+apiclient_discovery._cast = _cast_objects_too
+
+# Convert apiclient's HttpErrors into our own API error subclass for better
+# error reporting.
+# Reassigning apiclient_errors.HttpError is not sufficient because most of the
+# apiclient submodules import the class into their own namespace.
+def _new_http_error(cls, *args, **kwargs):
+ return super(apiclient_errors.HttpError, cls).__new__(
+ errors.ApiError, *args, **kwargs)
+apiclient_errors.HttpError.__new__ = staticmethod(_new_http_error)
def http_cache(data_type):
path = os.environ['HOME'] + '/.cache/arvados/' + data_type
path = None
return path
-def api(version=None, cache=True, host=None, token=None, insecure=False):
- global services
+def api(version=None, cache=True, host=None, token=None, insecure=False, **kwargs):
+ """Return an apiclient Resources object for an Arvados instance.
+
+ Arguments:
+ * version: A string naming the version of the Arvados API to use (for
+ example, 'v1').
+ * cache: Use a cache (~/.cache/arvados/discovery) for the discovery
+ document.
+ * host: The Arvados API server host (and optional :port) to connect to.
+ * token: The authentication token to send with each API call.
+ * insecure: If True, ignore SSL certificate validation errors.
+
+ Additional keyword arguments will be passed directly to
+ `apiclient_discovery.build` if a new Resource object is created.
+ If the `discoveryServiceUrl` or `http` keyword arguments are
+ missing, this function will set default values for them, based on
+ the current Arvados configuration settings.
- if 'ARVADOS_DEBUG' in config.settings():
- logging.basicConfig(level=logging.DEBUG)
+ """
if not version:
version = 'v1'
- logging.info("Using default API version. " +
+ _logger.info("Using default API version. " +
"Call arvados.api('%s') instead." %
version)
- if host and token:
- # Provided by caller
+ if 'discoveryServiceUrl' in kwargs:
+ if host:
+ raise ValueError("both discoveryServiceUrl and host provided")
+ # Here we can't use a token from environment, config file,
+ # etc. Those probably have nothing to do with the host
+ # provided by the caller.
+ if not token:
+ raise ValueError("discoveryServiceUrl provided, but token missing")
+ elif host and token:
pass
elif not host and not token:
# Load from user configuration or environment
for x in ['ARVADOS_API_HOST', 'ARVADOS_API_TOKEN']:
if x not in config.settings():
- raise Exception("%s is not set. Aborting." % x)
+ raise ValueError("%s is not set. Aborting." % x)
host = config.get('ARVADOS_API_HOST')
token = config.get('ARVADOS_API_TOKEN')
- apiinsecure = re.match(r'(?i)^(true|1|yes)$',
- config.get('ARVADOS_API_HOST_INSECURE', 'no'))
+ insecure = config.flag_is_true('ARVADOS_API_HOST_INSECURE')
else:
# Caller provided one but not the other
if not host:
- raise Exception("token argument provided, but host missing.")
+ raise ValueError("token argument provided, but host missing.")
else:
- raise Exception("host argument provided, but token missing.")
-
- connprofile = hashlib.sha1(' '.join([
- version, host, token, ('y' if apiinsecure else 'n')
- ])).hexdigest()
-
- if not cache or not services.get(connprofile):
- url = 'https://%s/discovery/v1/apis/{api}/{apiVersion}/rest' % host
- credentials = CredentialsFromToken(api_token=token)
-
- # Use system's CA certificates (if we find them) instead of httplib2's
- ca_certs = '/etc/ssl/certs/ca-certificates.crt'
- if not os.path.exists(ca_certs):
- ca_certs = None # use httplib2 default
-
- http = httplib2.Http(ca_certs=ca_certs,
- cache=(http_cache('discovery') if cache else None))
- http = credentials.authorize(http)
- if apiinsecure:
- http.disable_ssl_certificate_validation = True
- services[connprofile] = apiclient.discovery.build(
- 'arvados', version, http=http, discoveryServiceUrl=url)
- http.cache = None
-
- return services[connprofile]
+ raise ValueError("host argument provided, but token missing.")
+
+ if host:
+ # Caller wants us to build the discoveryServiceUrl
+ kwargs['discoveryServiceUrl'] = (
+ 'https://%s/discovery/v1/apis/{api}/{apiVersion}/rest' % (host,))
+
+ if 'http' not in kwargs:
+ http_kwargs = {}
+ # Prefer system's CA certificates (if available) over httplib2's.
+ certs_path = '/etc/ssl/certs/ca-certificates.crt'
+ if os.path.exists(certs_path):
+ http_kwargs['ca_certs'] = certs_path
+ if cache:
+ http_kwargs['cache'] = http_cache('discovery')
+ if insecure:
+ http_kwargs['disable_ssl_certificate_validation'] = True
+ kwargs['http'] = httplib2.Http(**http_kwargs)
+
+ credentials = CredentialsFromToken(api_token=token)
+ kwargs['http'] = credentials.authorize(kwargs['http'])
+
+ svc = apiclient_discovery.build('arvados', version, **kwargs)
+ svc.api_token = token
+ kwargs['http'].cache = None
+ return svc
projects / arvados.git / blobdiff