X-Git-Url: https://git.arvados.org/arvados.git/blobdiff_plain/497ea8e6fd12ce91cad108af78df5e3802a79d69..622a60e878900b94d71555d72bced70660f065bf:/apps/workbench/app/models/arvados_api_client.rb diff --git a/apps/workbench/app/models/arvados_api_client.rb b/apps/workbench/app/models/arvados_api_client.rb index 25c54d1e9c..ca09aa719d 100644 --- a/apps/workbench/app/models/arvados_api_client.rb +++ b/apps/workbench/app/models/arvados_api_client.rb @@ -2,13 +2,61 @@ require 'httpclient' require 'thread' class ArvadosApiClient - class NotLoggedInException < StandardError + class ApiError < StandardError + attr_reader :api_response, :api_response_s, :api_status, :request_url + + def initialize(request_url, errmsg) + @request_url = request_url + @api_response ||= {} + errors = @api_response[:errors] + if not errors.is_a?(Array) + @api_response[:errors] = [errors || errmsg] + end + super(errmsg) + end end - class InvalidApiResponseException < StandardError + + class NoApiResponseException < ApiError + def initialize(request_url, exception) + @api_response_s = exception.to_s + super(request_url, + "#{exception.class.to_s} error connecting to API server") + end + end + + class InvalidApiResponseException < ApiError + def initialize(request_url, api_response) + @api_status = api_response.status_code + @api_response_s = api_response.content + super(request_url, "Unparseable response from API server") + end end - class AccessForbiddenException < StandardError + + class ApiErrorResponseException < ApiError + def initialize(request_url, api_response) + @api_status = api_response.status_code + @api_response_s = api_response.content + @api_response = Oj.load(@api_response_s, :symbol_keys => true) + errors = @api_response[:errors] + if errors.respond_to?(:join) + errors = errors.join("\n\n") + else + errors = errors.to_s + end + super(request_url, "#{errors} [API: #{@api_status}]") + end end + class AccessForbiddenException < ApiErrorResponseException; end + class NotFoundException < ApiErrorResponseException; end + class NotLoggedInException < ApiErrorResponseException; end + + ERROR_CODE_CLASSES = { + 401 => NotLoggedInException, + 403 => AccessForbiddenException, + 404 => NotFoundException, + } + @@profiling_enabled = Rails.configuration.profiling_enabled @@discovery = nil @@ -30,7 +78,8 @@ class ArvadosApiClient @client_mtx = Mutex.new end - def api(resources_kind, action, data=nil) + def api(resources_kind, action, data=nil, tokens={}) + profile_checkpoint if not @api_client @@ -42,6 +91,9 @@ class ArvadosApiClient # Use system CA certificates @api_client.ssl_config.add_trust_ca('/etc/ssl/certs') end + if Rails.configuration.api_response_compression + @api_client.transparent_gzip_decompression = true + end end end @@ -52,8 +104,13 @@ class ArvadosApiClient url.sub! '/arvados/v1/../../', '/' query = { - 'api_token' => Thread.current[:arvados_api_token] || '', - 'reader_tokens' => (Thread.current[:reader_tokens] || []).to_json, + 'api_token' => (tokens[:arvados_api_token] || + Thread.current[:arvados_api_token] || + ''), + 'reader_tokens' => ((tokens[:reader_tokens] || + Thread.current[:reader_tokens] || + []) + + [Rails.configuration.anonymous_user_token]).to_json, } if !data.nil? data.each do |k,v| @@ -70,43 +127,43 @@ class ArvadosApiClient else query["_method"] = "GET" end + if @@profiling_enabled query["_profile"] = "true" end header = {"Accept" => "application/json"} - profile_checkpoint { "Prepare request #{url} #{query[:uuid]} #{query[:where]} #{query[:filters]}" } + profile_checkpoint { "Prepare request #{query["_method"] or "POST"} #{url} #{query[:uuid]} #{query.inspect[0,256]}" } msg = @client_mtx.synchronize do - @api_client.post(url, - query, - header: header) + begin + @api_client.post(url, query, header: header) + rescue => exception + raise NoApiResponseException.new(url, exception) + end end profile_checkpoint 'API transaction' - - if msg.status_code == 401 - raise NotLoggedInException.new + if @@profiling_enabled + if msg.headers['X-Runtime'] + Rails.logger.info "API server: #{msg.headers['X-Runtime']} runtime reported" + end + Rails.logger.info "Content-Encoding #{msg.headers['Content-Encoding'].inspect}, Content-Length #{msg.headers['Content-Length'].inspect}, actual content size #{msg.content.size}" end - json = msg.content - begin - resp = Oj.load(json, :symbol_keys => true) + resp = Oj.load(msg.content, :symbol_keys => true) rescue Oj::ParseError - raise InvalidApiResponseException.new json + resp = nil end + if not resp.is_a? Hash - raise InvalidApiResponseException.new json - end - if msg.status_code != 200 - errors = resp[:errors] - errors = errors.join("\n\n") if errors.is_a? Array - if msg.status_code == 403 - raise AccessForbiddenException.new "#{errors} [API: #{msg.status_code}]" - else - raise "#{errors} [API: #{msg.status_code}]" - end + raise InvalidApiResponseException.new(url, msg) + elsif msg.status_code != 200 + error_class = ERROR_CODE_CLASSES.fetch(msg.status_code, + ApiErrorResponseException) + raise error_class.new(url, msg) end + if resp[:_profile] Rails.logger.info "API client: " \ "#{resp.delete(:_profile)[:request_time]} request_time" @@ -172,6 +229,7 @@ class ArvadosApiClient CGI.escape(k.to_s) + '=' + CGI.escape(v.to_s) }.join('&') end + uri end def arvados_logout_url(params={})