prediction-market-agent-tooling 0.63.3__py3-none-any.whl → 0.63.5__py3-none-any.whl

prediction_market_agent_tooling/deploy/agent.py

@@ -30,7 +30,7 @@ from prediction_market_agent_tooling.deploy.trade_interval import (
     FixedInterval,
     TradeInterval,
 )
-from prediction_market_agent_tooling.gtypes import xDai
+from prediction_market_agent_tooling.gtypes import USD, OutcomeToken, xDai
 from prediction_market_agent_tooling.loggers import logger
 from prediction_market_agent_tooling.markets.agent_market import (
     AgentMarket,
@@ -499,7 +499,7 @@ class DeployablePredictionAgent(DeployableAgent):
 
         for market_idx, market in enumerate(available_markets):
             logger.info(
-                f"Going to process market {market_idx+1} / {len(available_markets)}."
+                f"Going to process market {market.url}: {market_idx+1} / {len(available_markets)}."
             )
             self.before_process_market(market_type, market)
             processed_market = self.process_market(market_type, market)
@@ -648,19 +648,27 @@ class DeployableTraderAgent(DeployablePredictionAgent):
                         )
                     case TradeType.SELL:
                         # Get actual value of the position we are going to sell, and if it's less than we wanted to sell, simply sell all of it.
-                        current_position_value = check_not_none(
+                        current_position = check_not_none(
                             market.get_position(user_id),
                             "Should exists if we are going to sell outcomes.",
-                        ).amounts_current[
+                        )
+                        current_position_value_usd = current_position.amounts_current[
                             market.get_outcome_str_from_bool(trade.outcome)
                         ]
-                        if current_position_value < trade.amount:
+                        amount_to_sell: USD | OutcomeToken
+                        if current_position_value_usd <= trade.amount:
                             logger.warning(
-                                f"Current value of position {trade.outcome=}, {current_position_value=} is less than the desired selling amount {trade.amount=}. Selling all."
+                                f"Current value of position {trade.outcome=}, {current_position_value_usd=} is less than the desired selling amount {trade.amount=}. Selling all."
                             )
+                            # In case the agent asked to sell too much, provide the amount to sell as all outcome tokens, instead of in USD, to minimze fx fluctuations when selling.
+                            amount_to_sell = current_position.amounts_ot[
+                                market.get_outcome_str_from_bool(trade.outcome)
+                            ]
+                        else:
+                            amount_to_sell = trade.amount
                         id = market.sell_tokens(
                             outcome=trade.outcome,
-                            amount=min(trade.amount, current_position_value),
+                            amount=amount_to_sell,
                         )
                     case _:
                         raise ValueError(f"Unexpected trade type {trade.trade_type}.")

prediction_market_agent_tooling/gtypes.py

@@ -34,7 +34,7 @@ class CollateralToken(_GenericValue[int | float | str | Decimal, float], parser=
 
     @property
     def as_wei(self) -> "Wei":
-        return Wei(Web3.to_wei(self.value, "ether"))
+        return Wei(to_wei_inc_negative(self.value))
 
 
 class OutcomeToken(_GenericValue[int | float | str | Decimal, float], parser=float):
@@ -51,7 +51,7 @@ class OutcomeToken(_GenericValue[int | float | str | Decimal, float], parser=flo
 
     @property
     def as_outcome_wei(self) -> "OutcomeWei":
-        return OutcomeWei(Web3.to_wei(self.value, "ether"))
+        return OutcomeWei(to_wei_inc_negative(self.value))
 
     @property
     def as_token(self) -> CollateralToken:
@@ -77,7 +77,7 @@ class xDai(_GenericValue[int | float | str | Decimal, float], parser=float):
 
     @property
     def as_xdai_wei(self) -> "xDaiWei":
-        return xDaiWei(Web3.to_wei(self.value, "ether"))
+        return xDaiWei(to_wei_inc_negative(self.value))
 
 
 class Mana(_GenericValue[int | float | str | Decimal, float], parser=float):
@@ -93,7 +93,7 @@ class Wei(_GenericValue[Web3Wei | int | str, Web3Wei], parser=int):
 
     @property
     def as_token(self) -> CollateralToken:
-        return CollateralToken(Web3.from_wei(self.value, "ether"))
+        return CollateralToken(from_wei_inc_negative(self.value))
 
 
 class OutcomeWei(_GenericValue[Web3Wei | int | str, Web3Wei], parser=int):
@@ -107,7 +107,7 @@ class OutcomeWei(_GenericValue[Web3Wei | int | str, Web3Wei], parser=int):
 
     @property
     def as_outcome_token(self) -> OutcomeToken:
-        return OutcomeToken(Web3.from_wei(self.value, "ether"))
+        return OutcomeToken(from_wei_inc_negative(self.value))
 
     @property
     def as_wei(self) -> Wei:
@@ -122,7 +122,7 @@ class xDaiWei(_GenericValue[Web3Wei | int | str, Web3Wei], parser=int):
 
     @property
     def as_xdai(self) -> xDai:
-        return xDai(Web3.from_wei(self.value, "ether"))
+        return xDai(from_wei_inc_negative(self.value))
 
     @property
     def as_wei(self) -> Wei:
@@ -162,3 +162,19 @@ def secretstr_to_v1_secretstr(s: SecretStr | None) -> SecretStrV1 | None:
 def int_to_hexbytes(v: int) -> HexBytes:
     # Example: 1 -> HexBytes("0x0000000000000000000000000000000000000000000000000000000000000001"). # web3-private-key-ok
     return HexBytes.fromhex(format(v, "064x"))
+
+
+def to_wei_inc_negative(value: int | float | str | Decimal) -> Web3Wei:
+    """
+    Handles conversion of a value to Wei, taking into account negative values.
+    """
+    return Web3Wei(
+        Web3.to_wei(abs(Decimal(value)), "ether") * (-1 if Decimal(value) < 0 else 1)
+    )
+
+
+def from_wei_inc_negative(value: int) -> int | Decimal:
+    """
+    Handles conversion from Wei to a float value, taking into account negative values.
+    """
+    return Web3.from_wei(abs(value), "ether") * (-1 if value < 0 else 1)

prediction_market_agent_tooling/markets/omen/data_models.py

@@ -1,6 +1,6 @@
 import typing as t
 
-from pydantic import BaseModel, ConfigDict, Field, computed_field
+from pydantic import BaseModel, ConfigDict, Field, computed_field, model_validator
 from web3 import Web3
 
 from prediction_market_agent_tooling.gtypes import (
@@ -17,6 +17,7 @@ from prediction_market_agent_tooling.gtypes import (
     xDai,
     xDaiWei,
 )
+from prediction_market_agent_tooling.loggers import logger
 from prediction_market_agent_tooling.markets.data_models import (
     Bet,
     Resolution,
@@ -35,6 +36,7 @@ from prediction_market_agent_tooling.tools.utils import (
     should_not_happen,
     utcnow,
 )
+from prediction_market_agent_tooling.tools.web3_utils import is_valid_wei
 
 OMEN_TRUE_OUTCOME = OutcomeStr("Yes")
 OMEN_FALSE_OUTCOME = OutcomeStr("No")
@@ -235,6 +237,27 @@ class OmenMarket(BaseModel):
     condition: Condition
     question: Question
 
+    @model_validator(mode="after")
+    def _model_validator(self) -> "OmenMarket":
+        if not all(is_valid_wei(number.value) for number in self.outcomeTokenAmounts):
+            # Sometimes we receive markets with outcomeTokenAmounts as `model.outcomeTokenAmounts=[OutcomeWei(24662799387878572), OutcomeWei(-24750000000000000)]`, which should be impossible.
+            # Current huntch is that it's a weird transitional status.
+            # Try to set them to zeros if market isn't open anymore (that's expected behaviour in such case),
+            # otherwise raise an error to investigate further.
+            if not self.is_open:
+                logger.warning(
+                    f"Market {self.url} has invalid {self.outcomeTokenAmounts=}, but isn't open anymore. Setting them to zeros."
+                )
+                self.outcomeTokenAmounts = [OutcomeWei(0) for _ in self.outcomes]
+                self.outcomeTokenMarginalPrices = None
+
+            else:
+                raise ValueError(
+                    f"Market {self.url} has invalid {self.outcomeTokenAmounts=}: {self=}"
+                )
+
+        return self
+
     @property
     def openingTimestamp(self) -> int:
         # This field is also available on this model itself, but for some reason it's typed to be optional,

prediction_market_agent_tooling/tools/web3_utils.py

@@ -6,6 +6,7 @@ import base58
 import tenacity
 from eth_account import Account
 from eth_typing import URI
+from eth_utils.currency import MAX_WEI, MIN_WEI
 from pydantic.types import SecretStr
 from safe_eth.eth import EthereumClient
 from safe_eth.safe.safe import SafeV141
@@ -21,6 +22,7 @@ from prediction_market_agent_tooling.gtypes import (
     HexStr,
     IPFSCIDVersion0,
     PrivateKey,
+    Web3Wei,
     private_key_type,
     xDai,
     xDaiWei,
@@ -354,3 +356,7 @@ def get_receipt_block_timestamp(receipt_tx: TxReceipt, web3: Web3) -> int:
     block = web3.eth.get_block(block_number)
     block_timestamp: int = block["timestamp"]
     return block_timestamp
+
+
+def is_valid_wei(value: Web3Wei) -> bool:
+    return MIN_WEI <= value <= MAX_WEI

{prediction_market_agent_tooling-0.63.3.dist-info → prediction_market_agent_tooling-0.63.5.dist-info}/METADATA

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

{prediction_market_agent_tooling-0.63.3.dist-info → prediction_market_agent_tooling-0.63.5.dist-info}/RECORD

@@ -21,7 +21,7 @@ prediction_market_agent_tooling/benchmark/agents.py,sha256=B1-uWdyeN4GGKMWGK_-Cc
 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=So5l8KbgmzcCpxzzf13TNrEJPu_4iQnUDhzus6XRvSc,10151
-prediction_market_agent_tooling/deploy/agent.py,sha256=OyrhPOjByQOAi1_VWhef7ieKqREjVhvjGHgnUIQc3gI,25877
+prediction_market_agent_tooling/deploy/agent.py,sha256=uh1_sf7W6Ti9HHdRw5uf540EYUEU13tLi-XQsXPzN6Q,26469
 prediction_market_agent_tooling/deploy/agent_example.py,sha256=dIIdZashExWk9tOdyDjw87AuUcGyM7jYxNChYrVK2dM,1001
 prediction_market_agent_tooling/deploy/betting_strategy.py,sha256=p25t7VU7I4hSkSl6SpzI_W55kLbYEySQdBqeschmARY,12918
 prediction_market_agent_tooling/deploy/constants.py,sha256=M5ty8URipYMGe_G-RzxRydK3AFL6CyvmqCraJUrLBnE,82
@@ -29,7 +29,7 @@ prediction_market_agent_tooling/deploy/gcp/deploy.py,sha256=CYUgnfy-9XVk04kkxA_5
 prediction_market_agent_tooling/deploy/gcp/kubernetes_models.py,sha256=OsPboCFGiZKsvGyntGZHwdqPlLTthITkNF5rJFvGgU8,2582
 prediction_market_agent_tooling/deploy/gcp/utils.py,sha256=WI2ycX1X-IlTRoNoG4ggFlRwPL28kwM9VGDFD2fePLo,5699
 prediction_market_agent_tooling/deploy/trade_interval.py,sha256=Xk9j45alQ_vrasGvsNyuW70XHIQ7wfvjoxNR3F6HYCw,1155
-prediction_market_agent_tooling/gtypes.py,sha256=DaerVkKVqhIhTwCB9A8piwCR97ZMnd8nSTSOlI9XcLM,5549
+prediction_market_agent_tooling/gtypes.py,sha256=bUIZfZIGvIi3aiZNu5rVE9kRevw8sfMa4bcze6QeBg8,6058
 prediction_market_agent_tooling/jobs/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 prediction_market_agent_tooling/jobs/jobs_models.py,sha256=8vYafsK1cqMWQtjBoq9rruroF84xAVD00vBTMWH6QMg,2166
 prediction_market_agent_tooling/jobs/omen/omen_jobs.py,sha256=Pf6QxPXGyie-2l_wZUjaGPTjZTlpv50_JhP40mULBaU,5048
@@ -50,7 +50,7 @@ prediction_market_agent_tooling/markets/metaculus/api.py,sha256=4TRPGytQQbSdf42D
 prediction_market_agent_tooling/markets/metaculus/data_models.py,sha256=FaBCTPPezXbBwZ9p791CiVgQ4vB696xnMbz9XVXmiVI,3267
 prediction_market_agent_tooling/markets/metaculus/metaculus.py,sha256=86TIx6cavEWc8Cv4KpZxSvwiSw9oFybXE3YB49pg-CA,4377
 prediction_market_agent_tooling/markets/omen/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-prediction_market_agent_tooling/markets/omen/data_models.py,sha256=URvplDcTLeL6vfpkSgi8ln2iEKxt8w5qf6mTZkSyrCo,29189
+prediction_market_agent_tooling/markets/omen/data_models.py,sha256=T08irohOXQnNeL45mIhGYgpJTShHVgXvQyYnLX4YLmU,30477
 prediction_market_agent_tooling/markets/omen/omen.py,sha256=Jf2qSJJn0UUISpi24xYRwoVycGuYE42kZ2z1HRGl43w,51927
 prediction_market_agent_tooling/markets/omen/omen_constants.py,sha256=D9oflYKafLQiHYtB5sScMHqmXyzM8JP8J0yATmc4SQQ,233
 prediction_market_agent_tooling/markets/omen/omen_contracts.py,sha256=bCC9A7ZTJxMDJcPbl3jof6HcAGGHv1BrFq3RRWbkQ_c,28739
@@ -120,9 +120,9 @@ prediction_market_agent_tooling/tools/tokens/token_utils.py,sha256=fhs-FH9m9IbzG
 prediction_market_agent_tooling/tools/tokens/usd.py,sha256=yuW8iPPtcpP4eLH2nORMDAfztcq0Nv2ascSrCquF1f8,3115
 prediction_market_agent_tooling/tools/transaction_cache.py,sha256=K5YKNL2_tR10Iw2TD9fuP-CTGpBbZtNdgbd0B_R7pjg,1814
 prediction_market_agent_tooling/tools/utils.py,sha256=1xsyBBJfiEdSoMlceB2F8o2sCb6Z8-qNz11pEJFrdyE,6566
-prediction_market_agent_tooling/tools/web3_utils.py,sha256=eYCc1iWAVtqDKUPTwnMUHuYolPdwh_OTiM3-AdRgDp4,12198
-prediction_market_agent_tooling-0.63.3.dist-info/LICENSE,sha256=6or154nLLU6bELzjh0mCreFjt0m2v72zLi3yHE0QbeE,7650
-prediction_market_agent_tooling-0.63.3.dist-info/METADATA,sha256=0RZTVpeWNV3EurtBs_MQ55JxJVW1EmHzuxKQsVpAHHU,8689
-prediction_market_agent_tooling-0.63.3.dist-info/WHEEL,sha256=fGIA9gx4Qxk2KDKeNJCbOEwSrmLtjWCwzBz351GyrPQ,88
-prediction_market_agent_tooling-0.63.3.dist-info/entry_points.txt,sha256=m8PukHbeH5g0IAAmOf_1Ahm-sGAMdhSSRQmwtpmi2s8,81
-prediction_market_agent_tooling-0.63.3.dist-info/RECORD,,
+prediction_market_agent_tooling/tools/web3_utils.py,sha256=zRq-eeBGWt8uUGN9G_WfjmJ0eVvO8aWE9S0Pz_Y6AOA,12342
+prediction_market_agent_tooling-0.63.5.dist-info/LICENSE,sha256=6or154nLLU6bELzjh0mCreFjt0m2v72zLi3yHE0QbeE,7650
+prediction_market_agent_tooling-0.63.5.dist-info/METADATA,sha256=IaLaaqZx0vS4t15q4zcpbXt_leP49eUYv8K7rGUh-p8,8689
+prediction_market_agent_tooling-0.63.5.dist-info/WHEEL,sha256=fGIA9gx4Qxk2KDKeNJCbOEwSrmLtjWCwzBz351GyrPQ,88
+prediction_market_agent_tooling-0.63.5.dist-info/entry_points.txt,sha256=m8PukHbeH5g0IAAmOf_1Ahm-sGAMdhSSRQmwtpmi2s8,81
+prediction_market_agent_tooling-0.63.5.dist-info/RECORD,,