opengradient 0.4.11__py3-none-any.whl → 0.4.12b1__py3-none-any.whl

opengradient/client.py

@@ -298,26 +298,7 @@ class Client:
 
             run_function = contract.functions.run(model_cid, inference_mode_uint8, converted_model_input)
 
-            nonce = self._blockchain.eth.get_transaction_count(self._wallet_account.address, "pending")
-            estimated_gas = run_function.estimate_gas({"from": self._wallet_account.address})
-            gas_limit = int(estimated_gas * 3)
-
-            transaction = run_function.build_transaction(
-                {
-                    "from": self._wallet_account.address,
-                    "nonce": nonce,
-                    "gas": gas_limit,
-                    "gasPrice": self._blockchain.eth.gas_price,
-                }
-            )
-
-            signed_tx = self._wallet_account.sign_transaction(transaction)
-            tx_hash = self._blockchain.eth.send_raw_transaction(signed_tx.raw_transaction)
-            tx_receipt = self._blockchain.eth.wait_for_transaction_receipt(tx_hash, timeout=INFERENCE_TX_TIMEOUT)
-
-            if tx_receipt["status"] == 0:
-                raise ContractLogicError(f"Transaction failed. Receipt: {tx_receipt}")
-
+            tx_hash, tx_receipt = self._send_tx_with_revert_handling(run_function)
             parsed_logs = contract.events.InferenceResult().process_receipt(tx_receipt, errors=DISCARD)
             if len(parsed_logs) < 1:
                 raise OpenGradientError("InferenceResult event not found in transaction logs")
@@ -382,27 +363,7 @@ class Client:
 
             run_function = contract.functions.runLLMCompletion(llm_request)
 
-            nonce = self._blockchain.eth.get_transaction_count(self._wallet_account.address, "pending")
-            estimated_gas = run_function.estimate_gas({"from": self._wallet_account.address})
-            # Artificially increase required gas for safety
-            gas_limit = int(estimated_gas * 1.5)
-
-            transaction = run_function.build_transaction(
-                {
-                    "from": self._wallet_account.address,
-                    "nonce": nonce,
-                    "gas": gas_limit,
-                    "gasPrice": self._blockchain.eth.gas_price,
-                }
-            )
-
-            signed_tx = self._wallet_account.sign_transaction(transaction)
-            tx_hash = self._blockchain.eth.send_raw_transaction(signed_tx.raw_transaction)
-            tx_receipt = self._blockchain.eth.wait_for_transaction_receipt(tx_hash, timeout=LLM_TX_TIMEOUT)
-
-            if tx_receipt["status"] == 0:
-                raise ContractLogicError(f"Transaction failed. Receipt: {tx_receipt}")
-
+            tx_hash, tx_receipt = self._send_tx_with_revert_handling(run_function)
             parsed_logs = contract.events.LLMCompletionResult().process_receipt(tx_receipt, errors=DISCARD)
             if len(parsed_logs) < 1:
                 raise OpenGradientError("LLM completion result event not found in transaction logs")
@@ -534,27 +495,7 @@ class Client:
 
             run_function = contract.functions.runLLMChat(llm_request)
 
-            nonce = self._blockchain.eth.get_transaction_count(self._wallet_account.address, "pending")
-            estimated_gas = run_function.estimate_gas({"from": self._wallet_account.address})
-            # Artificially increase required gas for safety
-            gas_limit = int(estimated_gas * 1.5)
-
-            transaction = run_function.build_transaction(
-                {
-                    "from": self._wallet_account.address,
-                    "nonce": nonce,
-                    "gas": gas_limit,
-                    "gasPrice": self._blockchain.eth.gas_price,
-                }
-            )
-
-            signed_tx = self._wallet_account.sign_transaction(transaction)
-            tx_hash = self._blockchain.eth.send_raw_transaction(signed_tx.raw_transaction)
-            tx_receipt = self._blockchain.eth.wait_for_transaction_receipt(tx_hash, timeout=LLM_TX_TIMEOUT)
-
-            if tx_receipt["status"] == 0:
-                raise ContractLogicError(f"Transaction failed. Receipt: {tx_receipt}")
-
+            tx_hash, tx_receipt = self._send_tx_with_revert_handling(run_function)
             parsed_logs = contract.events.LLMChatResult().process_receipt(tx_receipt, errors=DISCARD)
             if len(parsed_logs) < 1:
                 raise OpenGradientError("LLM chat result event not found in transaction logs")
@@ -752,6 +693,58 @@ class Client:
                 bytecode = "0x" + bytecode
             return bytecode
 
+    def _send_tx_with_revert_handling(self, run_function):
+        """
+        Execute a blockchain transaction with revert error.
+
+        Args:
+            run_function: Function that executes the transaction
+
+        Returns:
+            tx_hash: Transaction hash
+            tx_receipt: Transaction receipt
+
+        Raises:
+            Exception: If transaction fails or gas estimation fails
+        """
+        nonce = self._blockchain.eth.get_transaction_count(self._wallet_account.address, "pending")
+        try:
+            estimated_gas = run_function.estimate_gas({"from": self._wallet_account.address})
+        except ContractLogicError as e:
+            try:
+                run_function.call({"from": self._wallet_account.address})
+                
+            except ContractLogicError as call_err:
+                raise ContractLogicError(f"simulation failed with revert reason: {call_err.args[0]}")
+            
+            raise ContractLogicError(f"simulation failed with no revert reason. Reason: {e}")
+        
+        gas_limit = int(estimated_gas * 3)
+
+        transaction = run_function.build_transaction(
+            {
+                "from": self._wallet_account.address,
+                "nonce": nonce,
+                "gas": gas_limit,
+                "gasPrice": self._blockchain.eth.gas_price,
+            }
+        )
+
+        signed_tx = self._wallet_account.sign_transaction(transaction)
+        tx_hash = self._blockchain.eth.send_raw_transaction(signed_tx.raw_transaction)
+        tx_receipt = self._blockchain.eth.wait_for_transaction_receipt(tx_hash, timeout=INFERENCE_TX_TIMEOUT)
+
+        if tx_receipt["status"] == 0:
+            try:
+                run_function.call({"from": self._wallet_account.address})
+                
+            except ContractLogicError as call_err:
+                raise ContractLogicError(f"Transaction failed with revert reason: {call_err.args[0]}")
+            
+            raise ContractLogicError(f"Transaction failed with no revert reason. Receipt: {tx_receipt}")
+
+        return tx_hash, tx_receipt
+
     def new_workflow(
         self,
         model_cid: str,

{opengradient-0.4.11.dist-info → opengradient-0.4.12b1.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: opengradient
-Version: 0.4.11
+Version: 0.4.12b1
 Summary: Python SDK for OpenGradient decentralized model management & inference services
 Author-email: OpenGradient <oliver@opengradient.ai>
 License: MIT License
@@ -35,8 +35,10 @@ Classifier: Programming Language :: Python :: 3.12
 Requires-Python: >=3.10
 Description-Content-Type: text/markdown
 License-File: LICENSE
-Requires-Dist: eth-account>=0.13.4
-Requires-Dist: web3>=7.3.0
+Requires-Dist: eth-utils==2.2.2
+Requires-Dist: eth-account>=0.13.0
+Requires-Dist: web3>=6.11
+Requires-Dist: websockets>=14.1
 Requires-Dist: click>=8.1.7
 Requires-Dist: firebase-rest-api>=1.11.0
 Requires-Dist: grpcio>=1.66.2

{opengradient-0.4.11.dist-info → opengradient-0.4.12b1.dist-info}/RECORD

@@ -1,7 +1,7 @@
 opengradient/__init__.py,sha256=jNQwQmGa3r8BaPZP01mNwmhOU-16ggqUR4D2U4VrRZw,12422
 opengradient/account.py,sha256=5wrYpws_1lozjOFjLCTHtxgoxK-LmObDAaVy9eDcJY4,1145
 opengradient/cli.py,sha256=12fezJJvuceUaPSllsMqrBFoSpd2sTJjMpZ1_Dhzskg,25426
-opengradient/client.py,sha256=eXgWtYlocXh89XwbtxSZlCqffgN-ll_dszwdZxsH634,43991
+opengradient/client.py,sha256=fK7gEckQxjkK8T6-xaNp8Z4wJXbMgkfSJV39mUGaGMw,43315
 opengradient/defaults.py,sha256=ecGPGh2l-33ef2CTDDD_tvSSe_Qf8zYdIOjowjBqZCo,498
 opengradient/exceptions.py,sha256=88tfegboGtlehQcwhxsl6ZzhLJWZWlkf_bkHTiCtXpo,3391
 opengradient/types.py,sha256=JH8hjpcq4H7gQki74cuJpH4PcyQpwivLiqn9iq0evrI,5715
@@ -26,9 +26,9 @@ opengradient/workflow_models/constants.py,sha256=viIkb_LGcfVprqQNaA80gBTj6cfYam0
 opengradient/workflow_models/types.py,sha256=Z22hF6c8Y4D2GlzVEIBODGwsqSjSrQvUcpZ7R-mIJdI,409
 opengradient/workflow_models/utils.py,sha256=ySfpuiOBqLTlfto6ZxZf2vc7K6RGIja0l4eaVm5AOzY,1503
 opengradient/workflow_models/workflow_models.py,sha256=d4C_gs39DAfy4cdY9Ee6GMXpPfzwvKFpmxzK1A7LNgU,3900
-opengradient-0.4.11.dist-info/licenses/LICENSE,sha256=xEcvQ3AxZOtDkrqkys2Mm6Y9diEnaSeQRKvxi-JGnNA,1069
-opengradient-0.4.11.dist-info/METADATA,sha256=o6x7HxutNOT72WWcuCwBiaEzuYElReEerNinjsVCGSk,5237
-opengradient-0.4.11.dist-info/WHEEL,sha256=1tXe9gY0PYatrMPMDd6jXqjfpz_B-Wqm32CPfRC58XU,91
-opengradient-0.4.11.dist-info/entry_points.txt,sha256=yUKTaJx8RXnybkob0J62wVBiCp_1agVbgw9uzsmaeJc,54
-opengradient-0.4.11.dist-info/top_level.txt,sha256=oC1zimVLa2Yi1LQz8c7x-0IQm92milb5ax8gHBHwDqU,13
-opengradient-0.4.11.dist-info/RECORD,,
+opengradient-0.4.12b1.dist-info/licenses/LICENSE,sha256=xEcvQ3AxZOtDkrqkys2Mm6Y9diEnaSeQRKvxi-JGnNA,1069
+opengradient-0.4.12b1.dist-info/METADATA,sha256=E1xc6YqpEn9eSlIpwbAyUHyShz1JMX4paeBYsbOcHqQ,5302
+opengradient-0.4.12b1.dist-info/WHEEL,sha256=CmyFI0kx5cdEMTLiONQRbGQwjIoR1aIYB7eCAQ4KPJ0,91
+opengradient-0.4.12b1.dist-info/entry_points.txt,sha256=yUKTaJx8RXnybkob0J62wVBiCp_1agVbgw9uzsmaeJc,54
+opengradient-0.4.12b1.dist-info/top_level.txt,sha256=oC1zimVLa2Yi1LQz8c7x-0IQm92milb5ax8gHBHwDqU,13
+opengradient-0.4.12b1.dist-info/RECORD,,

{opengradient-0.4.11.dist-info → opengradient-0.4.12b1.dist-info}/WHEEL

@@ -1,5 +1,5 @@
 Wheel-Version: 1.0
-Generator: setuptools (77.0.3)
+Generator: setuptools (78.1.0)
 Root-Is-Purelib: true
 Tag: py3-none-any