From ca377ac998aae17c567049ac5651115661a33c05 Mon Sep 17 00:00:00 2001 From: Kaspar Peterson Date: Wed, 27 Mar 2024 16:43:48 +0200 Subject: [PATCH] Creates a function to sign and send tx --- oracles/src/repositories/oracle_repository.py | 61 +++++++++---------- 1 file changed, 28 insertions(+), 33 deletions(-) diff --git a/oracles/src/repositories/oracle_repository.py b/oracles/src/repositories/oracle_repository.py index bd3cd40..b15ae24 100644 --- a/oracles/src/repositories/oracle_repository.py +++ b/oracles/src/repositories/oracle_repository.py @@ -21,6 +21,7 @@ from src.entities import OpenAiModelType from src.entities import OpenaiToolChoiceType from src.entities import PromptType +from web3.types import TxReceipt class OracleRepository: @@ -42,7 +43,8 @@ async def _index_new_chats(self): chats_count = await self.oracle_contract.functions.promptsCount().call() config = None if chats_count > self.last_chats_count: - print(f"Indexing new prompts from {self.last_chats_count} to {chats_count}", flush=True) + print(f"Indexing new prompts from {self.last_chats_count} to {chats_count}", + flush=True) for i in range(self.last_chats_count, chats_count): callback_id = await self.oracle_contract.functions.promptCallbackIds( i @@ -96,13 +98,7 @@ async def send_chat_response(self, chat: Chat) -> bool: chat.transaction_receipt = {"error": str(e)} await self.mark_as_done(chat) return False - signed_tx = self.web3_client.eth.account.sign_transaction( - tx, private_key=self.account.key - ) - tx_hash = await self.web3_client.eth.send_raw_transaction( - signed_tx.rawTransaction - ) - tx_receipt = await self.web3_client.eth.wait_for_transaction_receipt(tx_hash) + tx_receipt = await self._sign_and_send_tx(tx) chat.transaction_receipt = tx_receipt chat.is_processed = bool(tx_receipt.get("status")) return bool(tx_receipt.get("status")) @@ -132,13 +128,7 @@ async def mark_as_done(self, chat: Chat): tx = await self.oracle_contract.functions.markPromptAsProcessed( chat.id, ).build_transaction(tx_data) - signed_tx = self.web3_client.eth.account.sign_transaction( - tx, private_key=self.account.key - ) - tx_hash = await self.web3_client.eth.send_raw_transaction( - signed_tx.rawTransaction - ) - await self.web3_client.eth.wait_for_transaction_receipt(tx_hash) + return await self._sign_and_send_tx(tx) async def _build_response_tx(self, chat: Chat): nonce = await self.web3_client.eth.get_transaction_count(self.account.address) @@ -244,13 +234,7 @@ async def send_function_call_response( function_call.transaction_receipt = {"error": str(e)} await self.mark_function_call_as_done(function_call) return False - signed_tx = self.web3_client.eth.account.sign_transaction( - tx, private_key=self.account.key - ) - tx_hash = await self.web3_client.eth.send_raw_transaction( - signed_tx.rawTransaction - ) - tx_receipt = await self.web3_client.eth.wait_for_transaction_receipt(tx_hash) + tx_receipt = await self._sign_and_send_tx(tx) function_call.transaction_receipt = tx_receipt function_call.is_processed = bool(tx_receipt.get("status")) return bool(tx_receipt.get("status")) @@ -271,13 +255,7 @@ async def mark_function_call_as_done(self, function_call: FunctionCall): tx = await self.oracle_contract.functions.markFunctionAsProcessed( function_call.id, ).build_transaction(tx_data) - signed_tx = self.web3_client.eth.account.sign_transaction( - tx, private_key=self.account.key - ) - tx_hash = await self.web3_client.eth.send_raw_transaction( - signed_tx.rawTransaction - ) - await self.web3_client.eth.wait_for_transaction_receipt(tx_hash) + return await self._sign_and_send_tx(tx) async def _get_openai_config(self, i: int) -> Optional[OpenAiConfig]: config = await self.oracle_contract.functions.openAiConfigurations(i).call() @@ -297,7 +275,8 @@ async def _get_openai_config(self, i: int) -> Optional[OpenAiConfig]: temperature=_parse_float_from_int(config[8], 0, 20), top_p=_parse_float_from_int(config[9], 0, 100, decimals=2), tools=_parse_tools(config[10]), - tool_choice=config[11] if (config[11] and config[11] in get_args(OpenaiToolChoiceType)) else None, + tool_choice=config[11] if (config[11] and config[11] in get_args( + OpenaiToolChoiceType)) else None, user=_value_or_none(config[12]), ) except: @@ -326,7 +305,8 @@ async def _get_groq_config(self, i: int) -> Optional[GroqConfig]: return None async def _get_prompt_type(self, i) -> PromptType: - prompt_type: Optional[str] = await self.oracle_contract.functions.promptType(i).call() + prompt_type: Optional[str] = await self.oracle_contract.functions.promptType( + i).call() if not prompt_type: return PromptType.DEFAULT try: @@ -334,13 +314,28 @@ async def _get_prompt_type(self, i) -> PromptType: except: return PromptType.DEFAULT + async def _sign_and_send_tx(self, tx) -> TxReceipt: + signed_tx = self.web3_client.eth.account.sign_transaction( + tx, private_key=self.account.key + ) + tx_hash = await self.web3_client.eth.send_raw_transaction( + signed_tx.rawTransaction + ) + await self.web3_client.eth.wait_for_transaction_receipt(tx_hash) + def _value_or_none(value: Any) -> Optional[Any]: return value if value else None -def _parse_float_from_int(value: Optional[float], min_value: int, max_value: int, decimals: int = 1) -> Optional[int]: - return round(value / (10 ** decimals), 1) if (min_value <= value <= max_value) else None +def _parse_float_from_int( + value: Optional[float], + min_value: int, + max_value: int, + decimals: int = 1 +) -> Optional[int]: + return round(value / (10 ** decimals), 1) if ( + min_value <= value <= max_value) else None def _parse_json_string(value: Optional[str]) -> Optional[Dict]: