prediction-market-agent-tooling 0.41.1__py3-none-any.whl → 0.42.1__py3-none-any.whl

prediction_market_agent_tooling/config.py

@@ -3,9 +3,14 @@ import typing as t
 from gnosis.eth import EthereumClient
 from gnosis.safe import Safe
 from pydantic.types import SecretStr
+from pydantic.v1.types import SecretStr as SecretStrV1
 from pydantic_settings import BaseSettings, SettingsConfigDict
 
-from prediction_market_agent_tooling.gtypes import ChecksumAddress, PrivateKey
+from prediction_market_agent_tooling.gtypes import (
+    ChecksumAddress,
+    PrivateKey,
+    secretstr_to_v1_secretstr,
+)
 from prediction_market_agent_tooling.markets.manifold.api import get_authenticated_user
 from prediction_market_agent_tooling.tools.utils import check_not_none
 from prediction_market_agent_tooling.tools.web3_utils import private_key_to_public_key
@@ -87,6 +92,10 @@ class APIKeys(BaseSettings):
             self.OPENAI_API_KEY, "OPENAI_API_KEY missing in the environment."
         )
 
+    @property
+    def openai_api_key_secretstr_v1(self) -> SecretStrV1:
+        return secretstr_to_v1_secretstr(self.openai_api_key)
+
     @property
     def graph_api_key(self) -> SecretStr:
         return check_not_none(

prediction_market_agent_tooling/markets/agent_market.py

@@ -13,6 +13,7 @@ from prediction_market_agent_tooling.markets.data_models import (
     Currency,
     Position,
     Resolution,
+    ResolvedBet,
     TokenAmount,
 )
 from prediction_market_agent_tooling.tools.utils import (
@@ -163,6 +164,12 @@ class AgentMarket(BaseModel):
     ) -> list[Bet]:
         raise NotImplementedError("Subclasses must implement this method")
 
+    @staticmethod
+    def get_resolved_bets_made_since(
+        better_address: ChecksumAddress, start_time: datetime, end_time: datetime | None
+    ) -> list[ResolvedBet]:
+        raise NotImplementedError("Subclasses must implement this method")
+
     def is_closed(self) -> bool:
         return self.close_time is not None and self.close_time <= utcnow()
 

prediction_market_agent_tooling/markets/categorize.py

@@ -21,7 +21,7 @@ Write only the category itself, nothing else.
         prompt
         | ChatOpenAI(
             model=model,
-            api_key=APIKeys().openai_api_key.get_secret_value(),
+            api_key=APIKeys().openai_api_key_secretstr_v1,
         )
         | StrOutputParser()
     )

prediction_market_agent_tooling/markets/data_models.py

@@ -24,6 +24,9 @@ class TokenAmount(BaseModel):
     amount: float
     currency: Currency
 
+    def __str__(self) -> str:
+        return f"Amount {self.amount} currency {self.currency}"
+
 
 BetAmount: TypeAlias = TokenAmount
 ProfitAmount: TypeAlias = TokenAmount
@@ -34,6 +37,10 @@ class Bet(BaseModel):
     outcome: bool
     created_time: datetime
     market_question: str
+    market_id: str
+
+    def __str__(self) -> str:
+        return f"Bet for market {self.market_id} for question {self.market_question} created at {self.created_time}: {self.amount} on {self.outcome}"
 
 
 class ResolvedBet(Bet):
@@ -46,6 +53,9 @@ class ResolvedBet(Bet):
     def is_correct(self) -> bool:
         return self.outcome == self.market_outcome
 
+    def __str__(self) -> str:
+        return f"Resolved bet for market {self.market_id} for question {self.market_question} created at {self.created_time}: {self.amount} on {self.outcome}. Bet was resolved at {self.resolved_time} and was {'correct' if self.is_correct else 'incorrect'}. Profit was {self.profit}"
+
 
 class Position(BaseModel):
     market_id: str

prediction_market_agent_tooling/markets/manifold/api.py

@@ -12,13 +12,17 @@ from prediction_market_agent_tooling.markets.data_models import (
     ResolvedBet,
 )
 from prediction_market_agent_tooling.markets.manifold.data_models import (
+    FullManifoldMarket,
     ManifoldBet,
     ManifoldContractMetric,
     ManifoldMarket,
     ManifoldUser,
 )
 from prediction_market_agent_tooling.tools.parallelism import par_map
-from prediction_market_agent_tooling.tools.utils import response_list_to_model
+from prediction_market_agent_tooling.tools.utils import (
+    response_list_to_model,
+    response_to_model,
+)
 
 """
 Python API for Manifold Markets
@@ -65,9 +69,7 @@ def get_manifold_binary_markets(
     while True:
         params["offset"] = offset
         response = requests.get(url, params=params)
-        response.raise_for_status()
-        data = response.json()
-        markets = [ManifoldMarket.model_validate(x) for x in data]
+        markets = response_list_to_model(response, ManifoldMarket)
 
         if not markets:
             break
@@ -152,11 +154,9 @@ def get_authenticated_user(api_key: str) -> ManifoldUser:
     wait=tenacity.wait_fixed(1),
     after=lambda x: logger.debug(f"get_manifold_market failed, {x.attempt_number=}."),
 )
-def get_manifold_market(market_id: str) -> ManifoldMarket:
+def get_manifold_market(market_id: str) -> FullManifoldMarket:
     url = f"{MANIFOLD_API_BASE_URL}/v0/market/{market_id}"
-    response = requests.get(url)
-    response.raise_for_status()
-    return ManifoldMarket.model_validate(response.json())
+    return response_to_model(requests.get(url), FullManifoldMarket)
 
 
 @tenacity.retry(
@@ -213,6 +213,7 @@ def manifold_to_generic_resolved_bet(
         outcome=bet.get_resolved_boolean_outcome(),
         created_time=bet.createdTime,
         market_question=market.question,
+        market_id=market.id,
         market_outcome=market_outcome,
         resolved_time=market.resolutionTime,
         profit=bet.get_profit(market_outcome=market_outcome),
@@ -222,6 +223,6 @@ def manifold_to_generic_resolved_bet(
 def get_market_positions(market_id: str, user_id: str) -> list[ManifoldContractMetric]:
     url = f"{MANIFOLD_API_BASE_URL}/v0/market/{market_id}/positions"
     params = {"userId": user_id}
-    response = requests.get(url, params=params)
-    response.raise_for_status()
-    return [ManifoldContractMetric.model_validate(x) for x in response.json()]
+    return response_list_to_model(
+        requests.get(url, params=params), ManifoldContractMetric
+    )

prediction_market_agent_tooling/markets/manifold/data_models.py

@@ -1,5 +1,6 @@
 import typing as t
 from datetime import datetime, timedelta
+from enum import Enum
 
 from pydantic import BaseModel, field_validator
 
@@ -19,6 +20,25 @@ class ManifoldPool(BaseModel):
     YES: float
 
 
+class ManifoldAnswersMode(str, Enum):
+    ANYONE = "ANYONE"
+    ONLY_CREATOR = "ONLY_CREATOR"
+    DISABLED = "DISABLED"
+
+
+class ManifoldAnswer(BaseModel):
+    createdTime: datetime
+    avatarUrl: str
+    id: str
+    username: str
+    number: int
+    name: str
+    contractId: str
+    text: str
+    userId: str
+    probability: float
+
+
 class ManifoldMarket(BaseModel):
     """
     https://docs.manifold.markets/api#get-v0markets
@@ -84,6 +104,20 @@ class ManifoldMarket(BaseModel):
         return datetime.fromtimestamp(value)
 
 
+class FullManifoldMarket(ManifoldMarket):
+    # Some of these fields are available only in specific cases, see https://docs.manifold.markets/api#get-v0marketmarketid.
+    answers: list[ManifoldAnswer] | None = None
+    shouldAnswersSumToOne: bool | None = None
+    addAnswersMode: ManifoldAnswersMode | None = None
+    options: dict[str, int | str] | None = None
+    totalBounty: float | None = None
+    bountyLeft: float | None = None
+    description: str | dict[str, t.Any]
+    textDescription: str
+    coverImageUrl: str | None = None
+    groupSlugs: list[str] | None = None
+
+
 class ProfitCached(BaseModel):
     daily: Mana
     weekly: Mana

prediction_market_agent_tooling/markets/omen/data_models.py

@@ -386,6 +386,7 @@ class OmenBet(BaseModel):
             outcome=self.boolean_outcome,
             created_time=self.creation_datetime,
             market_question=self.title,
+            market_id=self.fpmm.id,
         )
 
     def to_generic_resolved_bet(self) -> ResolvedBet:
@@ -399,6 +400,7 @@ class OmenBet(BaseModel):
             outcome=self.boolean_outcome,
             created_time=self.creation_datetime,
             market_question=self.title,
+            market_id=self.fpmm.id,
             market_outcome=self.fpmm.boolean_outcome,
             resolved_time=datetime.fromtimestamp(
                 check_not_none(self.fpmm.answerFinalizedTimestamp)

prediction_market_agent_tooling/markets/omen/omen.py

@@ -28,6 +28,7 @@ from prediction_market_agent_tooling.markets.data_models import (
     BetAmount,
     Currency,
     Position,
+    ResolvedBet,
     TokenAmount,
 )
 from prediction_market_agent_tooling.markets.omen.data_models import (
@@ -336,6 +337,20 @@ class OmenAgentMarket(AgentMarket):
         bets.sort(key=lambda x: x.creation_datetime)
         return [b.to_bet() for b in bets]
 
+    @staticmethod
+    def get_resolved_bets_made_since(
+        better_address: ChecksumAddress, start_time: datetime, end_time: datetime | None
+    ) -> list[ResolvedBet]:
+        subgraph_handler = OmenSubgraphHandler()
+        bets = subgraph_handler.get_resolved_bets_with_valid_answer(
+            better_address=better_address,
+            start_time=start_time,
+            end_time=end_time,
+            market_id=None,
+        )
+        generic_bets = [b.to_generic_resolved_bet() for b in bets]
+        return generic_bets
+
     def get_contract(
         self,
     ) -> OmenFixedProductMarketMakerContract:

prediction_market_agent_tooling/tools/image_gen/market_thumbnail_gen.py

@@ -14,7 +14,7 @@ def rewrite_question_into_image_generation_prompt(question: str) -> str:
     llm = ChatOpenAI(
         model="gpt-4-turbo",
         temperature=0.0,
-        api_key=APIKeys().openai_api_key.get_secret_value(),
+        api_key=APIKeys().openai_api_key_secretstr_v1,
     )
     rewritten = str(
         llm.invoke(

prediction_market_agent_tooling/tools/is_predictable.py

@@ -48,7 +48,7 @@ def is_predictable_binary(
     llm = ChatOpenAI(
         model=engine,
         temperature=0.0,
-        api_key=APIKeys().openai_api_key.get_secret_value(),
+        api_key=APIKeys().openai_api_key_secretstr_v1,
     )
 
     prompt = ChatPromptTemplate.from_template(template=prompt_template)

{prediction_market_agent_tooling-0.41.1.dist-info → prediction_market_agent_tooling-0.42.1.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: prediction-market-agent-tooling
-Version: 0.41.1
+Version: 0.42.1
 Summary: Tools to benchmark, deploy and monitor prediction market agents.
 Author: Gnosis
 Requires-Python: >=3.10,<3.12
@@ -21,9 +21,9 @@ Requires-Dist: google-cloud-functions (>=1.16.0,<2.0.0)
 Requires-Dist: google-cloud-resource-manager (>=1.12.0,<2.0.0)
 Requires-Dist: google-cloud-secret-manager (>=2.18.2,<3.0.0)
 Requires-Dist: isort (>=5.13.2,<6.0.0)
-Requires-Dist: langchain (>=0.1.9,<0.2.0) ; extra == "langchain"
+Requires-Dist: langchain (>=0.2.6,<0.3.0) ; extra == "langchain"
 Requires-Dist: langchain-community (>=0.0.19)
-Requires-Dist: langchain-openai (>=0.0.5,<0.0.6) ; extra == "langchain"
+Requires-Dist: langchain-openai (>=0.1.0,<0.2.0) ; extra == "langchain"
 Requires-Dist: langfuse (>=2.27.1,<3.0.0)
 Requires-Dist: loguru (>=0.7.2,<0.8.0)
 Requires-Dist: numpy (>=1.26.4,<2.0.0)

{prediction_market_agent_tooling-0.41.1.dist-info → prediction_market_agent_tooling-0.42.1.dist-info}/RECORD

@@ -12,7 +12,7 @@ prediction_market_agent_tooling/benchmark/__init__.py,sha256=47DEQpj8HBSa-_TImW-
 prediction_market_agent_tooling/benchmark/agents.py,sha256=HPIFJvackW110ch3UkktbxhU48gMRVo4gQse84Klhdc,4000
 prediction_market_agent_tooling/benchmark/benchmark.py,sha256=xiHKzZx5GHSsDerFHMZ9j_LXAXnSaITSvv67iPe3MEU,21095
 prediction_market_agent_tooling/benchmark/utils.py,sha256=iS1BzyXcCMfMm1Rx--1QCH0pHvBTblTndcDQFbTUJ2s,2897
-prediction_market_agent_tooling/config.py,sha256=beNwFgOpe30lIFIvwyXKzH86jNzkvqKARosKkrl_mmg,5026
+prediction_market_agent_tooling/config.py,sha256=3j1iMiJWntSkqQv5HllJgihgqf9I2_0e0LPncVFRi7g,5260
 prediction_market_agent_tooling/deploy/agent.py,sha256=TXuQ0L2-dG0tIrJ7srxD3Hbabe_2gILfdBQI-tkl9Og,10522
 prediction_market_agent_tooling/deploy/agent_example.py,sha256=tqXVA2HSFK3pdZ49tMmta8aKdJFT8JN8WeJ1akjrpBk,909
 prediction_market_agent_tooling/deploy/constants.py,sha256=M5ty8URipYMGe_G-RzxRydK3AFL6CyvmqCraJUrLBnE,82
@@ -21,12 +21,12 @@ prediction_market_agent_tooling/deploy/gcp/kubernetes_models.py,sha256=qYIHRxQLa
 prediction_market_agent_tooling/deploy/gcp/utils.py,sha256=oyW0jgrUT2Tr49c7GlpcMsYNQjoCSOcWis3q-MmVAhU,6089
 prediction_market_agent_tooling/gtypes.py,sha256=lbV2nsPyhMIRI9olx0_6A06jwTWKYBPGMxyiGVFysag,2467
 prediction_market_agent_tooling/loggers.py,sha256=ua9rynYmsbOJZjxPIFxRBooomeN08zuLSJ7lxZMDS7w,3133
-prediction_market_agent_tooling/markets/agent_market.py,sha256=ZpBpNLqY2QXTAdmkCr8-L3yjN70H_y-KiCptx3OFQgM,8099
-prediction_market_agent_tooling/markets/categorize.py,sha256=yTd-lDMPW4ESDSzmxeLLBuzLX0FggOF7Vbswh7295o0,941
-prediction_market_agent_tooling/markets/data_models.py,sha256=IYI8fne-OA18ZP1lcXySEo9rcJHYv3wZrUvJziSaHew,1476
+prediction_market_agent_tooling/markets/agent_market.py,sha256=zUxDOR-fx1roQKdUCN3FsBfnziIL6POTNK1NsMOgLFw,8365
+prediction_market_agent_tooling/markets/categorize.py,sha256=HyKSFHXPL7Hfe90ahbF7xszamYREUVrPkLcpifw1V9Y,935
+prediction_market_agent_tooling/markets/data_models.py,sha256=qD0LyFkzimaMkDVE0QO2a4I9fQ8qpO2qPmVzb-0JBik,2085
 prediction_market_agent_tooling/markets/manifold/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-prediction_market_agent_tooling/markets/manifold/api.py,sha256=m6qOzDiyQfxj62Eo_SzzQLkX4ijpi8KtQKGd4CpKAsk,7307
-prediction_market_agent_tooling/markets/manifold/data_models.py,sha256=xoCqxk9cO6MZ_px_SEGYZ8hHyhGh-X6QDC8dDhyF3rk,5302
+prediction_market_agent_tooling/markets/manifold/api.py,sha256=AC2zmkzpBU3P4kyybs7CgPbDg4hLAx3GY5mjgDi7qDo,7221
+prediction_market_agent_tooling/markets/manifold/data_models.py,sha256=jHqOzOiN21wYvDNyh4VtbGtj4adWr6vA4liOQmh24cc,6239
 prediction_market_agent_tooling/markets/manifold/manifold.py,sha256=EwRL06E2Y_ZAzr8efwS5yD6p6rnykrcBhqmNDUGZ8Aw,4075
 prediction_market_agent_tooling/markets/manifold/utils.py,sha256=cPPFWXm3vCYH1jy7_ctJZuQH9ZDaPL4_AgAYzGWkoow,513
 prediction_market_agent_tooling/markets/markets.py,sha256=Hz3E7LJ5HIjCHQtdU5_Bymav2dYT0dDxKOL0i8mV0mg,3142
@@ -34,8 +34,8 @@ prediction_market_agent_tooling/markets/metaculus/api.py,sha256=gvPQVAM5NlCyWzEM
 prediction_market_agent_tooling/markets/metaculus/data_models.py,sha256=6TBy17xntdLBR61QCE5wddwTa_k2D0D8ZgK6p7sGUuc,2448
 prediction_market_agent_tooling/markets/metaculus/metaculus.py,sha256=KMWksTNFCKxqjeMiuRh5yNarPSv7sH0aDkgeC3fm3Dg,3293
 prediction_market_agent_tooling/markets/omen/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-prediction_market_agent_tooling/markets/omen/data_models.py,sha256=EXtjmcujx68Xu50BVkYXvLuf_Asx5o65RvFS3ZS6HGs,14405
-prediction_market_agent_tooling/markets/omen/omen.py,sha256=0ua3bv8gc2aRHMg1UnuvqS-i7YE-QVzMJs07XgiR1n8,38445
+prediction_market_agent_tooling/markets/omen/data_models.py,sha256=oY-5wvFR4lXaTsmXVKrqrAQ8TWd-mAHLaxI1ETatLOc,14477
+prediction_market_agent_tooling/markets/omen/omen.py,sha256=VHZmO5_5i3ydzBvvjSas-8AfkmnQ87pMFStYUETQW2Y,38996
 prediction_market_agent_tooling/markets/omen/omen_contracts.py,sha256=JGXCO9MIVr-DGyoH2sxReAw7ZDTC_ev0UxDpq1QBv5Q,21854
 prediction_market_agent_tooling/markets/omen/omen_resolving.py,sha256=g77QsQ5WnSI2rzBlX87L_EhWMwobkyXyfRhHQmpAdzo,9012
 prediction_market_agent_tooling/markets/omen/omen_subgraph_handler.py,sha256=kDbeZ8ImLtBSFz0GoGdCqeC1Xd3_eGMAxvmLFT8kp8Y,25222
@@ -65,16 +65,16 @@ prediction_market_agent_tooling/tools/gnosis_rpc.py,sha256=_MYSoyOR2MgAJkop1ERf8
 prediction_market_agent_tooling/tools/google.py,sha256=SfVDxb3oEOUK8mpd0l3mTX9ybrdrTPNM6HjfJ7kfNjA,1794
 prediction_market_agent_tooling/tools/hexbytes_custom.py,sha256=Bp94qgPjvjWf1Vb4lNzGFDXRdThw1rJ91vL6r2PWq5E,2096
 prediction_market_agent_tooling/tools/image_gen/image_gen.py,sha256=HzRwBx62hOXBOmrtpkXaP9Qq1Ku03uUGdREocyjLQ_k,1266
-prediction_market_agent_tooling/tools/image_gen/market_thumbnail_gen.py,sha256=svEu-oJNVuqpPpA7JjPEz3s1yM1_DgVf4M6gu90YKMQ,1110
-prediction_market_agent_tooling/tools/is_predictable.py,sha256=yRSkmu4lZqrSje9QGpnyWTFmdCnRvClfaFDHE2Zf9G4,2936
+prediction_market_agent_tooling/tools/image_gen/market_thumbnail_gen.py,sha256=g-2BWS11CS7K6QRNbZRMTX_Xo2xOwjyCdhnwaQygX1Y,1104
+prediction_market_agent_tooling/tools/is_predictable.py,sha256=radTwyxfUGfE1HCKWlvKl05Cpv_HD7E1d6A_Wm1K5ek,2930
 prediction_market_agent_tooling/tools/parallelism.py,sha256=8mgkF5sBwFGS5GMvlpzam82Y3p2swPYuNsywpQuy-a4,1508
 prediction_market_agent_tooling/tools/safe.py,sha256=h0xOO0eNtitClf0fPkn-0oTc6A_bflDTee98V_aiV-A,5195
 prediction_market_agent_tooling/tools/singleton.py,sha256=CiIELUiI-OeS7U7eeHEt0rnVhtQGzwoUdAgn_7u_GBM,729
 prediction_market_agent_tooling/tools/streamlit_user_login.py,sha256=NXEqfjT9Lc9QtliwSGRASIz1opjQ7Btme43H4qJbzgE,3010
 prediction_market_agent_tooling/tools/utils.py,sha256=-G22UEbCRm59bm1RWFdeF55hRsaxgwZVAHvK32-Ye1g,6190
 prediction_market_agent_tooling/tools/web3_utils.py,sha256=nKRHmdLnWSKd3wpo-cysXGvhhrJ2Yf69sN2FFQfSt6s,10578
-prediction_market_agent_tooling-0.41.1.dist-info/LICENSE,sha256=6or154nLLU6bELzjh0mCreFjt0m2v72zLi3yHE0QbeE,7650
-prediction_market_agent_tooling-0.41.1.dist-info/METADATA,sha256=1zVYGk0omz_f1M8jk4ECidTv9zS8yoHjSA4d967-bmk,7634
-prediction_market_agent_tooling-0.41.1.dist-info/WHEEL,sha256=sP946D7jFCHeNz5Iq4fL4Lu-PrWrFsgfLXbbkciIZwg,88
-prediction_market_agent_tooling-0.41.1.dist-info/entry_points.txt,sha256=m8PukHbeH5g0IAAmOf_1Ahm-sGAMdhSSRQmwtpmi2s8,81
-prediction_market_agent_tooling-0.41.1.dist-info/RECORD,,
+prediction_market_agent_tooling-0.42.1.dist-info/LICENSE,sha256=6or154nLLU6bELzjh0mCreFjt0m2v72zLi3yHE0QbeE,7650
+prediction_market_agent_tooling-0.42.1.dist-info/METADATA,sha256=2sleEbYjQ1DxF34LiETR16iXB1HukqtLjeMVKJYRqNQ,7634
+prediction_market_agent_tooling-0.42.1.dist-info/WHEEL,sha256=sP946D7jFCHeNz5Iq4fL4Lu-PrWrFsgfLXbbkciIZwg,88
+prediction_market_agent_tooling-0.42.1.dist-info/entry_points.txt,sha256=m8PukHbeH5g0IAAmOf_1Ahm-sGAMdhSSRQmwtpmi2s8,81
+prediction_market_agent_tooling-0.42.1.dist-info/RECORD,,