1. 新增协议 custom-body ， 默认用户参数【Body以外】使用GET方式请求，body参数由用户自定义内容，通过Body请求。

刘一辰 · 刘一辰 · commit bfe41a6912ab · 2016-11-08T12:24:37.000+08:00
2.     服务下的各API的Action支持单独配置protocol，优先级最高，其次为Service的protocol，支持协议枚举与Service一致。

业务需求可通过针对特定Action配置custom-body协议支持，body内容对象由用户自行组织，如配置input shape，需定义body参数结构
diff --git a/kscore/client.py b/kscore/client.py
@@ -557,20 +557,13 @@ def _convert_to_request_dict(self, api_params, operation_model,
                 operation_name=operation_name),
             params=api_params, model=operation_model, context=context)
 
-        operation_protocol_serialize = None
-        if operation_model._operation_model.has_key('protocol'):
-            operation_protocol = operation_model._operation_model['protocol']
-            if operation_protocol is not None:
-                operation_protocol_serialize = kscore.serialize.create_serializer(
-                    operation_protocol, True)
-
-        if operation_protocol_serialize is not None:
-            request_dict = operation_protocol_serialize.serialize_to_request(
-                api_params, operation_model
-            )
-        else:
-            request_dict = self._serializer.serialize_to_request(
-                api_params, operation_model)
+        serializer = self._serializer
+
+        if operation_model.is_rewrite_protocol:
+
+            serializer = kscore.serialize.create_serializer(operation_model.protocol, True)
+
+        request_dict = serializer.serialize_to_request(api_params, operation_model)
 
         prepare_request_dict(request_dict, endpoint_url=self._endpoint.host,
                              user_agent=self._client_config.user_agent)
diff --git a/kscore/endpoint.py b/kscore/endpoint.py
@@ -195,15 +195,9 @@ def _get_response(self, request, operation_model, attempts):
                          exc_info=True)
             return (None, e)
         # This returns the http_response and the parsed_data.
-        response_dict = convert_to_response_dict(http_response,
-                                                 operation_model)
-
-        protocol = operation_model.metadata['protocol']
-        if operation_model._operation_model.has_key('protocol'):
-            operation_protocol = operation_model._operation_model['protocol']
-            if operation_protocol is not None:
-                protocol = operation_protocol
-        parser = self._response_parser_factory.create_parser(protocol)
+        response_dict = convert_to_response_dict(http_response, operation_model)
+        parser = self._response_parser_factory.create_parser(
+            operation_model.protocol)
 
         return ((http_response,
                  parser.parse(response_dict, operation_model.output_shape)),
diff --git a/kscore/model.py b/kscore/model.py
@@ -380,6 +380,17 @@ def wire_name(self):
         """
         return self._operation_model.get('name')
 
+    @property
+    def protocol(self):
+        """protocol from operation_model or service_model
+        """
+        return self._operation_model.get("protocol", self.metadata['protocol'])
+
+    @property
+    def is_rewrite_protocol(self):
+
+        return "protocol" in self._operation_model
+
     @property
     def service_model(self):
         return self._service_model
diff --git a/kscore/parsers.py b/kscore/parsers.py
@@ -590,7 +590,20 @@ def _do_parse(self, response, shape):
 
     def _do_error_parse(self, response, shape):
         body = self._parse_body_as_json(response['body'])
-        error = {"ResponseMetadata": {}, 'Error': body.get("Error", body.get("error", {}))}
+
+        if "Error" in body or "error" in body:
+            error = {"ResponseMetadata": {}, 'Error': body.get("Error", body.get("error", {}))}
+        else:
+            if "Code" in body or "code" in body:
+                code = body.get("Code", body.get("code"))
+            else:
+                code = response['status_code']
+            if "Message" in body or "message" in body:
+                message = body.get("Message", body.get("message"))
+            else:
+                message = str(body)
+            error = {"ResponseMetadata": {}, 'Error': {'Code': code, 'Message': message}}
+
         error['ResponseMetadata'].update(RequestId=body.get("RequestId"))
         return error
 
diff --git a/kscore/serialize.py b/kscore/serialize.py
@@ -348,15 +348,7 @@ def _serialize_data(self, serialized, data):
         return serialized
 
 
-class CustomBodySerializer(QuerySerializer):
-
-    @property
-    def headers(self):
-        return {"Accept": 'application/json'}
-
-    def _serialize_not_shape(self, data, parameters):
-
-        data.update(parameters)
+class CustomBodySerializer(QueryAcceptJsonSerializer):
 
     def serialize_to_request(self, parameters, operation_model):
         shape = operation_model.input_shape
@@ -372,21 +364,20 @@ def serialize_to_request(self, parameters, operation_model):
             }
         )
         body_params = self.MAP_TYPE()
+        custom_body = None
         if 'Body' in parameters:
-            body_params['Body'] = parameters['Body']
-            del parameters['Body']
-
+            custom_body = parameters.pop('Body')
         if shape is not None:
             self._serialize(body_params, parameters, shape)
         else:
             self._serialize_not_shape(body_params, parameters)
-        return self._serialize_data(serialized, body_params)
+        return self._serialize_data(serialized, body_params, custom_body)
 
-    def _serialize_data(self, serialized, data):
-        serialized['body'] = json.dumps(data).encode(self.DEFAULT_ENCODING)
-        if 'Body' in data:
-            del data['Body']
+    def _serialize_data(self, serialized, data, body=None):
+        if body is not None:
+            serialized['body'] = json.dumps(body).encode(self.DEFAULT_ENCODING)
         serialized['query_string'] = data
+        print serialized
         return serialized
 
 
@@ -397,6 +388,7 @@ class JSONSerializer(Serializer):
     TIMESTAMP_FORMAT = 'unixtimestamp'
 
     def serialize_to_request(self, parameters, operation_model):
+
         target = '%s.%s' % (operation_model.metadata['targetPrefix'],
                             operation_model.name)
         serialized = self._create_default_request()
