prediction-market-agent-tooling 0.66.3__py3-none-any.whl → 0.66.4__py3-none-any.whl

prediction_market_agent_tooling/benchmark/utils.py

@@ -6,6 +6,7 @@ from pydantic import BaseModel
 from prediction_market_agent_tooling.gtypes import OutcomeStr, Probability
 from prediction_market_agent_tooling.markets.data_models import (
     CategoricalProbabilisticAnswer,
+    ScalarProbabilisticAnswer,
 )
 
 
@@ -16,6 +17,18 @@ def get_most_probable_outcome(
     return max(probability_map, key=lambda k: float(probability_map[k]))
 
 
+class ScalarPrediction(BaseModel):
+    is_predictable: bool = True
+    outcome_prediction: t.Optional[ScalarProbabilisticAnswer] = None
+
+    time: t.Optional[float] = None
+    cost: t.Optional[float] = None
+
+    @property
+    def is_answered(self) -> bool:
+        return self.outcome_prediction is not None
+
+
 class Prediction(BaseModel):
     is_predictable: bool = True
     outcome_prediction: t.Optional[CategoricalProbabilisticAnswer] = None

prediction_market_agent_tooling/deploy/agent.py

@@ -31,6 +31,7 @@ from prediction_market_agent_tooling.markets.data_models import (
     ExistingPosition,
     PlacedTrade,
     ProbabilisticAnswer,
+    ScalarProbabilisticAnswer,
     Trade,
 )
 from prediction_market_agent_tooling.markets.markets import MarketType
@@ -219,6 +220,7 @@ class DeployablePredictionAgent(DeployableAgent):
         self.verify_market = observe()(self.verify_market)  # type: ignore[method-assign]
         self.answer_binary_market = observe()(self.answer_binary_market)  # type: ignore[method-assign]
         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]
 
     def update_langfuse_trace_by_market(
@@ -299,6 +301,11 @@ class DeployablePredictionAgent(DeployableAgent):
     ) -> CategoricalProbabilisticAnswer | None:
         raise NotImplementedError("This method must be implemented by the subclass")
 
+    def answer_scalar_market(
+        self, market: AgentMarket
+    ) -> ScalarProbabilisticAnswer | None:
+        raise NotImplementedError("This method must be implemented by the subclass")
+
     def answer_binary_market(self, market: AgentMarket) -> ProbabilisticAnswer | None:
         """
         Answer the binary market.
@@ -321,6 +328,13 @@ class DeployablePredictionAgent(DeployableAgent):
             return True
         return False
 
+    @property
+    def fetch_scalar_markets(self) -> bool:
+        # Check if the subclass has implemented the answer_scalar_market method, if yes, fetch scalar markets as well.
+        if self.answer_scalar_market.__wrapped__.__func__ is not DeployablePredictionAgent.answer_scalar_market:  # type: ignore[attr-defined] # This works just fine, but mypy doesn't know about it for some reason.
+            return True
+        return False
+
     def get_markets(
         self,
         market_type: MarketType,
@@ -336,6 +350,7 @@ class DeployablePredictionAgent(DeployableAgent):
             filter_by=self.get_markets_filter_by,
             created_after=self.trade_on_markets_created_after,
             fetch_categorical_markets=self.fetch_categorical_markets,
+            fetch_scalar_markets=self.fetch_scalar_markets,
         )
         return available_markets
 
@@ -383,7 +398,16 @@ class DeployablePredictionAgent(DeployableAgent):
                 logger.info(
                     "answer_binary_market() not implemented, falling back to answer_categorical_market()"
                 )
-
+        elif market.is_scalar:
+            scalar_answer = self.answer_scalar_market(market)
+            return (
+                CategoricalProbabilisticAnswer.from_scalar_answer(
+                    scalar_answer,
+                    market.outcomes,
+                )
+                if scalar_answer is not None
+                else None
+            )
         return self.answer_categorical_market(market)
 
     def verify_answer_outcomes(

prediction_market_agent_tooling/deploy/constants.py

@@ -5,3 +5,5 @@ INVALID_OUTCOME_LOWERCASE_IDENTIFIER = "invalid"
 # Market-agnostic outcome identifiers
 YES_OUTCOME_LOWERCASE_IDENTIFIER = "yes"
 NO_OUTCOME_LOWERCASE_IDENTIFIER = "no"
+UP_OUTCOME_LOWERCASE_IDENTIFIER = "up"
+DOWN_OUTCOME_LOWERCASE_IDENTIFIER = "down"

prediction_market_agent_tooling/jobs/omen/omen_jobs.py

@@ -133,4 +133,6 @@ class OmenJobAgentMarket(OmenAgentMarket, JobAgentMarket):
             condition=market.condition,
             finalized_time=market.finalized_time,
             fees=market.fees,
+            upper_bound=market.upper_bound,
+            lower_bound=market.lower_bound,
         )

prediction_market_agent_tooling/markets/agent_market.py

@@ -11,8 +11,10 @@ from web3 import Web3
 from prediction_market_agent_tooling.benchmark.utils import get_most_probable_outcome
 from prediction_market_agent_tooling.config import APIKeys
 from prediction_market_agent_tooling.deploy.constants import (
+    DOWN_OUTCOME_LOWERCASE_IDENTIFIER,
     INVALID_OUTCOME_LOWERCASE_IDENTIFIER,
     NO_OUTCOME_LOWERCASE_IDENTIFIER,
+    UP_OUTCOME_LOWERCASE_IDENTIFIER,
     YES_OUTCOME_LOWERCASE_IDENTIFIER,
 )
 from prediction_market_agent_tooling.gtypes import (
@@ -20,6 +22,7 @@ from prediction_market_agent_tooling.gtypes import (
     OutcomeToken,
     OutcomeWei,
     Probability,
+    Wei,
 )
 from prediction_market_agent_tooling.markets.data_models import (
     USD,
@@ -83,6 +86,9 @@ class AgentMarket(BaseModel):
     volume: CollateralToken | None
     fees: MarketFees
 
+    upper_bound: Wei | None = None
+    lower_bound: Wei | None = None
+
     @field_validator("probabilities")
     def validate_probabilities(
         cls,
@@ -165,6 +171,34 @@ class AgentMarket(BaseModel):
 
         return has_yes and has_no
 
+    @property
+    def is_scalar(self) -> bool:
+        # 3 outcomes can also be binary if 3rd outcome is invalid (Seer)
+        if len(self.outcomes) not in [2, 3]:
+            return False
+
+        lowercase_outcomes = [outcome.lower() for outcome in self.outcomes]
+
+        has_up = UP_OUTCOME_LOWERCASE_IDENTIFIER in lowercase_outcomes
+        has_down = DOWN_OUTCOME_LOWERCASE_IDENTIFIER in lowercase_outcomes
+
+        if len(lowercase_outcomes) == 3:
+            invalid_outcome = lowercase_outcomes[-1]
+            has_invalid = INVALID_OUTCOME_LOWERCASE_IDENTIFIER in invalid_outcome
+            return has_up and has_down and has_invalid
+
+        return has_up and has_down
+
+    @property
+    def p_up(self) -> Probability:
+        probs_lowercase = {o.lower(): p for o, p in self.probabilities.items()}
+        return check_not_none(probs_lowercase.get(UP_OUTCOME_LOWERCASE_IDENTIFIER))
+
+    @property
+    def p_down(self) -> Probability:
+        probs_lowercase = {o.lower(): p for o, p in self.probabilities.items()}
+        return check_not_none(probs_lowercase.get(DOWN_OUTCOME_LOWERCASE_IDENTIFIER))
+
     @property
     def p_yes(self) -> Probability:
         probs_lowercase = {o.lower(): p for o, p in self.probabilities.items()}
@@ -336,6 +370,7 @@ class AgentMarket(BaseModel):
         created_after: t.Optional[DatetimeUTC] = None,
         excluded_questions: set[str] | None = None,
         fetch_categorical_markets: bool = False,
+        fetch_scalar_markets: bool = False,
     ) -> t.Sequence["AgentMarket"]:
         raise NotImplementedError("Subclasses must implement this method")
 

prediction_market_agent_tooling/markets/data_models.py

@@ -4,7 +4,10 @@ from typing import Annotated, Sequence
 from pydantic import BaseModel, BeforeValidator, computed_field
 
 from prediction_market_agent_tooling.deploy.constants import (
+    DOWN_OUTCOME_LOWERCASE_IDENTIFIER,
+    INVALID_OUTCOME_LOWERCASE_IDENTIFIER,
     NO_OUTCOME_LOWERCASE_IDENTIFIER,
+    UP_OUTCOME_LOWERCASE_IDENTIFIER,
     YES_OUTCOME_LOWERCASE_IDENTIFIER,
 )
 from prediction_market_agent_tooling.gtypes import (
@@ -13,6 +16,7 @@ from prediction_market_agent_tooling.gtypes import (
     OutcomeStr,
     OutcomeToken,
     Probability,
+    Wei,
 )
 from prediction_market_agent_tooling.logprobs_parser import FieldLogprobs
 from prediction_market_agent_tooling.markets.omen.omen_constants import (
@@ -100,6 +104,31 @@ def to_boolean_outcome(value: str | bool) -> bool:
 Decision = Annotated[bool, BeforeValidator(to_boolean_outcome)]
 
 
+class ScalarProbabilisticAnswer(BaseModel):
+    scalar_value: Wei
+    upperBound: Wei
+    lowerBound: Wei
+    confidence: float
+    reasoning: str | None = None
+    logprobs: list[FieldLogprobs] | None = None
+
+    @property
+    def p_up(self) -> Probability:
+        if self.scalar_value > self.upperBound:
+            return Probability(1)
+        elif self.scalar_value < self.lowerBound:
+            return Probability(0)
+        else:
+            return Probability(
+                (self.scalar_value - self.lowerBound)
+                / (self.upperBound - self.lowerBound)
+            )
+
+    @property
+    def p_down(self) -> Probability:
+        return Probability(1 - self.p_up)
+
+
 class ProbabilisticAnswer(BaseModel):
     p_yes: Probability
     confidence: float
@@ -165,6 +194,41 @@ class CategoricalProbabilisticAnswer(BaseModel):
             reasoning=answer.reasoning,
         )
 
+    @staticmethod
+    def from_scalar_answer(
+        answer: ScalarProbabilisticAnswer,
+        market_outcomes: Sequence[OutcomeStr],
+    ) -> "CategoricalProbabilisticAnswer":
+        probabilities = {}
+        lowercase_market_outcomes = [outcome.lower() for outcome in market_outcomes]
+
+        if not set(
+            [
+                DOWN_OUTCOME_LOWERCASE_IDENTIFIER,
+                UP_OUTCOME_LOWERCASE_IDENTIFIER,
+            ]
+        ).issubset(lowercase_market_outcomes):
+            raise ValueError("Market with no outcomes")
+
+        probabilities[OutcomeStr(UP_OUTCOME_LOWERCASE_IDENTIFIER.upper())] = answer.p_up
+        probabilities[
+            OutcomeStr(DOWN_OUTCOME_LOWERCASE_IDENTIFIER.upper())
+        ] = answer.p_down
+
+        if (
+            market_outcomes
+            and INVALID_OUTCOME_LOWERCASE_IDENTIFIER in lowercase_market_outcomes
+        ):
+            probabilities[
+                OutcomeStr(INVALID_OUTCOME_LOWERCASE_IDENTIFIER.capitalize())
+            ] = Probability(1 - answer.p_up - answer.p_down)
+
+        return CategoricalProbabilisticAnswer(
+            probabilities=probabilities,
+            confidence=answer.confidence,
+            reasoning=answer.reasoning,
+        )
+
     def probability_for_market_outcome(self, market_outcome: OutcomeStr) -> Probability:
         for k, v in self.probabilities.items():
             if k.lower() == market_outcome.lower():

prediction_market_agent_tooling/markets/manifold/manifold.py

@@ -111,6 +111,7 @@ class ManifoldAgentMarket(AgentMarket):
         created_after: t.Optional[DatetimeUTC] = None,
         excluded_questions: set[str] | None = None,
         fetch_categorical_markets: bool = False,
+        fetch_scalar_markets: bool = False,
     ) -> t.Sequence["ManifoldAgentMarket"]:
         sort: t.Literal["newest", "close-date"] | None
         if sort_by == SortBy.CLOSING_SOONEST:

prediction_market_agent_tooling/markets/markets.py

@@ -68,6 +68,7 @@ def get_binary_markets(
     sort_by: SortBy = SortBy.NONE,
     excluded_questions: set[str] | None = None,
     created_after: DatetimeUTC | None = None,
+    fetch_scalar_markets: bool = False,
 ) -> t.Sequence[AgentMarket]:
     agent_market_class = MARKET_TYPE_TO_AGENT_MARKET[market_type]
     markets = agent_market_class.get_markets(
@@ -76,5 +77,6 @@ def get_binary_markets(
         filter_by=filter_by,
         created_after=created_after,
         excluded_questions=excluded_questions,
+        fetch_scalar_markets=fetch_scalar_markets,
     )
     return markets

prediction_market_agent_tooling/markets/metaculus/metaculus.py

@@ -73,6 +73,7 @@ class MetaculusAgentMarket(AgentMarket):
         created_after: t.Optional[DatetimeUTC] = None,
         excluded_questions: set[str] | None = None,
         tournament_id: int | None = None,
+        fetch_scalar_markets: bool = False,
     ) -> t.Sequence["MetaculusAgentMarket"]:
         order_by: str | None
         if sort_by == SortBy.NONE:

prediction_market_agent_tooling/markets/omen/omen.py

@@ -380,6 +380,7 @@ class OmenAgentMarket(AgentMarket):
         created_after: t.Optional[DatetimeUTC] = None,
         excluded_questions: set[str] | None = None,
         fetch_categorical_markets: bool = False,
+        fetch_scalar_markets: bool = False,
     ) -> t.Sequence["OmenAgentMarket"]:
         return [
             OmenAgentMarket.from_data_model(m)

prediction_market_agent_tooling/markets/polymarket/polymarket.py

@@ -62,6 +62,7 @@ class PolymarketAgentMarket(AgentMarket):
         created_after: t.Optional[DatetimeUTC] = None,
         excluded_questions: set[str] | None = None,
         fetch_categorical_markets: bool = False,
+        fetch_scalar_markets: bool = False,
     ) -> t.Sequence["PolymarketAgentMarket"]:
         if sort_by != SortBy.NONE:
             raise ValueError(f"Unsuported sort_by {sort_by} for Polymarket.")

prediction_market_agent_tooling/markets/seer/data_models.py

@@ -1,8 +1,9 @@
 import typing as t
 from datetime import timedelta
+from typing import Annotated
 from urllib.parse import urljoin
 
-from pydantic import BaseModel, ConfigDict, Field
+from pydantic import BaseModel, BeforeValidator, ConfigDict, Field
 from web3 import Web3
 from web3.constants import ADDRESS_ZERO
 
@@ -50,6 +51,17 @@ class CreateCategoricalMarketsParams(BaseModel):
 SEER_BASE_URL = "https://app.seer.pm"
 
 
+def seer_normalize_wei(value: int | 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
+    is_in_wei = value > 1e10
+    return value if is_in_wei else value * 10**18
+
+
+SeerNormalizedWei = Annotated[Wei | None, BeforeValidator(seer_normalize_wei)]
+
+
 class SeerMarket(BaseModel):
     model_config = ConfigDict(populate_by_name=True)
 
@@ -70,6 +82,8 @@ class SeerMarket(BaseModel):
     payout_reported: bool = Field(alias="payoutReported")
     payout_numerators: list[int] = Field(alias="payoutNumerators")
     outcomes_supply: int = Field(alias="outcomesSupply")
+    upper_bound: SeerNormalizedWei = Field(alias="upperBound", default=None)
+    lower_bound: SeerNormalizedWei = Field(alias="lowerBound", default=None)
 
     @property
     def has_valid_answer(self) -> bool:

prediction_market_agent_tooling/markets/seer/seer.py

@@ -32,6 +32,9 @@ from prediction_market_agent_tooling.markets.blockchain_utils import store_trade
 from prediction_market_agent_tooling.markets.data_models import ExistingPosition
 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 (
+    SDAI_CONTRACT_ADDRESS,
+)
 from prediction_market_agent_tooling.markets.omen.omen_contracts import (
     SeerAgentResultMappingContract,
 )
@@ -62,6 +65,7 @@ from prediction_market_agent_tooling.tools.contract import (
     to_gnosis_chain_contract,
 )
 from prediction_market_agent_tooling.tools.cow.cow_order import (
+    NoLiquidityAvailableOnCowException,
     get_buy_token_amount_else_raise,
     get_orders_by_owner,
     get_trades_by_owner,
@@ -128,10 +132,41 @@ class SeerAgentMarket(AgentMarket):
         )
 
     def get_token_in_usd(self, x: CollateralToken) -> USD:
-        return get_token_in_usd(x, self.collateral_token_contract_address_checksummed)
+        try:
+            return get_token_in_usd(
+                x, self.collateral_token_contract_address_checksummed
+            )
+        except NoLiquidityAvailableOnCowException as e:
+            logger.warning(
+                f"Could not get quote for {self.collateral_token_contract_address_checksummed} from Cow, exception {e=}. Falling back to pools. "
+            )
+            token_price = self.get_colateral_price_from_pools()
+            if token_price is None:
+                raise RuntimeError(
+                    "Both CoW and pool-fallback way of getting price failed."
+                ) from e
+            return USD(x.value * token_price.value)
+
+    def get_colateral_price_from_pools(self) -> CollateralToken | None:
+        p = PriceManager.build(HexBytes(HexStr(self.id)))
+        token_price = p.get_token_price_from_pools(token=SDAI_CONTRACT_ADDRESS)
+        return token_price
 
     def get_usd_in_token(self, x: USD) -> CollateralToken:
-        return get_usd_in_token(x, self.collateral_token_contract_address_checksummed)
+        try:
+            return get_usd_in_token(
+                x, self.collateral_token_contract_address_checksummed
+            )
+        except NoLiquidityAvailableOnCowException as e:
+            logger.warning(
+                f"Could not get quote for {self.collateral_token_contract_address_checksummed} from Cow, exception {e=}. Falling back to pools. "
+            )
+            token_price = self.get_colateral_price_from_pools()
+            if not token_price:
+                raise RuntimeError(
+                    "Both CoW and pool-fallback way of getting price failed."
+                ) from e
+            return CollateralToken(x.value / token_price.value)
 
     def get_buy_token_amount(
         self, bet_amount: USD | CollateralToken, outcome_str: OutcomeStr
@@ -165,14 +200,26 @@ class SeerAgentMarket(AgentMarket):
             return CollateralToken.zero()
 
         wrapped_outcome_token = self.get_wrapped_token_for_outcome(outcome)
-
-        # We calculate how much collateral we would get back if we sold `amount` of outcome token.
-        value_outcome_token_in_collateral = get_buy_token_amount_else_raise(
-            sell_amount=amount.as_outcome_wei.as_wei,
-            sell_token=wrapped_outcome_token,
-            buy_token=self.collateral_token_contract_address_checksummed,
-        )
-        return value_outcome_token_in_collateral.as_token
+        try:
+            # We calculate how much collateral we would get back if we sold `amount` of outcome token.
+            value_outcome_token_in_collateral = get_buy_token_amount_else_raise(
+                sell_amount=amount.as_outcome_wei.as_wei,
+                sell_token=wrapped_outcome_token,
+                buy_token=self.collateral_token_contract_address_checksummed,
+            )
+            return value_outcome_token_in_collateral.as_token
+        except NoLiquidityAvailableOnCowException as e:
+            logger.warning(
+                f"No liquidity available on Cow for {wrapped_outcome_token} -> {self.collateral_token_contract_address_checksummed}."
+            )
+            p = PriceManager.build(market_id=HexBytes(HexStr(self.id)))
+            price = p.get_token_price_from_pools(token=wrapped_outcome_token)
+            if not price:
+                logger.info(
+                    f"Could not get price for token from pools for {wrapped_outcome_token}"
+                )
+                raise e
+            return CollateralToken(price.value * amount.value)
 
     @staticmethod
     def get_trade_balance(api_keys: APIKeys) -> USD:
@@ -346,6 +393,8 @@ class SeerAgentMarket(AgentMarket):
             resolution=None,
             volume=None,
             probabilities=probability_map,
+            upper_bound=model.upper_bound,
+            lower_bound=model.lower_bound,
         )
 
         return market
@@ -358,6 +407,7 @@ class SeerAgentMarket(AgentMarket):
         created_after: t.Optional[DatetimeUTC] = None,
         excluded_questions: set[str] | None = None,
         fetch_categorical_markets: bool = False,
+        fetch_scalar_markets: bool = False,
     ) -> t.Sequence["SeerAgentMarket"]:
         seer_subgraph = SeerSubgraphHandler()
         markets = seer_subgraph.get_markets(
@@ -365,6 +415,8 @@ class SeerAgentMarket(AgentMarket):
             sort_by=sort_by,
             filter_by=filter_by,
             include_categorical_markets=fetch_categorical_markets,
+            include_only_scalar_markets=fetch_scalar_markets,
+            include_conditional_markets=False,
         )
 
         # We exclude the None values below because `from_data_model_with_subgraph` can return None, which
@@ -496,7 +548,11 @@ class SeerAgentMarket(AgentMarket):
             )
             return order_metadata.uid.root
 
-        except (UnexpectedResponseError, TimeoutError) as e:
+        except (
+            UnexpectedResponseError,
+            TimeoutError,
+            NoLiquidityAvailableOnCowException,
+        ) as e:
             # We don't retry if not enough balance.
             if "InsufficientBalance" in str(e):
                 raise e
@@ -506,6 +562,10 @@ class SeerAgentMarket(AgentMarket):
                 f"Exception occured when swapping tokens via Cowswap, doing swap via pools. {e}"
             )
 
+            if not self.has_liquidity():
+                logger.error(f"Market {self.id} has no liquidity. Cannot place bet.")
+                raise e
+
             tx_receipt = SwapPoolHandler(
                 api_keys=api_keys,
                 market_id=self.id,

prediction_market_agent_tooling/markets/seer/seer_subgraph_handler.py

@@ -6,7 +6,9 @@ from subgrounds import FieldPath
 from web3.constants import ADDRESS_ZERO
 
 from prediction_market_agent_tooling.deploy.constants import (
+    DOWN_OUTCOME_LOWERCASE_IDENTIFIER,
     NO_OUTCOME_LOWERCASE_IDENTIFIER,
+    UP_OUTCOME_LOWERCASE_IDENTIFIER,
     YES_OUTCOME_LOWERCASE_IDENTIFIER,
 )
 from prediction_market_agent_tooling.gtypes import ChecksumAddress, Wei
@@ -66,6 +68,8 @@ class SeerSubgraphHandler(BaseSubgraphHandler):
             markets_field.finalizeTs,
             markets_field.wrappedTokens,
             markets_field.collateralToken,
+            markets_field.upperBound,
+            markets_field.lowerBound,
         ]
         return fields
 
@@ -74,12 +78,30 @@ class SeerSubgraphHandler(BaseSubgraphHandler):
         # We do an extra check for the invalid outcome for safety.
         return [m for m in markets if len(m.outcomes) == 3]
 
+    @staticmethod
+    def _create_case_variations_condition(
+        identifier: str,
+        outcome_condition: str = "outcomes_contains",
+        condition: str = "or",
+    ) -> dict[str, list[dict[str, list[str]]]]:
+        return {
+            condition: [
+                {outcome_condition: [variation]}
+                for variation in [
+                    identifier.lower(),
+                    identifier.capitalize(),
+                    identifier.upper(),
+                ]
+            ]
+        }
+
     @staticmethod
     def _build_where_statements(
         filter_by: FilterBy,
         outcome_supply_gt_if_open: Wei,
         include_conditional_markets: bool = False,
         include_categorical_markets: bool = True,
+        include_only_scalar_markets: bool = False,
     ) -> dict[Any, Any]:
         now = to_int_timestamp(utcnow())
 
@@ -101,28 +123,43 @@ class SeerSubgraphHandler(BaseSubgraphHandler):
         if not include_conditional_markets:
             and_stms["parentMarket"] = ADDRESS_ZERO.lower()
 
-        # We are only interested in binary markets of type YES/NO/Invalid.
         yes_stms, no_stms = {}, {}
-        if not include_categorical_markets:
-            # Create single OR conditions with all variations
-            yes_stms["or"] = [
-                {"outcomes_contains": [variation]}
-                for variation in [
-                    YES_OUTCOME_LOWERCASE_IDENTIFIER,
-                    YES_OUTCOME_LOWERCASE_IDENTIFIER.capitalize(),
-                    YES_OUTCOME_LOWERCASE_IDENTIFIER.upper(),
-                ]
-            ]
-            no_stms["or"] = [
-                {"outcomes_contains": [variation]}
-                for variation in [
-                    NO_OUTCOME_LOWERCASE_IDENTIFIER,
-                    NO_OUTCOME_LOWERCASE_IDENTIFIER.capitalize(),
-                    NO_OUTCOME_LOWERCASE_IDENTIFIER.upper(),
-                ]
-            ]
+        exclude_scalar_yes, exclude_scalar_no = {}, {}
 
-        where_stms: dict[str, t.Any] = {"and": [and_stms, yes_stms, no_stms]}
+        # Return scalar markets.
+        if include_only_scalar_markets:
+            # We are interested in scalar markets only - this excludes categorical markets
+            yes_stms = SeerSubgraphHandler._create_case_variations_condition(
+                UP_OUTCOME_LOWERCASE_IDENTIFIER, "outcomes_contains", "or"
+            )
+            no_stms = SeerSubgraphHandler._create_case_variations_condition(
+                DOWN_OUTCOME_LOWERCASE_IDENTIFIER, "outcomes_contains", "or"
+            )
+        elif include_conditional_markets and not include_categorical_markets:
+            # We are interested in binary markets only
+            yes_stms = SeerSubgraphHandler._create_case_variations_condition(
+                YES_OUTCOME_LOWERCASE_IDENTIFIER, "outcomes_contains", "or"
+            )
+            no_stms = SeerSubgraphHandler._create_case_variations_condition(
+                NO_OUTCOME_LOWERCASE_IDENTIFIER, "outcomes_contains", "or"
+            )
+
+        if (
+            not include_only_scalar_markets
+            or include_categorical_markets
+            or include_conditional_markets
+        ):
+            # We should not provide any scalar markets because they are exclusive for categorical markets
+            exclude_scalar_yes = SeerSubgraphHandler._create_case_variations_condition(
+                UP_OUTCOME_LOWERCASE_IDENTIFIER, "outcomes_not_contains", "and"
+            )
+            exclude_scalar_no = SeerSubgraphHandler._create_case_variations_condition(
+                DOWN_OUTCOME_LOWERCASE_IDENTIFIER, "outcomes_not_contains", "and"
+            )
+
+        where_stms: dict[str, t.Any] = {
+            "and": [and_stms, yes_stms, no_stms, exclude_scalar_yes, exclude_scalar_no]
+        }
         return where_stms
 
     def _build_sort_params(
@@ -159,6 +196,7 @@ class SeerSubgraphHandler(BaseSubgraphHandler):
         outcome_supply_gt_if_open: Wei = Wei(0),
         include_conditional_markets: bool = True,
         include_categorical_markets: bool = True,
+        include_only_scalar_markets: bool = False,
     ) -> list[SeerMarket]:
         sort_direction, sort_by_field = self._build_sort_params(sort_by)
 
@@ -169,6 +207,7 @@ class SeerSubgraphHandler(BaseSubgraphHandler):
             outcome_supply_gt_if_open=outcome_supply_gt_if_open,
             include_conditional_markets=include_conditional_markets,
             include_categorical_markets=include_categorical_markets,
+            include_only_scalar_markets=include_only_scalar_markets,
         )
 
         # These values can not be set to `None`, but they can be omitted.
@@ -219,26 +258,25 @@ class SeerSubgraphHandler(BaseSubgraphHandler):
         self, token_address: ChecksumAddress, collateral_address: ChecksumAddress
     ) -> SeerPool | None:
         # We iterate through the wrapped tokens and put them in a where clause so that we hit the subgraph endpoint just once.
-        wheres = []
-        wheres.extend(
-            [
+
+        where_argument = {
+            "or": [
                 {
-                    "token0": token_address.lower(),
-                    "token1": collateral_address.lower(),
+                    "token0_": {"id": token_address.lower()},
+                    "token1_": {"id": collateral_address.lower()},
                 },
                 {
-                    "token0": collateral_address.lower(),
-                    "token1": token_address.lower(),
+                    "token0_": {"id": collateral_address.lower()},
+                    "token1_": {"id": token_address.lower()},
                 },
             ]
-        )
-
+        }
         optional_params = {}
         optional_params["orderBy"] = self.swapr_algebra_subgraph.Pool.liquidity
         optional_params["orderDirection"] = "desc"
 
         pools_field = self.swapr_algebra_subgraph.Query.pools(
-            where=unwrap_generic_value({"or": wheres}), **optional_params
+            where=unwrap_generic_value(where_argument), **optional_params
         )
 
         fields = self._get_fields_for_pools(pools_field)

{prediction_market_agent_tooling-0.66.3.dist-info → prediction_market_agent_tooling-0.66.4.dist-info}/METADATA

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

{prediction_market_agent_tooling-0.66.3.dist-info → prediction_market_agent_tooling-0.66.4.dist-info}/RECORD

@@ -22,14 +22,14 @@ prediction_market_agent_tooling/abis/swapr_router.abi.json,sha256=Y1wK20D1-zdbdl
 prediction_market_agent_tooling/benchmark/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 prediction_market_agent_tooling/benchmark/agents.py,sha256=zC5tUM6pPTWtqSddOOSYV_fxHYmZb5uGAb4Ru87Tah8,4221
 prediction_market_agent_tooling/benchmark/benchmark.py,sha256=hpIpjjePDFTLhK841sGftFbhu8bDDZr28KO4VTneewM,17837
-prediction_market_agent_tooling/benchmark/utils.py,sha256=xQd7p9H08-OtN3iC4QT2i9bkUTmrXa6rxGXeg9yMhgU,2986
+prediction_market_agent_tooling/benchmark/utils.py,sha256=vmVTQLER8I7MM_bHFiavrNM9aQe28PL6WihM6J-E65k,3327
 prediction_market_agent_tooling/chains.py,sha256=1qQstoqXMwqwM7k-KH7MjMz8Ei-D83KZByvDbCZpAxs,116
 prediction_market_agent_tooling/config.py,sha256=-kJfdDr-m0R-tGZ1KRI-hJJk0mXDt142CAlvwaJ2N2I,11778
 prediction_market_agent_tooling/data_download/langfuse_data_downloader.py,sha256=VY23h324VKIVkevj1B1O-zL1eEp9AElmcfn6SwYDUSc,14246
-prediction_market_agent_tooling/deploy/agent.py,sha256=EEAZQnOqsru1xRzt141iBy_9tG7zo1vnxkLqpg1SuDw,26313
+prediction_market_agent_tooling/deploy/agent.py,sha256=s6DZrf2weAum67RZZ2wm_1emnJqmcW8bzFBXDNWBLgA,27494
 prediction_market_agent_tooling/deploy/agent_example.py,sha256=yS1fWkHynr9MYGNOM2WsCnRWLPaffY4bOc6bIudrdd4,1377
 prediction_market_agent_tooling/deploy/betting_strategy.py,sha256=wiUV_zyB9ASLH-VUETIme0H_IMih8jZwiwEmcRa3W5Q,21125
-prediction_market_agent_tooling/deploy/constants.py,sha256=Qe9cllgsGMkecfmbhXoFkPxuJyG6ATsrT87RF9SmPWM,249
+prediction_market_agent_tooling/deploy/constants.py,sha256=iobTlZpQD6_2UL9TfoElAnBEbqzIIAKZSsAoMCGhwmA,331
 prediction_market_agent_tooling/deploy/gcp/deploy.py,sha256=CYUgnfy-9XVk04kkxA_5yp0GE9Mw5caYqlFUZQ2j3ks,3739
 prediction_market_agent_tooling/deploy/gcp/kubernetes_models.py,sha256=OsPboCFGiZKsvGyntGZHwdqPlLTthITkNF5rJFvGgU8,2582
 prediction_market_agent_tooling/deploy/gcp/utils.py,sha256=WI2ycX1X-IlTRoNoG4ggFlRwPL28kwM9VGDFD2fePLo,5699
@@ -37,28 +37,28 @@ prediction_market_agent_tooling/deploy/trade_interval.py,sha256=Xk9j45alQ_vrasGv
 prediction_market_agent_tooling/gtypes.py,sha256=bUIZfZIGvIi3aiZNu5rVE9kRevw8sfMa4bcze6QeBg8,6058
 prediction_market_agent_tooling/jobs/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 prediction_market_agent_tooling/jobs/jobs_models.py,sha256=DoZ9dlvVhpNrnINiR1uy6YUOsuzI_L-avBt362y5xXM,2467
-prediction_market_agent_tooling/jobs/omen/omen_jobs.py,sha256=UN7OF-oi3_cgaGEBxJO2SxzURnuTFFEUcrUWM2rnSGA,5044
+prediction_market_agent_tooling/jobs/omen/omen_jobs.py,sha256=lCymxn0iH4xDmqouTP2LMORoGCiTzlK1_yqYtx1Njj4,5132
 prediction_market_agent_tooling/loggers.py,sha256=o1HyvwtK1DbuC0YWQwJNqzXLLbSC41gNBkEUxiAziEg,5796
 prediction_market_agent_tooling/logprobs_parser.py,sha256=DBlBQtWX8_URXhzTU3YWIPa76Zx3QDHlx1ARqbgJsVI,5008
-prediction_market_agent_tooling/markets/agent_market.py,sha256=nMIa6BkoUWdiz12kFDKuKXD_m6PhLzp3to1vgyj63ZQ,18834
+prediction_market_agent_tooling/markets/agent_market.py,sha256=6x2ajWZYCB0_7qRAQKct1h3qC23CyK3JWXqxerwDXYk,20149
 prediction_market_agent_tooling/markets/base_subgraph_handler.py,sha256=7RaYO_4qAmQ6ZGM8oPK2-CkiJfKmV9MxM-rJlduaecU,1971
 prediction_market_agent_tooling/markets/blockchain_utils.py,sha256=6REOt70v3vnzmtCbuRcUTdwt6htXy9nAfNkLOH3Bv1U,2987
 prediction_market_agent_tooling/markets/categorize.py,sha256=orLZlPaHgeREU66m1amxfWikeV77idV4sZDPB8NgSD0,1300
-prediction_market_agent_tooling/markets/data_models.py,sha256=H3G-2I9QFhWrBY_KI-4BO2jMtb_f9yauzHz-zA4NI5Q,8016
+prediction_market_agent_tooling/markets/data_models.py,sha256=x4dBbdPb7dd2JiaD15jDaiA65KB1IcDGnx1hYcY0-2U,10063
 prediction_market_agent_tooling/markets/manifold/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 prediction_market_agent_tooling/markets/manifold/api.py,sha256=tWnjuqvU8pcCuja2B_ynHeds1iiEFc6QWHjeSO_GSxY,7676
 prediction_market_agent_tooling/markets/manifold/data_models.py,sha256=3z1gFbPMEgCDGqeH-IK8wcvqmIHgLdZX8C2M1UQ7iDw,6740
-prediction_market_agent_tooling/markets/manifold/manifold.py,sha256=7s8BC32QkzU80coLTKzms1FrG0E-GEeHfkrl_MgrrLk,5301
+prediction_market_agent_tooling/markets/manifold/manifold.py,sha256=LG54vm0lV05VXk8h3BBdjUyZjOisfmRmbyqDGhwBFPM,5345
 prediction_market_agent_tooling/markets/manifold/utils.py,sha256=DCigEbpGWkXR-RZT_oJrvJhilmxKFAxcWMjUFi0nBBI,530
 prediction_market_agent_tooling/markets/market_fees.py,sha256=YeK3ynjYIguB0xf6sO5iyg9lOdW_HD4C6nbJfiGyRCU,1351
-prediction_market_agent_tooling/markets/markets.py,sha256=lIEPfPJD1Gz90pTvN2pZi51rpb969STPgQtNFCqHUJg,2667
+prediction_market_agent_tooling/markets/markets.py,sha256=XfUX2xFQS4nU8xxa1rMovgEWRPBJ2NlSbQRMqVoL6Y4,2758
 prediction_market_agent_tooling/markets/metaculus/api.py,sha256=4TRPGytQQbSdf42DCg2M_JWYPAuNjqZ3eBqaQBLkNks,2736
 prediction_market_agent_tooling/markets/metaculus/data_models.py,sha256=WjPt0MKeJNtoY-8oLQTLC8vQYYQ-dBj8UZoPq-UBYsQ,3288
-prediction_market_agent_tooling/markets/metaculus/metaculus.py,sha256=S1Kkf_F3KuqFO938d5bun60wd8lsGvnGqxsW-tgEBgw,5110
+prediction_market_agent_tooling/markets/metaculus/metaculus.py,sha256=fsDU2c1F9ZZDZ9T8487bX8dw06QXeneYq7Gsq6FGeQQ,5154
 prediction_market_agent_tooling/markets/omen/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 prediction_market_agent_tooling/markets/omen/cow_contracts.py,sha256=sFaW82u_haL4nze8fjTmnQsOuV0OecunQlAhh1OAw0w,1091
 prediction_market_agent_tooling/markets/omen/data_models.py,sha256=RsBYSbM4deA6Os4kQ3egH3HvwT80tQho6T1yyoATCMs,31103
-prediction_market_agent_tooling/markets/omen/omen.py,sha256=fYDP64-gL3n18K86BXMrM9nO8ZQ4FQY8LynVL7Xm588,50468
+prediction_market_agent_tooling/markets/omen/omen.py,sha256=6pTXa0423IXPnu3rK47DxsNEDI6MigIdyh8GYC7cfDc,50512
 prediction_market_agent_tooling/markets/omen/omen_constants.py,sha256=XtRk4vpxwUYkTndfjlcmghA-NOIneV8zdHFdyI7tHhM,487
 prediction_market_agent_tooling/markets/omen/omen_contracts.py,sha256=27-HRngTqfk_wgvttB3GeVHhy_O2YZcz9izo9OufOI0,29991
 prediction_market_agent_tooling/markets/omen/omen_resolving.py,sha256=D-ubf_LumHs_c5rBAAntQ8wGKprtO2V1JZeedmChNIE,11035
@@ -66,14 +66,14 @@ prediction_market_agent_tooling/markets/omen/omen_subgraph_handler.py,sha256=2fL
 prediction_market_agent_tooling/markets/polymarket/api.py,sha256=UZ4_TG8ceb9Y-qgsOKs8Qiv8zDt957QkT8IX2c83yqo,4800
 prediction_market_agent_tooling/markets/polymarket/data_models.py,sha256=U1SXTz93FIG3GO1h5BJWSt1hPKn_YAMBeZ3k8IS-ook,4552
 prediction_market_agent_tooling/markets/polymarket/data_models_web.py,sha256=wCwpZ8Kppy8JG_1HZDfEK_Gg1g1sL7NCbGoPeTeMSko,12756
-prediction_market_agent_tooling/markets/polymarket/polymarket.py,sha256=meAhQ5_gwVDvlSxhGGVAvRB7B47zKLnRvZ-_13tKtwY,3433
+prediction_market_agent_tooling/markets/polymarket/polymarket.py,sha256=_g2T4LfI2lLvOKIHXqvoRJ6vlgfgnA_90q3Iy4C4KC0,3477
 prediction_market_agent_tooling/markets/polymarket/utils.py,sha256=8kTeVjXPcXC6DkDvWYsZQLY7x8DS6CEp_yznSEazsNU,2037
-prediction_market_agent_tooling/markets/seer/data_models.py,sha256=osM9WaLsxQf-pfVGq0O-IkM93ehP9a7fVUf-hi2VlMs,5523
+prediction_market_agent_tooling/markets/seer/data_models.py,sha256=Fkn9jG8f0W8XlfM4EFfMSw0V0c3IGSqnKPt1UnG34Ag,6084
 prediction_market_agent_tooling/markets/seer/exceptions.py,sha256=cEObdjluivD94tgOLzmimR7wgQEOt6SRakrYdhsRQtk,112
 prediction_market_agent_tooling/markets/seer/price_manager.py,sha256=MClY2NGwOV70nZYIcmzXFy6Ogd8NBIq7telQcQ3VcU4,6243
-prediction_market_agent_tooling/markets/seer/seer.py,sha256=_9NAisDsk9cu9RP3O-cphiefENN2nPK1Puk0C5eiGWg,24630
+prediction_market_agent_tooling/markets/seer/seer.py,sha256=ZeP7TecIK8QOLojh-3kLoBmLjjMFGo2YVYB6Kl7bhE8,27331
 prediction_market_agent_tooling/markets/seer/seer_contracts.py,sha256=uMzpHpI6_tgfhWxPzupLdUJlZ1P2wr0rRiYjAGClKgU,4984
-prediction_market_agent_tooling/markets/seer/seer_subgraph_handler.py,sha256=pJxch9_u0EdiIatQP1-UFClt8UEfMZAXBlk5wDO_ovk,9940
+prediction_market_agent_tooling/markets/seer/seer_subgraph_handler.py,sha256=DwFR_EscEujnja8KvtpiL1U4RKcO8noHnZVoUn17_to,11670
 prediction_market_agent_tooling/markets/seer/subgraph_data_models.py,sha256=0izxS8Mtzonfdl9UqvFVXrdj0hVzieroekXhogfZKCw,1817
 prediction_market_agent_tooling/markets/seer/swap_pool_handler.py,sha256=y0pDL2BoxayROy3warEN3r8Fs3rPCPPZ191bgrgZikg,3403
 prediction_market_agent_tooling/py.typed,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
@@ -125,8 +125,8 @@ prediction_market_agent_tooling/tools/tokens/usd.py,sha256=yuW8iPPtcpP4eLH2nORMD
 prediction_market_agent_tooling/tools/transaction_cache.py,sha256=K5YKNL2_tR10Iw2TD9fuP-CTGpBbZtNdgbd0B_R7pjg,1814
 prediction_market_agent_tooling/tools/utils.py,sha256=RlWSlzS2LavMIWrpwn1fevbzgPZruD4VcXTa-XxjWnE,7343
 prediction_market_agent_tooling/tools/web3_utils.py,sha256=0r26snqCXGdLKCWA8jpe7DV8x2NPYWZwOy4oyKyDCYk,12615
-prediction_market_agent_tooling-0.66.3.dist-info/LICENSE,sha256=6or154nLLU6bELzjh0mCreFjt0m2v72zLi3yHE0QbeE,7650
-prediction_market_agent_tooling-0.66.3.dist-info/METADATA,sha256=zW4isyxA9kXcMHO8I9V2FcsLMdcjriSD-kKmko9uAZs,8726
-prediction_market_agent_tooling-0.66.3.dist-info/WHEEL,sha256=b4K_helf-jlQoXBBETfwnf4B04YC67LOev0jo4fX5m8,88
-prediction_market_agent_tooling-0.66.3.dist-info/entry_points.txt,sha256=m8PukHbeH5g0IAAmOf_1Ahm-sGAMdhSSRQmwtpmi2s8,81
-prediction_market_agent_tooling-0.66.3.dist-info/RECORD,,
+prediction_market_agent_tooling-0.66.4.dist-info/LICENSE,sha256=6or154nLLU6bELzjh0mCreFjt0m2v72zLi3yHE0QbeE,7650
+prediction_market_agent_tooling-0.66.4.dist-info/METADATA,sha256=GCQu4RpxmyMXJNideo3bY_YM06t3A-1O4Cxb7Cf5R6U,8726
+prediction_market_agent_tooling-0.66.4.dist-info/WHEEL,sha256=b4K_helf-jlQoXBBETfwnf4B04YC67LOev0jo4fX5m8,88
+prediction_market_agent_tooling-0.66.4.dist-info/entry_points.txt,sha256=m8PukHbeH5g0IAAmOf_1Ahm-sGAMdhSSRQmwtpmi2s8,81
+prediction_market_agent_tooling-0.66.4.dist-info/RECORD,,