prediction-market-agent-tooling 0.58.4__tar.gz → 0.59.0__tar.gz

{prediction_market_agent_tooling-0.58.4 → prediction_market_agent_tooling-0.59.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.3
 Name: prediction-market-agent-tooling
-Version: 0.58.4
+Version: 0.59.0
 Summary: Tools to benchmark, deploy and monitor prediction market agents.
 Author: Gnosis
 Requires-Python: >=3.10,<3.13

{prediction_market_agent_tooling-0.58.4 → prediction_market_agent_tooling-0.59.0}/prediction_market_agent_tooling/deploy/agent.py

@@ -361,17 +361,23 @@ class DeployablePredictionAgent(DeployableAgent):
         if self.have_bet_on_market_since(
             market, since=self.same_market_trade_interval.get(market=market)
         ):
+            logger.info(
+                f"Market already bet on within {self.same_market_trade_interval}."
+            )
             return False
 
         # Manifold allows to bet only on markets with probability between 1 and 99.
         if market_type == MarketType.MANIFOLD and not (1 < market.current_p_yes < 99):
+            logger.info("Manifold's market probability not in the range 1-99.")
             return False
 
         # Do as a last check, as it uses paid OpenAI API.
         if not is_predictable_binary(market.question):
+            logger.info("Market question is not predictable.")
             return False
 
         if not self.allow_invalid_questions and is_invalid(market.question):
+            logger.info("Market question is invalid.")
             return False
 
         return True
@@ -481,7 +487,10 @@ class DeployablePredictionAgent(DeployableAgent):
         )
         processed = 0
 
-        for market in available_markets:
+        for market_idx, market in enumerate(available_markets):
+            logger.info(
+                f"Going to process market {market_idx+1} / {len(available_markets)}."
+            )
             self.before_process_market(market_type, market)
             processed_market = self.process_market(market_type, market)
             self.after_process_market(market_type, market, processed_market)
@@ -492,7 +501,9 @@ class DeployablePredictionAgent(DeployableAgent):
             if processed == self.bet_on_n_markets_per_run:
                 break
 
-        logger.info("All markets processed.")
+        logger.info(
+            f"All markets processed. Successfully processed {processed}/{len(available_markets)}."
+        )
 
     def after_process_markets(self, market_type: MarketType) -> None:
         """

{prediction_market_agent_tooling-0.58.4 → prediction_market_agent_tooling-0.59.0}/prediction_market_agent_tooling/markets/metaculus/data_models.py

@@ -20,7 +20,7 @@ class AggregationItem(BaseModel):
     centers: list[float] | None
     interval_upper_bounds: list[float] | None
     means: list[float] | None
-    histogram: list[float] | None
+    histogram: list[list[float]] | None
 
 
 class Aggregation(BaseModel):

{prediction_market_agent_tooling-0.58.4 → prediction_market_agent_tooling-0.59.0}/prediction_market_agent_tooling/tools/contract.py

@@ -18,16 +18,12 @@ from prediction_market_agent_tooling.gtypes import (
     TxParams,
     TxReceipt,
     Wei,
-    xDai,
 )
-from prediction_market_agent_tooling.tools.data_models import MessageContainer
-from prediction_market_agent_tooling.tools.hexbytes_custom import HexBytes
-from prediction_market_agent_tooling.tools.utils import BPS_CONSTANT, DatetimeUTC
+from prediction_market_agent_tooling.tools.utils import DatetimeUTC
 from prediction_market_agent_tooling.tools.web3_utils import (
     call_function_on_contract,
     send_function_on_contract_tx,
     send_function_on_contract_tx_using_safe,
-    wei_to_xdai,
 )
 
 
@@ -568,170 +564,6 @@ class DebuggingContract(ContractOnGnosisChain):
         )
 
 
-class SimpleTreasuryContract(ContractOnGnosisChain, OwnableContract):
-    # Contract ABI taken from built https://github.com/gnosis/labs-contracts.
-    abi: ABI = abi_field_validator(
-        os.path.join(
-            os.path.dirname(os.path.realpath(__file__)),
-            "../abis/simpletreasury.abi.json",
-        )
-    )
-
-    address: ChecksumAddress = Web3.to_checksum_address(
-        "0x624ad0db52e6b18afb4d36b8e79d0c2a74f3fc8a"
-    )
-
-    def required_nft_balance(self, web3: Web3 | None = None) -> int:
-        min_num_of_nfts: int = self.call("requiredNFTBalance", web3=web3)
-        return min_num_of_nfts
-
-    def set_required_nft_balance(
-        self,
-        api_keys: APIKeys,
-        new_required_balance: int,
-        web3: Web3 | None = None,
-    ) -> TxReceipt:
-        return self.send(
-            api_keys=api_keys,
-            function_name="setRequiredNFTBalance",
-            function_params=[new_required_balance],
-            web3=web3,
-        )
-
-    def nft_contract(self, web3: Web3 | None = None) -> ContractERC721BaseClass:
-        nft_contract_address: ChecksumAddress = self.call("nftContract", web3=web3)
-        contract = ContractERC721BaseClass(address=nft_contract_address)
-        return contract
-
-    def withdraw(
-        self,
-        api_keys: APIKeys,
-        web3: Web3 | None = None,
-    ) -> TxReceipt:
-        return self.send(
-            api_keys=api_keys,
-            function_name="withdraw",
-            web3=web3,
-        )
-
-
-class AgentCommunicationContract(ContractOnGnosisChain, OwnableContract):
-    # Contract ABI taken from built https://github.com/gnosis/labs-contracts.
-    abi: ABI = abi_field_validator(
-        os.path.join(
-            os.path.dirname(os.path.realpath(__file__)),
-            "../abis/agentcommunication.abi.json",
-        )
-    )
-
-    address: ChecksumAddress = Web3.to_checksum_address(
-        "0xe9dd78FF297DbaAbe5D0E45aE554a4B561935DE9"
-    )
-
-    def minimum_message_value(self, web3: Web3 | None = None) -> xDai:
-        value: Wei = self.call("minimumValueForSendingMessageInWei", web3=web3)
-        return wei_to_xdai(value)
-
-    def ratio_given_to_treasury(self, web3: Web3 | None = None) -> float:
-        bps: int = self.call("pctToTreasuryInBasisPoints", web3=web3)
-        return bps / BPS_CONSTANT
-
-    def count_unseen_messages(
-        self,
-        agent_address: ChecksumAddress,
-        web3: Web3 | None = None,
-    ) -> int:
-        unseen_message_count: int = self.call(
-            "countMessages", function_params=[agent_address], web3=web3
-        )
-        return unseen_message_count
-
-    def get_at_index(
-        self,
-        agent_address: ChecksumAddress,
-        idx: int,
-        web3: Web3 | None = None,
-    ) -> MessageContainer:
-        message_container_raw: t.Tuple[t.Any] = self.call(
-            "getAtIndex", function_params=[agent_address, idx], web3=web3
-        )
-        return MessageContainer.from_tuple(message_container_raw)
-
-    def set_treasury_address(
-        self,
-        api_keys: APIKeys,
-        new_treasury_address: ChecksumAddress,
-        web3: Web3 | None = None,
-    ) -> TxReceipt:
-        return self.send(
-            api_keys=api_keys,
-            function_name="setTreasuryAddress",
-            function_params=[new_treasury_address],
-            web3=web3,
-        )
-
-    def set_minimum_value_for_sending_message(
-        self,
-        api_keys: APIKeys,
-        new_minimum_value: Wei,
-        web3: Web3 | None = None,
-    ) -> TxReceipt:
-        return self.send(
-            api_keys=api_keys,
-            function_name="adjustMinimumValueForSendingMessage",
-            function_params=[new_minimum_value],
-            web3=web3,
-        )
-
-    def pop_message(
-        self,
-        api_keys: APIKeys,
-        agent_address: ChecksumAddress,
-        index: int = 0,
-        web3: Web3 | None = None,
-    ) -> MessageContainer:
-        """
-        Retrieves and removes message at specified index from the agent's message queue.
-
-        This method first retrieves the message at the front of the queue without removing it,
-        allowing us to return the message content directly. The actual removal of the message
-        from the queue is performed by sending a transaction to the contract, which executes
-        the `popMessageAtIndex` function. The transaction receipt is not used to obtain the message
-        content, as it only contains event data, not the returned struct.
-        """
-
-        # Peek the element before popping.
-        message_container = self.get_at_index(
-            agent_address=agent_address, idx=index, web3=web3
-        )
-
-        # Next, pop that element and discard the transaction receipt.
-        self.send(
-            api_keys=api_keys,
-            function_name="popMessageAtIndex",
-            function_params=[agent_address, index],
-            web3=web3,
-        )
-
-        return message_container
-
-    def send_message(
-        self,
-        api_keys: APIKeys,
-        agent_address: ChecksumAddress,
-        message: HexBytes,
-        amount_wei: Wei,
-        web3: Web3 | None = None,
-    ) -> TxReceipt:
-        return self.send_with_value(
-            api_keys=api_keys,
-            function_name="sendMessage",
-            amount_wei=amount_wei,
-            function_params=[agent_address, message],
-            web3=web3,
-        )
-
-
 def contract_implements_function(
     contract_address: ChecksumAddress,
     function_name: str,

{prediction_market_agent_tooling-0.58.4 → prediction_market_agent_tooling-0.59.0}/prediction_market_agent_tooling/tools/cow/cow_order.py

@@ -2,6 +2,7 @@ import asyncio
 from datetime import timedelta
 
 import httpx
+import tenacity
 from cowdao_cowpy import swap_tokens
 from cowdao_cowpy.common.chains import Chain
 from cowdao_cowpy.common.config import SupportedChainId
@@ -34,6 +35,11 @@ def get_order_book_api(env: Envs, chain: Chain) -> OrderBookApi:
     return OrderBookApi(OrderBookAPIConfigFactory.get_config(env, chain_id))
 
 
+@tenacity.retry(
+    stop=tenacity.stop_after_attempt(3),
+    wait=tenacity.wait_fixed(1),
+    after=lambda x: logger.debug(f"get_buy_token_amount failed, {x.attempt_number=}."),
+)
 def get_buy_token_amount(
     amount_wei: Wei,
     sell_token: ChecksumAddress,

{prediction_market_agent_tooling-0.58.4 → prediction_market_agent_tooling-0.59.0}/pyproject.toml

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "prediction-market-agent-tooling"
-version = "0.58.4"
+version = "0.59.0"
 description = "Tools to benchmark, deploy and monitor prediction market agents."
 authors = ["Gnosis"]
 readme = "README.md"

prediction_market_agent_tooling-0.58.4/prediction_market_agent_tooling/abis/agentcommunication.abi.json

@@ -1,224 +0,0 @@
-[
-  {
-    "inputs": [
-      {
-        "internalType": "address payable",
-        "name": "_treasury",
-        "type": "address"
-      },
-      {
-        "internalType": "uint256",
-        "name": "_pctToTreasuryInBasisPoints",
-        "type": "uint256"
-      }
-    ],
-    "stateMutability": "nonpayable",
-    "type": "constructor"
-  },
-  { "inputs": [], "name": "MessageNotSentByAgent", "type": "error" },
-  {
-    "inputs": [
-      { "internalType": "address", "name": "owner", "type": "address" }
-    ],
-    "name": "OwnableInvalidOwner",
-    "type": "error"
-  },
-  {
-    "inputs": [
-      { "internalType": "address", "name": "account", "type": "address" }
-    ],
-    "name": "OwnableUnauthorizedAccount",
-    "type": "error"
-  },
-  {
-    "anonymous": false,
-    "inputs": [
-      {
-        "indexed": true,
-        "internalType": "address",
-        "name": "sender",
-        "type": "address"
-      },
-      {
-        "indexed": true,
-        "internalType": "address",
-        "name": "agentAddress",
-        "type": "address"
-      },
-      {
-        "indexed": false,
-        "internalType": "bytes",
-        "name": "message",
-        "type": "bytes"
-      },
-      {
-        "indexed": false,
-        "internalType": "uint256",
-        "name": "value",
-        "type": "uint256"
-      }
-    ],
-    "name": "LogMessage",
-    "type": "event"
-  },
-  {
-    "anonymous": false,
-    "inputs": [
-      {
-        "indexed": true,
-        "internalType": "address",
-        "name": "previousOwner",
-        "type": "address"
-      },
-      {
-        "indexed": true,
-        "internalType": "address",
-        "name": "newOwner",
-        "type": "address"
-      }
-    ],
-    "name": "OwnershipTransferred",
-    "type": "event"
-  },
-  {
-    "inputs": [
-      { "internalType": "uint256", "name": "newValue", "type": "uint256" }
-    ],
-    "name": "adjustMinimumValueForSendingMessage",
-    "outputs": [],
-    "stateMutability": "nonpayable",
-    "type": "function"
-  },
-  {
-    "inputs": [
-      { "internalType": "address", "name": "agentAddress", "type": "address" }
-    ],
-    "name": "countMessages",
-    "outputs": [{ "internalType": "uint256", "name": "", "type": "uint256" }],
-    "stateMutability": "view",
-    "type": "function"
-  },
-  {
-    "inputs": [
-      { "internalType": "address", "name": "agentAddress", "type": "address" },
-      { "internalType": "uint256", "name": "idx", "type": "uint256" }
-    ],
-    "name": "getAtIndex",
-    "outputs": [
-      {
-        "components": [
-          { "internalType": "address", "name": "sender", "type": "address" },
-          { "internalType": "address", "name": "recipient", "type": "address" },
-          { "internalType": "bytes", "name": "message", "type": "bytes" },
-          { "internalType": "uint256", "name": "value", "type": "uint256" }
-        ],
-        "internalType": "struct DoubleEndedStructQueue.MessageContainer",
-        "name": "",
-        "type": "tuple"
-      }
-    ],
-    "stateMutability": "view",
-    "type": "function"
-  },
-  {
-    "inputs": [],
-    "name": "minimumValueForSendingMessageInWei",
-    "outputs": [{ "internalType": "uint256", "name": "", "type": "uint256" }],
-    "stateMutability": "view",
-    "type": "function"
-  },
-  {
-    "inputs": [],
-    "name": "owner",
-    "outputs": [{ "internalType": "address", "name": "", "type": "address" }],
-    "stateMutability": "view",
-    "type": "function"
-  },
-  {
-    "inputs": [],
-    "name": "pctToTreasuryInBasisPoints",
-    "outputs": [{ "internalType": "uint256", "name": "", "type": "uint256" }],
-    "stateMutability": "view",
-    "type": "function"
-  },
-  {
-    "inputs": [
-      { "internalType": "address", "name": "agentAddress", "type": "address" },
-      { "internalType": "uint256", "name": "idx", "type": "uint256" }
-    ],
-    "name": "popMessageAtIndex",
-    "outputs": [
-      {
-        "components": [
-          { "internalType": "address", "name": "sender", "type": "address" },
-          { "internalType": "address", "name": "recipient", "type": "address" },
-          { "internalType": "bytes", "name": "message", "type": "bytes" },
-          { "internalType": "uint256", "name": "value", "type": "uint256" }
-        ],
-        "internalType": "struct DoubleEndedStructQueue.MessageContainer",
-        "name": "",
-        "type": "tuple"
-      }
-    ],
-    "stateMutability": "nonpayable",
-    "type": "function"
-  },
-  {
-    "inputs": [{ "internalType": "address", "name": "", "type": "address" }],
-    "name": "queues",
-    "outputs": [
-      { "internalType": "uint128", "name": "_begin", "type": "uint128" },
-      { "internalType": "uint128", "name": "_end", "type": "uint128" }
-    ],
-    "stateMutability": "view",
-    "type": "function"
-  },
-  {
-    "inputs": [],
-    "name": "renounceOwnership",
-    "outputs": [],
-    "stateMutability": "nonpayable",
-    "type": "function"
-  },
-  {
-    "inputs": [
-      { "internalType": "address", "name": "agentAddress", "type": "address" },
-      { "internalType": "bytes", "name": "message", "type": "bytes" }
-    ],
-    "name": "sendMessage",
-    "outputs": [],
-    "stateMutability": "payable",
-    "type": "function"
-  },
-  {
-    "inputs": [
-      {
-        "internalType": "address payable",
-        "name": "_treasury",
-        "type": "address"
-      }
-    ],
-    "name": "setTreasuryAddress",
-    "outputs": [],
-    "stateMutability": "nonpayable",
-    "type": "function"
-  },
-  {
-    "inputs": [
-      { "internalType": "address", "name": "newOwner", "type": "address" }
-    ],
-    "name": "transferOwnership",
-    "outputs": [],
-    "stateMutability": "nonpayable",
-    "type": "function"
-  },
-  {
-    "inputs": [],
-    "name": "treasury",
-    "outputs": [
-      { "internalType": "address payable", "name": "", "type": "address" }
-    ],
-    "stateMutability": "view",
-    "type": "function"
-  }
-]

prediction_market_agent_tooling-0.58.4/prediction_market_agent_tooling/abis/simpletreasury.abi.json

@@ -1,156 +0,0 @@
-[
-  {
-    "inputs": [
-      {
-        "internalType": "address",
-        "name": "_nftContract",
-        "type": "address"
-      }
-    ],
-    "stateMutability": "nonpayable",
-    "type": "constructor"
-  },
-  {
-    "inputs": [
-      {
-        "internalType": "address",
-        "name": "owner",
-        "type": "address"
-      }
-    ],
-    "name": "OwnableInvalidOwner",
-    "type": "error"
-  },
-  {
-    "inputs": [
-      {
-        "internalType": "address",
-        "name": "account",
-        "type": "address"
-      }
-    ],
-    "name": "OwnableUnauthorizedAccount",
-    "type": "error"
-  },
-  {
-    "anonymous": false,
-    "inputs": [
-      {
-        "indexed": true,
-        "internalType": "address",
-        "name": "previousOwner",
-        "type": "address"
-      },
-      {
-        "indexed": true,
-        "internalType": "address",
-        "name": "newOwner",
-        "type": "address"
-      }
-    ],
-    "name": "OwnershipTransferred",
-    "type": "event"
-  },
-  {
-    "anonymous": false,
-    "inputs": [
-      {
-        "indexed": true,
-        "internalType": "address",
-        "name": "holder",
-        "type": "address"
-      },
-      {
-        "indexed": false,
-        "internalType": "uint256",
-        "name": "amount",
-        "type": "uint256"
-      }
-    ],
-    "name": "WithdrawnByNFTHolder",
-    "type": "event"
-  },
-  {
-    "inputs": [],
-    "name": "nftContract",
-    "outputs": [
-      {
-        "internalType": "contract IERC721",
-        "name": "",
-        "type": "address"
-      }
-    ],
-    "stateMutability": "view",
-    "type": "function"
-  },
-  {
-    "inputs": [],
-    "name": "owner",
-    "outputs": [
-      {
-        "internalType": "address",
-        "name": "",
-        "type": "address"
-      }
-    ],
-    "stateMutability": "view",
-    "type": "function"
-  },
-  {
-    "inputs": [],
-    "name": "renounceOwnership",
-    "outputs": [],
-    "stateMutability": "nonpayable",
-    "type": "function"
-  },
-  {
-    "inputs": [],
-    "name": "requiredNFTBalance",
-    "outputs": [
-      {
-        "internalType": "uint256",
-        "name": "",
-        "type": "uint256"
-      }
-    ],
-    "stateMutability": "view",
-    "type": "function"
-  },
-  {
-    "inputs": [
-      {
-        "internalType": "uint256",
-        "name": "_newBalance",
-        "type": "uint256"
-      }
-    ],
-    "name": "setRequiredNFTBalance",
-    "outputs": [],
-    "stateMutability": "nonpayable",
-    "type": "function"
-  },
-  {
-    "inputs": [
-      {
-        "internalType": "address",
-        "name": "newOwner",
-        "type": "address"
-      }
-    ],
-    "name": "transferOwnership",
-    "outputs": [],
-    "stateMutability": "nonpayable",
-    "type": "function"
-  },
-  {
-    "inputs": [],
-    "name": "withdraw",
-    "outputs": [],
-    "stateMutability": "nonpayable",
-    "type": "function"
-  },
-  {
-    "stateMutability": "payable",
-    "type": "receive"
-  }
-]

prediction_market_agent_tooling-0.58.4/prediction_market_agent_tooling/tools/data_models.py

@@ -1,23 +0,0 @@
-import typing as t
-
-from pydantic import BaseModel, ConfigDict, Field
-
-from prediction_market_agent_tooling.gtypes import ChecksumAddress, HexBytes, Wei
-
-
-# Taken from https://github.com/gnosis/labs-contracts/blob/main/src/NFT/DoubleEndedStructQueue.sol
-class MessageContainer(BaseModel):
-    model_config = ConfigDict(populate_by_name=True)
-    sender: ChecksumAddress
-    recipient: ChecksumAddress = Field(alias="agentAddress")
-    message: HexBytes
-    value: Wei
-
-    @staticmethod
-    def from_tuple(values: tuple[t.Any, ...]) -> "MessageContainer":
-        return MessageContainer(
-            sender=values[0],
-            recipient=values[1],
-            message=HexBytes(values[2]),
-            value=values[3],
-        )