prediction-market-agent-tooling 0.28.0__tar.gz → 0.30.0__tar.gz

{prediction_market_agent_tooling-0.28.0 → prediction_market_agent_tooling-0.30.0}/PKG-INFO

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

{prediction_market_agent_tooling-0.28.0 → prediction_market_agent_tooling-0.30.0}/prediction_market_agent_tooling/loggers.py

@@ -88,7 +88,9 @@ def print_using_loguru_info(
 
 
 def simple_warning_format(message, category, filename, lineno, line=None):  # type: ignore[no-untyped-def] # Not typed in the standard library neither.
-    return f"{category.__name__}: {message}"
+    return f"{category.__name__}: {message}".strip().replace(
+        "\n", "\\n"
+    )  # Escape new lines, because otherwise logs will be broken.
 
 
 if not getattr(logger, "_patched", False):

{prediction_market_agent_tooling-0.28.0 → prediction_market_agent_tooling-0.30.0}/prediction_market_agent_tooling/markets/agent_market.py

@@ -5,6 +5,7 @@ from enum import Enum
 from eth_typing import ChecksumAddress
 from pydantic import BaseModel, field_validator
 
+from prediction_market_agent_tooling.config import APIKeys
 from prediction_market_agent_tooling.gtypes import Probability
 from prediction_market_agent_tooling.markets.data_models import (
     Bet,
@@ -196,3 +197,7 @@ class AgentMarket(BaseModel):
         if self.is_closed() or not self.has_liquidity():
             return False
         return True
+
+    @classmethod
+    def get_user_url(cls, keys: APIKeys) -> str:
+        raise NotImplementedError("Subclasses must implement this method")

{prediction_market_agent_tooling-0.28.0 → prediction_market_agent_tooling-0.30.0}/prediction_market_agent_tooling/markets/manifold/manifold.py

@@ -11,6 +11,7 @@ from prediction_market_agent_tooling.markets.agent_market import (
 )
 from prediction_market_agent_tooling.markets.data_models import BetAmount, Currency
 from prediction_market_agent_tooling.markets.manifold.api import (
+    get_authenticated_user,
     get_manifold_binary_markets,
     place_bet,
 )
@@ -108,3 +109,7 @@ class ManifoldAgentMarket(AgentMarket):
                 excluded_questions=excluded_questions,
             )
         ]
+
+    @classmethod
+    def get_user_url(cls, keys: APIKeys) -> str:
+        return get_authenticated_user(keys.manifold_api_key.get_secret_value()).url

{prediction_market_agent_tooling-0.28.0 → prediction_market_agent_tooling-0.30.0}/prediction_market_agent_tooling/markets/omen/data_models.py

@@ -422,7 +422,7 @@ class RealityQuestion(BaseModel):
     # And because all the contract methods so far needed bytes32 input, when asked for question id, `questionId` field was the correct one to use so far.
     id: str
     user: HexAddress
-    historyHash: HexBytes
+    historyHash: HexBytes | None
     updatedTimestamp: datetime
     contentHash: HexBytes
     questionId: HexBytes

{prediction_market_agent_tooling-0.28.0 → prediction_market_agent_tooling-0.30.0}/prediction_market_agent_tooling/markets/omen/omen.py

@@ -369,6 +369,10 @@ class OmenAgentMarket(AgentMarket):
 
         return positions
 
+    @classmethod
+    def get_user_url(cls, keys: APIKeys) -> str:
+        return f"https://gnosisscan.io/address/{keys.bet_from_address}"
+
 
 def pick_binary_market(
     sort_by: SortBy = SortBy.CLOSING_SOONEST, filter_by: FilterBy = FilterBy.OPEN

{prediction_market_agent_tooling-0.28.0 → prediction_market_agent_tooling-0.30.0}/prediction_market_agent_tooling/markets/omen/omen_resolving.py

@@ -31,6 +31,7 @@ from prediction_market_agent_tooling.markets.omen.omen_subgraph_handler import (
 from prediction_market_agent_tooling.markets.polymarket.utils import (
     find_resolution_on_polymarket,
 )
+from prediction_market_agent_tooling.tools.utils import check_not_none
 from prediction_market_agent_tooling.tools.web3_utils import ZERO_BYTES, xdai_to_wei
 
 
@@ -95,7 +96,12 @@ def claim_bonds_on_realitio_question(
             # TODO: See `if len(answers_objects) > 1` above.
             # This is from the original Olas implementation (https://github.com/kongzii/trader/blob/700af475a4538cc3d5d22caf9dec9e9d22d72af1/packages/valory/skills/market_manager_abci/graph_tooling/requests.py#L297),
             # but it's most probably wrong (see comment above).
-            history_hashes.append(answers_objects[i + 1].question.historyHash)
+            history_hashes.append(
+                check_not_none(
+                    answers_objects[i + 1].question.historyHash,
+                    "Shouldn't be None here.",
+                )
+            )
 
         # last-to-first, the address of each answerer or commitment sender
         addresses.append(Web3.to_checksum_address(answer.question.user))

{prediction_market_agent_tooling-0.28.0 → prediction_market_agent_tooling-0.30.0}/prediction_market_agent_tooling/markets/polymarket/api.py

@@ -1,6 +1,8 @@
 import typing as t
 
 import requests
+import tenacity
+from loguru import logger
 
 from prediction_market_agent_tooling.markets.polymarket.data_models import (
     POLYMARKET_FALSE_OUTCOME,
@@ -18,6 +20,27 @@ POLYMARKET_API_BASE_URL = "https://clob.polymarket.com/"
 MARKETS_LIMIT = 100  # Polymarket will only return up to 100 markets
 
 
+@tenacity.retry(
+    stop=tenacity.stop_after_attempt(5),
+    wait=tenacity.wait_chain(*[tenacity.wait_fixed(n) for n in range(1, 6)]),
+    after=lambda x: logger.debug(f"get_polymarkets failed, {x.attempt_number=}."),
+)
+def get_polymarkets(
+    limit: int,
+    with_rewards: bool = False,
+    next_cursor: str | None = None,
+) -> MarketsEndpointResponse:
+    url = (
+        f"{POLYMARKET_API_BASE_URL}/{'sampling-markets' if with_rewards else 'markets'}"
+    )
+    params: dict[str, str | int | float | None] = {
+        "limit": min(limit, MARKETS_LIMIT),
+    }
+    if next_cursor is not None:
+        params["next_cursor"] = next_cursor
+    return response_to_model(requests.get(url, params=params), MarketsEndpointResponse)
+
+
 def get_polymarket_binary_markets(
     limit: int,
     closed: bool | None = False,
@@ -28,17 +51,13 @@ def get_polymarket_binary_markets(
     """
     See https://learn.polymarket.com/trading-rewards for information about rewards.
     """
-    url = (
-        f"{POLYMARKET_API_BASE_URL}/{'sampling-markets' if with_rewards else 'markets'}"
-    )
+
     all_markets: list[PolymarketMarketWithPrices] = []
-    params: dict[str, str | int | float | None] = {
-        "limit": min(limit, MARKETS_LIMIT),
-    }
+    next_cursor: str | None = None
 
     while True:
-        response = response_to_model(
-            requests.get(url, params=params), MarketsEndpointResponse
+        response = get_polymarkets(
+            limit, with_rewards=with_rewards, next_cursor=next_cursor
         )
 
         for market in response.data:
@@ -81,12 +100,12 @@ def get_polymarket_binary_markets(
         if len(all_markets) >= limit:
             break
 
-        if response.next_cursor == "LTE=":
+        next_cursor = response.next_cursor
+
+        if next_cursor == "LTE=":
             # 'LTE=' means the end.
             break
 
-        params["next_cursor"] = response.next_cursor
-
     return all_markets[:limit]
 
 

{prediction_market_agent_tooling-0.28.0 → prediction_market_agent_tooling-0.30.0}/prediction_market_agent_tooling/markets/polymarket/data_models.py

@@ -32,8 +32,8 @@ class PolymarketMarket(BaseModel):
     active: bool
     closed: bool
     archived: bool
-    minimum_order_size: str
-    minimum_tick_size: str
+    minimum_order_size: str | float
+    minimum_tick_size: str | float
     condition_id: str
     question_id: str
     question: str
@@ -54,8 +54,8 @@ class PolymarketMarket(BaseModel):
     rewards: PolymarketRewards
     tokens: tuple[PolymarketToken, ...]
     is_50_50_outcome: bool
-    categories: list[str]
-    parent_categories: list[str]
+    categories: list[str] | None = None
+    parent_categories: list[str] | None = None
     accepting_orders: bool
 
     @property

{prediction_market_agent_tooling-0.28.0 → prediction_market_agent_tooling-0.30.0}/prediction_market_agent_tooling/markets/polymarket/data_models_web.py

@@ -208,6 +208,25 @@ class Category(BaseModel):
     slug: str
 
 
+class Bid(BaseModel):
+    price: str
+    size: str
+
+
+class Ask(BaseModel):
+    price: str
+    size: str
+
+
+class MarketBidsAndAsks(BaseModel):
+    market: str
+    asset_id: str
+    hash: str
+    bids: list[Bid]
+    asks: list[Ask]
+    lastUpdated: int
+
+
 class PolymarketFullMarket(BaseModel):
     id: str
     ticker: str
@@ -231,7 +250,7 @@ class PolymarketFullMarket(BaseModel):
     liquidity: USDC | None
     volume: USDC | None
     volume24hr: USDC | None
-    competitive: float
+    competitive: float | None
     openInterest: int | None
     sortBy: str | None
     createdAt: datetime
@@ -327,7 +346,12 @@ class PriceSide(BaseModel):
 
 class State(BaseModel):
     data: (
-        PolymarketFullMarket | PriceSide | None
+        PolymarketFullMarket
+        | MarketBidsAndAsks
+        | PriceSide
+        | dict[str, MarketBidsAndAsks]
+        | dict[str, PriceSide]
+        | None
     )  # It's none if you go to the website and it says "Oops...we didn't forecast this".
     dataUpdateCount: int
     dataUpdatedAt: int

{prediction_market_agent_tooling-0.28.0 → prediction_market_agent_tooling-0.30.0}/prediction_market_agent_tooling/markets/polymarket/utils.py

@@ -9,7 +9,11 @@ from prediction_market_agent_tooling.tools.google import search_google
 def find_resolution_on_polymarket(question: str) -> Resolution | None:
     full_market = find_full_polymarket(question)
     # TODO: Only main markets are supported right now, add logic for others if needed.
-    return full_market.main_market.resolution if full_market else None
+    return (
+        full_market.main_market.resolution
+        if full_market and full_market.is_main_market
+        else None
+    )
 
 
 def find_full_polymarket(question: str) -> PolymarketFullMarket | None:

{prediction_market_agent_tooling-0.28.0 → prediction_market_agent_tooling-0.30.0}/prediction_market_agent_tooling/tools/is_predictable.py

@@ -1,5 +1,6 @@
 from loguru import logger
 
+from prediction_market_agent_tooling.config import APIKeys
 from prediction_market_agent_tooling.tools.cache import persistent_inmemory_cache
 
 # I tried to make it return a JSON, but it didn't work well in combo with asking it to do chain of thought.
@@ -44,7 +45,11 @@ def is_predictable_binary(
         logger.info("langchain not installed, skipping is_predictable_binary")
         return True
 
-    llm = ChatOpenAI(model=engine, temperature=0.0)
+    llm = ChatOpenAI(
+        model=engine,
+        temperature=0.0,
+        api_key=APIKeys().openai_api_key.get_secret_value(),
+    )
 
     prompt = ChatPromptTemplate.from_template(template=prompt_template)
     messages = prompt.format_messages(question=question)

{prediction_market_agent_tooling-0.28.0 → prediction_market_agent_tooling-0.30.0}/pyproject.toml

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