prediction-market-agent-tooling 0.63.0.dev498__tar.gz → 0.63.0.dev500__tar.gz

{prediction_market_agent_tooling-0.63.0.dev498 → prediction_market_agent_tooling-0.63.0.dev500}/PKG-INFO

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

{prediction_market_agent_tooling-0.63.0.dev498 → prediction_market_agent_tooling-0.63.0.dev500}/prediction_market_agent_tooling/deploy/betting_strategy.py

@@ -54,9 +54,6 @@ class BettingStrategy(ABC):
                 outcome_tokens_to_get = market.get_buy_token_amount(
                     trade.amount, trade.outcome
                 )
-                outcome_tokens_to_get_in_usd = market.get_token_in_usd(
-                    outcome_tokens_to_get.as_token
-                )
 
                 if not outcome_tokens_to_get:
                     logger.info(
@@ -64,6 +61,10 @@ class BettingStrategy(ABC):
                     )
                     continue
 
+                outcome_tokens_to_get_in_usd = market.get_token_in_usd(
+                    outcome_tokens_to_get.as_token
+                )
+
                 if outcome_tokens_to_get_in_usd <= trade.amount:
                     raise GuaranteedLossError(
                         f"Trade {trade=} would result in guaranteed loss by getting only {outcome_tokens_to_get=}. Halting execution."

{prediction_market_agent_tooling-0.63.0.dev498 → prediction_market_agent_tooling-0.63.0.dev500}/prediction_market_agent_tooling/markets/seer/data_models.py

@@ -5,19 +5,16 @@ from urllib.parse import urljoin
 
 from pydantic import BaseModel, ConfigDict, Field
 from web3 import Web3
+from web3.constants import ADDRESS_ZERO
 
 from prediction_market_agent_tooling.config import RPCConfig
-from prediction_market_agent_tooling.gtypes import ChecksumAddress, HexAddress, HexBytes
 from prediction_market_agent_tooling.gtypes import (
     ChecksumAddress,
-    CollateralToken,
     HexAddress,
     HexBytes,
     OutcomeStr,
-    Probability,
     Web3Wei,
 )
-from prediction_market_agent_tooling.loggers import logger
 from prediction_market_agent_tooling.markets.data_models import Resolution
 from prediction_market_agent_tooling.markets.seer.subgraph_data_models import (
     SeerParentMarket,

{prediction_market_agent_tooling-0.63.0.dev498 → prediction_market_agent_tooling-0.63.0.dev500}/prediction_market_agent_tooling/markets/seer/price_manager.py

@@ -1,11 +1,9 @@
-from functools import lru_cache
-
 from web3 import Web3
 
 from prediction_market_agent_tooling.gtypes import (
     ChecksumAddress,
+    CollateralToken,
     Probability,
-    xdai_type,
     Wei,
 )
 from prediction_market_agent_tooling.loggers import logger
@@ -19,7 +17,7 @@ from prediction_market_agent_tooling.markets.seer.seer_subgraph_handler import (
 from prediction_market_agent_tooling.markets.seer.subgraph_data_models import SeerPool
 from prediction_market_agent_tooling.tools.cow.cow_order import get_quote
 from prediction_market_agent_tooling.tools.hexbytes_custom import HexBytes
-from prediction_market_agent_tooling.tools.web3_utils import xdai_to_wei
+from prediction_market_agent_tooling.tools.utils import check_not_none
 
 
 class PriceManager:
@@ -70,12 +68,15 @@ class PriceManager:
         else:
             return None
 
-    @lru_cache(typed=True)
     def get_price_for_token(
-        self,
-        token: ChecksumAddress,
-        collateral_exchange_amount: Wei = xdai_to_wei(xdai_type(1)),
+        self, token: ChecksumAddress, collateral_exchange_amount: Wei | None = None
     ) -> float | None:
+        collateral_exchange_amount = (
+            collateral_exchange_amount
+            if collateral_exchange_amount is not None
+            else CollateralToken(1).as_wei
+        )
+
         try:
             quote = get_quote(
                 amount_wei=collateral_exchange_amount,
@@ -89,7 +90,9 @@ class PriceManager:
             )
             return self.get_token_price_from_pools(token=token)
 
-        return collateral_exchange_amount / float(quote.quote.buyAmount.root)
+        collateral_exchange_amount = check_not_none(collateral_exchange_amount)
+        price = collateral_exchange_amount / float(quote.quote.buyAmount.root)
+        return Wei(str(price)).value
 
     @staticmethod
     def _pool_token0_matches_token(token: ChecksumAddress, pool: SeerPool) -> bool:

{prediction_market_agent_tooling-0.63.0.dev498 → prediction_market_agent_tooling-0.63.0.dev500}/prediction_market_agent_tooling/markets/seer/seer.py

@@ -13,7 +13,6 @@ from prediction_market_agent_tooling.gtypes import (
     HexAddress,
     HexBytes,
     OutcomeStr,
-    Wei,
     OutcomeToken,
     OutcomeWei,
     xDai,
@@ -23,8 +22,8 @@ from prediction_market_agent_tooling.markets.agent_market import (
     AgentMarket,
     FilterBy,
     ProcessedMarket,
-    SortBy,
     ProcessedTradedMarket,
+    SortBy,
 )
 from prediction_market_agent_tooling.markets.data_models import ExistingPosition
 from prediction_market_agent_tooling.markets.market_fees import MarketFees
@@ -43,7 +42,6 @@ from prediction_market_agent_tooling.markets.seer.seer_subgraph_handler import (
 from prediction_market_agent_tooling.markets.seer.subgraph_data_models import (
     NewMarketEvent,
 )
-from prediction_market_agent_tooling.tools.balances import get_balances
 from prediction_market_agent_tooling.tools.contract import (
     ContractERC20OnGnosisChain,
     init_collateral_token_contract,
@@ -108,25 +106,23 @@ class SeerAgentMarket(AgentMarket):
         return get_usd_in_token(x, self.collateral_token_contract_address_checksummed)
 
     def get_buy_token_amount(
-        self, bet_amount: BetAmount, direction: bool
+        self, bet_amount: USD | CollateralToken, direction: bool
     ) -> OutcomeToken | None:
         """Returns number of outcome tokens returned for a given bet expressed in collateral units."""
 
         outcome_token = self.get_wrapped_token_for_outcome(direction)
         bet_amount_in_tokens = self.get_in_token(bet_amount)
-        bet_amount_in_wei = bet_amount_in_tokens.as_wei
 
         p = PriceManager.build(market_id=HexBytes(HexStr(self.id)))
         price_in_collateral_units = p.get_price_for_token(
-            token=outcome_token, collateral_exchange_amount=bet_amount_in_wei
+            token=outcome_token, collateral_exchange_amount=bet_amount_in_tokens.as_wei
         )
         if not price_in_collateral_units:
             logger.info(f"Could not get price for token {outcome_token}")
             return None
 
-        buy_amount = bet_amount_in_wei / price_in_collateral_units
-        sell_amount = OutcomeWei(buy_amount).as_outcome_token
-        return sell_amount
+        amount_outcome_tokens = bet_amount_in_tokens.value / price_in_collateral_units
+        return OutcomeToken(amount_outcome_tokens)
 
     def get_outcome_str_from_bool(self, outcome: bool) -> OutcomeStr:
         outcome_translated = SeerOutcomeEnum.from_bool(outcome)
@@ -191,7 +187,7 @@ class SeerAgentMarket(AgentMarket):
     @staticmethod
     def from_data_model_with_subgraph(
         model: SeerMarket, seer_subgraph: SeerSubgraphHandler
-    ) -> "SeerAgentMarket" | None:
+    ) -> t.Optional["SeerAgentMarket"]:
         p = PriceManager(seer_market=model, seer_subgraph=seer_subgraph)
         current_p_yes = p.current_p_yes()
         if not current_p_yes:
@@ -295,11 +291,10 @@ class SeerAgentMarket(AgentMarket):
             )
 
         outcome_token = self.get_wrapped_token_for_outcome(outcome)
-        amount_to_trade = xdai_type(amount.amount)
 
         #  Sell sDAI using token address
         order_metadata = swap_tokens_waiting(
-            amount_wei=xdai_to_wei(amount_to_trade),
+            amount_wei=amount_wei,
             sell_token=collateral_contract.address,
             buy_token=outcome_token,
             api_keys=api_keys,
@@ -321,7 +316,7 @@ class SeerAgentMarket(AgentMarket):
     def sell_tokens(
         self,
         outcome: bool,
-        amount: TokenAmount,
+        amount: USD | OutcomeToken,
         auto_withdraw: bool = True,
         api_keys: APIKeys | None = None,
         web3: Web3 | None = None,
@@ -331,10 +326,16 @@ class SeerAgentMarket(AgentMarket):
         """
         outcome_token = self.get_wrapped_token_for_outcome(outcome)
         api_keys = api_keys if api_keys is not None else APIKeys()
-        amount_to_trade = xdai_type(amount.amount)
+
+        ########
+        token_amount = (
+            amount.as_outcome_wei.as_wei
+            if isinstance(amount, OutcomeToken)
+            else self.get_in_token(amount).as_wei
+        )
 
         order_metadata = swap_tokens_waiting(
-            amount_wei=xdai_to_wei(amount_to_trade),
+            amount_wei=token_amount,
             sell_token=outcome_token,
             buy_token=Web3.to_checksum_address(
                 self.collateral_token_contract_address_checksummed

{prediction_market_agent_tooling-0.63.0.dev498 → prediction_market_agent_tooling-0.63.0.dev500}/prediction_market_agent_tooling/markets/seer/seer_contracts.py

@@ -2,13 +2,13 @@ import os
 import typing as t
 
 from web3 import Web3
-from web3.types import TxReceipt
 
 from prediction_market_agent_tooling.config import APIKeys
 from prediction_market_agent_tooling.gtypes import (
     ABI,
     ChecksumAddress,
     OutcomeStr,
+    TxReceipt,
     xDai,
 )
 from prediction_market_agent_tooling.markets.seer.subgraph_data_models import (
@@ -47,9 +47,9 @@ class SeerMarketFactory(ContractOnGnosisChain):
             token_names=[
                 o.upper() for o in outcomes
             ],  # Following usual token names on Seer (YES,NO).
-            min_bond=min_bond.as_xdai_wei.value,
+            min_bond=min_bond.as_xdai_wei.as_wei,
             opening_time=int(opening_time.timestamp()),
-            outcomes=outcomes,
+            outcomes=list(outcomes),
             lang=language,
             category=category,
         )

{prediction_market_agent_tooling-0.63.0.dev498 → prediction_market_agent_tooling-0.63.0.dev500}/prediction_market_agent_tooling/markets/seer/seer_subgraph_handler.py

@@ -241,8 +241,7 @@ class SeerSubgraphHandler(BaseSubgraphHandler):
         optional_params["orderDirection"] = "desc"
 
         pools_field = self.swapr_algebra_subgraph.Query.pools(
-            where=unwrap_generic_value({"or": wheres}, **optional_params
-        )
+            where=unwrap_generic_value({"or": wheres}, **optional_params)
         )
         fields = self._get_fields_for_pools(pools_field)
         pools = self.do_query(fields=fields, pydantic_model=SeerPool)

{prediction_market_agent_tooling-0.63.0.dev498 → prediction_market_agent_tooling-0.63.0.dev500}/prediction_market_agent_tooling/markets/seer/subgraph_data_models.py

@@ -1,7 +1,7 @@
 from pydantic import BaseModel, ConfigDict, Field
 from web3.constants import ADDRESS_ZERO
 
-from prediction_market_agent_tooling.gtypes import HexAddress, HexBytes, Wei
+from prediction_market_agent_tooling.gtypes import HexAddress, HexBytes, OutcomeStr, Wei
 
 
 class SeerToken(BaseModel):
@@ -34,7 +34,7 @@ class CreateCategoricalMarketsParams(BaseModel):
     model_config = ConfigDict(populate_by_name=True)
 
     market_name: str = Field(..., alias="marketName")
-    outcomes: list[str]
+    outcomes: list[OutcomeStr]
     # Only relevant for scalar markets
     question_start: str = Field(alias="questionStart", default="")
     question_end: str = Field(alias="questionEnd", default="")

{prediction_market_agent_tooling-0.63.0.dev498 → prediction_market_agent_tooling-0.63.0.dev500}/prediction_market_agent_tooling/tools/cow/cow_order.py

@@ -15,23 +15,29 @@ from cowdao_cowpy.order_book.generated.model import (
     Address,
     OrderMetaData,
     OrderQuoteRequest,
+    OrderQuoteResponse,
     OrderQuoteSide1,
+    OrderQuoteSide3,
+    OrderQuoteSideKindBuy,
     OrderQuoteSideKindSell,
     OrderStatus,
     TokenAmount,
-    OrderQuoteResponse,
 )
 from eth_account.signers.local import LocalAccount
-from tenacity import stop_after_attempt, wait_fixed, retry_if_not_exception_type
+from tenacity import retry_if_not_exception_type, stop_after_attempt, wait_fixed
 from web3 import Web3
 
 from prediction_market_agent_tooling.config import APIKeys
-from prediction_market_agent_tooling.gtypes import ChecksumAddress, Wei, wei_type
+from prediction_market_agent_tooling.gtypes import ChecksumAddress, Wei
 from prediction_market_agent_tooling.loggers import logger
 from prediction_market_agent_tooling.tools.contract import ContractERC20OnGnosisChain
 from prediction_market_agent_tooling.tools.utils import utcnow
 
 
+class OrderStatusError(Exception):
+    pass
+
+
 class NoLiquidityAvailableOnCowException(Exception):
     """Custom exception for handling case where no liquidity available."""
 
@@ -41,9 +47,42 @@ 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_sell_token_amount failed, {x.attempt_number=}."),
+)
+def get_sell_token_amount(
+    buy_amount: Wei,
+    sell_token: ChecksumAddress,
+    buy_token: ChecksumAddress,
+    chain: Chain = Chain.GNOSIS,
+    env: Envs = "prod",
+) -> Wei:
+    """
+    Calculate how much of the sell_token is needed to obtain a specified amount of buy_token.
+    """
+    order_book_api = get_order_book_api(env, chain)
+    order_quote_request = OrderQuoteRequest(
+        sellToken=Address(sell_token),
+        buyToken=Address(buy_token),
+        from_=Address(
+            "0x1234567890abcdef1234567890abcdef12345678"
+        ),  # Just random address, doesn't matter.
+    )
+    order_side = OrderQuoteSide3(
+        kind=OrderQuoteSideKindBuy.buy,
+        buyAmountAfterFee=TokenAmount(str(buy_amount)),
+    )
+    order_quote = asyncio.run(
+        order_book_api.post_quote(order_quote_request, order_side)
+    )
+    return Wei(order_quote.quote.sellAmount.root)
+
+
 @tenacity.retry(
     stop=stop_after_attempt(3),
-    wait=wait_fixed(2),
+    wait=wait_fixed(1),
     retry=retry_if_not_exception_type(NoLiquidityAvailableOnCowException),
 )
 def get_quote(
@@ -101,7 +140,7 @@ def get_buy_token_amount_else_raise(
         chain=chain,
         env=env,
     )
-    return wei_type(order_quote.quote.buyAmount.root)
+    return Wei(order_quote.quote.buyAmount.root)
 
 
 def swap_tokens_waiting(
@@ -141,7 +180,7 @@ async def swap_tokens_waiting_async(
     timeout: timedelta = timedelta(seconds=60),
 ) -> OrderMetaData:
     order = await swap_tokens(
-        amount=amount_wei,
+        amount=amount_wei.value,
         sell_token=sell_token,
         buy_token=buy_token,
         account=account,

{prediction_market_agent_tooling-0.63.0.dev498 → prediction_market_agent_tooling-0.63.0.dev500}/prediction_market_agent_tooling/tools/tokens/token_utils.py

@@ -1,4 +1,3 @@
-from eth_typing.evm import ChecksumAddress
 from web3 import Web3
 
 from prediction_market_agent_tooling.gtypes import ChecksumAddress, Wei
@@ -7,7 +6,9 @@ from prediction_market_agent_tooling.tools.contract import (
     init_collateral_token_contract,
     to_gnosis_chain_contract,
 )
-from prediction_market_agent_tooling.tools.cow.cow_order import get_buy_token_amount
+from prediction_market_agent_tooling.tools.cow.cow_order import (
+    get_buy_token_amount_else_raise,
+)
 
 
 def convert_to_another_token(
@@ -39,7 +40,7 @@ def convert_to_another_token(
         return from_token_contract.convertToAssets(amount)
 
     else:
-        return get_buy_token_amount(
+        return get_buy_token_amount_else_raise(
             amount,
             from_token,
             to_token,

{prediction_market_agent_tooling-0.63.0.dev498 → prediction_market_agent_tooling-0.63.0.dev500}/prediction_market_agent_tooling/tools/tokens/usd.py

@@ -1,5 +1,4 @@
 from cachetools import TTLCache, cached
-from eth_typing.evm import ChecksumAddress
 
 from prediction_market_agent_tooling.gtypes import (
     USD,
@@ -12,7 +11,9 @@ from prediction_market_agent_tooling.markets.omen.omen_constants import (
     WRAPPED_XDAI_CONTRACT_ADDRESS,
 )
 from prediction_market_agent_tooling.tools.contract import ContractERC4626OnGnosisChain
-from prediction_market_agent_tooling.tools.cow.cow_order import get_buy_token_amount
+from prediction_market_agent_tooling.tools.cow.cow_order import (
+    get_buy_token_amount_else_raise,
+)
 
 
 def get_usd_in_xdai(amount: USD) -> xDai:
@@ -48,8 +49,8 @@ def get_single_token_to_usd_rate(token_address: ChecksumAddress) -> USD:
             .convertToAssets(CollateralToken(1).as_wei)
             .as_token.value
         )
-    in_wei = get_buy_token_amount(
-        sell_amount=CollateralToken(1).as_wei,
+    in_wei = get_buy_token_amount_else_raise(
+        amount_wei=CollateralToken(1).as_wei,
         sell_token=token_address,
         buy_token=WRAPPED_XDAI_CONTRACT_ADDRESS,
     )
@@ -70,8 +71,8 @@ def get_single_usd_to_token_rate(token_address: ChecksumAddress) -> CollateralTo
             .convertToShares(CollateralToken(1).as_wei)
             .as_token.value
         )
-    in_wei = get_buy_token_amount(
-        sell_amount=CollateralToken(1).as_wei,
+    in_wei = get_buy_token_amount_else_raise(
+        amount_wei=CollateralToken(1).as_wei,
         sell_token=WRAPPED_XDAI_CONTRACT_ADDRESS,
         buy_token=token_address,
     )

{prediction_market_agent_tooling-0.63.0.dev498 → prediction_market_agent_tooling-0.63.0.dev500}/pyproject.toml

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