prediction-market-agent-tooling 0.50.0__py3-none-any.whl → 0.51.0__py3-none-any.whl

prediction_market_agent_tooling/config.py

@@ -45,6 +45,7 @@ class APIKeys(BaseSettings):
     LANGFUSE_HOST: t.Optional[str] = None
     LANGFUSE_DEPLOYMENT_VERSION: t.Optional[str] = None
 
+    ENABLE_IPFS_UPLOAD: bool = False
     PINATA_API_KEY: t.Optional[SecretStr] = None
     PINATA_API_SECRET: t.Optional[SecretStr] = None
 
@@ -151,6 +152,12 @@ class APIKeys(BaseSettings):
             and self.LANGFUSE_HOST is not None
         )
 
+    @property
+    def enable_ipfs_upload(self) -> bool:
+        return check_not_none(
+            self.ENABLE_IPFS_UPLOAD, "ENABLE_IPFS_UPLOAD missing in the environment."
+        )
+
     @property
     def pinata_api_key(self) -> SecretStr:
         return check_not_none(

prediction_market_agent_tooling/deploy/agent.py

@@ -11,6 +11,7 @@ from functools import cached_property
 from pydantic import BaseModel, BeforeValidator, computed_field
 from typing_extensions import Annotated
 from web3 import Web3
+from web3.constants import HASH_ZERO
 
 from prediction_market_agent_tooling.config import APIKeys
 from prediction_market_agent_tooling.deploy.betting_strategy import (
@@ -302,7 +303,6 @@ class DeployableTraderAgent(DeployableAgent):
     ) -> None:
         super().__init__(enable_langfuse=enable_langfuse)
         self.place_bet = place_bet
-        self.ipfs_handler = IPFSHandler(APIKeys())
 
     def get_betting_strategy(self, market: AgentMarket) -> BettingStrategy:
         user_id = market.get_user_id(api_keys=APIKeys())
@@ -522,16 +522,21 @@ class DeployableTraderAgent(DeployableAgent):
             if processed_market.answer.reasoning
             else ""
         )
-        ipfs_hash = self.ipfs_handler.store_agent_result(
-            IPFSAgentResult(reasoning=reasoning)
-        )
+
+        ipfs_hash_decoded = HexBytes(HASH_ZERO)
+        if keys.enable_ipfs_upload:
+            logger.info("Storing prediction on IPFS.")
+            ipfs_hash = IPFSHandler(keys).store_agent_result(
+                IPFSAgentResult(reasoning=reasoning)
+            )
+            ipfs_hash_decoded = ipfscidv0_to_byte32(ipfs_hash)
 
         tx_hashes = [
             HexBytes(HexStr(i.id)) for i in processed_market.trades if i.id is not None
         ]
         prediction = ContractPrediction(
             publisher=keys.public_key,
-            ipfs_hash=ipfscidv0_to_byte32(ipfs_hash),
+            ipfs_hash=ipfs_hash_decoded,
             tx_hashes=tx_hashes,
             estimated_probability_bps=int(processed_market.answer.p_yes * 10000),
         )

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/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/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.0.dist-info → prediction_market_agent_tooling-0.51.0.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: prediction-market-agent-tooling
-Version: 0.50.0
+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.0.dist-info → prediction_market_agent_tooling-0.51.0.dist-info}/RECORD

@@ -16,8 +16,8 @@ prediction_market_agent_tooling/benchmark/__init__.py,sha256=47DEQpj8HBSa-_TImW-
 prediction_market_agent_tooling/benchmark/agents.py,sha256=B1-uWdyeN4GGKMWGK_-CcAFJg1m9Y_XuaeIHPB29QR8,3971
 prediction_market_agent_tooling/benchmark/benchmark.py,sha256=MqTiaaJ3cYiOLUVR7OyImLWxcEya3Rl5JyFYW-K0lwM,17097
 prediction_market_agent_tooling/benchmark/utils.py,sha256=D0MfUkVZllmvcU0VOurk9tcKT7JTtwwOp-63zuCBVuc,2880
-prediction_market_agent_tooling/config.py,sha256=LAOG22P7yi8zDBqMuhBD6FaoCG-w4_tE8rF14hqDffk,6519
-prediction_market_agent_tooling/deploy/agent.py,sha256=xCIisNL-WW96hlndI_Cfftv__Eb6X7-LghzNmovCbno,21817
+prediction_market_agent_tooling/config.py,sha256=WC30Nr16RGueTafA9i67OIB-6KDHZRryhiLPzebg9_I,6740
+prediction_market_agent_tooling/deploy/agent.py,sha256=c9ovjd5UUk1Qw64Si7q0OO7SvM6I6Wne1fySpu0oWco,22005
 prediction_market_agent_tooling/deploy/agent_example.py,sha256=dIIdZashExWk9tOdyDjw87AuUcGyM7jYxNChYrVK2dM,1001
 prediction_market_agent_tooling/deploy/betting_strategy.py,sha256=cOPznMX0jd380qHw06A-l1XUyoicV54AXBghirtPw0Q,12127
 prediction_market_agent_tooling/deploy/constants.py,sha256=M5ty8URipYMGe_G-RzxRydK3AFL6CyvmqCraJUrLBnE,82
@@ -43,11 +43,11 @@ prediction_market_agent_tooling/markets/metaculus/api.py,sha256=4TRPGytQQbSdf42D
 prediction_market_agent_tooling/markets/metaculus/data_models.py,sha256=PIRN2FAQ32vNj78JRZPB1pXK61B0w2RBJvJSJ7dvvrg,2514
 prediction_market_agent_tooling/markets/metaculus/metaculus.py,sha256=S-XpK6Ij5AZgGMFMdXXcHm7hH2o8BRU-a_XqaW4xC54,3674
 prediction_market_agent_tooling/markets/omen/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-prediction_market_agent_tooling/markets/omen/data_models.py,sha256=YRsdASXBp5sMKmSTbwkZDWh0iwNnMnmJwLfgY-oj21s,26748
+prediction_market_agent_tooling/markets/omen/data_models.py,sha256=yYPHpZM4fthC1EhyXkXC8iyDQ1ITNBBY9nOHeKD6XSw,27283
 prediction_market_agent_tooling/markets/omen/omen.py,sha256=6tBhn7qxtsdrk0xgDSqWy44f_m1qmhfXjvQUWXtW3TI,47974
 prediction_market_agent_tooling/markets/omen/omen_contracts.py,sha256=w_ClGd8U4w2pKH3HLZqy2bAFkqZMSAhVgGFGlUqET6Y,28266
-prediction_market_agent_tooling/markets/omen/omen_resolving.py,sha256=eBFzXYsSvGRrGjQ60_SDQr1ZiPTe6U2CcZkSuKt_Wxc,9551
-prediction_market_agent_tooling/markets/omen/omen_subgraph_handler.py,sha256=_KlGEOoGCnZ33p_CxOXnYZ5pWqMmsIsBF4Yi6YaZcuQ,32735
+prediction_market_agent_tooling/markets/omen/omen_resolving.py,sha256=iDWdjICGkt968exwCjY-6nsnQyrrNAg3YjnDdP430GQ,9415
+prediction_market_agent_tooling/markets/omen/omen_subgraph_handler.py,sha256=EZN3K93WjMQ3FmKBtHmMlmorZ-9v7mWenHRWqMmV-RU,32563
 prediction_market_agent_tooling/markets/polymarket/api.py,sha256=UZ4_TG8ceb9Y-qgsOKs8Qiv8zDt957QkT8IX2c83yqo,4800
 prediction_market_agent_tooling/markets/polymarket/data_models.py,sha256=Fd5PI5y3mJM8VHExBhWFWEnuuIKxQmIAXgBuoPDvNjw,4341
 prediction_market_agent_tooling/markets/polymarket/data_models_web.py,sha256=VZhVccTApygSKMmy6Au2G02JCJOKJnR_oVeKlaesuSg,12548
@@ -90,8 +90,8 @@ prediction_market_agent_tooling/tools/tavily_storage/tavily_models.py,sha256=99S
 prediction_market_agent_tooling/tools/tavily_storage/tavily_storage.py,sha256=xrtQH9v5pXycBRyc5j45pWqkSffkoc9efNIU1_G633Q,3706
 prediction_market_agent_tooling/tools/utils.py,sha256=JZj_xM4VbsDSiDlbn2lZFZPEOBSYhqqxd1Y2NpCqnJ4,7117
 prediction_market_agent_tooling/tools/web3_utils.py,sha256=dkcjG-LtuaWRh7WEMzRGmZ5B5rsxZTlliFOI6fj-EJ8,11842
-prediction_market_agent_tooling-0.50.0.dist-info/LICENSE,sha256=6or154nLLU6bELzjh0mCreFjt0m2v72zLi3yHE0QbeE,7650
-prediction_market_agent_tooling-0.50.0.dist-info/METADATA,sha256=WJM6adz0OH9KsvN-ZcCPV46AnEIEPNGio8ZXZFFeqbA,8056
-prediction_market_agent_tooling-0.50.0.dist-info/WHEEL,sha256=sP946D7jFCHeNz5Iq4fL4Lu-PrWrFsgfLXbbkciIZwg,88
-prediction_market_agent_tooling-0.50.0.dist-info/entry_points.txt,sha256=m8PukHbeH5g0IAAmOf_1Ahm-sGAMdhSSRQmwtpmi2s8,81
-prediction_market_agent_tooling-0.50.0.dist-info/RECORD,,
+prediction_market_agent_tooling-0.51.0.dist-info/LICENSE,sha256=6or154nLLU6bELzjh0mCreFjt0m2v72zLi3yHE0QbeE,7650
+prediction_market_agent_tooling-0.51.0.dist-info/METADATA,sha256=G5RtTj92IHwgLBO6VKf6xCz4WWva0BNo77Xhbfl2lVs,8056
+prediction_market_agent_tooling-0.51.0.dist-info/WHEEL,sha256=sP946D7jFCHeNz5Iq4fL4Lu-PrWrFsgfLXbbkciIZwg,88
+prediction_market_agent_tooling-0.51.0.dist-info/entry_points.txt,sha256=m8PukHbeH5g0IAAmOf_1Ahm-sGAMdhSSRQmwtpmi2s8,81
+prediction_market_agent_tooling-0.51.0.dist-info/RECORD,,