prediction-market-agent-tooling 0.61.1.dev483__py3-none-any.whl → 0.61.1.dev485__py3-none-any.whl

prediction_market_agent_tooling/markets/seer/data_models.py

@@ -11,10 +11,8 @@ from prediction_market_agent_tooling.gtypes import (
     ChecksumAddress,
     HexAddress,
     HexBytes,
-    Probability,
 )
 from prediction_market_agent_tooling.markets.data_models import Resolution
-from prediction_market_agent_tooling.markets.seer.price_manager import PriceManager
 from prediction_market_agent_tooling.markets.seer.subgraph_data_models import (
     SeerParentMarket,
 )
@@ -158,11 +156,6 @@ class SeerMarket(BaseModel):
     def created_time(self) -> DatetimeUTC:
         return DatetimeUTC.to_datetime_utc(self.block_timestamp)
 
-    @property
-    def current_p_yes(self) -> Probability:
-        p = PriceManager(self)
-        return p.current_market_p_yes
-
     @property
     def url(self) -> str:
         chain_id = RPCConfig().chain_id

prediction_market_agent_tooling/markets/seer/price_manager.py

@@ -1,7 +1,7 @@
 from web3 import Web3
 
-from prediction_market_agent_tooling.gtypes import ChecksumAddress
-from prediction_market_agent_tooling.gtypes import Probability, xdai_type
+from prediction_market_agent_tooling.gtypes import ChecksumAddress, xdai_type
+from prediction_market_agent_tooling.gtypes import Probability
 from prediction_market_agent_tooling.loggers import logger
 from prediction_market_agent_tooling.markets.seer.data_models import (
     SeerMarket,
@@ -19,36 +19,18 @@ from prediction_market_agent_tooling.tools.web3_utils import xdai_to_wei
 
 
 class PriceManager:
-    def __init__(self, market: SeerMarket):
-        self.seer_market = market
-        self.subgraph_handler = SeerSubgraphHandler()
+    def __init__(self, seer_market: SeerMarket, seer_subgraph: SeerSubgraphHandler):
+        self.seer_market = seer_market
+        self.seer_subgraph = seer_subgraph
 
-    def fetch_outcome_price_for_seer_market(self) -> float:
+    @property
+    def current_p_yes(self) -> Probability:
         price_data = {}
-        for idx in range(len(self.seer_market.outcomes)):
-            wrapped_token = self.seer_market.wrapped_tokens[idx]
+        for idx, wrapped_token in enumerate(self.seer_market.wrapped_tokens):
             price = self.get_price_for_token(
-                token=Web3.to_checksum_address(wrapped_token)
+                token=Web3.to_checksum_address(wrapped_token),
             )
-            price_data[idx] = price
-
-        if sum(price_data.values()) == 0:
-            logger.warning(
-                f"Could not get p_yes for market {self.seer_market.id.hex()}, all price quotes are 0."
-            )
-            return Probability(0)
-
-        yes_idx = self.seer_market.outcome_as_enums[SeerOutcomeEnum.YES]
-        price_yes = price_data[yes_idx] / sum(price_data.values())
-        return Probability(price_yes)
 
-    def current_market_p_yes(self) -> Probability:
-        price_data = {}
-        for idx in range(len(self.seer_market.outcomes)):
-            wrapped_token = self.seer_market.wrapped_tokens[idx]
-            price = self.get_price_for_token(
-                token=Web3.to_checksum_address(wrapped_token)
-            )
             price_data[idx] = price
 
         if sum(price_data.values()) == 0:
@@ -57,10 +39,8 @@ class PriceManager:
             )
             return Probability(0)
 
-        yes_idx = self.seer_market.outcome_as_enums[SeerOutcomeEnum.YES]
-        no_idx = self.seer_market.outcome_as_enums[SeerOutcomeEnum.NO]
-        price_yes = price_data[yes_idx]
-        price_no = price_data[no_idx]
+        price_yes = price_data[self.seer_market.outcome_as_enums[SeerOutcomeEnum.YES]]
+        price_no = price_data[self.seer_market.outcome_as_enums[SeerOutcomeEnum.NO]]
         if price_yes and not price_no:
             # We simply return p_yes since it's probably a bug that p_no wasn't found.
             return Probability(price_yes)
@@ -73,7 +53,10 @@ class PriceManager:
             return Probability(price_yes)
 
     @persistent_inmemory_cache
-    def get_price_for_token(self, token: ChecksumAddress) -> float:
+    def get_price_for_token(
+        self,
+        token: ChecksumAddress,
+    ) -> float:
         collateral_exchange_amount = xdai_to_wei(xdai_type(1))
         try:
             quote = CowManager().get_quote(
@@ -94,8 +77,11 @@ class PriceManager:
     def _pool_token0_matches_token(token: ChecksumAddress, pool: SeerPool) -> bool:
         return pool.token0.id.hex().lower() == token.lower()
 
-    def get_token_price_from_pools(self, token: ChecksumAddress) -> float:
-        pool = self.subgraph_handler.get_pool_by_token(token_address=token)
+    def get_token_price_from_pools(
+        self,
+        token: ChecksumAddress,
+    ) -> float:
+        pool = SeerSubgraphHandler().get_pool_by_token(token_address=token)
 
         if not pool:
             logger.warning(f"Could not find a pool for {token=}, returning 0.")
@@ -109,16 +95,16 @@ class PriceManager:
         )
         if (
             collateral_address.hex().lower()
-            != self.seer_market.collateral_token.lower()
+            != self.seer_market.collateral_token_contract_address_checksummed.lower()
         ):
             logger.warning(
-                f"Pool {pool.id.hex()} has collateral mismatch with market. Collateral from pool {collateral_address.hex()}, collateral from market {self.seer_market.collateral_token}, returning 0."
+                f"Pool {pool.id.hex()} has collateral mismatch with market. Collateral from pool {collateral_address.hex()}, collateral from market {self.seer_market.collateral_token_contract_address_checksummed}, returning 0."
             )
             return 0
 
         price_in_collateral_units = (
             pool.token0Price
-            if self._pool_token0_matches_token(pool)
+            if self._pool_token0_matches_token(token=token, pool=pool)
             else pool.token1Price
         )
         return price_in_collateral_units

prediction_market_agent_tooling/markets/seer/seer.py

@@ -33,16 +33,19 @@ from prediction_market_agent_tooling.markets.market_fees import MarketFees
 from prediction_market_agent_tooling.markets.omen.omen import OmenAgentMarket
 from prediction_market_agent_tooling.markets.omen.omen_contracts import sDaiContract
 from prediction_market_agent_tooling.markets.seer.data_models import (
-    NewMarketEvent,
     SeerMarket,
     SeerOutcomeEnum,
 )
+from prediction_market_agent_tooling.markets.seer.price_manager import PriceManager
 from prediction_market_agent_tooling.markets.seer.seer_contracts import (
     SeerMarketFactory,
 )
 from prediction_market_agent_tooling.markets.seer.seer_subgraph_handler import (
     SeerSubgraphHandler,
 )
+from prediction_market_agent_tooling.markets.seer.subgraph_data_models import (
+    NewMarketEvent,
+)
 from prediction_market_agent_tooling.tools.balances import get_balances
 from prediction_market_agent_tooling.tools.contract import (
     ContractERC20OnGnosisChain,
@@ -166,6 +169,33 @@ class SeerAgentMarket(AgentMarket):
     def verify_operational_balance(api_keys: APIKeys) -> bool:
         return OmenAgentMarket.verify_operational_balance(api_keys=api_keys)
 
+    @staticmethod
+    def from_data_model_with_subgraph(
+        model: SeerMarket, seer_subgraph: SeerSubgraphHandler
+    ) -> "SeerAgentMarket":
+        p = PriceManager(seer_market=model, seer_subgraph=seer_subgraph)
+        current_p_yes = p.get_current_p_price()
+
+        return SeerAgentMarket(
+            id=model.id.hex(),
+            question=model.title,
+            creator=model.creator,
+            created_time=model.created_time,
+            outcomes=model.outcomes,
+            collateral_token_contract_address_checksummed=model.collateral_token_contract_address_checksummed,
+            condition_id=model.condition_id,
+            url=model.url,
+            close_time=model.close_time,
+            wrapped_tokens=[Web3.to_checksum_address(i) for i in model.wrapped_tokens],
+            fees=MarketFees.get_zero_fees(),
+            outcome_token_pool=None,
+            resolution=model.get_resolution_enum(),
+            volume=None,
+            # current_p_yes=model.current_p_yes,
+            current_p_yes=current_p_yes,
+            seer_outcomes=model.outcome_as_enums,
+        )
+
     @staticmethod
     def from_data_model(model: SeerMarket) -> "SeerAgentMarket":
         return SeerAgentMarket(
@@ -195,14 +225,11 @@ class SeerAgentMarket(AgentMarket):
         created_after: t.Optional[DatetimeUTC] = None,
         excluded_questions: set[str] | None = None,
     ) -> t.Sequence["SeerAgentMarket"]:
-        return [
-            SeerAgentMarket.from_data_model(m)
-            for m in SeerSubgraphHandler().get_binary_markets(
-                limit=limit,
-                sort_by=sort_by,
-                filter_by=filter_by,
-            )
-        ]
+        markets = SeerSubgraphHandler().get_binary_markets(
+            limit=limit, sort_by=sort_by, filter_by=filter_by
+        )
+
+        return [SeerAgentMarket.from_data_model(m) for m in markets]
 
     def has_liquidity_for_outcome(self, outcome: bool) -> bool:
         outcome_token = self.get_wrapped_token_for_outcome(outcome)
@@ -352,4 +379,4 @@ def extract_market_address_from_tx(
         .process_receipt(tx_receipt)
     )
     new_market_event = NewMarketEvent(**event_logs[0]["args"])
-    return Web3.to_checksum_address(new_market_event.seer_market)
+    return Web3.to_checksum_address(new_market_event.market)

prediction_market_agent_tooling/markets/seer/seer_contracts.py

@@ -5,7 +5,7 @@ from web3.types import TxReceipt
 
 from prediction_market_agent_tooling.config import APIKeys
 from prediction_market_agent_tooling.gtypes import ABI, ChecksumAddress, xDai
-from prediction_market_agent_tooling.markets.seer.data_models import (
+from prediction_market_agent_tooling.markets.seer.subgraph_data_models import (
     CreateCategoricalMarketsParams,
 )
 from prediction_market_agent_tooling.tools.contract import (

prediction_market_agent_tooling/markets/seer/seer_subgraph_handler.py

@@ -12,8 +12,8 @@ from prediction_market_agent_tooling.markets.base_subgraph_handler import (
 )
 from prediction_market_agent_tooling.markets.seer.data_models import (
     SeerMarket,
-    SeerPool,
 )
+from prediction_market_agent_tooling.markets.seer.subgraph_data_models import SeerPool
 from prediction_market_agent_tooling.tools.hexbytes_custom import HexBytes
 from prediction_market_agent_tooling.tools.utils import to_int_timestamp, utcnow
 

prediction_market_agent_tooling/markets/seer/subgraph_data_models.py

@@ -1,6 +1,7 @@
 from pydantic import BaseModel, ConfigDict, Field
+from web3.constants import ADDRESS_ZERO
 
-from prediction_market_agent_tooling.gtypes import HexBytes, HexAddress
+from prediction_market_agent_tooling.gtypes import HexBytes, HexAddress, Wei
 
 
 class SeerToken(BaseModel):

{prediction_market_agent_tooling-0.61.1.dev483.dist-info → prediction_market_agent_tooling-0.61.1.dev485.dist-info}/METADATA

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

{prediction_market_agent_tooling-0.61.1.dev483.dist-info → prediction_market_agent_tooling-0.61.1.dev485.dist-info}/RECORD

@@ -61,12 +61,12 @@ prediction_market_agent_tooling/markets/polymarket/data_models.py,sha256=Fd5PI5y
 prediction_market_agent_tooling/markets/polymarket/data_models_web.py,sha256=VZhVccTApygSKMmy6Au2G02JCJOKJnR_oVeKlaesuSg,12548
 prediction_market_agent_tooling/markets/polymarket/polymarket.py,sha256=NRoZK71PtH8kkangMqme7twcAXhRJSSabbmOir-UnAI,3418
 prediction_market_agent_tooling/markets/polymarket/utils.py,sha256=8kTeVjXPcXC6DkDvWYsZQLY7x8DS6CEp_yznSEazsNU,2037
-prediction_market_agent_tooling/markets/seer/data_models.py,sha256=EDzVMgBvum400VQl4IUvdnchBszF6M_4LWxMWkeTIHY,5576
-prediction_market_agent_tooling/markets/seer/price_manager.py,sha256=tuozfXp2dwgUQXvD4G4UAOzs-rIm6vgevbi804vv8-0,5102
-prediction_market_agent_tooling/markets/seer/seer.py,sha256=Anxp66UUzIIKt5wgLoqtUjUM-5HQ0wC5f5rDiYwrRRg,12959
-prediction_market_agent_tooling/markets/seer/seer_contracts.py,sha256=E7CYAKZiK6cg3dyj1kJuIPKSYYUft98F64shF5S0g4s,2730
-prediction_market_agent_tooling/markets/seer/seer_subgraph_handler.py,sha256=2M6vmUxMKQU61VNCp4Ykican6XH1LOp257--GjCJZx8,8974
-prediction_market_agent_tooling/markets/seer/subgraph_data_models.py,sha256=uPTCYTg_lS91Pb7JCU-neVEgAQe3zSOtkttlhQGlcBI,1599
+prediction_market_agent_tooling/markets/seer/data_models.py,sha256=ECuCDqRcs9vB9rKIec399HxsL915oT7VGSwztcMfGIw,5347
+prediction_market_agent_tooling/markets/seer/price_manager.py,sha256=Anuz-O3ZsLXU7td830XuN5fWEDjm5-WwviTU19O_pDU,4406
+prediction_market_agent_tooling/markets/seer/seer.py,sha256=0OQyvKQ_qGRMIKpVHveSUgKPIjhdjdti8ibNLqWClWE,14177
+prediction_market_agent_tooling/markets/seer/seer_contracts.py,sha256=TXGDbv7CI08X8N5re1SAm-X_BaXj8m4ceyzkS_ktQok,2739
+prediction_market_agent_tooling/markets/seer/seer_subgraph_handler.py,sha256=lcaKbFHxigMYwi4TCePyTb5HXJhGoCu5dJPFWTj5E28,9047
+prediction_market_agent_tooling/markets/seer/subgraph_data_models.py,sha256=RIt2oO-PbykzbYN11Qltt8tjjYTty-PfjH3Q4D2VEoA,1644
 prediction_market_agent_tooling/monitor/financial_metrics/financial_metrics.py,sha256=fjIgjDIx5MhH5mwf7S0cspLOOSU3elYLhGYoIiM26mU,2746
 prediction_market_agent_tooling/monitor/markets/manifold.py,sha256=TS4ERwTfQnot8dhekNyVNhJYf5ysYsjF-9v5_kM3aVI,3334
 prediction_market_agent_tooling/monitor/markets/metaculus.py,sha256=LOnyWWBFdg10-cTWdb76nOsNjDloO8OfMT85GBzRCFI,1455
@@ -119,8 +119,8 @@ prediction_market_agent_tooling/tools/tokens/main_token.py,sha256=7JPgVF4RbiFzLD
 prediction_market_agent_tooling/tools/transaction_cache.py,sha256=K5YKNL2_tR10Iw2TD9fuP-CTGpBbZtNdgbd0B_R7pjg,1814
 prediction_market_agent_tooling/tools/utils.py,sha256=jLG4nbEoIzzJiZ4RgMx4Q969Zdl0p0s63p8uET_0Fuw,6440
 prediction_market_agent_tooling/tools/web3_utils.py,sha256=3wfqNxvMn44ivweFRoeKNVb9QRtFd7kFtp7VUY5juEE,12862
-prediction_market_agent_tooling-0.61.1.dev483.dist-info/LICENSE,sha256=6or154nLLU6bELzjh0mCreFjt0m2v72zLi3yHE0QbeE,7650
-prediction_market_agent_tooling-0.61.1.dev483.dist-info/METADATA,sha256=078bYVh1iho-ehDfULc_ZXtRaQc71KnHdmJErDU_B5k,8636
-prediction_market_agent_tooling-0.61.1.dev483.dist-info/WHEEL,sha256=XbeZDeTWKc1w7CSIyre5aMDU_-PohRwTQceYnisIYYY,88
-prediction_market_agent_tooling-0.61.1.dev483.dist-info/entry_points.txt,sha256=m8PukHbeH5g0IAAmOf_1Ahm-sGAMdhSSRQmwtpmi2s8,81
-prediction_market_agent_tooling-0.61.1.dev483.dist-info/RECORD,,
+prediction_market_agent_tooling-0.61.1.dev485.dist-info/LICENSE,sha256=6or154nLLU6bELzjh0mCreFjt0m2v72zLi3yHE0QbeE,7650
+prediction_market_agent_tooling-0.61.1.dev485.dist-info/METADATA,sha256=1mVyJDn3LvVOE0LrV9q6nH4g9tGMab4ThJgdbTOCUw8,8636
+prediction_market_agent_tooling-0.61.1.dev485.dist-info/WHEEL,sha256=XbeZDeTWKc1w7CSIyre5aMDU_-PohRwTQceYnisIYYY,88
+prediction_market_agent_tooling-0.61.1.dev485.dist-info/entry_points.txt,sha256=m8PukHbeH5g0IAAmOf_1Ahm-sGAMdhSSRQmwtpmi2s8,81
+prediction_market_agent_tooling-0.61.1.dev485.dist-info/RECORD,,