prediction-market-agent-tooling 0.48.8__py3-none-any.whl → 0.48.10__py3-none-any.whl

prediction_market_agent_tooling/deploy/agent.py

@@ -100,6 +100,10 @@ def initialize_langfuse(enable_langfuse: bool) -> None:
 Decision = Annotated[bool, BeforeValidator(to_boolean_outcome)]
 
 
+class CantPayForGasError(ValueError):
+    pass
+
+
 class OutOfFundsError(ValueError):
     pass
 
@@ -337,17 +341,38 @@ class DeployableTraderAgent(DeployableAgent):
             ]
         )
 
-    def check_min_required_balance_to_operate(self, market_type: MarketType) -> None:
+    def check_min_required_balance_to_operate(
+        self,
+        market_type: MarketType,
+        check_for_gas: bool = True,
+        check_for_trades: bool = True,
+    ) -> None:
         api_keys = APIKeys()
+        if (
+            market_type == MarketType.OMEN
+            and check_for_gas
+            and not is_minimum_required_balance(
+                api_keys.public_key,
+                min_required_balance=xdai_type(0.001),
+                sum_wxdai=False,
+            )
+        ):
+            raise CantPayForGasError(
+                f"{api_keys.public_key=} doesn't have enough xDai to pay for gas."
+            )
         if self.min_required_balance_to_operate is None:
             return
-        if market_type == MarketType.OMEN and not is_minimum_required_balance(
-            api_keys.public_key,
-            min_required_balance=self.min_required_balance_to_operate,
+        if (
+            market_type == MarketType.OMEN
+            and check_for_trades
+            and not is_minimum_required_balance(
+                api_keys.bet_from_address,
+                min_required_balance=self.min_required_balance_to_operate,
+            )
         ):
             raise OutOfFundsError(
                 f"Minimum required balance {self.min_required_balance_to_operate} "
-                f"for agent with address {api_keys.public_key} is not met."
+                f"for agent with address {api_keys.bet_from_address=} is not met."
             )
 
     def have_bet_on_market_since(self, market: AgentMarket, since: timedelta) -> bool:
@@ -448,8 +473,13 @@ class DeployableTraderAgent(DeployableAgent):
         """
         api_keys = APIKeys()
         if market_type == MarketType.OMEN:
+            # First, check if we have enough xDai to pay for gas, there is no way of doing anything without it.
+            self.check_min_required_balance_to_operate(
+                market_type, check_for_trades=False
+            )
             # Omen is specific, because the user (agent) needs to manually withdraw winnings from the market.
             redeem_from_all_user_positions(api_keys)
+            # After redeeming, check if we have enough xDai to pay for gas and place bets.
             self.check_min_required_balance_to_operate(market_type)
             # Exchange wxdai back to xdai if the balance is getting low, so we can keep paying for fees.
             if self.min_balance_to_keep_in_native_currency is not None:

prediction_market_agent_tooling/markets/omen/omen.py

@@ -1047,13 +1047,19 @@ def is_minimum_required_balance(
     address: ChecksumAddress,
     min_required_balance: xDai,
     web3: Web3 | None = None,
+    sum_xdai: bool = True,
+    sum_wxdai: bool = True,
 ) -> bool:
     """
     Checks if the total balance of xDai and wxDai in the wallet is above the minimum required balance.
     """
     current_balances = get_balances(address, web3)
     # xDai and wxDai have equal value and can be exchanged for almost no cost, so we can sum them up.
-    total_balance = current_balances.xdai + current_balances.wxdai
+    total_balance = 0.0
+    if sum_xdai:
+        total_balance += current_balances.xdai
+    if sum_wxdai:
+        total_balance += current_balances.wxdai
     return total_balance >= min_required_balance
 
 

prediction_market_agent_tooling/markets/omen/omen_subgraph_handler.py

@@ -608,21 +608,25 @@ class OmenSubgraphHandler(metaclass=SingletonMeta):
         )
         return [b for b in bets if b.fpmm.is_resolved_with_valid_answer]
 
-    def get_questions(
-        self,
+    @staticmethod
+    def get_reality_question_filters(
         user: HexAddress | None = None,
         claimed: bool | None = None,
         current_answer_before: datetime | None = None,
         finalized_before: datetime | None = None,
         finalized_after: datetime | None = None,
         id_in: list[str] | None = None,
+        question_id: HexBytes | None = None,
         question_id_in: list[HexBytes] | None = None,
-    ) -> list[RealityQuestion]:
+    ) -> dict[str, t.Any]:
         where_stms: dict[str, t.Any] = {}
 
         if user is not None:
             where_stms["user"] = user.lower()
 
+        if question_id is not None:
+            where_stms["questionId"] = question_id.hex()
+
         if claimed is not None:
             if claimed:
                 where_stms["historyHash"] = ZERO_BYTES.hex()
@@ -650,6 +654,27 @@ class OmenSubgraphHandler(metaclass=SingletonMeta):
         if question_id_in is not None:
             where_stms["questionId_in"] = [x.hex() for x in question_id_in]
 
+        return where_stms
+
+    def get_questions(
+        self,
+        user: HexAddress | None = None,
+        claimed: bool | None = None,
+        current_answer_before: datetime | None = None,
+        finalized_before: datetime | None = None,
+        finalized_after: datetime | None = None,
+        id_in: list[str] | None = None,
+        question_id_in: list[HexBytes] | None = None,
+    ) -> list[RealityQuestion]:
+        where_stms: dict[str, t.Any] = self.get_reality_question_filters(
+            user=user,
+            claimed=claimed,
+            finalized_before=finalized_before,
+            finalized_after=finalized_after,
+            current_answer_before=current_answer_before,
+            id_in=id_in,
+            question_id_in=question_id_in,
+        )
         questions = self.realityeth_subgraph.Query.questions(where=where_stms)
         fields = self._get_fields_for_reality_questions(questions)
         result = self.sg.query_json(fields)
@@ -669,11 +694,24 @@ class OmenSubgraphHandler(metaclass=SingletonMeta):
         items = self._parse_items_from_json(result)
         return [RealityAnswer.model_validate(i) for i in items]
 
-    def get_responses(self, question_id: HexBytes) -> list[RealityResponse]:
-        response = self.realityeth_subgraph.Response
-        where_stms = [
-            response.question.questionId == question_id.hex(),
-        ]
+    def get_responses(
+        self,
+        user: HexAddress | None = None,
+        question_id: HexBytes | None = None,
+        question_claimed: bool | None = None,
+        question_finalized_before: datetime | None = None,
+    ) -> list[RealityResponse]:
+        where_stms: dict[str, t.Any] = {}
+
+        if user is not None:
+            where_stms["user"] = user.lower()
+
+        where_stms["question_"] = self.get_reality_question_filters(
+            question_id=question_id,
+            claimed=question_claimed,
+            finalized_before=question_finalized_before,
+        )
+
         responses = self.realityeth_subgraph.Query.responses(where=where_stms)
         fields = self._get_fields_for_responses(responses)
         result = self.sg.query_json(fields)

{prediction_market_agent_tooling-0.48.8.dist-info → prediction_market_agent_tooling-0.48.10.dist-info}/METADATA

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

{prediction_market_agent_tooling-0.48.8.dist-info → prediction_market_agent_tooling-0.48.10.dist-info}/RECORD

@@ -15,7 +15,7 @@ prediction_market_agent_tooling/benchmark/agents.py,sha256=BwE3U11tQq0rfOJBn-Xn5
 prediction_market_agent_tooling/benchmark/benchmark.py,sha256=xiHKzZx5GHSsDerFHMZ9j_LXAXnSaITSvv67iPe3MEU,21095
 prediction_market_agent_tooling/benchmark/utils.py,sha256=D0MfUkVZllmvcU0VOurk9tcKT7JTtwwOp-63zuCBVuc,2880
 prediction_market_agent_tooling/config.py,sha256=9h68Nb9O1YZabZqtOBrH1S-4U5aIdLKfVYLSKspfUeA,6008
-prediction_market_agent_tooling/deploy/agent.py,sha256=MdNiUG2y-E6S_Hc7d31ISIPF7e18-2bmO8SULg7RDd4,17760
+prediction_market_agent_tooling/deploy/agent.py,sha256=KsAFknAbMPVSqBSSahuZuu2cX08azZ8EZ481XwWgR_8,18746
 prediction_market_agent_tooling/deploy/agent_example.py,sha256=dIIdZashExWk9tOdyDjw87AuUcGyM7jYxNChYrVK2dM,1001
 prediction_market_agent_tooling/deploy/betting_strategy.py,sha256=nJizN4d_jsw5WA8uukaKModVezAgVwoLrCOXsaBOwXo,2223
 prediction_market_agent_tooling/deploy/constants.py,sha256=M5ty8URipYMGe_G-RzxRydK3AFL6CyvmqCraJUrLBnE,82
@@ -38,10 +38,10 @@ prediction_market_agent_tooling/markets/metaculus/data_models.py,sha256=6TBy17xn
 prediction_market_agent_tooling/markets/metaculus/metaculus.py,sha256=uNF7LP4evvubk818g2zbX1VlnFxeUQOkNgx_e_LwaJA,3416
 prediction_market_agent_tooling/markets/omen/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 prediction_market_agent_tooling/markets/omen/data_models.py,sha256=7KXT8a_WYyXMFR8OtcPlaazeigc8eE_AvBkx2q-CNi8,16764
-prediction_market_agent_tooling/markets/omen/omen.py,sha256=fL8Lk1H0guwNBcgvT8Ymy3jRewbWLbJ9m8br4HN7vPg,40014
+prediction_market_agent_tooling/markets/omen/omen.py,sha256=0odOGRtuDjB12sXnRglUyW8IdOsuha7X6ALc2OryF3c,40156
 prediction_market_agent_tooling/markets/omen/omen_contracts.py,sha256=MfaWfDDfEzHYVAbeT3Dgtl8KG7XsqEpdY3m3-rsOPwo,23588
 prediction_market_agent_tooling/markets/omen/omen_resolving.py,sha256=Awaw1r32IBAClCktrXbYJ24RNyLDWcLb8RqAx6FGSkI,9529
-prediction_market_agent_tooling/markets/omen/omen_subgraph_handler.py,sha256=XMCXEZi5TWpxxw5hDJ3QU-19VpD77otw3qhNLT_OhRE,28452
+prediction_market_agent_tooling/markets/omen/omen_subgraph_handler.py,sha256=Zxxu3HKg8e-uUNywJSaXUjkzHHrZxq3WC0x6pILAavA,29742
 prediction_market_agent_tooling/markets/polymarket/api.py,sha256=HXmA1akA0qDj0m3e-GEvWG8x75pm6BX4H7YJPQcST7I,4767
 prediction_market_agent_tooling/markets/polymarket/data_models.py,sha256=9CJzakyEcsn6DQBK2nOXjOMzTZBLAmK_KqevXvW17DI,4292
 prediction_market_agent_tooling/markets/polymarket/data_models_web.py,sha256=IPsFT3FX9Ge5l5zR1nBd2w-sd5ue7oR8PJSW710vFWY,12479
@@ -78,8 +78,8 @@ prediction_market_agent_tooling/tools/tavily_storage/tavily_models.py,sha256=dr-
 prediction_market_agent_tooling/tools/tavily_storage/tavily_storage.py,sha256=eln3BygdfsDf8WOlSQPL7qH946QnGnThRkazRZKBA8o,3194
 prediction_market_agent_tooling/tools/utils.py,sha256=JE9YWtPPhnTgLiOyGAZDNG5K8nCwUY9IZEuAlm9UcxA,6611
 prediction_market_agent_tooling/tools/web3_utils.py,sha256=euq_MH-LhTowACq42colks2IXxZQjqjuisYl91EYZtU,10440
-prediction_market_agent_tooling-0.48.8.dist-info/LICENSE,sha256=6or154nLLU6bELzjh0mCreFjt0m2v72zLi3yHE0QbeE,7650
-prediction_market_agent_tooling-0.48.8.dist-info/METADATA,sha256=-l7BCizaFtD0scKftcebwoel16w9o2nggRSRjMJ_EEc,7810
-prediction_market_agent_tooling-0.48.8.dist-info/WHEEL,sha256=sP946D7jFCHeNz5Iq4fL4Lu-PrWrFsgfLXbbkciIZwg,88
-prediction_market_agent_tooling-0.48.8.dist-info/entry_points.txt,sha256=m8PukHbeH5g0IAAmOf_1Ahm-sGAMdhSSRQmwtpmi2s8,81
-prediction_market_agent_tooling-0.48.8.dist-info/RECORD,,
+prediction_market_agent_tooling-0.48.10.dist-info/LICENSE,sha256=6or154nLLU6bELzjh0mCreFjt0m2v72zLi3yHE0QbeE,7650
+prediction_market_agent_tooling-0.48.10.dist-info/METADATA,sha256=KCZBnatFqFzYv_MNiRcnAomqicUKMhxjlEaf5gCdKjc,7811
+prediction_market_agent_tooling-0.48.10.dist-info/WHEEL,sha256=sP946D7jFCHeNz5Iq4fL4Lu-PrWrFsgfLXbbkciIZwg,88
+prediction_market_agent_tooling-0.48.10.dist-info/entry_points.txt,sha256=m8PukHbeH5g0IAAmOf_1Ahm-sGAMdhSSRQmwtpmi2s8,81
+prediction_market_agent_tooling-0.48.10.dist-info/RECORD,,