X-Git-Url: https://git.arvados.org/arvados.git/blobdiff_plain/04b8def3069732ac8038c39f1541cdc11cf265a0..62e3f155b14b30fde1323a367351c70b23f312b8:/sdk/python/arvados/api.py diff --git a/sdk/python/arvados/api.py b/sdk/python/arvados/api.py index cb716f1709..cf1c29be2d 100644 --- a/sdk/python/arvados/api.py +++ b/sdk/python/arvados/api.py @@ -6,14 +6,13 @@ import re import types import apiclient -import apiclient.discovery -import apiclient.errors +from apiclient import discovery as apiclient_discovery +from apiclient import errors as apiclient_errors import config import errors import util _logger = logging.getLogger('arvados.api') -conncache = {} class CredentialsFromToken(object): def __init__(self, api_token): @@ -47,7 +46,7 @@ class CredentialsFromToken(object): # 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 @@ -55,16 +54,16 @@ def _cast_objects_too(value, schema_type): 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 +# 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__( + return super(apiclient_errors.HttpError, cls).__new__( errors.ApiError, *args, **kwargs) -apiclient.errors.HttpError.__new__ = staticmethod(_new_http_error) +apiclient_errors.HttpError.__new__ = staticmethod(_new_http_error) def http_cache(data_type): path = os.environ['HOME'] + '/.cache/arvados/' + data_type @@ -80,17 +79,14 @@ def api(version=None, cache=True, host=None, token=None, insecure=False, **kwarg Arguments: * version: A string naming the version of the Arvados API to use (for example, 'v1'). - * cache: If True (default), return an existing Resources object if - one already exists with the same endpoint and credentials. If - False, create a new one, and do not keep it in the cache (i.e., - do not return it from subsequent api(cache=True) calls with - matching endpoint and credentials). + * 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. + `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. @@ -113,13 +109,7 @@ def api(version=None, cache=True, host=None, token=None, insecure=False, **kwarg 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 ValueError("%s is not set. Aborting." % x) - host = config.get('ARVADOS_API_HOST') - token = config.get('ARVADOS_API_TOKEN') - insecure = config.flag_is_true('ARVADOS_API_HOST_INSECURE') + return api_from_config(version=version, cache=cache, **kwargs) else: # Caller provided one but not the other if not host: @@ -132,12 +122,6 @@ def api(version=None, cache=True, host=None, token=None, insecure=False, **kwarg kwargs['discoveryServiceUrl'] = ( 'https://%s/discovery/v1/apis/{api}/{apiVersion}/rest' % (host,)) - if cache: - connprofile = (version, host, token, insecure) - svc = conncache.get(connprofile) - if svc: - return svc - if 'http' not in kwargs: http_kwargs = {} # Prefer system's CA certificates (if available) over httplib2's. @@ -153,9 +137,40 @@ def api(version=None, cache=True, host=None, token=None, insecure=False, **kwarg credentials = CredentialsFromToken(api_token=token) kwargs['http'] = credentials.authorize(kwargs['http']) - svc = apiclient.discovery.build('arvados', version, **kwargs) + svc = apiclient_discovery.build('arvados', version, **kwargs) svc.api_token = token kwargs['http'].cache = None - if cache: - conncache[connprofile] = svc return svc + +def api_from_config(version=None, apiconfig=None, **kwargs): + """Return an apiclient Resources object enabling access to an Arvados server + instance. + + :version: + A string naming the version of the Arvados REST API to use (for + example, 'v1'). + + :cache: + Use a cache (~/.cache/arvados/discovery) for the discovery + document. + + :apiconfig: + If provided, this should be a dict-like object (must support the get() + method) with entries for ARVADOS_API_HOST, ARVADOS_API_TOKEN, and + optionally ARVADOS_API_HOST_INSECURE. If not provided, use + arvados.config (which gets these parameters from the environment by + default.) + + """ + # Load from user configuration or environment + if apiconfig is None: + apiconfig = config.settings() + + for x in ['ARVADOS_API_HOST', 'ARVADOS_API_TOKEN']: + if x not in apiconfig: + raise ValueError("%s is not set. Aborting." % x) + host = apiconfig.get('ARVADOS_API_HOST') + token = apiconfig.get('ARVADOS_API_TOKEN') + insecure = config.flag_is_true('ARVADOS_API_HOST_INSECURE', apiconfig) + + return api(version=version, host=host, token=token, insecure=insecure, **kwargs)