prediction-market-agent-tooling 0.67.2__py3-none-any.whl → 0.67.4__py3-none-any.whl

prediction_market_agent_tooling/markets/data_models.py

@@ -1,7 +1,7 @@
 from enum import Enum
-from typing import Annotated, Sequence
+from typing import Annotated, Any, Sequence
 
-from pydantic import BaseModel, BeforeValidator, computed_field
+from pydantic import BaseModel, BeforeValidator, computed_field, model_validator
 
 from prediction_market_agent_tooling.deploy.constants import (
     DOWN_OUTCOME_LOWERCASE_IDENTIFIER,
@@ -157,6 +157,15 @@ class CategoricalProbabilisticAnswer(BaseModel):
     confidence: float
     reasoning: str | None = None
 
+    @model_validator(mode="before")
+    @classmethod
+    def _model_validator(cls, data: Any) -> Any:
+        if "p_yes" in data:
+            return CategoricalProbabilisticAnswer.from_probabilistic_answer(
+                ProbabilisticAnswer.model_validate(data)
+            ).model_dump()
+        return data
+
     @property
     def probable_resolution(self) -> Resolution:
         most_likely_outcome = max(
@@ -290,9 +299,20 @@ class Trade(BaseModel):
     outcome: OutcomeStr
     amount: USD
 
+    @model_validator(mode="before")
+    @classmethod
+    def _model_validator(cls, data: Any) -> Any:
+        if isinstance(data["outcome"], bool):
+            data["outcome"] = (
+                YES_OUTCOME_LOWERCASE_IDENTIFIER
+                if data["outcome"]
+                else NO_OUTCOME_LOWERCASE_IDENTIFIER
+            )
+        return data
+
 
 class PlacedTrade(Trade):
-    id: str | None = None
+    id: str
 
     @staticmethod
     def from_trade(trade: Trade, id: str) -> "PlacedTrade":

prediction_market_agent_tooling/markets/manifold/manifold.py

@@ -10,6 +10,7 @@ from prediction_market_agent_tooling.gtypes import (
 )
 from prediction_market_agent_tooling.markets.agent_market import (
     AgentMarket,
+    ConditionalFilterType,
     FilterBy,
     MarketFees,
     QuestionType,
@@ -112,7 +113,7 @@ class ManifoldAgentMarket(AgentMarket):
         created_after: t.Optional[DatetimeUTC] = None,
         excluded_questions: set[str] | None = None,
         question_type: QuestionType = QuestionType.ALL,
-        include_conditional_markets: bool = False,
+        conditional_filter_type: ConditionalFilterType = ConditionalFilterType.ONLY_NOT_CONDITIONAL,
     ) -> t.Sequence["ManifoldAgentMarket"]:
         sort: t.Literal["newest", "close-date"] | None
         if sort_by == SortBy.CLOSING_SOONEST:

prediction_market_agent_tooling/markets/metaculus/metaculus.py

@@ -7,6 +7,7 @@ from prediction_market_agent_tooling.config import APIKeys
 from prediction_market_agent_tooling.gtypes import OutcomeStr, Probability
 from prediction_market_agent_tooling.markets.agent_market import (
     AgentMarket,
+    ConditionalFilterType,
     FilterBy,
     MarketFees,
     ProcessedMarket,
@@ -74,7 +75,7 @@ class MetaculusAgentMarket(AgentMarket):
         created_after: t.Optional[DatetimeUTC] = None,
         excluded_questions: set[str] | None = None,
         question_type: QuestionType = QuestionType.ALL,
-        include_conditional_markets: bool = False,
+        conditional_filter_type: ConditionalFilterType = ConditionalFilterType.ONLY_NOT_CONDITIONAL,
         tournament_id: int | None = None,
     ) -> t.Sequence["MetaculusAgentMarket"]:
         order_by: str | None

prediction_market_agent_tooling/markets/omen/omen.py

@@ -23,6 +23,7 @@ from prediction_market_agent_tooling.gtypes import (
 from prediction_market_agent_tooling.loggers import logger
 from prediction_market_agent_tooling.markets.agent_market import (
     AgentMarket,
+    ConditionalFilterType,
     FilterBy,
     MarketFees,
     ProcessedMarket,
@@ -381,7 +382,7 @@ class OmenAgentMarket(AgentMarket):
         created_after: t.Optional[DatetimeUTC] = None,
         excluded_questions: set[str] | None = None,
         question_type: QuestionType = QuestionType.ALL,
-        include_conditional_markets: bool = False,
+        conditional_filter_type: ConditionalFilterType = ConditionalFilterType.ONLY_NOT_CONDITIONAL,
     ) -> t.Sequence["OmenAgentMarket"]:
         fetch_categorical_markets = question_type == QuestionType.CATEGORICAL
 

prediction_market_agent_tooling/markets/polymarket/api.py

@@ -1,4 +1,5 @@
 import typing as t
+from datetime import timedelta
 from enum import Enum
 from urllib.parse import urljoin
 
@@ -49,7 +50,7 @@ def get_polymarkets_with_pagination(
     Binary markets have len(model.markets) == 1.
     Categorical markets have len(model.markets) > 1
     """
-    client: httpx.Client = HttpxCachedClient(ttl=60).get_client()
+    client: httpx.Client = HttpxCachedClient(ttl=timedelta(seconds=60)).get_client()
     all_markets: list[PolymarketGammaResponseDataItem] = []
     offset = 0
     remaining = limit
@@ -82,6 +83,9 @@ def get_polymarkets_with_pagination(
 
         markets_to_add = []
         for m in market_response.data:
+            # Some Polymarket markets are missing the markets field
+            if m.markets is None:
+                continue
             if excluded_questions and m.title in excluded_questions:
                 continue
 
@@ -94,14 +98,16 @@ def get_polymarkets_with_pagination(
                 ]:
                     continue
 
-            if created_after and created_after > m.startDate:
+            if not m.startDate or (created_after and created_after > m.startDate):
                 continue
 
             markets_to_add.append(m)
 
         if only_binary:
             markets_to_add = [
-                market for market in market_response.data if len(market.markets) == 1
+                market
+                for market in markets_to_add
+                if market.markets is not None and len(market.markets) == 1
             ]
 
         # Add the markets from this batch to our results

prediction_market_agent_tooling/markets/polymarket/data_models.py

@@ -59,16 +59,18 @@ class PolymarketGammaResponseDataItem(BaseModel):
     id: str
     slug: str
     volume: float | None = None
-    startDate: DatetimeUTC
+    startDate: DatetimeUTC | None = None
     endDate: DatetimeUTC | None = None
     liquidity: float | None = None
     liquidityClob: float | None = None
     title: str
-    description: str
+    description: str | None = None
     archived: bool
     closed: bool
     active: bool
-    markets: list[PolymarketGammaMarket]
+    markets: list[
+        PolymarketGammaMarket
+    ] | None = None  # Some Polymarket markets have missing markets field. We skip these markets manually when retrieving.
     tags: list[PolymarketGammaTag]
 
     @property

prediction_market_agent_tooling/markets/polymarket/polymarket.py

@@ -7,8 +7,10 @@ from prediction_market_agent_tooling.gtypes import (
     OutcomeStr,
     Probability,
 )
+from prediction_market_agent_tooling.loggers import logger
 from prediction_market_agent_tooling.markets.agent_market import (
     AgentMarket,
+    ConditionalFilterType,
     FilterBy,
     MarketFees,
     QuestionType,
@@ -30,6 +32,7 @@ from prediction_market_agent_tooling.markets.polymarket.polymarket_subgraph_hand
     PolymarketSubgraphHandler,
 )
 from prediction_market_agent_tooling.tools.datetime_utc import DatetimeUTC
+from prediction_market_agent_tooling.tools.utils import check_not_none
 
 
 class PolymarketAgentMarket(AgentMarket):
@@ -68,9 +71,11 @@ class PolymarketAgentMarket(AgentMarket):
         ]
         # For a binary market, there should be exactly one payout numerator greater than 0.
         if len(payout_numerator_indices_gt_0) != 1:
-            raise ValueError(
-                f"Only binary markets are supported. Got payout numerators: {condition_model.payoutNumerators}"
+            # These cases involve multi-categorical resolution (to be implemented https://github.com/gnosis/prediction-market-agent-tooling/issues/770)
+            logger.warning(
+                f"Only binary markets are supported. Got payout numerators: {condition_model.payoutNumerators} for condition_id {condition_id.hex()}"
             )
+            return Resolution(outcome=None, invalid=False)
 
         # we return the only payout numerator greater than 0 as resolution
         resolved_outcome = outcomes[payout_numerator_indices_gt_0[0]]
@@ -82,16 +87,16 @@ class PolymarketAgentMarket(AgentMarket):
         condition_model_dict: dict[HexBytes, ConditionSubgraphModel],
     ) -> "PolymarketAgentMarket":
         # If len(model.markets) > 0, this denotes a categorical market.
-
-        outcomes = model.markets[0].outcomes_list
-        outcome_prices = model.markets[0].outcome_prices
+        markets = check_not_none(model.markets)
+        outcomes = markets[0].outcomes_list
+        outcome_prices = markets[0].outcome_prices
         if not outcome_prices:
             # We give random prices
             outcome_prices = [0.5, 0.5]
         probabilities = {o: Probability(op) for o, op in zip(outcomes, outcome_prices)}
 
         resolution = PolymarketAgentMarket.build_resolution_from_condition(
-            condition_id=model.markets[0].conditionId,
+            condition_id=markets[0].conditionId,
             condition_model_dict=condition_model_dict,
             outcomes=outcomes,
         )
@@ -124,7 +129,7 @@ class PolymarketAgentMarket(AgentMarket):
         created_after: t.Optional[DatetimeUTC] = None,
         excluded_questions: set[str] | None = None,
         question_type: QuestionType = QuestionType.ALL,
-        include_conditional_markets: bool = False,
+        conditional_filter_type: ConditionalFilterType = ConditionalFilterType.ONLY_NOT_CONDITIONAL,
     ) -> t.Sequence["PolymarketAgentMarket"]:
         closed: bool | None
 
@@ -163,7 +168,11 @@ class PolymarketAgentMarket(AgentMarket):
         )
 
         condition_models = PolymarketSubgraphHandler().get_conditions(
-            condition_ids=[market.markets[0].conditionId for market in markets]
+            condition_ids=[
+                market.markets[0].conditionId
+                for market in markets
+                if market.markets is not None
+            ]
         )
         condition_models_dict = {c.id: c for c in condition_models}
 

prediction_market_agent_tooling/markets/seer/data_models.py

@@ -48,10 +48,14 @@ class CreateCategoricalMarketsParams(BaseModel):
 SEER_BASE_URL = "https://app.seer.pm"
 
 
-def seer_normalize_wei(value: int | None) -> int | None:
+def seer_normalize_wei(value: int | dict[str, t.Any] | None) -> int | None:
     # See https://github.com/seer-pm/demo/blob/main/web/netlify/edge-functions/utils/common.ts#L22
     if value is None:
         return value
+    elif isinstance(value, dict):
+        if value.get("value") is None:
+            raise ValueError(f"Expected a dictionary with a value key, but got {value}")
+        value = int(value["value"])
     is_in_wei = value > 1e10
     return value if is_in_wei else value * 10**18
 
@@ -59,6 +63,21 @@ def seer_normalize_wei(value: int | None) -> int | None:
 SeerNormalizedWei = Annotated[Wei | None, BeforeValidator(seer_normalize_wei)]
 
 
+class MarketId(BaseModel):
+    id: HexBytes
+
+
+class SeerQuestion(BaseModel):
+    id: str
+    best_answer: HexBytes
+    finalize_ts: int
+
+
+class SeerMarketQuestions(BaseModel):
+    question: SeerQuestion
+    market: MarketId
+
+
 class SeerMarket(BaseModel):
     model_config = ConfigDict(populate_by_name=True)
 
@@ -71,6 +90,7 @@ class SeerMarket(BaseModel):
         alias="parentOutcome", description="It comes as 0 from non-conditioned markets."
     )
     parent_market: t.Optional["SeerMarket"] = Field(alias="parentMarket", default=None)
+    template_id: int = Field(alias="templateId")
     collateral_token: HexAddress = Field(alias="collateralToken")
     condition_id: HexBytes = Field(alias="conditionId")
     opening_ts: int = Field(alias="openingTs")
@@ -143,6 +163,10 @@ class SeerMarket(BaseModel):
         return urljoin(SEER_BASE_URL, f"markets/{chain_id}/{self.id.hex()}")
 
 
+class SeerMarketWithQuestions(SeerMarket):
+    questions: list[SeerMarketQuestions]
+
+
 class RedeemParams(BaseModel):
     model_config = ConfigDict(populate_by_name=True)
     market: ChecksumAddress

prediction_market_agent_tooling/markets/seer/seer.py

@@ -2,6 +2,7 @@ import asyncio
 import typing as t
 from datetime import timedelta
 
+import cachetools
 from cowdao_cowpy.common.api.errors import UnexpectedResponseError
 from eth_typing import ChecksumAddress
 from web3 import Web3
@@ -23,8 +24,8 @@ from prediction_market_agent_tooling.gtypes import (
 from prediction_market_agent_tooling.loggers import logger
 from prediction_market_agent_tooling.markets.agent_market import (
     AgentMarket,
+    ConditionalFilterType,
     FilterBy,
-    MarketFees,
     ParentMarket,
     ProcessedMarket,
     ProcessedTradedMarket,
@@ -32,7 +33,10 @@ from prediction_market_agent_tooling.markets.agent_market import (
     SortBy,
 )
 from prediction_market_agent_tooling.markets.blockchain_utils import store_trades
-from prediction_market_agent_tooling.markets.data_models import ExistingPosition
+from prediction_market_agent_tooling.markets.data_models import (
+    ExistingPosition,
+    Resolution,
+)
 from prediction_market_agent_tooling.markets.market_fees import MarketFees
 from prediction_market_agent_tooling.markets.omen.omen import OmenAgentMarket
 from prediction_market_agent_tooling.markets.omen.omen_constants import (
@@ -44,6 +48,7 @@ from prediction_market_agent_tooling.markets.omen.omen_contracts import (
 from prediction_market_agent_tooling.markets.seer.data_models import (
     RedeemParams,
     SeerMarket,
+    SeerMarketWithQuestions,
 )
 from prediction_market_agent_tooling.markets.seer.exceptions import (
     PriceCalculationError,
@@ -54,7 +59,9 @@ from prediction_market_agent_tooling.markets.seer.seer_contracts import (
     SeerMarketFactory,
 )
 from prediction_market_agent_tooling.markets.seer.seer_subgraph_handler import (
+    SeerQuestionsCache,
     SeerSubgraphHandler,
+    TemplateId,
 )
 from prediction_market_agent_tooling.markets.seer.subgraph_data_models import (
     NewMarketEvent,
@@ -93,6 +100,11 @@ from prediction_market_agent_tooling.tools.utils import check_not_none, utcnow
 SEER_TINY_BET_AMOUNT = USD(0.1)
 
 
+SHARED_CACHE: cachetools.TTLCache[t.Hashable, t.Any] = cachetools.TTLCache(
+    maxsize=256, ttl=10 * 60
+)
+
+
 class SeerAgentMarket(AgentMarket):
     wrapped_tokens: list[ChecksumAddress]
     creator: HexAddress
@@ -257,7 +269,7 @@ class SeerAgentMarket(AgentMarket):
     @staticmethod
     def _filter_markets_contained_in_trades(
         api_keys: APIKeys,
-        markets: list[SeerMarket],
+        markets: t.Sequence[SeerMarket],
     ) -> list[SeerMarket]:
         """
         We filter the markets using previous trades by the user so that we don't have to process all Seer markets.
@@ -267,7 +279,7 @@ class SeerAgentMarket(AgentMarket):
         traded_tokens = {t.buyToken for t in trades_by_user}.union(
             [t.sellToken for t in trades_by_user]
         )
-        filtered_markets = []
+        filtered_markets: list[SeerMarket] = []
         for market in markets:
             if any(
                 [
@@ -338,9 +350,64 @@ class SeerAgentMarket(AgentMarket):
         return OmenAgentMarket.verify_operational_balance(api_keys=api_keys)
 
     @staticmethod
-    def from_data_model_with_subgraph(
+    def build_resolution(
+        model: SeerMarketWithQuestions,
+    ) -> Resolution | None:
+        if model.questions[0].question.finalize_ts == 0:
+            # resolution not yet finalized
+            return None
+
+        if model.template_id != TemplateId.CATEGORICAL:
+            logger.warning("Resolution can only be built for categorical markets.")
+            # Future note - for scalar markets, simply fetch best_answer and convert
+            # from hex into int and divide by 1e18 (because Wei).
+            return None
+
+        if len(model.questions) != 1:
+            raise ValueError("Seer categorical markets must have 1 question.")
+
+        question = model.questions[0]
+        outcome = model.outcomes[int(question.question.best_answer.hex(), 16)]
+        return Resolution(outcome=outcome, invalid=False)
+
+    @staticmethod
+    def convert_seer_market_into_market_with_questions(
+        seer_market: SeerMarket, seer_subgraph: SeerSubgraphHandler
+    ) -> "SeerMarketWithQuestions":
+        q = SeerQuestionsCache(seer_subgraph_handler=seer_subgraph)
+        q.fetch_questions([seer_market.id])
+        questions = q.market_id_to_questions[seer_market.id]
+        return SeerMarketWithQuestions(**seer_market.model_dump(), questions=questions)
+
+    @staticmethod
+    def get_parent(
         model: SeerMarket,
         seer_subgraph: SeerSubgraphHandler,
+    ) -> t.Optional["ParentMarket"]:
+        if not model.parent_market:
+            return None
+
+        # turn into a market with questions
+        parent_market_with_questions = (
+            SeerAgentMarket.convert_seer_market_into_market_with_questions(
+                model.parent_market, seer_subgraph=seer_subgraph
+            )
+        )
+
+        market_with_questions = check_not_none(
+            SeerAgentMarket.from_data_model_with_subgraph(
+                parent_market_with_questions, seer_subgraph, False
+            )
+        )
+
+        return ParentMarket(
+            market=market_with_questions, parent_outcome=model.parent_outcome
+        )
+
+    @staticmethod
+    def from_data_model_with_subgraph(
+        model: SeerMarketWithQuestions,
+        seer_subgraph: SeerSubgraphHandler,
         must_have_prices: bool,
     ) -> t.Optional["SeerAgentMarket"]:
         price_manager = PriceManager(seer_market=model, seer_subgraph=seer_subgraph)
@@ -356,6 +423,10 @@ class SeerAgentMarket(AgentMarket):
                 # Price calculation failed, so don't return the market
                 return None
 
+        resolution = SeerAgentMarket.build_resolution(model=model)
+
+        parent = SeerAgentMarket.get_parent(model=model, seer_subgraph=seer_subgraph)
+
         market = SeerAgentMarket(
             id=model.id.hex(),
             question=model.title,
@@ -370,27 +441,12 @@ class SeerAgentMarket(AgentMarket):
             fees=MarketFees.get_zero_fees(),
             outcome_token_pool=None,
             outcomes_supply=model.outcomes_supply,
-            resolution=None,
+            resolution=resolution,
             volume=None,
             probabilities=probability_map,
             upper_bound=model.upper_bound,
             lower_bound=model.lower_bound,
-            parent=(
-                ParentMarket(
-                    market=(
-                        check_not_none(
-                            SeerAgentMarket.from_data_model_with_subgraph(
-                                model.parent_market,
-                                seer_subgraph,
-                                False,
-                            )
-                        )
-                    ),
-                    parent_outcome=model.parent_outcome,
-                )
-                if model.parent_market
-                else None
-            ),
+            parent=parent,
         )
 
         return market
@@ -403,7 +459,7 @@ class SeerAgentMarket(AgentMarket):
         created_after: t.Optional[DatetimeUTC] = None,
         excluded_questions: set[str] | None = None,
         question_type: QuestionType = QuestionType.ALL,
-        include_conditional_markets: bool = False,
+        conditional_filter_type: ConditionalFilterType = ConditionalFilterType.ONLY_NOT_CONDITIONAL,
     ) -> t.Sequence["SeerAgentMarket"]:
         seer_subgraph = SeerSubgraphHandler()
 
@@ -412,7 +468,7 @@ class SeerAgentMarket(AgentMarket):
             sort_by=sort_by,
             filter_by=filter_by,
             question_type=question_type,
-            include_conditional_markets=include_conditional_markets,
+            conditional_filter_type=conditional_filter_type,
         )
 
         # We exclude the None values below because `from_data_model_with_subgraph` can return None, which
@@ -491,6 +547,7 @@ class SeerAgentMarket(AgentMarket):
         liquidity = self.get_liquidity_for_outcome(outcome)
         return liquidity > self.minimum_market_liquidity_required
 
+    @cachetools.cached(cache=SHARED_CACHE, key=lambda self: f"has_liquidity_{self.id}")
     def has_liquidity(self) -> bool:
         # We define a market as having liquidity if it has liquidity for all outcomes except for the invalid (index -1)
         return all(
@@ -544,7 +601,7 @@ class SeerAgentMarket(AgentMarket):
                     f"Expected exactly 1 trade from {order_metadata=}, but got {len(trades)=}."
                 )
             cow_tx_hash = trades[0].txHash
-            logger.info(f"TxHash for {order_metadata.uid.root=} is {cow_tx_hash=}.")
+            logger.info(f"TxHash is {cow_tx_hash=} for {order_metadata.uid.root=}.")
             return cow_tx_hash.hex()
 
         except (
@@ -576,7 +633,9 @@ class SeerAgentMarket(AgentMarket):
                 amount_wei=amount_wei,
                 web3=web3,
             )
-            return tx_receipt["transactionHash"].hex()
+            swap_pool_tx_hash = tx_receipt["transactionHash"].hex()
+            logger.info(f"TxHash is {swap_pool_tx_hash=}.")
+            return swap_pool_tx_hash
 
     def place_bet(
         self,

prediction_market_agent_tooling/markets/seer/seer_contracts.py

@@ -9,6 +9,7 @@ from prediction_market_agent_tooling.gtypes import (
     ChecksumAddress,
     OutcomeStr,
     TxReceipt,
+    Wei,
     xDai,
 )
 from prediction_market_agent_tooling.markets.seer.data_models import (
@@ -115,6 +116,23 @@ class GnosisRouter(ContractOnGnosisChain):
         )
         return receipt_tx
 
+    def split_position(
+        self,
+        api_keys: APIKeys,
+        collateral_token: ChecksumAddress,
+        market_id: ChecksumAddress,
+        amount: Wei,
+        web3: Web3 | None = None,
+    ) -> TxReceipt:
+        """Splits collateral token into full set of outcome tokens."""
+        receipt_tx = self.send(
+            api_keys=api_keys,
+            function_name="splitPosition",
+            function_params=[collateral_token, market_id, amount],
+            web3=web3,
+        )
+        return receipt_tx
+
 
 class SwaprRouterContract(ContractOnGnosisChain):
     # File content taken from https://github.com/protofire/omen-exchange/blob/master/app/src/abi/marketMaker.json.