prediction-market-agent-tooling 0.67.1__py3-none-any.whl → 0.67.3__py3-none-any.whl

prediction_market_agent_tooling/markets/markets.py

@@ -3,11 +3,12 @@ from enum import Enum
 
 from prediction_market_agent_tooling.jobs.jobs_models import JobAgentMarket
 from prediction_market_agent_tooling.jobs.omen.omen_jobs import OmenJobAgentMarket
-from prediction_market_agent_tooling.markets.agent_market import AgentMarket, FilterBy
 from prediction_market_agent_tooling.markets.agent_market import (
-    MarketType as AgentMarketType,
+    AgentMarket,
+    FilterBy,
+    QuestionType,
+    SortBy,
 )
-from prediction_market_agent_tooling.markets.agent_market import SortBy
 from prediction_market_agent_tooling.markets.manifold.manifold import (
     ManifoldAgentMarket,
 )
@@ -68,7 +69,7 @@ def get_binary_markets(
     sort_by: SortBy = SortBy.NONE,
     excluded_questions: set[str] | None = None,
     created_after: DatetimeUTC | None = None,
-    agent_market_type: AgentMarketType = AgentMarketType.BINARY,
+    question_type: QuestionType = QuestionType.BINARY,
 ) -> t.Sequence[AgentMarket]:
     agent_market_class = MARKET_TYPE_TO_AGENT_MARKET[market_type]
     markets = agent_market_class.get_markets(
@@ -77,6 +78,6 @@ def get_binary_markets(
         filter_by=filter_by,
         created_after=created_after,
         excluded_questions=excluded_questions,
-        market_type=agent_market_type,
+        question_type=question_type,
     )
     return markets

prediction_market_agent_tooling/markets/metaculus/metaculus.py

@@ -7,10 +7,11 @@ 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,
-    MarketType,
     ProcessedMarket,
+    QuestionType,
     SortBy,
 )
 from prediction_market_agent_tooling.markets.metaculus.api import (
@@ -73,8 +74,8 @@ class MetaculusAgentMarket(AgentMarket):
         filter_by: FilterBy = FilterBy.OPEN,
         created_after: t.Optional[DatetimeUTC] = None,
         excluded_questions: set[str] | None = None,
-        market_type: MarketType = MarketType.ALL,
-        include_conditional_markets: bool = False,
+        question_type: QuestionType = QuestionType.ALL,
+        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,11 +23,12 @@ 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,
-    MarketType,
     ProcessedMarket,
     ProcessedTradedMarket,
+    QuestionType,
     SortBy,
 )
 from prediction_market_agent_tooling.markets.blockchain_utils import store_trades
@@ -380,10 +381,10 @@ class OmenAgentMarket(AgentMarket):
         filter_by: FilterBy = FilterBy.OPEN,
         created_after: t.Optional[DatetimeUTC] = None,
         excluded_questions: set[str] | None = None,
-        market_type: MarketType = MarketType.ALL,
-        include_conditional_markets: bool = False,
+        question_type: QuestionType = QuestionType.ALL,
+        conditional_filter_type: ConditionalFilterType = ConditionalFilterType.ONLY_NOT_CONDITIONAL,
     ) -> t.Sequence["OmenAgentMarket"]:
-        fetch_categorical_markets = market_type == MarketType.CATEGORICAL
+        fetch_categorical_markets = question_type == QuestionType.CATEGORICAL
 
         return [
             OmenAgentMarket.from_data_model(m)

prediction_market_agent_tooling/markets/polymarket/polymarket.py

@@ -9,9 +9,10 @@ from prediction_market_agent_tooling.gtypes import (
 )
 from prediction_market_agent_tooling.markets.agent_market import (
     AgentMarket,
+    ConditionalFilterType,
     FilterBy,
     MarketFees,
-    MarketType,
+    QuestionType,
     SortBy,
 )
 from prediction_market_agent_tooling.markets.data_models import Resolution
@@ -123,8 +124,8 @@ class PolymarketAgentMarket(AgentMarket):
         filter_by: FilterBy = FilterBy.OPEN,
         created_after: t.Optional[DatetimeUTC] = None,
         excluded_questions: set[str] | None = None,
-        market_type: MarketType = MarketType.ALL,
-        include_conditional_markets: bool = False,
+        question_type: QuestionType = QuestionType.ALL,
+        conditional_filter_type: ConditionalFilterType = ConditionalFilterType.ONLY_NOT_CONDITIONAL,
     ) -> t.Sequence["PolymarketAgentMarket"]:
         closed: bool | None
 
@@ -159,7 +160,7 @@ class PolymarketAgentMarket(AgentMarket):
             ascending=ascending,
             created_after=created_after,
             excluded_questions=excluded_questions,
-            only_binary=market_type is not MarketType.CATEGORICAL,
+            only_binary=question_type is not QuestionType.CATEGORICAL,
         )
 
         condition_models = PolymarketSubgraphHandler().get_conditions(

prediction_market_agent_tooling/markets/seer/data_models.py

@@ -3,7 +3,7 @@ from datetime import timedelta
 from typing import Annotated
 from urllib.parse import urljoin
 
-from pydantic import BaseModel, BeforeValidator, ConfigDict, Field
+from pydantic import BaseModel, BeforeValidator, ConfigDict, Field, computed_field
 from web3 import Web3
 from web3.constants import ADDRESS_ZERO
 
@@ -17,9 +17,6 @@ from prediction_market_agent_tooling.gtypes import (
     Web3Wei,
     Wei,
 )
-from prediction_market_agent_tooling.markets.seer.subgraph_data_models import (
-    SeerParentMarket,
-)
 from prediction_market_agent_tooling.tools.contract import ContractERC20OnGnosisChain
 from prediction_market_agent_tooling.tools.datetime_utc import DatetimeUTC
 from prediction_market_agent_tooling.tools.utils import utcnow
@@ -51,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
 
@@ -62,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)
 
@@ -70,10 +86,11 @@ class SeerMarket(BaseModel):
     title: str = Field(alias="marketName")
     outcomes: t.Sequence[OutcomeStr]
     wrapped_tokens: list[HexAddress] = Field(alias="wrappedTokens")
-    parent_outcome: int = Field(alias="parentOutcome")
-    parent_market: t.Optional[SeerParentMarket] = Field(
-        alias="parentMarket", default=None
+    parent_outcome: int = Field(
+        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")
@@ -139,12 +156,17 @@ class SeerMarket(BaseModel):
     def created_time(self) -> DatetimeUTC:
         return DatetimeUTC.to_datetime_utc(self.block_timestamp)
 
+    @computed_field  # type: ignore[prop-decorator]
     @property
     def url(self) -> str:
         chain_id = RPCConfig().chain_id
         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

@@ -23,15 +23,19 @@ 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,
-    MarketType,
+    ParentMarket,
     ProcessedMarket,
     ProcessedTradedMarket,
+    QuestionType,
     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 (
@@ -43,6 +47,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,
@@ -53,7 +58,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,
@@ -86,7 +93,7 @@ from prediction_market_agent_tooling.tools.tokens.usd import (
     get_token_in_usd,
     get_usd_in_token,
 )
-from prediction_market_agent_tooling.tools.utils import utcnow
+from prediction_market_agent_tooling.tools.utils import check_not_none, utcnow
 
 # We place a larger bet amount by default than Omen so that cow presents valid quotes.
 SEER_TINY_BET_AMOUNT = USD(0.1)
@@ -256,7 +263,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.
@@ -266,7 +273,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(
                 [
@@ -337,9 +344,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)
@@ -355,6 +417,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,
@@ -369,11 +435,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=parent,
         )
 
         return market
@@ -385,8 +452,8 @@ class SeerAgentMarket(AgentMarket):
         filter_by: FilterBy = FilterBy.OPEN,
         created_after: t.Optional[DatetimeUTC] = None,
         excluded_questions: set[str] | None = None,
-        market_type: MarketType = MarketType.ALL,
-        include_conditional_markets: bool = False,
+        question_type: QuestionType = QuestionType.ALL,
+        conditional_filter_type: ConditionalFilterType = ConditionalFilterType.ONLY_NOT_CONDITIONAL,
     ) -> t.Sequence["SeerAgentMarket"]:
         seer_subgraph = SeerSubgraphHandler()
 
@@ -394,8 +461,8 @@ class SeerAgentMarket(AgentMarket):
             limit=limit,
             sort_by=sort_by,
             filter_by=filter_by,
-            market_type=market_type,
-            include_conditional_markets=False,
+            question_type=question_type,
+            conditional_filter_type=conditional_filter_type,
         )
 
         # We exclude the None values below because `from_data_model_with_subgraph` can return None, which
@@ -585,14 +652,6 @@ class SeerAgentMarket(AgentMarket):
                 collateral_contract, amount_wei, api_keys, web3
             )
 
-        collateral_balance = collateral_contract.balanceOf(
-            api_keys.bet_from_address, web3=web3
-        )
-        if collateral_balance < amount_wei:
-            raise ValueError(
-                f"Balance {collateral_balance} not enough for bet size {amount}"
-            )
-
         return self._swap_tokens_with_fallback(
             sell_token=collateral_contract.address,
             buy_token=outcome_token,

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.