prediction-market-agent-tooling 0.67.1__tar.gz → 0.67.2__tar.gz

{prediction_market_agent_tooling-0.67.1 → prediction_market_agent_tooling-0.67.2}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.3
 Name: prediction-market-agent-tooling
-Version: 0.67.1
+Version: 0.67.2
 Summary: Tools to benchmark, deploy and monitor prediction market agents.
 Author: Gnosis
 Requires-Python: >=3.10,<3.13
@@ -42,6 +42,7 @@ Requires-Dist: proto-plus (>=1.0.0,<2.0.0)
 Requires-Dist: protobuf (>=5.0.0,<6.0.0)
 Requires-Dist: psycopg2-binary (>=2.9.9,<3.0.0)
 Requires-Dist: pydantic (>=2.6.1,<3.0.0)
+Requires-Dist: pydantic-ai (>=0.1.9,<1.0.0)
 Requires-Dist: pydantic-settings (>=2.4.0,<3.0.0)
 Requires-Dist: pymongo (>=4.8.0,<5.0.0)
 Requires-Dist: pytest-postgresql (>=6.1.1,<7.0.0)

{prediction_market_agent_tooling-0.67.1 → prediction_market_agent_tooling-0.67.2}/prediction_market_agent_tooling/deploy/agent.py

@@ -6,6 +6,7 @@ from enum import Enum
 from functools import cached_property
 
 from pydantic import computed_field
+from pydantic_ai.exceptions import UnexpectedModelBehavior
 
 from prediction_market_agent_tooling.config import APIKeys
 from prediction_market_agent_tooling.deploy.betting_strategy import (
@@ -19,13 +20,12 @@ from prediction_market_agent_tooling.deploy.trade_interval import (
 )
 from prediction_market_agent_tooling.gtypes import USD, OutcomeToken, xDai
 from prediction_market_agent_tooling.loggers import logger
-from prediction_market_agent_tooling.markets.agent_market import AgentMarket, FilterBy
-from prediction_market_agent_tooling.markets.agent_market import (
-    MarketType as AgentMarketType,
-)
 from prediction_market_agent_tooling.markets.agent_market import (
+    AgentMarket,
+    FilterBy,
     ProcessedMarket,
     ProcessedTradedMarket,
+    QuestionType,
     SortBy,
 )
 from prediction_market_agent_tooling.markets.data_models import (
@@ -47,6 +47,9 @@ from prediction_market_agent_tooling.tools.custom_exceptions import (
 from prediction_market_agent_tooling.tools.is_invalid import is_invalid
 from prediction_market_agent_tooling.tools.is_predictable import is_predictable_binary
 from prediction_market_agent_tooling.tools.langfuse_ import langfuse_context, observe
+from prediction_market_agent_tooling.tools.rephrase import (
+    rephrase_question_to_unconditioned,
+)
 from prediction_market_agent_tooling.tools.tokens.main_token import (
     MINIMUM_NATIVE_TOKEN_IN_EOA_FOR_FEES,
 )
@@ -196,6 +199,7 @@ class DeployablePredictionAgent(DeployableAgent):
     trade_on_markets_created_after: DatetimeUTC | None = None
     get_markets_sort_by: SortBy = SortBy.CLOSING_SOONEST
     get_markets_filter_by: FilterBy = FilterBy.OPEN
+    rephrase_conditioned_markets: bool = True
 
     # Agent behaviour when filtering fetched markets
     allow_invalid_questions: bool = False
@@ -205,6 +209,8 @@ class DeployablePredictionAgent(DeployableAgent):
         MINIMUM_NATIVE_TOKEN_IN_EOA_FOR_FEES
     )
 
+    just_warn_on_unexpected_model_behavior: bool = False
+
     # Only Metaculus allows to post predictions without trading (buying/selling of outcome tokens).
     supported_markets: t.Sequence[MarketType] = [MarketType.METACULUS]
 
@@ -224,6 +230,7 @@ class DeployablePredictionAgent(DeployableAgent):
         self.answer_categorical_market = observe()(self.answer_categorical_market)  # type: ignore[method-assign]
         self.answer_scalar_market = observe()(self.answer_scalar_market)  # type: ignore[method-assign]
         self.process_market = observe()(self.process_market)  # type: ignore[method-assign]
+        self.rephrase_market_to_unconditioned = observe()(self.rephrase_market_to_unconditioned)  # type: ignore[method-assign]
 
     def update_langfuse_trace_by_market(
         self, market_type: MarketType, market: AgentMarket
@@ -298,6 +305,34 @@ class DeployablePredictionAgent(DeployableAgent):
 
         return True
 
+    def rephrase_market_to_unconditioned(
+        self,
+        market_: AgentMarket,
+    ) -> AgentMarket:
+        """
+        If `rephrase_conditioned_markets` is set to True,
+        this method will be used to rephrase the question to account for the parent's market probability in the agent's decision process.
+        """
+        new = market_.model_copy(deep=True)
+
+        if new.parent is not None and new.parent.market.parent is not None:
+            new.parent.market = self.rephrase_market_to_unconditioned(new.parent.market)
+
+        rephrased_question = (
+            rephrase_question_to_unconditioned(
+                new.question,
+                new.parent.market.question,
+                new.parent.market.outcomes[new.parent.parent_outcome],
+            )
+            if new.parent is not None
+            else new.question
+        )
+
+        new.question = rephrased_question
+        new.parent = None
+
+        return new
+
     def answer_categorical_market(
         self, market: AgentMarket
     ) -> CategoricalProbabilisticAnswer | None:
@@ -338,13 +373,23 @@ class DeployablePredictionAgent(DeployableAgent):
         return False
 
     @property
-    def agent_market_type(self) -> AgentMarketType:
+    def include_conditional_markets(self) -> bool:
+        # TODO: All should work in our code, except that currently CoW most of the time completely fails to swap xDai into outcome tokens of conditioned market.
+        # Enable after https://github.com/gnosis/prediction-market-agent-tooling/issues/748 and/or https://github.com/gnosis/prediction-market-agent-tooling/issues/759 is resolved.
+        return False
+        # `include_conditional_markets` if `rephrase_conditioned_markets` is enabled.
+        # We can expand this method in teh future, when we implement also more complex logic about conditional markets.
+        # Note that conditional market isn't a type of the market like Binary or Categorical, it means that it uses outcome tokens from parent market as a collateral token in this market.
+        return self.rephrase_conditioned_markets
+
+    @property
+    def agent_question_type(self) -> QuestionType:
         if self.fetch_scalar_markets:
-            return AgentMarketType.SCALAR
+            return QuestionType.SCALAR
         elif self.fetch_categorical_markets:
-            return AgentMarketType.CATEGORICAL
+            return QuestionType.CATEGORICAL
         else:
-            return AgentMarketType.BINARY
+            return QuestionType.BINARY
 
     def get_markets(
         self,
@@ -355,15 +400,14 @@ class DeployablePredictionAgent(DeployableAgent):
         """
         cls = market_type.market_class
 
-        agent_market_type = self.agent_market_type
-
         # Fetch the soonest closing markets to choose from
         available_markets = cls.get_markets(
             limit=self.n_markets_to_fetch,
             sort_by=self.get_markets_sort_by,
             filter_by=self.get_markets_filter_by,
             created_after=self.trade_on_markets_created_after,
-            market_type=agent_market_type,
+            question_type=self.agent_question_type,
+            include_conditional_markets=self.include_conditional_markets,
         )
         return available_markets
 
@@ -396,6 +440,9 @@ class DeployablePredictionAgent(DeployableAgent):
 
         logger.info(f"Answering market '{market.question}'.")
 
+        if self.rephrase_conditioned_markets and market.parent is not None:
+            market = self.rephrase_market_to_unconditioned(market)
+
         if market.is_binary:
             try:
                 binary_answer = self.answer_binary_market(market)
@@ -455,9 +502,18 @@ class DeployablePredictionAgent(DeployableAgent):
             f"Processing market {market.question=} from {market.url=} with liquidity {market.get_liquidity()}."
         )
 
-        answer = self.build_answer(
-            market=market, market_type=market_type, verify_market=verify_market
-        )
+        try:
+            answer = self.build_answer(
+                market=market, market_type=market_type, verify_market=verify_market
+            )
+        except UnexpectedModelBehavior:
+            (
+                logger.warning
+                if self.just_warn_on_unexpected_model_behavior
+                else logger.exception
+            )(f"Unexpected model behaviour in {self.__class__.__name__}.")
+            answer = None
+
         if answer is not None:
             self.verify_answer_outcomes(market=market, answer=answer)
 

{prediction_market_agent_tooling-0.67.1 → prediction_market_agent_tooling-0.67.2}/prediction_market_agent_tooling/markets/agent_market.py

@@ -64,7 +64,12 @@ class FilterBy(str, Enum):
     NONE = "none"
 
 
-class MarketType(str, Enum):
+class ParentMarket(BaseModel):
+    market: "AgentMarket"
+    parent_outcome: int
+
+
+class QuestionType(str, Enum):
     ALL = "all"
     CATEGORICAL = "categorical"
     SCALAR = "scalar"
@@ -96,6 +101,8 @@ class AgentMarket(BaseModel):
     upper_bound: Wei | None = None
     lower_bound: Wei | None = None
 
+    parent: ParentMarket | None = None
+
     @field_validator("probabilities")
     def validate_probabilities(
         cls,
@@ -376,7 +383,7 @@ class AgentMarket(BaseModel):
         filter_by: FilterBy = FilterBy.OPEN,
         created_after: t.Optional[DatetimeUTC] = None,
         excluded_questions: set[str] | None = None,
-        market_type: MarketType = MarketType.ALL,
+        question_type: QuestionType = QuestionType.ALL,
         include_conditional_markets: bool = False,
     ) -> t.Sequence["AgentMarket"]:
         raise NotImplementedError("Subclasses must implement this method")

{prediction_market_agent_tooling-0.67.1 → prediction_market_agent_tooling-0.67.2}/prediction_market_agent_tooling/markets/manifold/manifold.py

@@ -12,7 +12,7 @@ from prediction_market_agent_tooling.markets.agent_market import (
     AgentMarket,
     FilterBy,
     MarketFees,
-    MarketType,
+    QuestionType,
     SortBy,
 )
 from prediction_market_agent_tooling.markets.manifold.api import (
@@ -111,7 +111,7 @@ class ManifoldAgentMarket(AgentMarket):
         filter_by: FilterBy = FilterBy.OPEN,
         created_after: t.Optional[DatetimeUTC] = None,
         excluded_questions: set[str] | None = None,
-        market_type: MarketType = MarketType.ALL,
+        question_type: QuestionType = QuestionType.ALL,
         include_conditional_markets: bool = False,
     ) -> t.Sequence["ManifoldAgentMarket"]:
         sort: t.Literal["newest", "close-date"] | None

{prediction_market_agent_tooling-0.67.1 → prediction_market_agent_tooling-0.67.2}/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-0.67.1 → prediction_market_agent_tooling-0.67.2}/prediction_market_agent_tooling/markets/metaculus/metaculus.py

@@ -9,8 +9,8 @@ from prediction_market_agent_tooling.markets.agent_market import (
     AgentMarket,
     FilterBy,
     MarketFees,
-    MarketType,
     ProcessedMarket,
+    QuestionType,
     SortBy,
 )
 from prediction_market_agent_tooling.markets.metaculus.api import (
@@ -73,7 +73,7 @@ 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,
+        question_type: QuestionType = QuestionType.ALL,
         include_conditional_markets: bool = False,
         tournament_id: int | None = None,
     ) -> t.Sequence["MetaculusAgentMarket"]:

{prediction_market_agent_tooling-0.67.1 → prediction_market_agent_tooling-0.67.2}/prediction_market_agent_tooling/markets/omen/omen.py

@@ -25,9 +25,9 @@ from prediction_market_agent_tooling.markets.agent_market import (
     AgentMarket,
     FilterBy,
     MarketFees,
-    MarketType,
     ProcessedMarket,
     ProcessedTradedMarket,
+    QuestionType,
     SortBy,
 )
 from prediction_market_agent_tooling.markets.blockchain_utils import store_trades
@@ -380,10 +380,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,
+        question_type: QuestionType = QuestionType.ALL,
         include_conditional_markets: bool = False,
     ) -> 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-0.67.1 → prediction_market_agent_tooling-0.67.2}/prediction_market_agent_tooling/markets/polymarket/polymarket.py

@@ -11,7 +11,7 @@ from prediction_market_agent_tooling.markets.agent_market import (
     AgentMarket,
     FilterBy,
     MarketFees,
-    MarketType,
+    QuestionType,
     SortBy,
 )
 from prediction_market_agent_tooling.markets.data_models import Resolution
@@ -123,7 +123,7 @@ 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,
+        question_type: QuestionType = QuestionType.ALL,
         include_conditional_markets: bool = False,
     ) -> t.Sequence["PolymarketAgentMarket"]:
         closed: bool | None
@@ -159,7 +159,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-0.67.1 → prediction_market_agent_tooling-0.67.2}/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
@@ -70,10 +67,10 @@ 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)
     collateral_token: HexAddress = Field(alias="collateralToken")
     condition_id: HexBytes = Field(alias="conditionId")
     opening_ts: int = Field(alias="openingTs")
@@ -139,6 +136,7 @@ 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

{prediction_market_agent_tooling-0.67.1 → prediction_market_agent_tooling-0.67.2}/prediction_market_agent_tooling/markets/seer/seer.py

@@ -25,9 +25,10 @@ from prediction_market_agent_tooling.markets.agent_market import (
     AgentMarket,
     FilterBy,
     MarketFees,
-    MarketType,
+    ParentMarket,
     ProcessedMarket,
     ProcessedTradedMarket,
+    QuestionType,
     SortBy,
 )
 from prediction_market_agent_tooling.markets.blockchain_utils import store_trades
@@ -86,7 +87,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)
@@ -374,6 +375,22 @@ class SeerAgentMarket(AgentMarket):
             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
+            ),
         )
 
         return market
@@ -385,7 +402,7 @@ 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,
+        question_type: QuestionType = QuestionType.ALL,
         include_conditional_markets: bool = False,
     ) -> t.Sequence["SeerAgentMarket"]:
         seer_subgraph = SeerSubgraphHandler()
@@ -394,8 +411,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,
+            include_conditional_markets=include_conditional_markets,
         )
 
         # We exclude the None values below because `from_data_model_with_subgraph` can return None, which
@@ -585,14 +602,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-0.67.1 → prediction_market_agent_tooling-0.67.2}/prediction_market_agent_tooling/markets/seer/seer_subgraph_handler.py

@@ -16,7 +16,7 @@ from prediction_market_agent_tooling.gtypes import ChecksumAddress, Wei
 from prediction_market_agent_tooling.loggers import logger
 from prediction_market_agent_tooling.markets.agent_market import (
     FilterBy,
-    MarketType,
+    QuestionType,
     SortBy,
 )
 from prediction_market_agent_tooling.markets.base_subgraph_handler import (
@@ -62,7 +62,9 @@ class SeerSubgraphHandler(BaseSubgraphHandler):
             )
         )
 
-    def _get_fields_for_markets(self, markets_field: FieldPath) -> list[FieldPath]:
+    def _get_fields_for_markets(
+        self, markets_field: FieldPath, current_level: int = 0, max_level: int = 1
+    ) -> list[FieldPath]:
         fields = [
             markets_field.id,
             markets_field.factory,
@@ -76,7 +78,6 @@ class SeerSubgraphHandler(BaseSubgraphHandler):
             markets_field.payoutNumerators,
             markets_field.hasAnswers,
             markets_field.blockTimestamp,
-            markets_field.parentMarket.id,
             markets_field.openingTs,
             markets_field.finalizeTs,
             markets_field.wrappedTokens,
@@ -84,7 +85,25 @@ class SeerSubgraphHandler(BaseSubgraphHandler):
             markets_field.upperBound,
             markets_field.lowerBound,
             markets_field.templateId,
+            # TODO: On the Subgraph, `questions` field is a kind of sub-query, instead of a classic list of values.
+            # See how it is shown on their UI: https://thegraph.com/explorer/subgraphs/B4vyRqJaSHD8dRDb3BFRoAzuBK18c1QQcXq94JbxDxWH?view=Query&chain=arbitrum-one.
+            # And that doesn't work with subgrounds.
+            # markets_field.questions.question.id,
+            # markets_field.questions.question.finalize_ts,
+            # markets_field.questions.question.best_answer,
         ]
+        if current_level < max_level:
+            fields.extend(
+                self._get_fields_for_markets(
+                    markets_field.parentMarket, current_level + 1, max_level
+                )
+            )
+            # TODO: Same situation as with `questions` field above.
+            # fields.extend(
+            #     self._get_fields_for_markets(
+            #         markets_field.childMarkets, current_level + 1, max_level
+            #     )
+            # )
         return fields
 
     @staticmethod
@@ -114,7 +133,8 @@ class SeerSubgraphHandler(BaseSubgraphHandler):
         filter_by: FilterBy,
         outcome_supply_gt_if_open: Wei,
         include_conditional_markets: bool = False,
-        market_type: MarketType = MarketType.ALL,
+        question_type: QuestionType = QuestionType.ALL,
+        parent_market_id: HexBytes | None = None,
     ) -> dict[Any, Any]:
         now = to_int_timestamp(utcnow())
 
@@ -136,9 +156,12 @@ class SeerSubgraphHandler(BaseSubgraphHandler):
         if not include_conditional_markets:
             and_stms["parentMarket"] = ADDRESS_ZERO.lower()
 
+        if parent_market_id:
+            and_stms["parentMarket"] = parent_market_id.hex().lower()
+
         outcome_filters: list[dict[str, t.Any]] = []
 
-        if market_type == MarketType.SCALAR:
+        if question_type == QuestionType.SCALAR:
             # Template ID "1" + UP/DOWN outcomes for scalar markets
             and_stms["templateId"] = TemplateId.SCALAR.value
             up_filter = SeerSubgraphHandler._create_case_variations_condition(
@@ -149,7 +172,7 @@ class SeerSubgraphHandler(BaseSubgraphHandler):
             )
             outcome_filters.extend([up_filter, down_filter])
 
-        elif market_type == MarketType.BINARY:
+        elif question_type == QuestionType.BINARY:
             # Template ID "2" + YES/NO outcomes for binary markets
             and_stms["templateId"] = TemplateId.CATEGORICAL.value
             yes_filter = SeerSubgraphHandler._create_case_variations_condition(
@@ -160,7 +183,7 @@ class SeerSubgraphHandler(BaseSubgraphHandler):
             )
             outcome_filters.extend([yes_filter, no_filter])
 
-        elif market_type == MarketType.CATEGORICAL:
+        elif question_type == QuestionType.CATEGORICAL:
             # Template ID 2 (categorical) OR Template ID 3 (multi-categorical,
             # we treat them as categorical for now for simplicity)
             # https://reality.eth.limo/app/docs/html/contracts.html#templates
@@ -211,16 +234,18 @@ class SeerSubgraphHandler(BaseSubgraphHandler):
         sort_by: SortBy = SortBy.NONE,
         limit: int | None = None,
         outcome_supply_gt_if_open: Wei = Wei(0),
-        market_type: MarketType = MarketType.ALL,
+        question_type: QuestionType = QuestionType.ALL,
         include_conditional_markets: bool = False,
+        parent_market_id: HexBytes | None = None,
     ) -> list[SeerMarket]:
         sort_direction, sort_by_field = self._build_sort_params(sort_by)
 
         where_stms = self._build_where_statements(
             filter_by=filter_by,
             outcome_supply_gt_if_open=outcome_supply_gt_if_open,
+            parent_market_id=parent_market_id,
+            question_type=question_type,
             include_conditional_markets=include_conditional_markets,
-            market_type=market_type,
         )
 
         # These values can not be set to `None`, but they can be omitted.

{prediction_market_agent_tooling-0.67.1 → prediction_market_agent_tooling-0.67.2}/prediction_market_agent_tooling/markets/seer/subgraph_data_models.py

@@ -58,7 +58,3 @@ class CreateCategoricalMarketsParams(BaseModel):
     )  # typed as int for later .model_dump() usage (if using Wei, other keys also exported)
     opening_time: int = Field(..., alias="openingTime")
     token_names: list[str] = Field(..., alias="tokenNames")
-
-
-class SeerParentMarket(BaseModel):
-    id: HexBytes

{prediction_market_agent_tooling-0.67.1 → prediction_market_agent_tooling-0.67.2}/prediction_market_agent_tooling/markets/seer/swap_pool_handler.py

@@ -19,7 +19,6 @@ from prediction_market_agent_tooling.markets.seer.seer_contracts import (
 from prediction_market_agent_tooling.markets.seer.seer_subgraph_handler import (
     SeerSubgraphHandler,
 )
-from prediction_market_agent_tooling.tools.contract import ContractERC20OnGnosisChain
 
 
 class SwapPoolHandler:
@@ -91,15 +90,6 @@ class SwapPoolHandler:
             amount_out_minimum=amount_out_minimum,
         )
 
-        # make sure user has enough tokens to sell
-        balance_collateral_token = ContractERC20OnGnosisChain(
-            address=token_in
-        ).balanceOf(self.api_keys.bet_from_address, web3=web3)
-        if balance_collateral_token < amount_wei:
-            raise ValueError(
-                f"Balance {balance_collateral_token} of {token_in} insufficient for trade, required {amount_wei}"
-            )
-
         tx_receipt = SwaprRouterContract().exact_input_single(
             api_keys=self.api_keys, params=p, web3=web3
         )

prediction_market_agent_tooling-0.67.2/prediction_market_agent_tooling/tools/rephrase.py

@@ -0,0 +1,71 @@
+import tenacity
+
+from prediction_market_agent_tooling.config import APIKeys
+from prediction_market_agent_tooling.tools.caches.db_cache import db_cache
+from prediction_market_agent_tooling.tools.langfuse_ import (
+    get_langfuse_langchain_config,
+    observe,
+)
+from prediction_market_agent_tooling.tools.utils import (
+    LLM_SEED,
+    LLM_SUPER_LOW_TEMPERATURE,
+)
+
+REPHRASE_QUESTION_PROMPT = """Given the following question of main interest: {question}
+
+But it's conditioned on `{parent_question}` resolving to `{needed_parent_outcome}`.
+
+Rewrite the main question to contain the parent question in the correct form. 
+
+The main question will be used as a prediction market, so it does need to be rephrased using the parent question properly. Such that the probability of the main question also accounts for the conditioned outcome.
+
+For example:
+```
+Main question: What is the probability of <X> happening before <date>?
+Conditioned on: Will <Y> happen before <another-date>?
+Rephrased: What is the joint probability of Y happening before <another-date> and then X happening before <date>?
+```
+
+Output only the rephrased question.
+"""
+
+
+@tenacity.retry(stop=tenacity.stop_after_attempt(3), wait=tenacity.wait_fixed(1))
+@observe()
+@db_cache
+def rephrase_question_to_unconditioned(
+    question: str,
+    parent_question: str,
+    needed_parent_outcome: str,
+    engine: str = "gpt-4.1",
+    temperature: float = LLM_SUPER_LOW_TEMPERATURE,
+    seed: int = LLM_SEED,
+    prompt_template: str = REPHRASE_QUESTION_PROMPT,
+    max_tokens: int = 1024,
+) -> str:
+    try:
+        from langchain.prompts import ChatPromptTemplate
+        from langchain_openai import ChatOpenAI
+    except ImportError:
+        raise ImportError("langchain not installed")
+
+    llm = ChatOpenAI(
+        model_name=engine,
+        temperature=temperature,
+        seed=seed,
+        openai_api_key=APIKeys().openai_api_key,
+    )
+
+    prompt = ChatPromptTemplate.from_template(template=prompt_template)
+    messages = prompt.format_messages(
+        question=question,
+        parent_question=parent_question,
+        needed_parent_outcome=needed_parent_outcome,
+    )
+    completion = str(
+        llm.invoke(
+            messages, max_tokens=max_tokens, config=get_langfuse_langchain_config()
+        ).content
+    )
+
+    return completion

{prediction_market_agent_tooling-0.67.1 → prediction_market_agent_tooling-0.67.2}/pyproject.toml

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "prediction-market-agent-tooling"
-version = "0.67.1"
+version = "0.67.2"
 description = "Tools to benchmark, deploy and monitor prediction market agents."
 authors = ["Gnosis"]
 readme = "README.md"
@@ -61,6 +61,7 @@ proto-plus = "^1.0.0"
 protobuf = "^5.0.0"
 types-cachetools = "^5.5.0.20240820"
 python-json-logger = "^3.3.0"
+pydantic-ai = ">=0.1.9,<1.0.0"
 
 [tool.poetry.extras]
 openai = ["openai"]