prediction-market-agent-tooling 0.65.6__py3-none-any.whl → 0.65.7__py3-none-any.whl

prediction_market_agent_tooling/markets/data_models.py

@@ -1,5 +1,5 @@
 from enum import Enum
-from typing import Annotated
+from typing import Annotated, Sequence
 
 from pydantic import BaseModel, BeforeValidator, computed_field
 
@@ -26,6 +26,26 @@ class Resolution(BaseModel):
     def from_answer(answer: OutcomeStr) -> "Resolution":
         return Resolution(outcome=answer, invalid=False)
 
+    def find_outcome_matching_market(
+        self, market_outcomes: Sequence[OutcomeStr]
+    ) -> OutcomeStr | None:
+        """
+        Finds a matching outcome in the provided market outcomes.
+
+        Performs case-insensitive matching between this resolution's outcome
+        and the provided market outcomes.
+
+        """
+
+        if not self.outcome:
+            return None
+
+        normalized_outcome = self.outcome.lower()
+        for outcome in market_outcomes:
+            if outcome.lower() == normalized_outcome:
+                return outcome
+        return None
+
 
 class Bet(BaseModel):
     id: str

prediction_market_agent_tooling/markets/omen/omen_resolving.py

@@ -31,7 +31,7 @@ from prediction_market_agent_tooling.markets.omen.omen_subgraph_handler import (
 from prediction_market_agent_tooling.tools.tokens.main_token import (
     MINIMUM_NATIVE_TOKEN_IN_EOA_FOR_FEES,
 )
-from prediction_market_agent_tooling.tools.utils import utcnow
+from prediction_market_agent_tooling.tools.utils import check_not_none, utcnow
 from prediction_market_agent_tooling.tools.web3_utils import ZERO_BYTES
 
 
@@ -223,7 +223,10 @@ def omen_submit_answer_market_tx(
     And after the period is over, you need to resolve the market using `omen_resolve_market_tx`.
     """
     realitio_contract = OmenRealitioContract()
-    outcome_index = market.outcomes.index(resolution.outcome)
+    outcome_matching_market = check_not_none(
+        resolution.find_outcome_matching_market(market.outcomes)
+    )
+    outcome_index = market.outcomes.index(outcome_matching_market)
     realitio_contract.submit_answer(
         api_keys=api_keys,
         question_id=market.question.id,

prediction_market_agent_tooling/markets/seer/exceptions.py

@@ -0,0 +1,2 @@
+class PriceCalculationError(Exception):
+    """Raised when there's an error discovering prices for a market."""

prediction_market_agent_tooling/markets/seer/price_manager.py

@@ -12,6 +12,9 @@ from prediction_market_agent_tooling.gtypes import (
 )
 from prediction_market_agent_tooling.loggers import logger
 from prediction_market_agent_tooling.markets.seer.data_models import SeerMarket
+from prediction_market_agent_tooling.markets.seer.exceptions import (
+    PriceCalculationError,
+)
 from prediction_market_agent_tooling.markets.seer.seer_subgraph_handler import (
     SeerSubgraphHandler,
 )
@@ -128,7 +131,7 @@ class PriceManager:
             )
             # It's okay if invalid (last) outcome has price 0, but not the other outcomes.
             if price is None and idx != len(self.seer_market.wrapped_tokens) - 1:
-                raise ValueError(
+                raise PriceCalculationError(
                     f"Couldn't get price for {wrapped_token} for market {self.seer_market.url}."
                 )
             price_data[wrapped_token] = (
@@ -142,7 +145,7 @@ class PriceManager:
             sum(price_data.values(), start=CollateralToken.zero())
             == CollateralToken.zero()
         ):
-            raise ValueError(
+            raise PriceCalculationError(
                 f"All prices for market {self.seer_market.url} are zero. This shouldn't happen."
             )
 

prediction_market_agent_tooling/markets/seer/seer.py

@@ -31,6 +31,9 @@ from prediction_market_agent_tooling.markets.seer.data_models import (
     RedeemParams,
     SeerMarket,
 )
+from prediction_market_agent_tooling.markets.seer.exceptions import (
+    PriceCalculationError,
+)
 from prediction_market_agent_tooling.markets.seer.price_manager import PriceManager
 from prediction_market_agent_tooling.markets.seer.seer_contracts import (
     GnosisRouter,
@@ -275,18 +278,24 @@ class SeerAgentMarket(AgentMarket):
 
     @staticmethod
     def from_data_model_with_subgraph(
-        model: SeerMarket, seer_subgraph: SeerSubgraphHandler
+        model: SeerMarket,
+        seer_subgraph: SeerSubgraphHandler,
+        must_have_prices: bool,
     ) -> t.Optional["SeerAgentMarket"]:
-        p = PriceManager(seer_market=model, seer_subgraph=seer_subgraph)
+        price_manager = PriceManager(seer_market=model, seer_subgraph=seer_subgraph)
 
-        probability_map = p.build_probability_map()
-        if not probability_map:
+        probability_map = {}
+        try:
+            probability_map = price_manager.build_probability_map()
+        except PriceCalculationError as e:
             logger.info(
-                f"probability_map for market {model.id.hex()} could not be calculated. Skipping."
+                f"Error when calculating probabilities for market {model.id.hex()} - {e}"
             )
-            return None
+            if must_have_prices:
+                # Price calculation failed, so don't return the market
+                return None
 
-        return SeerAgentMarket(
+        market = SeerAgentMarket(
             id=model.id.hex(),
             question=model.title,
             creator=model.creator,
@@ -305,6 +314,8 @@ class SeerAgentMarket(AgentMarket):
             probabilities=probability_map,
         )
 
+        return market
+
     @staticmethod
     def get_markets(
         limit: int,
@@ -324,17 +335,25 @@ class SeerAgentMarket(AgentMarket):
 
         # We exclude the None values below because `from_data_model_with_subgraph` can return None, which
         # represents an invalid market.
-        return [
+        seer_agent_markets = [
             market
             for m in markets
             if (
                 market := SeerAgentMarket.from_data_model_with_subgraph(
-                    model=m, seer_subgraph=seer_subgraph
+                    model=m,
+                    seer_subgraph=seer_subgraph,
+                    must_have_prices=filter_by == FilterBy.OPEN,
                 )
             )
             is not None
         ]
 
+        if filter_by == FilterBy.OPEN:
+            # Extra manual filter for liquidity, as subgraph is sometimes unreliable.
+            seer_agent_markets = [m for m in seer_agent_markets if m.has_liquidity()]
+
+        return seer_agent_markets
+
     def get_outcome_str_from_idx(self, outcome_index: int) -> OutcomeStr:
         return self.outcomes[outcome_index]
 

{prediction_market_agent_tooling-0.65.6.dist-info → prediction_market_agent_tooling-0.65.7.dist-info}/METADATA

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

{prediction_market_agent_tooling-0.65.6.dist-info → prediction_market_agent_tooling-0.65.7.dist-info}/RECORD

@@ -42,7 +42,7 @@ prediction_market_agent_tooling/markets/agent_market.py,sha256=smKuMaP1zyTtw31Ro
 prediction_market_agent_tooling/markets/base_subgraph_handler.py,sha256=7RaYO_4qAmQ6ZGM8oPK2-CkiJfKmV9MxM-rJlduaecU,1971
 prediction_market_agent_tooling/markets/blockchain_utils.py,sha256=gZMwCTO-1d2ALXeY7-LP6U4kCpotJ6GMPZwN11kFOfE,2604
 prediction_market_agent_tooling/markets/categorize.py,sha256=orLZlPaHgeREU66m1amxfWikeV77idV4sZDPB8NgSD0,1300
-prediction_market_agent_tooling/markets/data_models.py,sha256=vFlX1iNWJcYZlImPkTOQCp2C0veIO7HuAxe0Wf_S8yg,6952
+prediction_market_agent_tooling/markets/data_models.py,sha256=seifqxjVpzZdVKJQ7a5sKPPUM749EHV80SdI6pVQ3b4,7542
 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=QzRfR2g_3vzCw4azj_lOSKSFAZczjAWlM0lQy2dZry8,6704
@@ -59,7 +59,7 @@ prediction_market_agent_tooling/markets/omen/data_models.py,sha256=0jCxgUEVpaggt
 prediction_market_agent_tooling/markets/omen/omen.py,sha256=jyoAV-E_Qcbqqs4oi7junE3rHTG3kaYLMtIVzEkNC6M,49981
 prediction_market_agent_tooling/markets/omen/omen_constants.py,sha256=D9oflYKafLQiHYtB5sScMHqmXyzM8JP8J0yATmc4SQQ,233
 prediction_market_agent_tooling/markets/omen/omen_contracts.py,sha256=f0dKbdVM2OUTSpkCSZdPtKqeckS2c48j3rjnK8oD3wE,29716
-prediction_market_agent_tooling/markets/omen/omen_resolving.py,sha256=05x-Yb0bUsJSEtsWQLqSHyl4HqLChksIb64OGygN-Rw,10226
+prediction_market_agent_tooling/markets/omen/omen_resolving.py,sha256=h4iK7r57D0EaJqfk_n7ISaJHOB93ALL-fCPI1VztXbQ,10364
 prediction_market_agent_tooling/markets/omen/omen_subgraph_handler.py,sha256=149T_tJxK2GFnGCulOlGr2Mwiaa7sa74E4lqYsuCv68,39962
 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
@@ -67,8 +67,9 @@ prediction_market_agent_tooling/markets/polymarket/data_models_web.py,sha256=wCw
 prediction_market_agent_tooling/markets/polymarket/polymarket.py,sha256=meAhQ5_gwVDvlSxhGGVAvRB7B47zKLnRvZ-_13tKtwY,3433
 prediction_market_agent_tooling/markets/polymarket/utils.py,sha256=8kTeVjXPcXC6DkDvWYsZQLY7x8DS6CEp_yznSEazsNU,2037
 prediction_market_agent_tooling/markets/seer/data_models.py,sha256=G0i-fnVaK16KWDYVI6w3lvyte6Op7ca_iIC8IfrXmlM,4702
-prediction_market_agent_tooling/markets/seer/price_manager.py,sha256=4hSSDyxSj9po9-tRrdtNvJ2d9v0xXT08Ezgbk1JDE3c,6122
-prediction_market_agent_tooling/markets/seer/seer.py,sha256=5uSKUhyM_3PTguYi9yiD3-E5Famb6M_fayBX1NqebAE,20273
+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=9AsfvsCVxNvieDPqGtyjdESzFyPEzDVpTR-4P9mL9Y8,20966
 prediction_market_agent_tooling/markets/seer/seer_contracts.py,sha256=kH9nPXsx6UM5er42g2f3fLvy36sY5JM2f_beXeuNgUc,3790
 prediction_market_agent_tooling/markets/seer/seer_subgraph_handler.py,sha256=pJxch9_u0EdiIatQP1-UFClt8UEfMZAXBlk5wDO_ovk,9940
 prediction_market_agent_tooling/markets/seer/subgraph_data_models.py,sha256=0izxS8Mtzonfdl9UqvFVXrdj0hVzieroekXhogfZKCw,1817
@@ -119,8 +120,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=Jzpck3_QwShhejhgbAhmNxPSOPQJssBQep0eVemVjZ4,7064
 prediction_market_agent_tooling/tools/web3_utils.py,sha256=zRq-eeBGWt8uUGN9G_WfjmJ0eVvO8aWE9S0Pz_Y6AOA,12342
-prediction_market_agent_tooling-0.65.6.dist-info/LICENSE,sha256=6or154nLLU6bELzjh0mCreFjt0m2v72zLi3yHE0QbeE,7650
-prediction_market_agent_tooling-0.65.6.dist-info/METADATA,sha256=XT7Kp9vv8HBSZjedQV7VgRp7H4Awv4GQdjrzz1F7Z-E,8734
-prediction_market_agent_tooling-0.65.6.dist-info/WHEEL,sha256=b4K_helf-jlQoXBBETfwnf4B04YC67LOev0jo4fX5m8,88
-prediction_market_agent_tooling-0.65.6.dist-info/entry_points.txt,sha256=m8PukHbeH5g0IAAmOf_1Ahm-sGAMdhSSRQmwtpmi2s8,81
-prediction_market_agent_tooling-0.65.6.dist-info/RECORD,,
+prediction_market_agent_tooling-0.65.7.dist-info/LICENSE,sha256=6or154nLLU6bELzjh0mCreFjt0m2v72zLi3yHE0QbeE,7650
+prediction_market_agent_tooling-0.65.7.dist-info/METADATA,sha256=Swm7dO-d5M0d1OqUB21l3QZ8gsrlORPKbG_UDDnZRZo,8734
+prediction_market_agent_tooling-0.65.7.dist-info/WHEEL,sha256=b4K_helf-jlQoXBBETfwnf4B04YC67LOev0jo4fX5m8,88
+prediction_market_agent_tooling-0.65.7.dist-info/entry_points.txt,sha256=m8PukHbeH5g0IAAmOf_1Ahm-sGAMdhSSRQmwtpmi2s8,81
+prediction_market_agent_tooling-0.65.7.dist-info/RECORD,,