opengradient 0.4.12__tar.gz → 0.4.13__tar.gz

{opengradient-0.4.12/src/opengradient.egg-info → opengradient-0.4.13}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: opengradient
-Version: 0.4.12
+Version: 0.4.13
 Summary: Python SDK for OpenGradient decentralized model management & inference services
 Author-email: OpenGradient <oliver@opengradient.ai>
 License: MIT License

{opengradient-0.4.12 → opengradient-0.4.13}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "opengradient"
-version = "0.4.12"
+version = "0.4.13"
 description = "Python SDK for OpenGradient decentralized model management & inference services"
 authors = [{name = "OpenGradient", email = "oliver@opengradient.ai"}]
 license = {file = "LICENSE"}

{opengradient-0.4.12 → opengradient-0.4.13}/src/opengradient/client.py

@@ -2,6 +2,7 @@ import json
 import logging
 import os
 import time
+import base64
 from pathlib import Path
 from typing import Any, Dict, List, Optional, Union, Callable
 
@@ -318,8 +319,8 @@ class Client:
                 # check inference directly from node
                 parsed_logs = precompile_contract.events.ModelInferenceEvent().process_receipt(tx_receipt, errors=DISCARD)
                 inference_id = parsed_logs[0]["args"]["inferenceID"]
-                inference_result = self.get_inference_result_from_node(inference_id)
-                model_output = inference_result
+                inference_result = self._get_inference_result_from_node(inference_id, inference_mode)
+                model_output = convert_to_model_output(inference_result)
 
             return InferenceResult(tx_hash.hex(), model_output)
 
@@ -971,7 +972,7 @@ class Client:
         return [convert_array_to_model_output(result) for result in results]
 
 
-    def get_inference_result_from_node(self, inference_id: str) -> str:
+    def _get_inference_result_from_node(self, inference_id: str, inference_mode: InferenceMode) -> Dict:
         """
         Get the inference result from node.
         
@@ -979,7 +980,7 @@ class Client:
             inference_id (str): Inference id for a inference request
             
         Returns:
-            str: The inference result as returned by the node
+            Dict: The inference result as returned by the node
             
         Raises:
             OpenGradientError: If the request fails or returns an error
@@ -990,7 +991,54 @@ class Client:
         
             response = requests.get(url)
             if response.status_code == 200:
-                return response.json()
+                resp = response.json()
+                inference_result = resp.get("inference_results", {})
+                if inference_result:
+                    decoded_bytes = base64.b64decode(inference_result[0])
+                    decoded_string = decoded_bytes.decode('utf-8')
+                    output = json.loads(decoded_string).get("InferenceResult",{})
+                    if output is None:
+                        raise OpenGradientError("Missing InferenceResult in inference output")
+                    
+                    match inference_mode:
+                        case InferenceMode.VANILLA:
+                            if "VanillaResult" not in output:
+                                raise OpenGradientError("Missing VanillaResult in inference output")
+                            if "model_output" not in output["VanillaResult"]:
+                                raise OpenGradientError("Missing model_output in VanillaResult")
+                            return {
+                                "output": output["VanillaResult"]["model_output"]
+                            }
+                    
+                        case InferenceMode.TEE:
+                            if "TeeNodeResult" not in output:
+                                raise OpenGradientError("Missing TeeNodeResult in inference output")
+                            if "Response" not in output["TeeNodeResult"]:
+                                raise OpenGradientError("Missing Response in TeeNodeResult")
+                            if "VanillaResponse" in output["TeeNodeResult"]["Response"]:
+                                if "model_output" not in output["TeeNodeResult"]["Response"]["VanillaResponse"]:
+                                    raise OpenGradientError("Missing model_output in VanillaResponse")
+                                return {
+                                    "output": output["TeeNodeResult"]["Response"]["VanillaResponse"]["model_output"]
+                                }
+                    
+                            else:
+                                raise OpenGradientError("Missing VanillaResponse in TeeNodeResult Response")
+                                
+                        case InferenceMode.ZKML:
+                            if "ZkmlResult" not in output:
+                                raise OpenGradientError("Missing ZkmlResult in inference output")
+                            if "model_output" not in output["ZkmlResult"]:
+                                raise OpenGradientError("Missing model_output in ZkmlResult")
+                            return {
+                                "output": output["ZkmlResult"]["model_output"]
+                            }
+                    
+                        case _:
+                            raise OpenGradientError(f"Invalid inference mode: {inference_mode}")
+                else:
+                    return None
+                    
             else:
                 error_message = f"Failed to get inference result: HTTP {response.status_code}"
                 if response.text:

{opengradient-0.4.12 → opengradient-0.4.13}/src/opengradient/utils.py

@@ -122,24 +122,18 @@ def convert_to_model_output(event_data: AttributeDict) -> Dict[str, np.ndarray]:
     We need to reshape each output array using the shape parameter in order to get the array
     back into its original shape.
     """
-    logging.debug(f"Parsing event data: {event_data}")
-
     output_dict = {}
-
     output = event_data.get("output", {})
-    logging.debug(f"Output data: {output}")
 
-    if isinstance(output, AttributeDict):
-        # Parse numbers
+    if isinstance(output, (AttributeDict, dict)):
         for tensor in output.get("numbers", []):
-            logging.debug(f"Processing number tensor: {tensor}")
-            if isinstance(tensor, AttributeDict):
+            if isinstance(tensor, (AttributeDict, dict)):
                 name = tensor.get("name")
                 shape = tensor.get("shape")
                 values = []
                 # Convert from fixed point back into np.float32
                 for v in tensor.get("values", []):
-                    if isinstance(v, AttributeDict):
+                    if isinstance(v, (AttributeDict, dict)):
                         values.append(convert_to_float32(value=int(v.get("value")), decimals=int(v.get("decimals"))))
                     else:
                         logging.warning(f"Unexpected number type: {type(v)}")
@@ -149,8 +143,7 @@ def convert_to_model_output(event_data: AttributeDict) -> Dict[str, np.ndarray]:
 
         # Parse strings
         for tensor in output.get("strings", []):
-            logging.debug(f"Processing string tensor: {tensor}")
-            if isinstance(tensor, AttributeDict):
+            if isinstance(tensor, (AttributeDict, dict)):
                 name = tensor.get("name")
                 shape = tensor.get("shape")
                 values = tensor.get("values", [])
@@ -160,8 +153,7 @@ def convert_to_model_output(event_data: AttributeDict) -> Dict[str, np.ndarray]:
 
         # Parse JSON dicts
         for tensor in output.get("jsons", []):
-            logging.debug(f"Processing JSON tensor: {tensor}")
-            if isinstance(tensor, AttributeDict):
+            if isinstance(tensor, (AttributeDict, dict)):
                 name = tensor.get("name")
                 value = tensor.get("value")
                 output_dict[name] = np.array(json.loads(value))
@@ -172,7 +164,6 @@ def convert_to_model_output(event_data: AttributeDict) -> Dict[str, np.ndarray]:
         logging.warning(f"Unexpected output type: {type(output)}")
 
     logging.debug(f"Parsed output: {output_dict}")
-
     return output_dict
 
 

{opengradient-0.4.12 → opengradient-0.4.13/src/opengradient.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: opengradient
-Version: 0.4.12
+Version: 0.4.13
 Summary: Python SDK for OpenGradient decentralized model management & inference services
 Author-email: OpenGradient <oliver@opengradient.ai>
 License: MIT License