prediction-market-agent-tooling 0.26.0__py3-none-any.whl → 0.28.0__py3-none-any.whl

prediction_market_agent_tooling/config.py

@@ -2,7 +2,6 @@ import typing as t
 
 from gnosis.eth import EthereumClient
 from gnosis.safe import Safe
-from pydantic import BaseModel
 from pydantic.types import SecretStr
 from pydantic_settings import BaseSettings, SettingsConfigDict
 
@@ -58,6 +57,15 @@ class APIKeys(BaseSettings):
             "BET_FROM_PRIVATE_KEY missing in the environment.",
         )
 
+    @property
+    def bet_from_address(self) -> ChecksumAddress:
+        """If the SAFE is available, we always route transactions via SAFE. Otherwise we use the EOA."""
+        return (
+            self.SAFE_ADDRESS
+            if self.SAFE_ADDRESS
+            else private_key_to_public_key(self.bet_from_private_key)
+        )
+
     @property
     def openai_api_key(self) -> SecretStr:
         return check_not_none(
@@ -110,35 +118,10 @@ class APIKeys(BaseSettings):
             if APIKeys.model_fields[k].annotation in SECRET_TYPES and v is not None
         }
 
-
-class PrivateCredentials(BaseModel):
-    private_key: PrivateKey
-    safe_address: ChecksumAddress | None
-
-    @property
-    def public_key(self) -> ChecksumAddress:
-        """If the SAFE is available, we always route transactions via SAFE. Otherwise we use the EOA."""
-        return (
-            self.safe_address
-            if self.safe_address is not None
-            else private_key_to_public_key(self.private_key)
-        )
-
-    @property
-    def has_safe_address(self) -> bool:
-        return self.safe_address is not None
-
-    @staticmethod
-    def from_api_keys(api_keys: APIKeys) -> "PrivateCredentials":
-        return PrivateCredentials(
-            private_key=api_keys.bet_from_private_key,
-            safe_address=api_keys.SAFE_ADDRESS,
-        )
-
     def check_if_is_safe_owner(self, ethereum_client: EthereumClient) -> bool:
-        if not self.safe_address:
+        if not self.SAFE_ADDRESS:
             raise ValueError("Cannot check ownership if safe_address is not defined.")
 
-        s = Safe(self.safe_address, ethereum_client)  # type: ignore[abstract]
-        public_key_from_signer = private_key_to_public_key(self.private_key)
+        s = Safe(self.SAFE_ADDRESS, ethereum_client)  # type: ignore[abstract]
+        public_key_from_signer = private_key_to_public_key(self.bet_from_private_key)
         return s.retrieve_is_owner(public_key_from_signer)

prediction_market_agent_tooling/deploy/agent.py

@@ -8,7 +8,7 @@ from datetime import datetime, timedelta
 from pydantic import BaseModel, BeforeValidator
 from typing_extensions import Annotated
 
-from prediction_market_agent_tooling.config import APIKeys, PrivateCredentials
+from prediction_market_agent_tooling.config import APIKeys
 from prediction_market_agent_tooling.deploy.constants import (
     MARKET_TYPE_KEY,
     REPOSITORY_KEY,
@@ -260,11 +260,9 @@ class DeployableTraderAgent(DeployableAgent):
         """
         Executes actions that occur before bets are placed.
         """
-        private_credentials = PrivateCredentials.from_api_keys(APIKeys())
-
         if market_type == MarketType.OMEN:
             # Omen is specific, because the user (agent) needs to manually withdraw winnings from the market.
-            redeem_from_all_user_positions(private_credentials)
+            redeem_from_all_user_positions(APIKeys())
 
     def process_bets(self, market_type: MarketType) -> None:
         """

prediction_market_agent_tooling/loggers.py

@@ -1,5 +1,7 @@
+import builtins
 import logging
 import sys
+import typing as t
 import warnings
 from enum import Enum
 
@@ -35,9 +37,11 @@ def patch_logger() -> None:
         format_loguru = GCP_LOG_LOGURU_FORMAT
         format_logging = GCP_LOG_LOGGING_FORMAT
         datefmt_logging = GCP_LOG_FORMAT_LOGGING_DATEFMT
+        print_logging = print_using_loguru_info
 
     elif config.LOG_FORMAT == LogFormat.DEFAULT:
         format_loguru, format_logging, datefmt_logging = None, None, None
+        print_logging = None
 
     else:
         raise ValueError(f"Unknown log format: {config.LOG_FORMAT}")
@@ -63,9 +67,26 @@ def patch_logger() -> None:
     # Use logging module for warnings.
     logging.captureWarnings(True)
 
+    # Use loguru for prints.
+    if print_logging is not None:
+        builtins.print = print_logging  # type: ignore[assignment] # Monkey patching, it's messy but it works.
+
     logger.info(f"Patched logger for {config.LOG_FORMAT.value} format.")
 
 
+def print_using_loguru_info(
+    *values: object,
+    sep: str = " ",
+    end: str = "\n",
+    **kwargs: t.Any,
+) -> None:
+    message = sep.join(map(str, values)) + end
+    message = message.strip().replace(
+        "\n", "\\n"
+    )  # Escape new lines, because otherwise logs will be broken.
+    logger.info(message)
+
+
 def simple_warning_format(message, category, filename, lineno, line=None):  # type: ignore[no-untyped-def] # Not typed in the standard library neither.
     return f"{category.__name__}: {message}"
 

prediction_market_agent_tooling/markets/agent_market.py

@@ -18,6 +18,7 @@ from prediction_market_agent_tooling.tools.utils import (
     add_utc_timezone_validator,
     check_not_none,
     should_not_happen,
+    utcnow,
 )
 
 
@@ -147,9 +148,18 @@ class AgentMarket(BaseModel):
     ) -> list[Bet]:
         raise NotImplementedError("Subclasses must implement this method")
 
+    def is_closed(self) -> bool:
+        return self.close_time is not None and self.close_time <= utcnow()
+
     def is_resolved(self) -> bool:
         return self.resolution is not None
 
+    def get_liquidity(self) -> TokenAmount:
+        raise NotImplementedError("Subclasses must implement this method")
+
+    def has_liquidity(self) -> bool:
+        return self.get_liquidity().amount > 0
+
     def has_successful_resolution(self) -> bool:
         return self.resolution in [Resolution.YES, Resolution.NO]
 
@@ -174,8 +184,15 @@ class AgentMarket(BaseModel):
         raise NotImplementedError("Subclasses must implement this method")
 
     @classmethod
-    def get_positions(cls, user_id: str) -> list[Position]:
+    def get_positions(cls, user_id: str, liquid_only: bool = False) -> list[Position]:
         """
         Get all non-zero positions a user has in any market.
+
+        If `liquid_only` is True, only return positions that can be sold.
         """
         raise NotImplementedError("Subclasses must implement this method")
+
+    def can_be_traded(self) -> bool:
+        if self.is_closed() or not self.has_liquidity():
+            return False
+        return True

prediction_market_agent_tooling/markets/markets.py

@@ -2,7 +2,7 @@ import typing as t
 from datetime import datetime, timedelta
 from enum import Enum
 
-from prediction_market_agent_tooling.config import APIKeys, PrivateCredentials
+from prediction_market_agent_tooling.config import APIKeys
 from prediction_market_agent_tooling.markets.agent_market import (
     AgentMarket,
     FilterBy,
@@ -68,7 +68,6 @@ def have_bet_on_market_since(
     keys: APIKeys, market: AgentMarket, since: timedelta
 ) -> bool:
     start_time = utcnow() - since
-    credentials = PrivateCredentials.from_api_keys(keys)
     recently_betted_questions = (
         set(
             get_manifold_market(b.contractId).question
@@ -85,7 +84,7 @@ def have_bet_on_market_since(
             set(
                 b.title
                 for b in OmenSubgraphHandler().get_bets(
-                    better_address=credentials.public_key,
+                    better_address=keys.bet_from_address,
                     start_time=start_time,
                 )
             )

prediction_market_agent_tooling/markets/omen/omen.py

@@ -5,7 +5,7 @@ from datetime import datetime
 from web3 import Web3
 from web3.constants import HASH_ZERO
 
-from prediction_market_agent_tooling.config import APIKeys, PrivateCredentials
+from prediction_market_agent_tooling.config import APIKeys
 from prediction_market_agent_tooling.gtypes import (
     ChecksumAddress,
     HexAddress,
@@ -117,11 +117,17 @@ class OmenAgentMarket(AgentMarket):
             else None
         )
 
-    def get_liquidity(self) -> Wei:
+    def get_liquidity_in_wei(self) -> Wei:
         return self.get_contract().totalSupply()
 
     def get_liquidity_in_xdai(self) -> xDai:
-        return wei_to_xdai(self.get_liquidity())
+        return wei_to_xdai(self.get_liquidity_in_wei())
+
+    def get_liquidity(self) -> TokenAmount:
+        return TokenAmount(
+            amount=self.get_liquidity_in_xdai(),
+            currency=Currency.xDai,
+        )
 
     def get_tiny_bet_amount(self) -> BetAmount:
         return BetAmount(amount=0.00001, currency=self.currency)
@@ -133,13 +139,15 @@ class OmenAgentMarket(AgentMarket):
         omen_auto_deposit: bool = True,
         web3: Web3 | None = None,
     ) -> None:
+        if not self.can_be_traded():
+            raise ValueError(
+                f"Market {self.id} is not open for trading. Cannot place bet."
+            )
         if amount.currency != self.currency:
             raise ValueError(f"Omen bets are made in xDai. Got {amount.currency}.")
         amount_xdai = xDai(amount.amount)
-        keys = APIKeys()
-        private_credentials = PrivateCredentials.from_api_keys(keys)
         binary_omen_buy_outcome_tx(
-            private_credentials=private_credentials,
+            api_keys=APIKeys(),
             amount=amount_xdai,
             market=self,
             binary_outcome=outcome,
@@ -150,10 +158,12 @@ class OmenAgentMarket(AgentMarket):
     def sell_tokens(
         self, outcome: bool, amount: TokenAmount, auto_withdraw: bool = True
     ) -> None:
-        keys = APIKeys()
-        private_credentials = PrivateCredentials.from_api_keys(keys)
+        if not self.can_be_traded():
+            raise ValueError(
+                f"Market {self.id} is not open for trading. Cannot sell tokens."
+            )
         binary_omen_sell_outcome_tx(
-            private_credentials=private_credentials,
+            api_keys=APIKeys(),
             amount=xDai(amount.amount),
             market=self,
             binary_outcome=outcome,
@@ -206,9 +216,9 @@ class OmenAgentMarket(AgentMarket):
 
     def redeem_positions(
         self,
-        private_credentials: PrivateCredentials,
+        api_keys: APIKeys,
     ) -> None:
-        for_public_key = private_credentials.public_key
+        for_public_key = api_keys.bet_from_address
         market_is_redeemable = self.market_redeemable_by(user=for_public_key)
         if not market_is_redeemable:
             logger.debug(
@@ -216,9 +226,7 @@ class OmenAgentMarket(AgentMarket):
             )
             return None
 
-        omen_redeem_full_position_tx(
-            private_credentials=private_credentials, market=self
-        )
+        omen_redeem_full_position_tx(api_keys=api_keys, market=self)
 
     @staticmethod
     def from_data_model(model: OmenMarket) -> "OmenAgentMarket":
@@ -273,9 +281,6 @@ class OmenAgentMarket(AgentMarket):
         bets = OmenSubgraphHandler().get_bets(
             better_address=better_address, start_time=start_time
         )
-        # get unique titles
-        seen_titles = {bet.title: bet for bet in bets}
-        bets = list(seen_titles.values())
         bets.sort(key=lambda x: x.creation_datetime)
         return [b.to_bet() for b in bets]
 
@@ -310,7 +315,7 @@ class OmenAgentMarket(AgentMarket):
         )
 
     @classmethod
-    def get_positions(cls, user_id: str) -> list[Position]:
+    def get_positions(cls, user_id: str, liquid_only: bool = False) -> list[Position]:
         sgh = OmenSubgraphHandler()
         omen_positions = sgh.get_user_positions(
             better_address=Web3.to_checksum_address(user_id),
@@ -338,6 +343,11 @@ class OmenAgentMarket(AgentMarket):
         positions = []
         for condition_id, omen_positions in omen_positions_dict.items():
             market = cls.from_data_model(omen_markets[condition_id])
+
+            # Skip markets that cannot be traded if `liquid_only`` is True.
+            if liquid_only and not market.can_be_traded():
+                continue
+
             amounts: dict[OutcomeStr, TokenAmount] = {}
             for omen_position in omen_positions:
                 outecome_str = market.index_set_to_outcome_str(
@@ -370,7 +380,7 @@ def pick_binary_market(
 
 
 def omen_buy_outcome_tx(
-    private_credentials: PrivateCredentials,
+    api_keys: APIKeys,
     amount: xDai,
     market: OmenAgentMarket,
     outcome: str,
@@ -381,7 +391,7 @@ def omen_buy_outcome_tx(
     Bets the given amount of xDai for the given outcome in the given market.
     """
     amount_wei = xdai_to_wei(amount)
-    from_address_checksummed = private_credentials.public_key
+    from_address_checksummed = api_keys.bet_from_address
 
     market_contract: OmenFixedProductMarketMakerContract = market.get_contract()
 
@@ -398,7 +408,7 @@ def omen_buy_outcome_tx(
     expected_shares = remove_fraction(expected_shares, 0.01)
     # Approve the market maker to withdraw our collateral token.
     collateral_token_contract.approve(
-        private_credentials=private_credentials,
+        api_keys=api_keys,
         for_address=market_contract.address,
         amount_wei=amount_wei,
         web3=web3,
@@ -410,11 +420,11 @@ def omen_buy_outcome_tx(
     )
     if auto_deposit and collateral_token_balance < amount_wei:
         collateral_token_contract.deposit(
-            private_credentials=private_credentials, amount_wei=amount_wei, web3=web3
+            api_keys=api_keys, amount_wei=amount_wei, web3=web3
         )
     # Buy shares using the deposited xDai in the collateral token.
     market_contract.buy(
-        private_credentials=private_credentials,
+        api_keys=api_keys,
         amount_wei=amount_wei,
         outcome_index=outcome_index,
         min_outcome_tokens_to_buy=expected_shares,
@@ -423,7 +433,7 @@ def omen_buy_outcome_tx(
 
 
 def binary_omen_buy_outcome_tx(
-    private_credentials: PrivateCredentials,
+    api_keys: APIKeys,
     amount: xDai,
     market: OmenAgentMarket,
     binary_outcome: bool,
@@ -431,7 +441,7 @@ def binary_omen_buy_outcome_tx(
     web3: Web3 | None = None,
 ) -> None:
     omen_buy_outcome_tx(
-        private_credentials=private_credentials,
+        api_keys=api_keys,
         amount=amount,
         market=market,
         outcome=OMEN_TRUE_OUTCOME if binary_outcome else OMEN_FALSE_OUTCOME,
@@ -441,7 +451,7 @@ def binary_omen_buy_outcome_tx(
 
 
 def omen_sell_outcome_tx(
-    private_credentials: PrivateCredentials,
+    api_keys: APIKeys,
     amount: xDai,  # The xDai value of shares to sell.
     market: OmenAgentMarket,
     outcome: str,
@@ -482,14 +492,14 @@ def omen_sell_outcome_tx(
 
     # Approve the market maker to move our (all) conditional tokens.
     conditional_token_contract.setApprovalForAll(
-        private_credentials=private_credentials,
+        api_keys=api_keys,
         for_address=market_contract.address,
         approve=True,
         web3=web3,
     )
     # Sell the shares.
     market_contract.sell(
-        private_credentials,
+        api_keys,
         amount_wei,
         outcome_index,
         max_outcome_tokens_to_sell,
@@ -497,13 +507,11 @@ def omen_sell_outcome_tx(
     )
     if auto_withdraw:
         # Optionally, withdraw from the collateral token back to the `from_address` wallet.
-        collateral_token.withdraw(
-            private_credentials=private_credentials, amount_wei=amount_wei, web3=web3
-        )
+        collateral_token.withdraw(api_keys=api_keys, amount_wei=amount_wei, web3=web3)
 
 
 def binary_omen_sell_outcome_tx(
-    private_credentials: PrivateCredentials,
+    api_keys: APIKeys,
     amount: xDai,
     market: OmenAgentMarket,
     binary_outcome: bool,
@@ -511,7 +519,7 @@ def binary_omen_sell_outcome_tx(
     web3: Web3 | None = None,
 ) -> None:
     omen_sell_outcome_tx(
-        private_credentials=private_credentials,
+        api_keys=api_keys,
         amount=amount,
         market=market,
         outcome=OMEN_TRUE_OUTCOME if binary_outcome else OMEN_FALSE_OUTCOME,
@@ -521,7 +529,7 @@ def binary_omen_sell_outcome_tx(
 
 
 def omen_create_market_tx(
-    private_credentials: PrivateCredentials,
+    api_keys: APIKeys,
     initial_funds: xDai,
     question: str,
     closing_time: datetime,
@@ -535,7 +543,7 @@ def omen_create_market_tx(
     """
     Based on omen-exchange TypeScript code: https://github.com/protofire/omen-exchange/blob/b0b9a3e71b415d6becf21fe428e1c4fc0dad2e80/app/src/services/cpk/cpk.ts#L308
     """
-    from_address = private_credentials.public_key
+    from_address = api_keys.bet_from_address
     initial_funds_wei = xdai_to_wei(initial_funds)
 
     realitio_contract = OmenRealitioContract()
@@ -558,7 +566,7 @@ def omen_create_market_tx(
 
     # Approve the market maker to withdraw our collateral token.
     collateral_token_contract.approve(
-        private_credentials=private_credentials,
+        api_keys=api_keys,
         for_address=factory_contract.address,
         amount_wei=initial_funds_wei,
         web3=web3,
@@ -574,13 +582,11 @@ def omen_create_market_tx(
         and initial_funds_wei > 0
         and collateral_token_balance < initial_funds_wei
     ):
-        collateral_token_contract.deposit(
-            private_credentials, initial_funds_wei, web3=web3
-        )
+        collateral_token_contract.deposit(api_keys, initial_funds_wei, web3=web3)
 
     # Create the question on Realitio.
     question_id = realitio_contract.askQuestion(
-        private_credentials=private_credentials,
+        api_keys=api_keys,
         question=question,
         category=category,
         outcomes=outcomes,
@@ -599,7 +605,7 @@ def omen_create_market_tx(
     )
     if not conditional_token_contract.does_condition_exists(condition_id, web3=web3):
         conditional_token_contract.prepareCondition(
-            private_credentials=private_credentials,
+            api_keys=api_keys,
             question_id=question_id,
             oracle_address=oracle_contract.address,
             outcomes_slot_count=len(outcomes),
@@ -608,7 +614,7 @@ def omen_create_market_tx(
 
     # Create the market.
     create_market_receipt_tx = factory_contract.create2FixedProductMarketMaker(
-        private_credentials=private_credentials,
+        api_keys=api_keys,
         condition_id=condition_id,
         fee=fee,
         initial_funds_wei=initial_funds_wei,
@@ -627,13 +633,13 @@ def omen_create_market_tx(
 
 
 def omen_fund_market_tx(
-    private_credentials: PrivateCredentials,
+    api_keys: APIKeys,
     market: OmenAgentMarket,
     funds: Wei,
     auto_deposit: bool,
     web3: Web3 | None = None,
 ) -> None:
-    from_address = private_credentials.public_key
+    from_address = api_keys.bet_from_address
     market_contract = market.get_contract()
     collateral_token_contract = OmenCollateralTokenContract()
 
@@ -644,16 +650,16 @@ def omen_fund_market_tx(
         and collateral_token_contract.balanceOf(for_address=from_address, web3=web3)
         < funds
     ):
-        collateral_token_contract.deposit(private_credentials, funds, web3=web3)
+        collateral_token_contract.deposit(api_keys, funds, web3=web3)
 
     collateral_token_contract.approve(
-        private_credentials=private_credentials,
+        api_keys=api_keys,
         for_address=market_contract.address,
         amount_wei=funds,
         web3=web3,
     )
 
-    market_contract.addFunding(private_credentials, funds, web3=web3)
+    market_contract.addFunding(api_keys, funds, web3=web3)
 
 
 def build_parent_collection_id() -> HexStr:
@@ -661,7 +667,7 @@ def build_parent_collection_id() -> HexStr:
 
 
 def omen_redeem_full_position_tx(
-    private_credentials: PrivateCredentials,
+    api_keys: APIKeys,
     market: OmenAgentMarket,
     web3: Web3 | None = None,
 ) -> None:
@@ -670,7 +676,7 @@ def omen_redeem_full_position_tx(
     to be redeemed before sending the transaction.
     """
 
-    from_address = private_credentials.public_key
+    from_address = api_keys.bet_from_address
 
     market_contract: OmenFixedProductMarketMakerContract = market.get_contract()
     conditional_token_contract = OmenConditionalTokenContract()
@@ -700,7 +706,7 @@ def omen_redeem_full_position_tx(
         return
 
     conditional_token_contract.redeemPositions(
-        private_credentials=private_credentials,
+        api_keys=api_keys,
         collateral_token_address=market.collateral_token_contract_address_checksummed,
         condition_id=market.condition.id,
         parent_collection_id=parent_collection_id,
@@ -741,7 +747,7 @@ def get_conditional_tokens_balance_for_market(
 
 
 def omen_remove_fund_market_tx(
-    private_credentials: PrivateCredentials,
+    api_keys: APIKeys,
     market: OmenAgentMarket,
     shares: Wei | None,
     web3: Web3 | None = None,
@@ -754,7 +760,7 @@ def omen_remove_fund_market_tx(
     After we remove funding, using the `mergePositions` we get `min(shares per index)` of wxDai back, but the remaining shares can be converted back only after the market is resolved.
     That can be done using the `redeem_from_all_user_positions` function below.
     """
-    from_address = private_credentials.public_key
+    from_address = api_keys.bet_from_address
     market_contract = market.get_contract()
     original_balances = get_balances(from_address, web3=web3)
 
@@ -769,9 +775,7 @@ def omen_remove_fund_market_tx(
         )
         shares = total_shares
 
-    market_contract.removeFunding(
-        private_credentials=private_credentials, remove_funding=shares, web3=web3
-    )
+    market_contract.removeFunding(api_keys=api_keys, remove_funding=shares, web3=web3)
 
     conditional_tokens = OmenConditionalTokenContract()
     parent_collection_id = build_parent_collection_id()
@@ -784,7 +788,7 @@ def omen_remove_fund_market_tx(
     amount_to_merge = min(amount_per_index_set.values())
 
     result = conditional_tokens.mergePositions(
-        private_credentials=private_credentials,
+        api_keys=api_keys,
         collateral_token_address=market.collateral_token_contract_address_checksummed,
         parent_collection_id=parent_collection_id,
         conditionId=market.condition.id,
@@ -802,13 +806,13 @@ def omen_remove_fund_market_tx(
 
 
 def redeem_from_all_user_positions(
-    private_credentials: PrivateCredentials,
+    api_keys: APIKeys,
     web3: Web3 | None = None,
 ) -> None:
     """
     Redeems from all user positions where the user didn't redeem yet.
     """
-    public_key = private_credentials.public_key
+    public_key = api_keys.bet_from_address
 
     conditional_token_contract = OmenConditionalTokenContract()
     user_positions = OmenSubgraphHandler().get_user_positions(
@@ -832,7 +836,7 @@ def redeem_from_all_user_positions(
 
         original_balances = get_balances(public_key, web3)
         conditional_token_contract.redeemPositions(
-            private_credentials=private_credentials,
+            api_keys=api_keys,
             collateral_token_address=user_position.position.collateral_token_contract_address_checksummed,
             condition_id=condition_id,
             parent_collection_id=build_parent_collection_id(),

prediction_market_agent_tooling/markets/omen/omen_contracts.py

@@ -6,7 +6,7 @@ from enum import Enum
 
 from web3 import Web3
 
-from prediction_market_agent_tooling.config import PrivateCredentials
+from prediction_market_agent_tooling.config import APIKeys
 from prediction_market_agent_tooling.gtypes import (
     ABI,
     ChecksumAddress,
@@ -51,7 +51,7 @@ class OmenOracleContract(ContractOnGnosisChain):
 
     def resolve(
         self,
-        private_credentials: PrivateCredentials,
+        api_keys: APIKeys,
         question_id: HexBytes,
         template_id: int,
         question_raw: str,
@@ -59,7 +59,7 @@ class OmenOracleContract(ContractOnGnosisChain):
         web3: Web3 | None = None,
     ) -> TxReceipt:
         return self.send(
-            private_credentials=private_credentials,
+            api_keys=api_keys,
             function_name="resolve",
             function_params=dict(
                 questionId=question_id,
@@ -138,7 +138,7 @@ class OmenConditionalTokenContract(ContractOnGnosisChain):
 
     def mergePositions(
         self,
-        private_credentials: PrivateCredentials,
+        api_keys: APIKeys,
         collateral_token_address: ChecksumAddress,
         parent_collection_id: HexStr,
         conditionId: HexBytes,
@@ -147,7 +147,7 @@ class OmenConditionalTokenContract(ContractOnGnosisChain):
         web3: Web3 | None = None,
     ) -> TxReceipt:
         return self.send(
-            private_credentials=private_credentials,
+            api_keys=api_keys,
             function_name="mergePositions",
             function_params=[
                 collateral_token_address,
@@ -161,7 +161,7 @@ class OmenConditionalTokenContract(ContractOnGnosisChain):
 
     def redeemPositions(
         self,
-        private_credentials: PrivateCredentials,
+        api_keys: APIKeys,
         collateral_token_address: HexAddress,
         condition_id: HexBytes,
         parent_collection_id: HexStr,
@@ -169,7 +169,7 @@ class OmenConditionalTokenContract(ContractOnGnosisChain):
         web3: Web3 | None = None,
     ) -> TxReceipt:
         return self.send(
-            private_credentials=private_credentials,
+            api_keys=api_keys,
             function_name="redeemPositions",
             function_params=[
                 collateral_token_address,
@@ -209,14 +209,14 @@ class OmenConditionalTokenContract(ContractOnGnosisChain):
 
     def setApprovalForAll(
         self,
-        private_credentials: PrivateCredentials,
+        api_keys: APIKeys,
         for_address: ChecksumAddress,
         approve: bool,
         tx_params: t.Optional[TxParams] = None,
         web3: Web3 | None = None,
     ) -> TxReceipt:
         return self.send(
-            private_credentials=private_credentials,
+            api_keys=api_keys,
             function_name="setApprovalForAll",
             function_params=[
                 for_address,
@@ -228,7 +228,7 @@ class OmenConditionalTokenContract(ContractOnGnosisChain):
 
     def prepareCondition(
         self,
-        private_credentials: PrivateCredentials,
+        api_keys: APIKeys,
         oracle_address: ChecksumAddress,
         question_id: HexBytes,
         outcomes_slot_count: int,
@@ -236,7 +236,7 @@ class OmenConditionalTokenContract(ContractOnGnosisChain):
         web3: Web3 | None = None,
     ) -> TxReceipt:
         return self.send(
-            private_credentials=private_credentials,
+            api_keys=api_keys,
             function_name="prepareCondition",
             function_params=[
                 oracle_address,
@@ -291,7 +291,7 @@ class OmenFixedProductMarketMakerContract(ContractOnGnosisChain):
 
     def buy(
         self,
-        private_credentials: PrivateCredentials,
+        api_keys: APIKeys,
         amount_wei: Wei,
         outcome_index: int,
         min_outcome_tokens_to_buy: OmenOutcomeToken,
@@ -299,7 +299,7 @@ class OmenFixedProductMarketMakerContract(ContractOnGnosisChain):
         web3: Web3 | None = None,
     ) -> TxReceipt:
         return self.send(
-            private_credentials=private_credentials,
+            api_keys=api_keys,
             function_name="buy",
             function_params=[
                 amount_wei,
@@ -312,7 +312,7 @@ class OmenFixedProductMarketMakerContract(ContractOnGnosisChain):
 
     def sell(
         self,
-        private_credentials: PrivateCredentials,
+        api_keys: APIKeys,
         amount_wei: Wei,
         outcome_index: int,
         max_outcome_tokens_to_sell: OmenOutcomeToken,
@@ -320,7 +320,7 @@ class OmenFixedProductMarketMakerContract(ContractOnGnosisChain):
         web3: Web3 | None = None,
     ) -> TxReceipt:
         return self.send(
-            private_credentials=private_credentials,
+            api_keys=api_keys,
             function_name="sell",
             function_params=[
                 amount_wei,
@@ -333,7 +333,7 @@ class OmenFixedProductMarketMakerContract(ContractOnGnosisChain):
 
     def addFunding(
         self,
-        private_credentials: PrivateCredentials,
+        api_keys: APIKeys,
         add_funding: Wei,
         tx_params: t.Optional[TxParams] = None,
         web3: Web3 | None = None,
@@ -344,7 +344,7 @@ class OmenFixedProductMarketMakerContract(ContractOnGnosisChain):
         # `addFunding` with `distribution_hint` can be used only during the market creation, so forcing empty here.
         distribution_hint: list[int] = []
         return self.send(
-            private_credentials=private_credentials,
+            api_keys=api_keys,
             function_name="addFunding",
             function_params=[add_funding, distribution_hint],
             tx_params=tx_params,
@@ -353,7 +353,7 @@ class OmenFixedProductMarketMakerContract(ContractOnGnosisChain):
 
     def removeFunding(
         self,
-        private_credentials: PrivateCredentials,
+        api_keys: APIKeys,
         remove_funding: Wei,
         tx_params: t.Optional[TxParams] = None,
         web3: Web3 | None = None,
@@ -362,7 +362,7 @@ class OmenFixedProductMarketMakerContract(ContractOnGnosisChain):
         Remove funding is done in shares.
         """
         return self.send(
-            private_credentials=private_credentials,
+            api_keys=api_keys,
             function_name="removeFunding",
             function_params=[remove_funding],
             tx_params=tx_params,
@@ -407,7 +407,7 @@ class OmenFixedProductMarketMakerFactoryContract(ContractOnGnosisChain):
 
     def create2FixedProductMarketMaker(
         self,
-        private_credentials: PrivateCredentials,
+        api_keys: APIKeys,
         condition_id: HexBytes,
         initial_funds_wei: Wei,
         fee: float = OMEN_DEFAULT_MARKET_FEE,
@@ -418,7 +418,7 @@ class OmenFixedProductMarketMakerFactoryContract(ContractOnGnosisChain):
             xdai_type(fee)
         )  # We need to convert this to the wei units, but in reality it's % fee as stated in the `OMEN_DEFAULT_MARKET_FEE` variable.
         return self.send(
-            private_credentials=private_credentials,
+            api_keys=api_keys,
             function_name="create2FixedProductMarketMaker",
             function_params=dict(
                 saltNonce=random.randint(
@@ -491,7 +491,7 @@ class OmenRealitioContract(ContractOnGnosisChain):
 
     def askQuestion(
         self,
-        private_credentials: PrivateCredentials,
+        api_keys: APIKeys,
         question: str,
         category: str,
         outcomes: list[str],
@@ -518,7 +518,7 @@ class OmenRealitioContract(ContractOnGnosisChain):
             ]
         )
         receipt_tx = self.send(
-            private_credentials=private_credentials,
+            api_keys=api_keys,
             function_name="askQuestion",
             function_params=dict(
                 template_id=template_id,
@@ -540,7 +540,7 @@ class OmenRealitioContract(ContractOnGnosisChain):
 
     def submitAnswer(
         self,
-        private_credentials: PrivateCredentials,
+        api_keys: APIKeys,
         question_id: HexBytes,
         answer: str,
         outcomes: list[str],
@@ -558,7 +558,7 @@ class OmenRealitioContract(ContractOnGnosisChain):
         outcomes = [o.lower() for o in outcomes]
 
         return self.send_with_value(
-            private_credentials=private_credentials,
+            api_keys=api_keys,
             function_name="submitAnswer",
             function_params=dict(
                 question_id=question_id,
@@ -573,7 +573,7 @@ class OmenRealitioContract(ContractOnGnosisChain):
 
     def claimWinnings(
         self,
-        private_credentials: PrivateCredentials,
+        api_keys: APIKeys,
         question_id: HexBytes,
         history_hashes: list[HexBytes],
         addresses: list[ChecksumAddress],
@@ -583,7 +583,7 @@ class OmenRealitioContract(ContractOnGnosisChain):
         web3: Web3 | None = None,
     ) -> TxReceipt:
         return self.send(
-            private_credentials=private_credentials,
+            api_keys=api_keys,
             function_name="claimWinnings",
             function_params=dict(
                 question_id=question_id,
@@ -606,9 +606,7 @@ class OmenRealitioContract(ContractOnGnosisChain):
 
     def withdraw(
         self,
-        private_credentials: PrivateCredentials,
+        api_keys: APIKeys,
         web3: Web3 | None = None,
     ) -> TxReceipt:
-        return self.send(
-            private_credentials=private_credentials, function_name="withdraw", web3=web3
-        )
+        return self.send(api_keys=api_keys, function_name="withdraw", web3=web3)

prediction_market_agent_tooling/markets/omen/omen_resolving.py

@@ -1,6 +1,6 @@
 from web3 import Web3
 
-from prediction_market_agent_tooling.config import PrivateCredentials
+from prediction_market_agent_tooling.config import APIKeys
 from prediction_market_agent_tooling.gtypes import (
     ChecksumAddress,
     HexAddress,
@@ -35,7 +35,7 @@ from prediction_market_agent_tooling.tools.web3_utils import ZERO_BYTES, xdai_to
 
 
 def claim_bonds_on_realitio_questions(
-    private_credentials: PrivateCredentials,
+    api_keys: APIKeys,
     questions: list[RealityQuestion],
     auto_withdraw: bool,
     web3: Web3 | None = None,
@@ -47,7 +47,7 @@ def claim_bonds_on_realitio_questions(
             f"[{idx+1} / {len(questions)}] Claiming bond for {question.questionId=} {question.url=}"
         )
         claim_bonds_on_realitio_question(
-            private_credentials, question, auto_withdraw=auto_withdraw, web3=web3
+            api_keys, question, auto_withdraw=auto_withdraw, web3=web3
         )
         claimed_questions.append(question.questionId)
 
@@ -55,12 +55,12 @@ def claim_bonds_on_realitio_questions(
 
 
 def claim_bonds_on_realitio_question(
-    private_credentials: PrivateCredentials,
+    api_keys: APIKeys,
     question: RealityQuestion,
     auto_withdraw: bool,
     web3: Web3 | None = None,
 ) -> None:
-    public_key = private_credentials.public_key
+    public_key = api_keys.bet_from_address
     realitio_contract = OmenRealitioContract()
 
     # Get all answers for the question.
@@ -105,7 +105,7 @@ def claim_bonds_on_realitio_question(
         answers.append(answer.answer)
 
     realitio_contract.claimWinnings(
-        private_credentials=private_credentials,
+        api_keys=api_keys,
         question_id=question.questionId,
         history_hashes=history_hashes,
         addresses=addresses,
@@ -118,11 +118,11 @@ def claim_bonds_on_realitio_question(
     # Keeping balance on Realitio is not useful, so it's recommended to just withdraw it.
     if current_balance > 0 and auto_withdraw:
         logger.info(f"Withdrawing remaining balance {current_balance=}")
-        realitio_contract.withdraw(private_credentials, web3=web3)
+        realitio_contract.withdraw(api_keys, web3=web3)
 
 
 def finalize_markets(
-    private_credentials: PrivateCredentials,
+    api_keys: APIKeys,
     markets_with_resolutions: list[tuple[OmenMarket, Resolution | None]],
     web3: Web3 | None = None,
 ) -> list[HexAddress]:
@@ -139,7 +139,7 @@ def finalize_markets(
         elif resolution in (Resolution.YES, Resolution.NO):
             logger.info(f"Found resolution {resolution.value=} for {market.url=}")
             omen_submit_answer_market_tx(
-                private_credentials,
+                api_keys,
                 market,
                 resolution,
                 OMEN_DEFAULT_REALITIO_BOND_VALUE,
@@ -155,7 +155,7 @@ def finalize_markets(
 
 
 def resolve_markets(
-    private_credentials: PrivateCredentials,
+    api_keys: APIKeys,
     markets: list[OmenMarket],
     web3: Web3 | None = None,
 ) -> list[HexAddress]:
@@ -165,14 +165,14 @@ def resolve_markets(
         logger.info(
             f"[{idx+1} / {len(markets)}] Resolving {market.url=} {market.question_title=}"
         )
-        omen_resolve_market_tx(private_credentials, market, web3=web3)
+        omen_resolve_market_tx(api_keys, market, web3=web3)
         resolved_markets.append(market.id)
 
     return resolved_markets
 
 
 def omen_submit_answer_market_tx(
-    private_credentials: PrivateCredentials,
+    api_keys: APIKeys,
     market: OmenMarket,
     resolution: Resolution,
     bond: xDai,
@@ -184,7 +184,7 @@ def omen_submit_answer_market_tx(
     """
     realitio_contract = OmenRealitioContract()
     realitio_contract.submitAnswer(
-        private_credentials=private_credentials,
+        api_keys=api_keys,
         question_id=market.question.id,
         answer=resolution.value,
         outcomes=market.question.outcomes,
@@ -194,7 +194,7 @@ def omen_submit_answer_market_tx(
 
 
 def omen_resolve_market_tx(
-    private_credentials: PrivateCredentials,
+    api_keys: APIKeys,
     market: OmenMarket,
     web3: Web3 | None = None,
 ) -> None:
@@ -203,7 +203,7 @@ def omen_resolve_market_tx(
     """
     oracle_contract = OmenOracleContract()
     oracle_contract.resolve(
-        private_credentials=private_credentials,
+        api_keys=api_keys,
         question_id=market.question.id,
         template_id=market.question.templateId,
         question_raw=market.question.question_raw,

prediction_market_agent_tooling/markets/polymarket/data_models_web.py

@@ -83,7 +83,7 @@ class Market(BaseModel):
     category: t.Any | None
     ammType: t.Any | None
     description: str
-    liquidity: str
+    liquidity: str | None
     startDate: datetime
     createdAt: datetime
     xAxisValue: t.Any | None
@@ -128,7 +128,7 @@ class Market(BaseModel):
     umaResolutionStatus: t.Any | None
     curationOrder: t.Any | None
     volumeNum: USDC | None
-    liquidityNum: float
+    liquidityNum: float | None
     endDateIso: datetime | None
     startDateIso: datetime | None
     umaEndDateIso: datetime | None
@@ -137,8 +137,8 @@ class Market(BaseModel):
     gameStartTime: datetime | None
     secondsDelay: int | None
     clobTokenIds: list[str]
-    liquidityAmm: float
-    liquidityClob: float
+    liquidityAmm: float | None
+    liquidityClob: float | None
     makerBaseFee: int | None
     takerBaseFee: int | None
     negRisk: t.Any | None
@@ -163,7 +163,7 @@ class Market(BaseModel):
     closed_time: t.Any | None
     wide_format: bool | None
     volume_num: USDC | None
-    liquidity_num: USDC
+    liquidity_num: USDC | None
     image_raw: str
     resolutionData: ResolutionData
 
@@ -228,7 +228,7 @@ class PolymarketFullMarket(BaseModel):
     new: bool
     featured: bool
     restricted: bool
-    liquidity: USDC
+    liquidity: USDC | None
     volume: USDC | None
     volume24hr: USDC | None
     competitive: float
@@ -239,8 +239,8 @@ class PolymarketFullMarket(BaseModel):
     disqusThread: t.Any | None
     updatedAt: datetime
     enableOrderBook: bool
-    liquidityAmm: float
-    liquidityClob: float
+    liquidityAmm: float | None
+    liquidityClob: float | None
     imageOptimized: ImageOptimized | None
     iconOptimized: IconOptimized | None
     featuredImageOptimized: str | None
@@ -248,7 +248,7 @@ class PolymarketFullMarket(BaseModel):
     negRiskMarketID: t.Any | None
     negRiskFeeBips: t.Any | None
     markets: list[Market]
-    categories: list[Category] | None
+    categories: list[Category] | None = None
     series: t.Any | None
     image_raw: str
 

prediction_market_agent_tooling/monitor/markets/omen.py

@@ -2,7 +2,7 @@ import typing as t
 
 from google.cloud.functions_v2.types.functions import Function
 
-from prediction_market_agent_tooling.config import APIKeys, PrivateCredentials
+from prediction_market_agent_tooling.config import APIKeys
 from prediction_market_agent_tooling.deploy.constants import MARKET_TYPE_KEY
 from prediction_market_agent_tooling.gtypes import ChecksumAddress, DatetimeWithTimezone
 from prediction_market_agent_tooling.markets.data_models import ResolvedBet
@@ -49,8 +49,7 @@ class DeployedOmenAgent(DeployedAgent):
             and api_keys.BET_FROM_PRIVATE_KEY
             != APIKeys().BET_FROM_PRIVATE_KEY  # Check that it didn't get if from the default env.
         ):
-            private_credentials = PrivateCredentials.from_api_keys(api_keys)
-            env_vars["omen_public_key"] = private_credentials.public_key
+            env_vars["omen_public_key"] = api_keys.bet_from_address
         return super().from_env_vars_without_prefix(
             env_vars=env_vars, extra_vars=extra_vars
         )
@@ -61,11 +60,10 @@ class DeployedOmenAgent(DeployedAgent):
         start_time: DatetimeWithTimezone,
         api_keys: APIKeys,
     ) -> "DeployedOmenAgent":
-        private_credentials = PrivateCredentials.from_api_keys(api_keys)
         return DeployedOmenAgent(
             name=name,
             start_time=start_time,
-            omen_public_key=private_credentials.public_key,
+            omen_public_key=api_keys.bet_from_address,
         )
 
     @classmethod

prediction_market_agent_tooling/monitor/markets/polymarket.py

@@ -2,7 +2,7 @@ import typing as t
 
 from google.cloud.functions_v2.types.functions import Function
 
-from prediction_market_agent_tooling.config import APIKeys, PrivateCredentials
+from prediction_market_agent_tooling.config import APIKeys
 from prediction_market_agent_tooling.deploy.constants import MARKET_TYPE_KEY
 from prediction_market_agent_tooling.gtypes import ChecksumAddress, DatetimeWithTimezone
 from prediction_market_agent_tooling.markets.data_models import ResolvedBet
@@ -28,11 +28,10 @@ class DeployedPolymarketAgent(DeployedAgent):
         start_time: DatetimeWithTimezone,
         api_keys: APIKeys,
     ) -> "DeployedPolymarketAgent":
-        private_credentials = PrivateCredentials.from_api_keys(api_keys)
         return DeployedPolymarketAgent(
             name=name,
             start_time=start_time,
-            polymarket_public_key=private_credentials.public_key,
+            polymarket_public_key=api_keys.bet_from_address,
         )
 
     @classmethod

prediction_market_agent_tooling/tools/contract.py

@@ -6,7 +6,7 @@ from contextlib import contextmanager
 from pydantic import BaseModel, field_validator
 from web3 import Web3
 
-from prediction_market_agent_tooling.config import PrivateCredentials
+from prediction_market_agent_tooling.config import APIKeys
 from prediction_market_agent_tooling.gtypes import (
     ABI,
     ChainID,
@@ -86,7 +86,7 @@ class ContractBaseClass(BaseModel):
 
     def send(
         self,
-        private_credentials: PrivateCredentials,
+        api_keys: APIKeys,
         function_name: str,
         function_params: t.Optional[list[t.Any] | dict[str, t.Any]] = None,
         tx_params: t.Optional[TxParams] = None,
@@ -97,13 +97,13 @@ class ContractBaseClass(BaseModel):
         Used for changing a state (writing) to the contract.
         """
 
-        if private_credentials.safe_address is not None:
+        if api_keys.SAFE_ADDRESS:
             return send_function_on_contract_tx_using_safe(
                 web3=web3 or self.get_web3(),
                 contract_address=self.address,
                 contract_abi=self.abi,
-                from_private_key=private_credentials.private_key,
-                safe_address=private_credentials.safe_address,
+                from_private_key=api_keys.bet_from_private_key,
+                safe_address=api_keys.SAFE_ADDRESS,
                 function_name=function_name,
                 function_params=function_params,
                 tx_params=tx_params,
@@ -113,7 +113,7 @@ class ContractBaseClass(BaseModel):
             web3=web3 or self.get_web3(),
             contract_address=self.address,
             contract_abi=self.abi,
-            from_private_key=private_credentials.private_key,
+            from_private_key=api_keys.bet_from_private_key,
             function_name=function_name,
             function_params=function_params,
             tx_params=tx_params,
@@ -122,7 +122,7 @@ class ContractBaseClass(BaseModel):
 
     def send_with_value(
         self,
-        private_credentials: PrivateCredentials,
+        api_keys: APIKeys,
         function_name: str,
         amount_wei: Wei,
         function_params: t.Optional[list[t.Any] | dict[str, t.Any]] = None,
@@ -134,7 +134,7 @@ class ContractBaseClass(BaseModel):
         Used for changing a state (writing) to the contract, including sending chain's native currency.
         """
         return self.send(
-            private_credentials=private_credentials,
+            api_keys=api_keys,
             function_name=function_name,
             function_params=function_params,
             tx_params={"value": amount_wei, **(tx_params or {})},
@@ -158,14 +158,14 @@ class ContractERC20BaseClass(ContractBaseClass):
 
     def approve(
         self,
-        private_credentials: PrivateCredentials,
+        api_keys: APIKeys,
         for_address: ChecksumAddress,
         amount_wei: Wei,
         tx_params: t.Optional[TxParams] = None,
         web3: Web3 | None = None,
     ) -> TxReceipt:
         return self.send(
-            private_credentials=private_credentials,
+            api_keys=api_keys,
             function_name="approve",
             function_params=[
                 for_address,
@@ -177,13 +177,13 @@ class ContractERC20BaseClass(ContractBaseClass):
 
     def deposit(
         self,
-        private_credentials: PrivateCredentials,
+        api_keys: APIKeys,
         amount_wei: Wei,
         tx_params: t.Optional[TxParams] = None,
         web3: Web3 | None = None,
     ) -> TxReceipt:
         return self.send_with_value(
-            private_credentials=private_credentials,
+            api_keys=api_keys,
             function_name="deposit",
             amount_wei=amount_wei,
             tx_params=tx_params,
@@ -192,7 +192,7 @@ class ContractERC20BaseClass(ContractBaseClass):
 
     def transferFrom(
         self,
-        private_credentials: PrivateCredentials,
+        api_keys: APIKeys,
         sender: ChecksumAddress,
         recipient: ChecksumAddress,
         amount_wei: Wei,
@@ -200,7 +200,7 @@ class ContractERC20BaseClass(ContractBaseClass):
         web3: Web3 | None = None,
     ) -> TxReceipt:
         return self.send(
-            private_credentials=private_credentials,
+            api_keys=api_keys,
             function_name="transferFrom",
             function_params=[sender, recipient, amount_wei],
             tx_params=tx_params,
@@ -209,13 +209,13 @@ class ContractERC20BaseClass(ContractBaseClass):
 
     def withdraw(
         self,
-        private_credentials: PrivateCredentials,
+        api_keys: APIKeys,
         amount_wei: Wei,
         tx_params: t.Optional[TxParams] = None,
         web3: Web3 | None = None,
     ) -> TxReceipt:
         return self.send(
-            private_credentials=private_credentials,
+            api_keys=api_keys,
             function_name="withdraw",
             function_params=[amount_wei],
             tx_params=tx_params,

{prediction_market_agent_tooling-0.26.0.dist-info → prediction_market_agent_tooling-0.28.0.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: prediction-market-agent-tooling
-Version: 0.26.0
+Version: 0.28.0
 Summary: Tools to benchmark, deploy and monitor prediction market agents.
 Author: Gnosis
 Requires-Python: >=3.10,<3.12

{prediction_market_agent_tooling-0.26.0.dist-info → prediction_market_agent_tooling-0.28.0.dist-info}/RECORD

@@ -11,16 +11,16 @@ prediction_market_agent_tooling/benchmark/__init__.py,sha256=47DEQpj8HBSa-_TImW-
 prediction_market_agent_tooling/benchmark/agents.py,sha256=HPIFJvackW110ch3UkktbxhU48gMRVo4gQse84Klhdc,4000
 prediction_market_agent_tooling/benchmark/benchmark.py,sha256=xiHKzZx5GHSsDerFHMZ9j_LXAXnSaITSvv67iPe3MEU,21095
 prediction_market_agent_tooling/benchmark/utils.py,sha256=iS1BzyXcCMfMm1Rx--1QCH0pHvBTblTndcDQFbTUJ2s,2897
-prediction_market_agent_tooling/config.py,sha256=FI8feNLmA0QYmN-llvyDh3c6tN2ZGl7Eerw1e27v51A,4757
-prediction_market_agent_tooling/deploy/agent.py,sha256=M6qSZ1mN0AEwyix3WJal7ulifI0o-v89S2K_s_zTBbs,10292
+prediction_market_agent_tooling/config.py,sha256=yELIlzAm2yBwZzGRvHtHBZZV3NZy5CllJfo3chMQMo0,4297
+prediction_market_agent_tooling/deploy/agent.py,sha256=P4MaueaXpNakAWXhB0EYsWLNRXSeRisaN55IVDb8AR8,10187
 prediction_market_agent_tooling/deploy/agent_example.py,sha256=tqXVA2HSFK3pdZ49tMmta8aKdJFT8JN8WeJ1akjrpBk,909
 prediction_market_agent_tooling/deploy/constants.py,sha256=M5ty8URipYMGe_G-RzxRydK3AFL6CyvmqCraJUrLBnE,82
 prediction_market_agent_tooling/deploy/gcp/deploy.py,sha256=CYUgnfy-9XVk04kkxA_5yp0GE9Mw5caYqlFUZQ2j3ks,3739
 prediction_market_agent_tooling/deploy/gcp/kubernetes_models.py,sha256=qYIHRxQLac3yxtZ8ChikiPG9O1aUQucHW0muTSm1nto,2627
 prediction_market_agent_tooling/deploy/gcp/utils.py,sha256=oyW0jgrUT2Tr49c7GlpcMsYNQjoCSOcWis3q-MmVAhU,6089
 prediction_market_agent_tooling/gtypes.py,sha256=xGSJXw12hzp8LwvQ956l01GiZMWd07MZTYqo8CXVeLY,2417
-prediction_market_agent_tooling/loggers.py,sha256=0znHrzxSbeBaDiB920EZC6a2TiF0tw80Sa_yoLwvo_w,2289
-prediction_market_agent_tooling/markets/agent_market.py,sha256=b2gsqEXADJir_LxcNUmzEfxGCcJ_V5mWPGM2SZfIA6M,6250
+prediction_market_agent_tooling/loggers.py,sha256=gG92EeLAxqFqAm9E_Uz5dFXL_FC-8x9zszI9a-4A1Os,2898
+prediction_market_agent_tooling/markets/agent_market.py,sha256=I1r83EU5yMJ1dJhCqZjJ523XOElhBkb96oGDxbr4mlU,6818
 prediction_market_agent_tooling/markets/categorize.py,sha256=yTd-lDMPW4ESDSzmxeLLBuzLX0FggOF7Vbswh7295o0,941
 prediction_market_agent_tooling/markets/data_models.py,sha256=uODY3aoFp8YYeLAUcrzMk1yU8pIKsTLobB9xIEGTmKs,1170
 prediction_market_agent_tooling/markets/manifold/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
@@ -28,22 +28,22 @@ prediction_market_agent_tooling/markets/manifold/api.py,sha256=m6qOzDiyQfxj62Eo_
 prediction_market_agent_tooling/markets/manifold/data_models.py,sha256=2DZIxwtDp-PH0UWTGiktMFIGAAQoVutI07UsxjNyTyE,5296
 prediction_market_agent_tooling/markets/manifold/manifold.py,sha256=DJZ88r5BGtAugUw5SIyDfzK1S70titba_fwT7OYXuAY,3896
 prediction_market_agent_tooling/markets/manifold/utils.py,sha256=cPPFWXm3vCYH1jy7_ctJZuQH9ZDaPL4_AgAYzGWkoow,513
-prediction_market_agent_tooling/markets/markets.py,sha256=TXo2qNmjUXhbTK0d-V7hW_aaJDpqP9RWHxm7mayhI0o,3042
+prediction_market_agent_tooling/markets/markets.py,sha256=w05Oo7yCA2axpCw69Q9y4i9Gcdpht0u5bZGbWqld3rU,2964
 prediction_market_agent_tooling/markets/omen/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 prediction_market_agent_tooling/markets/omen/data_models.py,sha256=f7RO1Zvytii-M2koGuLQiPERjTq_DsDjrT01mar_sX4,14398
-prediction_market_agent_tooling/markets/omen/omen.py,sha256=iNL8m5qzkkxr_ohDfQaYIGiFg92h70WOMxq8-udToIE,32337
-prediction_market_agent_tooling/markets/omen/omen_contracts.py,sha256=cHL-VYQDzLWLtqS_4l91HGaKAOKoFjXHN76OYfIU2T0,20537
-prediction_market_agent_tooling/markets/omen/omen_resolving.py,sha256=WbVAQyhFlwFCk1wncs3Uf2PM6YZ9hV7pUbkFIGGu8iw,9067
+prediction_market_agent_tooling/markets/omen/omen.py,sha256=UeBKfiEzTVZMRJ-r6YHXdlrMniwz3V1Te2yZgNX64rA,31902
+prediction_market_agent_tooling/markets/omen/omen_contracts.py,sha256=eDS8vN4Klv_-Y1wwfIeLDt3twhl9U_AJjPQov0JScb0,19888
+prediction_market_agent_tooling/markets/omen/omen_resolving.py,sha256=-qssaOJweI_QktR7bQiYjn-V6T_bBTQOH9qQjG35D48,8809
 prediction_market_agent_tooling/markets/omen/omen_subgraph_handler.py,sha256=QZWwkqvOqQ-b15jidwTNsn1K64x3FY_Un-l6A6g3Twg,22299
 prediction_market_agent_tooling/markets/polymarket/api.py,sha256=p1JkqL9kF8C04qbmqFzF0hgtzD5kN3yup2hYOjxazQ4,4188
 prediction_market_agent_tooling/markets/polymarket/data_models.py,sha256=srTl8-0FM76AGLRDWzjLpf46ikWloaBCgkn0XqZoKCI,4248
-prediction_market_agent_tooling/markets/polymarket/data_models_web.py,sha256=qop9lK4-3VfEJ9SuSCJdYPhjMqP4g6F5FpHziJv8HDY,10887
+prediction_market_agent_tooling/markets/polymarket/data_models_web.py,sha256=_GCa3P60W8kNeg_8kF20CZF0hvaM2RR4FhTcDfXwF2o,10950
 prediction_market_agent_tooling/markets/polymarket/polymarket.py,sha256=zqGfiUOH9f7jmDcQAt30wrHyfmqLMNwCYtotsxFoJmA,2678
 prediction_market_agent_tooling/markets/polymarket/utils.py,sha256=Gwd2kOK_DrsjtyqgO6ob8oK7tjsB1Yo-Hf7IS5UGnio,1960
 prediction_market_agent_tooling/monitor/langfuse/langfuse_wrapper.py,sha256=b6T69YB1x8kSUvW9uRFuSWPLOrXzapZG7m5O5SU0QTQ,895
 prediction_market_agent_tooling/monitor/markets/manifold.py,sha256=GdYpgRX1GahDi-75Mr53jgtEg6nWcs_rHDUkg4o_7dQ,3352
-prediction_market_agent_tooling/monitor/markets/omen.py,sha256=cYyKdX4qhGo-VqsboOyWHmMyFsdcX899RrHH5oMEwRI,3503
-prediction_market_agent_tooling/monitor/markets/polymarket.py,sha256=j_CHY03LAhg84p-TpwbkuzzIdd5YUWapW3hk7U79Phs,1879
+prediction_market_agent_tooling/monitor/markets/omen.py,sha256=jOLPnIbDU9syjnYtHfOb2xa6-Ize3vbplgh-8WWkuT4,3323
+prediction_market_agent_tooling/monitor/markets/polymarket.py,sha256=I9z9aO1wncyGI3a09ihrw17JkeBKjAuMmC0I9pl_9o4,1781
 prediction_market_agent_tooling/monitor/monitor.py,sha256=elvCqCASCd3fOnM7f2kajb_Oy3RMUmGh88jzpworrEU,13387
 prediction_market_agent_tooling/monitor/monitor_app.py,sha256=rDxgdDJqSK0ARx0TJFMkS76npkHZJz0__Rp0xTpiRok,4611
 prediction_market_agent_tooling/monitor/monitor_settings.py,sha256=Xiozs3AsufuJ04JOe1vjUri-IAMWHjjmc2ugGGiHNH4,947
@@ -54,7 +54,7 @@ prediction_market_agent_tooling/tools/betting_strategies/market_moving.py,sha256
 prediction_market_agent_tooling/tools/betting_strategies/minimum_bet_to_win.py,sha256=-FUSuQQgjcWSSnoFxnlAyTeilY6raJABJVM2QKkFqAY,438
 prediction_market_agent_tooling/tools/betting_strategies/stretch_bet_between.py,sha256=THMXwFlskvzbjnX_OiYtDSzI8XVFyULWfP2525_9UGc,429
 prediction_market_agent_tooling/tools/cache.py,sha256=tGHHd9HCiE_hCCtPtloHZQdDfBuiow9YsqJNYi2Tx_0,499
-prediction_market_agent_tooling/tools/contract.py,sha256=FTC5povNDOyTWJNKieCmoMkUK25_sHcTQkBuCVWh5Ck,7290
+prediction_market_agent_tooling/tools/contract.py,sha256=fWYQAJhLLBasEJCiJqZEiXOgJ3dO9Mknppdsd1gHchc,6999
 prediction_market_agent_tooling/tools/costs.py,sha256=EaAJ7v9laD4VEV3d8B44M4u3_oEO_H16jRVCdoZ93Uw,954
 prediction_market_agent_tooling/tools/gnosis_rpc.py,sha256=_MYSoyOR2MgAJkop1ERf8RhLum-M8S6OjaAsaqUW41w,203
 prediction_market_agent_tooling/tools/google.py,sha256=SfVDxb3oEOUK8mpd0l3mTX9ybrdrTPNM6HjfJ7kfNjA,1794
@@ -65,8 +65,8 @@ prediction_market_agent_tooling/tools/safe.py,sha256=h0xOO0eNtitClf0fPkn-0oTc6A_
 prediction_market_agent_tooling/tools/singleton.py,sha256=CiIELUiI-OeS7U7eeHEt0rnVhtQGzwoUdAgn_7u_GBM,729
 prediction_market_agent_tooling/tools/utils.py,sha256=zkmwPi3YisgZDPCeNwaRbL8sInOYOkvFgFY4Q8PbEo4,5077
 prediction_market_agent_tooling/tools/web3_utils.py,sha256=cboATXNmEdn5RmPbVblHOwOdUMKBYrUK3GiI6i6Vzxo,9855
-prediction_market_agent_tooling-0.26.0.dist-info/LICENSE,sha256=6or154nLLU6bELzjh0mCreFjt0m2v72zLi3yHE0QbeE,7650
-prediction_market_agent_tooling-0.26.0.dist-info/METADATA,sha256=WS8GWqlx4050Kncw9dK8RBO2RTWVkWOaeINf-O94paM,5465
-prediction_market_agent_tooling-0.26.0.dist-info/WHEEL,sha256=sP946D7jFCHeNz5Iq4fL4Lu-PrWrFsgfLXbbkciIZwg,88
-prediction_market_agent_tooling-0.26.0.dist-info/entry_points.txt,sha256=m8PukHbeH5g0IAAmOf_1Ahm-sGAMdhSSRQmwtpmi2s8,81
-prediction_market_agent_tooling-0.26.0.dist-info/RECORD,,
+prediction_market_agent_tooling-0.28.0.dist-info/LICENSE,sha256=6or154nLLU6bELzjh0mCreFjt0m2v72zLi3yHE0QbeE,7650
+prediction_market_agent_tooling-0.28.0.dist-info/METADATA,sha256=NtheDRRimzmgtWXNLObDx0rKM3ZvZT3toRmpCNV04oY,5465
+prediction_market_agent_tooling-0.28.0.dist-info/WHEEL,sha256=sP946D7jFCHeNz5Iq4fL4Lu-PrWrFsgfLXbbkciIZwg,88
+prediction_market_agent_tooling-0.28.0.dist-info/entry_points.txt,sha256=m8PukHbeH5g0IAAmOf_1Ahm-sGAMdhSSRQmwtpmi2s8,81
+prediction_market_agent_tooling-0.28.0.dist-info/RECORD,,