Move cloud event decode logic from preprocess to decode method (kubef…

…low#2881) * Move cloud event decode logic from preprocess to decode method Signed-off-by: Sivanantham Chinnaiyan <sivanantham.chinnaiyan@ideas2it.com> * Fix parameters argument default value Signed-off-by: Sivanantham Chinnaiyan <sivanantham.chinnaiyan@ideas2it.com> * Resolve comments Signed-off-by: Sivanantham Chinnaiyan <sivanantham.chinnaiyan@ideas2it.com> * Use importlib instead of deprecated pkg_resources Signed-off-by: Sivanantham Chinnaiyan <sivanantham.chinnaiyan@ideas2it.com> * Remove unused parameter Signed-off-by: Sivanantham Chinnaiyan <sivanantham.chinnaiyan@ideas2it.com> --------- Signed-off-by: Sivanantham Chinnaiyan <sivanantham.chinnaiyan@ideas2it.com>
magdalenakuhn17 · May 13, 2023 · b16a393 · b16a393
1 parent 8618d32
commit b16a393
Show file tree

Hide file tree

Showing 18 changed files with 140 additions and 102 deletions.
diff --git a/python/aiffairness/poetry.lock b/python/aiffairness/poetry.lock
diff --git a/python/alibiexplainer/poetry.lock b/python/alibiexplainer/poetry.lock
diff --git a/python/artexplainer/poetry.lock b/python/artexplainer/poetry.lock
diff --git a/python/custom_model/poetry.lock b/python/custom_model/poetry.lock
diff --git a/python/custom_transformer/poetry.lock b/python/custom_transformer/poetry.lock
diff --git a/python/kserve/kserve/model.py b/python/kserve/kserve/model.py
@@ -31,7 +31,6 @@
 from .protocol.grpc.grpc_predict_v2_pb2 import ModelInferRequest, ModelInferResponse
 
 from .errors import InvalidInput
-from .utils.utils import is_structured_cloudevent
 
 PREDICTOR_URL_FORMAT = "http://{0}/v1/models/{1}:predict"
 EXPLAINER_URL_FORMAT = "http://{0}/v1/models/{1}:explain"
@@ -200,27 +199,8 @@ async def preprocess(self, payload: Union[Dict, CloudEvent, InferRequest],
         Returns:
             Dict|InferRequest: Transformed inputs to ``predict`` handler or return InferRequest for predictor call.
         """
-        response = payload
-
-        if isinstance(payload, CloudEvent):
-            response = payload.data
-            # Try to decode and parse JSON UTF-8 if possible, otherwise
-            # just pass the CloudEvent data on to the predict function.
-            # This is for the cases that CloudEvent encoding is protobuf, avro etc.
-            try:
-                response = orjson.loads(response.decode('UTF-8'))
-            except (orjson.JSONDecodeError, UnicodeDecodeError) as e:
-                # If decoding or parsing failed, check if it was supposed to be JSON UTF-8
-                if "content-type" in payload._attributes and \
-                        (payload._attributes["content-type"] == "application/cloudevents+json" or
-                         payload._attributes["content-type"] == "application/json"):
-                    raise InvalidInput(f"Failed to decode or parse binary json cloudevent: {e}")
-
-        elif isinstance(payload, dict):
-            if is_structured_cloudevent(payload):
-                response = payload["data"]
 
-        return response
+        return payload
 
     def postprocess(self, response: Union[Dict, InferResponse, ModelInferResponse], headers: Dict[str, str] = None) \
             -> Union[Dict, ModelInferResponse]: