prediction-market-agent-tooling 0.50.1__tar.gz → 0.51.0__tar.gz

{prediction_market_agent_tooling-0.50.1 → prediction_market_agent_tooling-0.51.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: prediction-market-agent-tooling
-Version: 0.50.1
+Version: 0.51.0
 Summary: Tools to benchmark, deploy and monitor prediction market agents.
 Author: Gnosis
 Requires-Python: >=3.10,<3.12

{prediction_market_agent_tooling-0.50.1 → prediction_market_agent_tooling-0.51.0}/prediction_market_agent_tooling/markets/omen/data_models.py

@@ -352,25 +352,38 @@ class OmenMarket(BaseModel):
     def is_binary(self) -> bool:
         return len(self.outcomes) == 2
 
-    @property
-    def boolean_outcome(self) -> bool:
+    def boolean_outcome_from_answer(self, answer: HexBytes) -> bool:
         if not self.is_binary:
             raise ValueError(
                 f"Market with title {self.title} is not binary, it has {len(self.outcomes)} outcomes."
             )
+        outcome: str = self.outcomes[answer.as_int()]
+        return get_boolean_outcome(outcome)
+
+    @property
+    def boolean_outcome(self) -> bool:
         if not self.is_resolved_with_valid_answer:
             raise ValueError(f"Bet with title {self.title} is not resolved.")
+        return self.boolean_outcome_from_answer(
+            check_not_none(
+                self.currentAnswer, "Can not be None if `is_resolved_with_valid_answer`"
+            )
+        )
 
-        outcome: str = self.outcomes[check_not_none(self.answer_index)]
-        return get_boolean_outcome(outcome)
+    def get_resolution_enum_from_answer(self, answer: HexBytes) -> Resolution:
+        if self.boolean_outcome_from_answer(answer):
+            return Resolution.YES
+        else:
+            return Resolution.NO
 
     def get_resolution_enum(self) -> t.Optional[Resolution]:
         if not self.is_resolved_with_valid_answer:
             return None
-        if self.boolean_outcome:
-            return Resolution.YES
-        else:
-            return Resolution.NO
+        return self.get_resolution_enum_from_answer(
+            check_not_none(
+                self.currentAnswer, "Can not be None if `is_resolved_with_valid_answer`"
+            )
+        )
 
     @property
     def url(self) -> str:

{prediction_market_agent_tooling-0.50.1 → prediction_market_agent_tooling-0.51.0}/prediction_market_agent_tooling/markets/omen/omen_resolving.py

@@ -18,9 +18,6 @@ from prediction_market_agent_tooling.markets.omen.data_models import (
     OmenMarket,
     RealityQuestion,
 )
-from prediction_market_agent_tooling.markets.omen.omen import (
-    OMEN_DEFAULT_REALITIO_BOND_VALUE,
-)
 from prediction_market_agent_tooling.markets.omen.omen_contracts import (
     OmenOracleContract,
     OmenRealitioContract,
@@ -121,6 +118,7 @@ def claim_bonds_on_realitio_question(
 def finalize_markets(
     api_keys: APIKeys,
     markets_with_resolutions: list[tuple[OmenMarket, Resolution | None]],
+    realitio_bond: xDai,
     wait_n_days_before_invalid: int = 30,
     web3: Web3 | None = None,
 ) -> list[HexAddress]:
@@ -140,7 +138,7 @@ def finalize_markets(
                 omen_submit_invalid_answer_market_tx(
                     api_keys,
                     market,
-                    OMEN_DEFAULT_REALITIO_BOND_VALUE,
+                    realitio_bond,
                     web3=web3,
                 )
 
@@ -155,7 +153,7 @@ def finalize_markets(
                 api_keys,
                 market,
                 resolution,
-                OMEN_DEFAULT_REALITIO_BOND_VALUE,
+                realitio_bond,
                 web3=web3,
             )
             finalized_markets.append(market.id)
@@ -168,7 +166,7 @@ def finalize_markets(
             omen_submit_invalid_answer_market_tx(
                 api_keys,
                 market,
-                OMEN_DEFAULT_REALITIO_BOND_VALUE,
+                realitio_bond,
                 web3=web3,
             )
 

{prediction_market_agent_tooling-0.50.1 → prediction_market_agent_tooling-0.51.0}/prediction_market_agent_tooling/markets/omen/omen_subgraph_handler.py

@@ -71,12 +71,17 @@ class OmenSubgraphHandler(metaclass=SingletonMeta):
     def __init__(self) -> None:
         self.sg = Subgrounds()
 
-        # Patch the query_json method to retry on failure.
+        # Patch methods to retry on failure.
         self.sg.query_json = tenacity.retry(
             stop=tenacity.stop_after_attempt(3),
             wait=tenacity.wait_fixed(1),
             after=lambda x: logger.debug(f"query_json failed, {x.attempt_number=}."),
         )(self.sg.query_json)
+        self.sg.load_subgraph = tenacity.retry(
+            stop=tenacity.stop_after_attempt(3),
+            wait=tenacity.wait_fixed(1),
+            after=lambda x: logger.debug(f"load_subgraph failed, {x.attempt_number=}."),
+        )(self.sg.load_subgraph)
 
         keys = APIKeys()
 
@@ -221,7 +226,6 @@ class OmenSubgraphHandler(metaclass=SingletonMeta):
         opened_after: t.Optional[DatetimeUTC] = None,
         finalized_before: t.Optional[DatetimeUTC] = None,
         finalized_after: t.Optional[DatetimeUTC] = None,
-        finalized: bool | None = None,
         resolved: bool | None = None,
         liquidity_bigger_than: Wei | None = None,
         condition_id_in: list[HexBytes] | None = None,
@@ -273,12 +277,6 @@ class OmenSubgraphHandler(metaclass=SingletonMeta):
             else:
                 where_stms["resolutionTimestamp"] = None
 
-        if finalized is not None:
-            if finalized:
-                where_stms["answerFinalizedTimestamp_not"] = None
-            else:
-                where_stms["answerFinalizedTimestamp"] = None
-
         if opened_after:
             where_stms["question_"]["openingTimestamp_gt"] = to_int_timestamp(
                 opened_after
@@ -358,13 +356,11 @@ class OmenSubgraphHandler(metaclass=SingletonMeta):
         Simplified `get_omen_binary_markets` method, which allows to fetch markets based on the filter_by and sort_by values.
         """
         # These values need to be set according to the filter_by value, so they can not be passed as arguments.
-        finalized: bool | None = None
         resolved: bool | None = None
         opened_after: DatetimeUTC | None = None
         liquidity_bigger_than: Wei | None = None
 
         if filter_by == FilterBy.RESOLVED:
-            finalized = True
             resolved = True
         elif filter_by == FilterBy.OPEN:
             # We can not use `resolved=False` + `finalized=False` here,
@@ -381,7 +377,6 @@ class OmenSubgraphHandler(metaclass=SingletonMeta):
 
         return self.get_omen_binary_markets(
             limit=limit,
-            finalized=finalized,
             resolved=resolved,
             opened_after=opened_after,
             liquidity_bigger_than=liquidity_bigger_than,
@@ -401,7 +396,6 @@ class OmenSubgraphHandler(metaclass=SingletonMeta):
         opened_after: t.Optional[DatetimeUTC] = None,
         finalized_before: t.Optional[DatetimeUTC] = None,
         finalized_after: t.Optional[DatetimeUTC] = None,
-        finalized: bool | None = None,
         resolved: bool | None = None,
         creator: t.Optional[HexAddress] = None,
         creator_in: t.Optional[t.Sequence[HexAddress]] = None,
@@ -429,7 +423,6 @@ class OmenSubgraphHandler(metaclass=SingletonMeta):
             opened_after=opened_after,
             finalized_before=finalized_before,
             finalized_after=finalized_after,
-            finalized=finalized,
             resolved=resolved,
             condition_id_in=condition_id_in,
             id_in=id_in,

{prediction_market_agent_tooling-0.50.1 → prediction_market_agent_tooling-0.51.0}/pyproject.toml

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "prediction-market-agent-tooling"
-version = "0.50.1"
+version = "0.51.0"
 description = "Tools to benchmark, deploy and monitor prediction market agents."
 authors = ["Gnosis"]
 readme = "README.md"