prediction-market-agent-tooling 0.39.2__tar.gz → 0.39.5__tar.gz

{prediction_market_agent_tooling-0.39.2 → prediction_market_agent_tooling-0.39.5}/PKG-INFO

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

{prediction_market_agent_tooling-0.39.2 → prediction_market_agent_tooling-0.39.5}/prediction_market_agent_tooling/markets/data_models.py

@@ -2,7 +2,7 @@ from datetime import datetime
 from enum import Enum
 from typing import TypeAlias
 
-from pydantic import BaseModel
+from pydantic import BaseModel, computed_field
 
 from prediction_market_agent_tooling.gtypes import OutcomeStr
 
@@ -41,6 +41,7 @@ class ResolvedBet(Bet):
     resolved_time: datetime
     profit: ProfitAmount
 
+    @computed_field  # type: ignore[misc]
     @property
     def is_correct(self) -> bool:
         return self.outcome == self.market_outcome

{prediction_market_agent_tooling-0.39.2 → prediction_market_agent_tooling-0.39.5}/prediction_market_agent_tooling/markets/manifold/data_models.py

@@ -150,7 +150,7 @@ class ManifoldBet(BaseModel):
     id: str
     fees: ManifoldBetFees
     isCancelled: t.Optional[bool] = None
-    loanAmount: Mana
+    loanAmount: Mana | None
     orderAmount: t.Optional[Mana] = None
     fills: t.Optional[list[ManifoldBetFills]] = None
     createdTime: datetime

{prediction_market_agent_tooling-0.39.2 → prediction_market_agent_tooling-0.39.5}/prediction_market_agent_tooling/markets/omen/omen_contracts.py

@@ -627,9 +627,13 @@ class OmenThumbnailMapping(ContractOnGnosisChain):
         )
     )
     address: ChecksumAddress = Web3.to_checksum_address(
-        "0x5D8B7B619EcdE05B8A94C0a0E99E0A0727A0e2e7"
+        "0xe0cf08311F03850497B0ed6A2cf067f1750C3eFc"
     )
 
+    @staticmethod
+    def construct_ipfs_url(ipfs_hash: IPFSCIDVersion0) -> str:
+        return f"https://ipfs.io/ipfs/{ipfs_hash}"
+
     def get(
         self,
         market_address: ChecksumAddress,
@@ -646,7 +650,7 @@ class OmenThumbnailMapping(ContractOnGnosisChain):
         web3: Web3 | None = None,
     ) -> str | None:
         hash_ = self.get(market_address, web3)
-        return f"https://ipfs.io/ipfs/{hash_}" if hash_ is not None else None
+        return self.construct_ipfs_url(hash_) if hash_ is not None else None
 
     def set(
         self,

{prediction_market_agent_tooling-0.39.2 → prediction_market_agent_tooling-0.39.5}/prediction_market_agent_tooling/markets/omen/omen_subgraph_handler.py

@@ -2,8 +2,11 @@ import sys
 import typing as t
 from datetime import datetime
 
+import requests
 import tenacity
 from eth_typing import ChecksumAddress
+from PIL import Image
+from PIL.Image import Image as ImageType
 from subgrounds import FieldPath, Subgrounds
 
 from prediction_market_agent_tooling.config import APIKeys
@@ -20,9 +23,15 @@ from prediction_market_agent_tooling.markets.omen.data_models import (
     RealityAnswer,
     RealityQuestion,
 )
+from prediction_market_agent_tooling.markets.omen.omen_contracts import (
+    OmenThumbnailMapping,
+)
 from prediction_market_agent_tooling.tools.singleton import SingletonMeta
 from prediction_market_agent_tooling.tools.utils import to_int_timestamp, utcnow
-from prediction_market_agent_tooling.tools.web3_utils import ZERO_BYTES
+from prediction_market_agent_tooling.tools.web3_utils import (
+    ZERO_BYTES,
+    byte32_to_ipfscidv0,
+)
 
 
 class OmenSubgraphHandler(metaclass=SingletonMeta):
@@ -36,6 +45,11 @@ class OmenSubgraphHandler(metaclass=SingletonMeta):
 
     REALITYETH_GRAPH_URL = "https://gateway-arbitrum.network.thegraph.com/api/{graph_api_key}/subgraphs/id/E7ymrCnNcQdAAgLbdFWzGE5mvr5Mb5T9VfT43FqA7bNh"
 
+    # TODO: Switch to arbitrum subgraph once it's published.
+    OMEN_IMAGE_MAPPING_GRAPH_URL = (
+        "https://api.studio.thegraph.com/query/63564/omen-thumbnailmapping/v0.0.3"
+    )
+
     INVALID_ANSWER = "ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff"
 
     def __init__(self) -> None:
@@ -66,6 +80,11 @@ class OmenSubgraphHandler(metaclass=SingletonMeta):
                 graph_api_key=keys.graph_api_key.get_secret_value()
             )
         )
+        self.omen_image_mapping_subgraph = self.sg.load_subgraph(
+            self.OMEN_IMAGE_MAPPING_GRAPH_URL.format(
+                graph_api_key=keys.graph_api_key.get_secret_value()
+            )
+        )
 
     def _get_fields_for_bets(self, bets_field: FieldPath) -> list[FieldPath]:
         markets = bets_field.fpmm
@@ -383,7 +402,9 @@ class OmenSubgraphHandler(metaclass=SingletonMeta):
         for result_chunk in result:
             for k, v in result_chunk.items():
                 # subgrounds might pack all items as a list, indexed by a key, or pack it as a dictionary (if one single element)
-                if isinstance(v, dict):
+                if v is None:
+                    continue
+                elif isinstance(v, dict):
                     items.extend([v])
                 else:
                     items.extend(v)
@@ -607,3 +628,23 @@ class OmenSubgraphHandler(metaclass=SingletonMeta):
                 f"Incorrect number of markets fetched {len(markets)}, expected 1."
             )
         return markets[0]
+
+    def get_market_image_url(self, market_id: HexAddress) -> str | None:
+        image = self.omen_image_mapping_subgraph.Query.omenThumbnailMapping(
+            id=market_id.lower()
+        )
+        fields = [image.id, image.image_hash]
+        result = self.sg.query_json(fields)
+        items = self._parse_items_from_json(result)
+        if not items:
+            return None
+        parsed = byte32_to_ipfscidv0(HexBytes(items[0]["image_hash"]))
+        return OmenThumbnailMapping.construct_ipfs_url(parsed)
+
+    def get_market_image(self, market_id: HexAddress) -> ImageType | None:
+        image_url = self.get_market_image_url(market_id)
+        return (
+            Image.open(requests.get(image_url, stream=True).raw)
+            if image_url is not None
+            else None
+        )

{prediction_market_agent_tooling-0.39.2 → prediction_market_agent_tooling-0.39.5}/pyproject.toml

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