prediction-market-agent-tooling 0.64.1.dev590__tar.gz → 0.64.2.dev604__tar.gz

{prediction_market_agent_tooling-0.64.1.dev590 → prediction_market_agent_tooling-0.64.2.dev604}/PKG-INFO

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

{prediction_market_agent_tooling-0.64.1.dev590 → prediction_market_agent_tooling-0.64.2.dev604}/prediction_market_agent_tooling/markets/omen/data_models.py

@@ -177,7 +177,7 @@ class OmenPosition(BaseModel):
         return Web3.to_checksum_address(self.collateralTokenAddress)
 
     def get_collateral_token_contract(
-        self, web3: Web3 | None
+        self, web3: Web3 | None = None
     ) -> ContractERC20OnGnosisChain:
         web3 = web3 or ContractERC20OnGnosisChain.get_web3()
         return to_gnosis_chain_contract(
@@ -875,3 +875,12 @@ class IPFSAgentResult(BaseModel):
     model_config = ConfigDict(
         extra="forbid",
     )
+
+
+class PayoutRedemptionEvent(BaseModel):
+    redeemer: HexAddress
+    collateralToken: HexAddress
+    parentCollectionId: HexBytes
+    conditionId: HexBytes
+    indexSets: list[int]
+    payout: Wei

{prediction_market_agent_tooling-0.64.1.dev590 → prediction_market_agent_tooling-0.64.2.dev604}/prediction_market_agent_tooling/markets/omen/omen.py

@@ -1071,25 +1071,22 @@ def omen_redeem_full_position_tx(
         logger.debug("Market not yet resolved, not possible to claim")
         return
 
-    original_balance = collateral_token_contract.balanceOf(from_address, web3=web3)
-    conditional_token_contract.redeemPositions(
+    redeem_event = conditional_token_contract.redeemPositions(
         api_keys=api_keys,
         collateral_token_address=market.collateral_token_contract_address_checksummed,
         condition_id=market.condition.id,
         index_sets=market.condition.index_sets,
         web3=web3,
     )
-    new_balance = collateral_token_contract.balanceOf(from_address, web3=web3)
-    balance_diff = new_balance - original_balance
 
     logger.info(
-        f"Redeemed {balance_diff.as_token} {collateral_token_contract.symbol_cached(web3=web3)} from market {market.question=} ({market.url})."
+        f"Redeemed {redeem_event.payout.as_token} {collateral_token_contract.symbol_cached(web3=web3)} from market {market.question=} ({market.url})."
     )
 
     if auto_withdraw:
         auto_withdraw_collateral_token(
             collateral_token_contract=collateral_token_contract,
-            amount_wei=balance_diff,
+            amount_wei=redeem_event.payout,
             api_keys=api_keys,
             web3=web3,
         )
@@ -1231,25 +1228,22 @@ def redeem_from_all_user_positions(
             user_position.position.get_collateral_token_contract(web3=web3)
         )
 
-        original_balance = collateral_token_contract.balanceOf(public_key, web3=web3)
-        conditional_token_contract.redeemPositions(
+        redeem_event = conditional_token_contract.redeemPositions(
             api_keys=api_keys,
             collateral_token_address=user_position.position.collateral_token_contract_address_checksummed,
             condition_id=condition_id,
             index_sets=user_position.position.indexSets,
             web3=web3,
         )
-        new_balance = collateral_token_contract.balanceOf(public_key, web3=web3)
-        balance_diff = new_balance - original_balance
 
         logger.info(
-            f"Redeemed {balance_diff.as_token} {collateral_token_contract.symbol_cached(web3=web3)} from position {user_position.id=}."
+            f"Redeemed {redeem_event.payout.as_token} {collateral_token_contract.symbol_cached(web3=web3)} from position {user_position.id=}."
         )
 
         if auto_withdraw:
             auto_withdraw_collateral_token(
                 collateral_token_contract=collateral_token_contract,
-                amount_wei=balance_diff,
+                amount_wei=redeem_event.payout,
                 api_keys=api_keys,
                 web3=web3,
             )

{prediction_market_agent_tooling-0.64.1.dev590 → prediction_market_agent_tooling-0.64.2.dev604}/prediction_market_agent_tooling/markets/omen/omen_contracts.py

@@ -28,6 +28,7 @@ from prediction_market_agent_tooling.markets.omen.data_models import (
     ContractPrediction,
     FPMMFundingAddedEvent,
     OmenFixedProductMarketMakerCreationEvent,
+    PayoutRedemptionEvent,
     RealitioLogNewQuestionEvent,
     format_realitio_question,
 )
@@ -194,8 +195,8 @@ class OmenConditionalTokenContract(ContractOnGnosisChain):
         index_sets: t.List[int],
         parent_collection_id: HexStr = build_parent_collection_id(),
         web3: Web3 | None = None,
-    ) -> TxReceipt:
-        return self.send(
+    ) -> PayoutRedemptionEvent:
+        receipt_tx = self.send(
             api_keys=api_keys,
             function_name="redeemPositions",
             function_params=[
@@ -206,6 +207,13 @@ class OmenConditionalTokenContract(ContractOnGnosisChain):
             ],
             web3=web3,
         )
+        redeem_event_logs = (
+            self.get_web3_contract(web3=web3)
+            .events.PayoutRedemption()
+            .process_receipt(receipt_tx)
+        )
+        redeem_event = PayoutRedemptionEvent(**redeem_event_logs[0]["args"])
+        return redeem_event
 
     def getOutcomeSlotCount(
         self, condition_id: HexBytes, web3: Web3 | None = None

{prediction_market_agent_tooling-0.64.1.dev590 → prediction_market_agent_tooling-0.64.2.dev604}/prediction_market_agent_tooling/markets/omen/omen_subgraph_handler.py

@@ -510,18 +510,24 @@ class OmenSubgraphHandler(BaseSubgraphHandler):
 
     def get_user_positions(
         self,
-        better_address: ChecksumAddress,
+        better_address: ChecksumAddress | None = None,
+        user_position_id_in: list[HexBytes] | None = None,
         position_id_in: list[HexBytes] | None = None,
         total_balance_bigger_than: OutcomeWei | None = None,
     ) -> list[OmenUserPosition]:
         where_stms: dict[str, t.Any] = {
-            "user": better_address.lower(),
             "position_": {},
         }
 
+        if better_address is not None:
+            where_stms["user"] = better_address.lower()
+
         if total_balance_bigger_than is not None:
             where_stms["totalBalance_gt"] = total_balance_bigger_than
 
+        if user_position_id_in is not None:
+            where_stms["id_in"] = [x.hex() for x in user_position_id_in]
+
         if position_id_in is not None:
             where_stms["position_"]["positionId_in"] = [x.hex() for x in position_id_in]
 

{prediction_market_agent_tooling-0.64.1.dev590 → prediction_market_agent_tooling-0.64.2.dev604}/prediction_market_agent_tooling/tools/caches/db_cache.py

@@ -3,6 +3,7 @@ import inspect
 import json
 from datetime import timedelta
 from functools import wraps
+from types import UnionType
 from typing import (
     Any,
     Callable,
@@ -276,6 +277,17 @@ def convert_cached_output_to_pydantic(return_type: Any, data: Any) -> Any:
                 ): convert_cached_output_to_pydantic(value_type, v)
                 for k, v in data.items()
             }
+        # If the origin is a union and one of the unions is basemodel, convert it to it.
+        elif (
+            origin is UnionType
+            and (
+                base_model_from_args := next(
+                    (x for x in args if issubclass(x, BaseModel)), None
+                )
+            )
+            is not None
+        ):
+            return base_model_from_args.model_validate(data)
         else:
             # If the origin is not a dictionary, return the data as is
             return data

{prediction_market_agent_tooling-0.64.1.dev590 → prediction_market_agent_tooling-0.64.2.dev604}/prediction_market_agent_tooling/tools/contract.py

@@ -60,7 +60,6 @@ class ContractBaseClass(BaseModel):
     """
 
     CHAIN_ID: t.ClassVar[ChainID]
-    CHAIN_RPC_URL: t.ClassVar[str]
 
     abi: ABI
     address: ChecksumAddress
@@ -165,7 +164,7 @@ class ContractBaseClass(BaseModel):
 
     @classmethod
     def get_web3(cls) -> Web3:
-        return Web3(Web3.HTTPProvider(cls.CHAIN_RPC_URL))
+        return RPCConfig().get_web3()
 
 
 class ContractProxyBaseClass(ContractBaseClass):
@@ -501,7 +500,6 @@ class ContractOnGnosisChain(ContractBaseClass):
     """
 
     CHAIN_ID = RPCConfig().chain_id
-    CHAIN_RPC_URL = RPCConfig().gnosis_rpc_url
 
 
 class ContractProxyOnGnosisChain(ContractProxyBaseClass, ContractOnGnosisChain):

{prediction_market_agent_tooling-0.64.1.dev590 → prediction_market_agent_tooling-0.64.2.dev604}/pyproject.toml

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