prediction-market-agent-tooling 0.60.0.dev412__tar.gz → 0.60.1.dev424__tar.gz

{prediction_market_agent_tooling-0.60.0.dev412 → prediction_market_agent_tooling-0.60.1.dev424}/PKG-INFO

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

{prediction_market_agent_tooling-0.60.0.dev412 → prediction_market_agent_tooling-0.60.1.dev424}/prediction_market_agent_tooling/markets/omen/omen_resolving.py

@@ -26,7 +26,11 @@ from prediction_market_agent_tooling.markets.omen.omen_subgraph_handler import (
     OmenSubgraphHandler,
 )
 from prediction_market_agent_tooling.tools.utils import utcnow
-from prediction_market_agent_tooling.tools.web3_utils import ZERO_BYTES, xdai_to_wei
+from prediction_market_agent_tooling.tools.web3_utils import (
+    ZERO_BYTES,
+    wei_to_xdai,
+    xdai_to_wei,
+)
 
 
 def claim_bonds_on_realitio_questions(
@@ -116,7 +120,9 @@ def claim_bonds_on_realitio_question(
     current_balance = realitio_contract.balanceOf(public_key, web3=web3)
     # Keeping balance on Realitio is not useful, so it's recommended to just withdraw it.
     if current_balance > 0 and auto_withdraw:
-        logger.info(f"Withdrawing remaining balance {current_balance=}")
+        logger.info(
+            f"Withdrawing remaining balance {wei_to_xdai(current_balance)} xDai from Realitio."
+        )
         realitio_contract.withdraw(api_keys, web3=web3)
 
 

{prediction_market_agent_tooling-0.60.0.dev412 → prediction_market_agent_tooling-0.60.1.dev424}/prediction_market_agent_tooling/markets/omen/omen_subgraph_handler.py

@@ -46,10 +46,12 @@ from prediction_market_agent_tooling.tools.web3_utils import (
     byte32_to_ipfscidv0,
 )
 
-# TODO: Agents don't know how to convert value between other tokens, we assume 1 unit = 1xDai = $1 (for example if market would be in wETH, betting 1 unit of wETH would be crazy :D)
-SAFE_COLLATERAL_TOKEN_MARKETS = (
-    WrappedxDaiContract().address,
-    sDaiContract().address,
+SAFE_COLLATERAL_TOKENS = (
+    WrappedxDaiContract(),
+    sDaiContract(),
+)
+SAFE_COLLATERAL_TOKENS_ADDRESSES = tuple(
+    contract.address for contract in SAFE_COLLATERAL_TOKENS
 )
 
 
@@ -326,7 +328,7 @@ class OmenSubgraphHandler(BaseSubgraphHandler):
         excluded_questions: set[str] | None = None,  # question titles
         collateral_token_address_in: (
             tuple[ChecksumAddress, ...] | None
-        ) = SAFE_COLLATERAL_TOKEN_MARKETS,
+        ) = SAFE_COLLATERAL_TOKENS_ADDRESSES,
         category: str | None = None,
         creator_in: t.Sequence[HexAddress] | None = None,
     ) -> t.List[OmenMarket]:
@@ -392,7 +394,7 @@ class OmenSubgraphHandler(BaseSubgraphHandler):
         outcomes: list[str] = OMEN_BINARY_MARKET_OUTCOMES,
         collateral_token_address_in: (
             tuple[ChecksumAddress, ...] | None
-        ) = SAFE_COLLATERAL_TOKEN_MARKETS,
+        ) = SAFE_COLLATERAL_TOKENS_ADDRESSES,
         category: str | None = None,
     ) -> t.List[OmenMarket]:
         """

{prediction_market_agent_tooling-0.60.0.dev412 → prediction_market_agent_tooling-0.60.1.dev424}/prediction_market_agent_tooling/tools/caches/db_cache.py

@@ -14,6 +14,7 @@ from typing import (
     overload,
 )
 
+import psycopg2
 from pydantic import BaseModel
 from sqlalchemy import Column
 from sqlalchemy.dialects.postgresql import JSONB
@@ -200,12 +201,22 @@ def db_cache(
                 result=computed_result,
                 created_at=utcnow(),
             )
-            with DBManager(
-                api_keys.sqlalchemy_db_url.get_secret_value()
-            ).get_session() as session:
-                logger.info(f"Saving {cache_entry} into database.")
-                session.add(cache_entry)
-                session.commit()
+            # Do not raise an exception if saving to the database fails, just log it and let the agent continue the work.
+            try:
+                with DBManager(
+                    api_keys.sqlalchemy_db_url.get_secret_value()
+                ).get_session() as session:
+                    logger.info(f"Saving {cache_entry} into database.")
+                    session.add(cache_entry)
+                    session.commit()
+            except psycopg2.errors.UntranslatableCharacter as e:
+                logger.warning(
+                    f"Failed to save {cache_entry} into database, ignoring, because: {e}"
+                )
+            except Exception:
+                logger.exception(
+                    f"Failed to save {cache_entry} into database, ignoring."
+                )
 
         return computed_result
 

{prediction_market_agent_tooling-0.60.0.dev412 → prediction_market_agent_tooling-0.60.1.dev424}/prediction_market_agent_tooling/tools/contract.py

@@ -336,6 +336,7 @@ class ContractERC4626BaseClass(ContractERC20BaseClass):
         tx_params: t.Optional[TxParams] = None,
         web3: Web3 | None = None,
     ) -> TxReceipt:
+        # assets_wei is the amount of assets (underlying erc20 token amount) we want to withdraw.
         receiver = receiver or api_keys.bet_from_address
         owner = owner or api_keys.bet_from_address
         return self.send(
@@ -346,6 +347,13 @@ class ContractERC4626BaseClass(ContractERC20BaseClass):
             web3=web3,
         )
 
+    def withdraw_in_shares(
+        self, api_keys: APIKeys, shares_wei: Wei, web3: Web3 | None = None
+    ) -> TxReceipt:
+        # shares_wei is the amount of shares we want to withdraw.
+        assets = self.convertToAssets(shares_wei, web3=web3)
+        return self.withdraw(api_keys=api_keys, assets_wei=assets, web3=web3)
+
     def convertToShares(self, assets: Wei, web3: Web3 | None = None) -> Wei:
         shares: Wei = self.call("convertToShares", [assets], web3=web3)
         return shares

{prediction_market_agent_tooling-0.60.0.dev412 → prediction_market_agent_tooling-0.60.1.dev424}/prediction_market_agent_tooling/tools/tokens/auto_withdraw.py

@@ -53,7 +53,7 @@ def auto_withdraw_collateral_token(
         logger.info(
             f"Withdrawing {wei_to_xdai(amount_wei)} from {collateral_token_contract.symbol_cached(web3)} into {KEEPING_ERC20_TOKEN.symbol_cached(web3)}"
         )
-        collateral_token_contract.withdraw(
+        collateral_token_contract.withdraw_in_shares(
             api_keys,
             amount_wei,
             web3=web3,

{prediction_market_agent_tooling-0.60.0.dev412 → prediction_market_agent_tooling-0.60.1.dev424}/pyproject.toml

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