prediction-market-agent-tooling 0.27.0__py3-none-any.whl → 0.29.0__py3-none-any.whl

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,11 +67,30 @@ 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}"
+    return f"{category.__name__}: {message}".strip().replace(
+        "\n", "\\n"
+    )  # Escape new lines, because otherwise logs will be broken.
 
 
 if not getattr(logger, "_patched", False):

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/omen/data_models.py

@@ -422,7 +422,7 @@ class RealityQuestion(BaseModel):
     # And because all the contract methods so far needed bytes32 input, when asked for question id, `questionId` field was the correct one to use so far.
     id: str
     user: HexAddress
-    historyHash: HexBytes
+    historyHash: HexBytes | None
     updatedTimestamp: datetime
     contentHash: HexBytes
     questionId: HexBytes

prediction_market_agent_tooling/markets/omen/omen.py

@@ -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,6 +139,10 @@ 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)
@@ -148,6 +158,10 @@ class OmenAgentMarket(AgentMarket):
     def sell_tokens(
         self, outcome: bool, amount: TokenAmount, auto_withdraw: bool = True
     ) -> None:
+        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(
             api_keys=APIKeys(),
             amount=xDai(amount.amount),
@@ -301,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),
@@ -329,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(

prediction_market_agent_tooling/markets/omen/omen_resolving.py

@@ -31,6 +31,7 @@ from prediction_market_agent_tooling.markets.omen.omen_subgraph_handler import (
 from prediction_market_agent_tooling.markets.polymarket.utils import (
     find_resolution_on_polymarket,
 )
+from prediction_market_agent_tooling.tools.utils import check_not_none
 from prediction_market_agent_tooling.tools.web3_utils import ZERO_BYTES, xdai_to_wei
 
 
@@ -95,7 +96,12 @@ def claim_bonds_on_realitio_question(
             # TODO: See `if len(answers_objects) > 1` above.
             # This is from the original Olas implementation (https://github.com/kongzii/trader/blob/700af475a4538cc3d5d22caf9dec9e9d22d72af1/packages/valory/skills/market_manager_abci/graph_tooling/requests.py#L297),
             # but it's most probably wrong (see comment above).
-            history_hashes.append(answers_objects[i + 1].question.historyHash)
+            history_hashes.append(
+                check_not_none(
+                    answers_objects[i + 1].question.historyHash,
+                    "Shouldn't be None here.",
+                )
+            )
 
         # last-to-first, the address of each answerer or commitment sender
         addresses.append(Web3.to_checksum_address(answer.question.user))

prediction_market_agent_tooling/markets/polymarket/api.py

@@ -1,6 +1,8 @@
 import typing as t
 
 import requests
+import tenacity
+from loguru import logger
 
 from prediction_market_agent_tooling.markets.polymarket.data_models import (
     POLYMARKET_FALSE_OUTCOME,
@@ -18,6 +20,27 @@ POLYMARKET_API_BASE_URL = "https://clob.polymarket.com/"
 MARKETS_LIMIT = 100  # Polymarket will only return up to 100 markets
 
 
+@tenacity.retry(
+    stop=tenacity.stop_after_attempt(5),
+    wait=tenacity.wait_chain(*[tenacity.wait_fixed(n) for n in range(1, 6)]),
+    after=lambda x: logger.debug(f"get_polymarkets failed, {x.attempt_number=}."),
+)
+def get_polymarkets(
+    limit: int,
+    with_rewards: bool = False,
+    next_cursor: str | None = None,
+) -> MarketsEndpointResponse:
+    url = (
+        f"{POLYMARKET_API_BASE_URL}/{'sampling-markets' if with_rewards else 'markets'}"
+    )
+    params: dict[str, str | int | float | None] = {
+        "limit": min(limit, MARKETS_LIMIT),
+    }
+    if next_cursor is not None:
+        params["next_cursor"] = next_cursor
+    return response_to_model(requests.get(url, params=params), MarketsEndpointResponse)
+
+
 def get_polymarket_binary_markets(
     limit: int,
     closed: bool | None = False,
@@ -28,17 +51,13 @@ def get_polymarket_binary_markets(
     """
     See https://learn.polymarket.com/trading-rewards for information about rewards.
     """
-    url = (
-        f"{POLYMARKET_API_BASE_URL}/{'sampling-markets' if with_rewards else 'markets'}"
-    )
+
     all_markets: list[PolymarketMarketWithPrices] = []
-    params: dict[str, str | int | float | None] = {
-        "limit": min(limit, MARKETS_LIMIT),
-    }
+    next_cursor: str | None = None
 
     while True:
-        response = response_to_model(
-            requests.get(url, params=params), MarketsEndpointResponse
+        response = get_polymarkets(
+            limit, with_rewards=with_rewards, next_cursor=next_cursor
         )
 
         for market in response.data:
@@ -81,12 +100,12 @@ def get_polymarket_binary_markets(
         if len(all_markets) >= limit:
             break
 
-        if response.next_cursor == "LTE=":
+        next_cursor = response.next_cursor
+
+        if next_cursor == "LTE=":
             # 'LTE=' means the end.
             break
 
-        params["next_cursor"] = response.next_cursor
-
     return all_markets[:limit]
 
 

prediction_market_agent_tooling/markets/polymarket/data_models.py

@@ -32,8 +32,8 @@ class PolymarketMarket(BaseModel):
     active: bool
     closed: bool
     archived: bool
-    minimum_order_size: str
-    minimum_tick_size: str
+    minimum_order_size: str | float
+    minimum_tick_size: str | float
     condition_id: str
     question_id: str
     question: str
@@ -54,8 +54,8 @@ class PolymarketMarket(BaseModel):
     rewards: PolymarketRewards
     tokens: tuple[PolymarketToken, ...]
     is_50_50_outcome: bool
-    categories: list[str]
-    parent_categories: list[str]
+    categories: list[str] | None = None
+    parent_categories: list[str] | None = None
     accepting_orders: bool
 
     @property

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
 
@@ -208,6 +208,25 @@ class Category(BaseModel):
     slug: str
 
 
+class Bid(BaseModel):
+    price: str
+    size: str
+
+
+class Ask(BaseModel):
+    price: str
+    size: str
+
+
+class MarketBidsAndAsks(BaseModel):
+    market: str
+    asset_id: str
+    hash: str
+    bids: list[Bid]
+    asks: list[Ask]
+    lastUpdated: int
+
+
 class PolymarketFullMarket(BaseModel):
     id: str
     ticker: str
@@ -228,10 +247,10 @@ class PolymarketFullMarket(BaseModel):
     new: bool
     featured: bool
     restricted: bool
-    liquidity: USDC
+    liquidity: USDC | None
     volume: USDC | None
     volume24hr: USDC | None
-    competitive: float
+    competitive: float | None
     openInterest: int | None
     sortBy: str | None
     createdAt: datetime
@@ -239,8 +258,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 +267,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
 
@@ -327,7 +346,12 @@ class PriceSide(BaseModel):
 
 class State(BaseModel):
     data: (
-        PolymarketFullMarket | PriceSide | None
+        PolymarketFullMarket
+        | MarketBidsAndAsks
+        | PriceSide
+        | dict[str, MarketBidsAndAsks]
+        | dict[str, PriceSide]
+        | None
     )  # It's none if you go to the website and it says "Oops...we didn't forecast this".
     dataUpdateCount: int
     dataUpdatedAt: int

prediction_market_agent_tooling/markets/polymarket/utils.py

@@ -9,7 +9,11 @@ from prediction_market_agent_tooling.tools.google import search_google
 def find_resolution_on_polymarket(question: str) -> Resolution | None:
     full_market = find_full_polymarket(question)
     # TODO: Only main markets are supported right now, add logic for others if needed.
-    return full_market.main_market.resolution if full_market else None
+    return (
+        full_market.main_market.resolution
+        if full_market and full_market.is_main_market
+        else None
+    )
 
 
 def find_full_polymarket(question: str) -> PolymarketFullMarket | None:

{prediction_market_agent_tooling-0.27.0.dist-info → prediction_market_agent_tooling-0.29.0.dist-info}/METADATA

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

{prediction_market_agent_tooling-0.27.0.dist-info → prediction_market_agent_tooling-0.29.0.dist-info}/RECORD

@@ -19,8 +19,8 @@ prediction_market_agent_tooling/deploy/gcp/deploy.py,sha256=CYUgnfy-9XVk04kkxA_5
 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=p_ibaEpUGGdcpPtzIJxh5UusJNCQyN1y_RDvoTaeUfA,3001
+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
@@ -30,16 +30,16 @@ prediction_market_agent_tooling/markets/manifold/manifold.py,sha256=DJZ88r5BGtAu
 prediction_market_agent_tooling/markets/manifold/utils.py,sha256=cPPFWXm3vCYH1jy7_ctJZuQH9ZDaPL4_AgAYzGWkoow,513
 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=YcM9AbBUOJ1xoZTI9UlHZTSNR4T1cTwyl3lZlXy2qbs,31209
+prediction_market_agent_tooling/markets/omen/data_models.py,sha256=EXtjmcujx68Xu50BVkYXvLuf_Asx5o65RvFS3ZS6HGs,14405
+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_resolving.py,sha256=g77QsQ5WnSI2rzBlX87L_EhWMwobkyXyfRhHQmpAdzo,9012
 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/api.py,sha256=HXmA1akA0qDj0m3e-GEvWG8x75pm6BX4H7YJPQcST7I,4767
+prediction_market_agent_tooling/markets/polymarket/data_models.py,sha256=9CJzakyEcsn6DQBK2nOXjOMzTZBLAmK_KqevXvW17DI,4292
+prediction_market_agent_tooling/markets/polymarket/data_models_web.py,sha256=f8SRQy0Rn-gIHSEMrJJAI8H3J7l8lzOLj3aCMe0vJv8,11324
 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/markets/polymarket/utils.py,sha256=m4JG6WULh5epCJt4XBMHg0ae5NoVhqlOvAl0A7DR9iM,2023
 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=jOLPnIbDU9syjnYtHfOb2xa6-Ize3vbplgh-8WWkuT4,3323
@@ -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.27.0.dist-info/LICENSE,sha256=6or154nLLU6bELzjh0mCreFjt0m2v72zLi3yHE0QbeE,7650
-prediction_market_agent_tooling-0.27.0.dist-info/METADATA,sha256=EOgPmMy7tmfMsgdKgxB_zVCFZN8YQO5n49IazPE9gJA,5465
-prediction_market_agent_tooling-0.27.0.dist-info/WHEEL,sha256=sP946D7jFCHeNz5Iq4fL4Lu-PrWrFsgfLXbbkciIZwg,88
-prediction_market_agent_tooling-0.27.0.dist-info/entry_points.txt,sha256=m8PukHbeH5g0IAAmOf_1Ahm-sGAMdhSSRQmwtpmi2s8,81
-prediction_market_agent_tooling-0.27.0.dist-info/RECORD,,
+prediction_market_agent_tooling-0.29.0.dist-info/LICENSE,sha256=6or154nLLU6bELzjh0mCreFjt0m2v72zLi3yHE0QbeE,7650
+prediction_market_agent_tooling-0.29.0.dist-info/METADATA,sha256=o_gMRsvw7wrtl0JcbGw11_I-wyNA7VzW5GDlNqeR9tM,5465
+prediction_market_agent_tooling-0.29.0.dist-info/WHEEL,sha256=sP946D7jFCHeNz5Iq4fL4Lu-PrWrFsgfLXbbkciIZwg,88
+prediction_market_agent_tooling-0.29.0.dist-info/entry_points.txt,sha256=m8PukHbeH5g0IAAmOf_1Ahm-sGAMdhSSRQmwtpmi2s8,81
+prediction_market_agent_tooling-0.29.0.dist-info/RECORD,,