prediction-market-agent-tooling 0.11.0__tar.gz → 0.13.1__tar.gz

{prediction_market_agent_tooling-0.11.0 → prediction_market_agent_tooling-0.13.1}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: prediction-market-agent-tooling
-Version: 0.11.0
+Version: 0.13.1
 Summary: Tools to benchmark, deploy and monitor prediction market agents.
 Author: Gnosis
 Requires-Python: >=3.10,<3.12
@@ -20,7 +20,7 @@ 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-community (>=0.0.19)
-Requires-Dist: langchain-openai (>=0.0.8,<0.0.9) ; extra == "langchain"
+Requires-Dist: langchain-openai (>=0.0.5,<0.0.6) ; extra == "langchain"
 Requires-Dist: loguru (>=0.7.2,<0.8.0)
 Requires-Dist: numpy (>=1.26.4,<2.0.0)
 Requires-Dist: pydantic (>=2.6.1,<3.0.0)

{prediction_market_agent_tooling-0.11.0 → prediction_market_agent_tooling-0.13.1}/prediction_market_agent_tooling/markets/agent_market.py

@@ -10,6 +10,7 @@ from prediction_market_agent_tooling.markets.data_models import (
     BetAmount,
     Currency,
     Resolution,
+    TokenAmount,
 )
 from prediction_market_agent_tooling.tools.utils import (
     add_utc_timezone_validator,
@@ -104,6 +105,12 @@ class AgentMarket(BaseModel):
     def place_bet(self, outcome: bool, amount: BetAmount) -> None:
         raise NotImplementedError("Subclasses must implement this method")
 
+    def buy_tokens(self, outcome: bool, amount: TokenAmount) -> None:
+        return self.place_bet(outcome=outcome, amount=amount)
+
+    def sell_tokens(self, outcome: bool, amount: TokenAmount) -> None:
+        raise NotImplementedError("Subclasses must implement this method")
+
     @staticmethod
     def get_binary_markets(
         limit: int,
@@ -143,3 +150,6 @@ class AgentMarket(BaseModel):
 
     def get_squared_error(self) -> float:
         return (self.p_yes - self.boolean_outcome) ** 2
+
+    def get_token_balance(self, user_id: str, outcome: str) -> TokenAmount:
+        raise NotImplementedError("Subclasses must implement this method")

{prediction_market_agent_tooling-0.11.0 → prediction_market_agent_tooling-0.13.1}/prediction_market_agent_tooling/markets/categorize.py

@@ -3,7 +3,6 @@ from langchain.schema.output_parser import StrOutputParser
 from langchain_openai import ChatOpenAI
 
 from prediction_market_agent_tooling.config import APIKeys
-from prediction_market_agent_tooling.gtypes import secretstr_to_v1_secretstr
 
 
 def infer_category(
@@ -22,7 +21,7 @@ Write only the category itself, nothing else.
         prompt
         | ChatOpenAI(
             model=model,
-            api_key=secretstr_to_v1_secretstr(APIKeys().openai_api_key),
+            api_key=APIKeys().openai_api_key.get_secret_value(),
         )
         | StrOutputParser()
     )

{prediction_market_agent_tooling-0.11.0 → prediction_market_agent_tooling-0.13.1}/prediction_market_agent_tooling/markets/data_models.py

@@ -1,6 +1,7 @@
 from datetime import datetime
 from decimal import Decimal
 from enum import Enum
+from typing import TypeAlias
 
 from pydantic import BaseModel
 
@@ -18,14 +19,13 @@ class Resolution(str, Enum):
     MKT = "MKT"
 
 
-class BetAmount(BaseModel):
+class TokenAmount(BaseModel):
     amount: Decimal
     currency: Currency
 
 
-class ProfitAmount(BaseModel):
-    amount: Decimal
-    currency: Currency
+BetAmount: TypeAlias = TokenAmount
+ProfitAmount: TypeAlias = TokenAmount
 
 
 class Bet(BaseModel):

{prediction_market_agent_tooling-0.11.0 → prediction_market_agent_tooling-0.13.1}/prediction_market_agent_tooling/markets/omen/omen.py

@@ -22,7 +22,11 @@ from prediction_market_agent_tooling.markets.agent_market import (
     FilterBy,
     SortBy,
 )
-from prediction_market_agent_tooling.markets.data_models import BetAmount, Currency
+from prediction_market_agent_tooling.markets.data_models import (
+    BetAmount,
+    Currency,
+    TokenAmount,
+)
 from prediction_market_agent_tooling.markets.omen.data_models import (
     OMEN_BASE_URL,
     OMEN_FALSE_OUTCOME,
@@ -100,6 +104,18 @@ class OmenAgentMarket(AgentMarket):
             auto_deposit=omen_auto_deposit,
         )
 
+    def sell_tokens(
+        self, outcome: bool, amount: TokenAmount, auto_withdraw: bool = True
+    ) -> None:
+        keys = APIKeys()
+        binary_omen_sell_outcome_tx(
+            amount=xDai(amount.amount),
+            from_private_key=keys.bet_from_private_key,
+            market=self,
+            binary_outcome=outcome,
+            auto_withdraw=auto_withdraw,
+        )
+
     def was_any_bet_outcome_correct(
         self, resolved_omen_bets: t.List[OmenBet]
     ) -> bool | None:
@@ -206,17 +222,18 @@ class OmenAgentMarket(AgentMarket):
             address=self.market_maker_contract_address_checksummed
         )
 
+    def get_index_set(self, outcome: str) -> int:
+        return self.get_outcome_index(outcome) + 1
 
-def ordering_from_sort_by(sort_by: SortBy) -> tuple[str, str]:
-    """
-    Returns 'orderBy' and 'orderDirection' strings for the given SortBy.
-    """
-    if sort_by == SortBy.CLOSING_SOONEST:
-        return "creationTimestamp", "desc"  # TODO make more accurate
-    elif sort_by == SortBy.NEWEST:
-        return "creationTimestamp", "desc"
-    else:
-        raise ValueError(f"Unknown sort_by: {sort_by}")
+    def get_token_balance(self, user_id: str, outcome: str) -> TokenAmount:
+        index_set = self.get_index_set(outcome)
+        balances = get_conditional_tokens_balance_for_market(
+            self, Web3.to_checksum_address(user_id)
+        )
+        return TokenAmount(
+            amount=Decimal(wei_to_xdai(balances[index_set])),
+            currency=Currency.xDai,
+        )
 
 
 def pick_binary_market(

{prediction_market_agent_tooling-0.11.0 → prediction_market_agent_tooling-0.13.1}/prediction_market_agent_tooling/tools/contract.py

@@ -22,6 +22,7 @@ from prediction_market_agent_tooling.tools.gnosis_rpc import (
 )
 from prediction_market_agent_tooling.tools.web3_utils import (
     call_function_on_contract,
+    private_key_to_public_key,
     send_function_on_contract_tx,
 )
 
@@ -95,17 +96,18 @@ class ContractBaseClass(BaseModel):
         """
         Used for changing a state (writing) to the contract.
         """
-        web3 = web3 or self.get_web3()
-        return send_function_on_contract_tx(
-            web3=web3,
-            contract_address=self.address,
-            contract_abi=self.abi,
-            from_private_key=from_private_key,
-            function_name=function_name,
-            function_params=function_params,
-            tx_params=tx_params,
-            timeout=timeout,
-        )
+        with wait_until_nonce_changed(private_key_to_public_key(from_private_key)):
+            receipt = send_function_on_contract_tx(
+                web3=web3 or self.get_web3(),
+                contract_address=self.address,
+                contract_abi=self.abi,
+                from_private_key=from_private_key,
+                function_name=function_name,
+                function_params=function_params,
+                tx_params=tx_params,
+                timeout=timeout,
+            )
+        return receipt
 
     def send_with_value(
         self,

{prediction_market_agent_tooling-0.11.0 → prediction_market_agent_tooling-0.13.1}/prediction_market_agent_tooling/tools/is_predictable.py

@@ -42,7 +42,7 @@ def is_predictable_binary(
 
     prompt = ChatPromptTemplate.from_template(template=prompt_template)
     messages = prompt.format_messages(question=question)
-    completion = llm(messages, max_tokens=512).content
+    completion = str(llm(messages, max_tokens=512).content)
 
     try:
         decision = completion.lower().rsplit("decision", 1)[1]

{prediction_market_agent_tooling-0.11.0 → prediction_market_agent_tooling-0.13.1}/pyproject.toml

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "prediction-market-agent-tooling"
-version = "0.11.0"
+version = "0.13.1"
 description = "Tools to benchmark, deploy and monitor prediction market agents."
 authors = ["Gnosis"]
 readme = "README.md"
@@ -32,7 +32,7 @@ tabulate = "^0.9.0"
 types-pytz = "^2024.1.0.20240203"
 google-cloud-secret-manager = "^2.18.2"
 langchain = { version = "^0.1.9", optional = true}
-langchain-openai = { version = "^0.0.8", optional = true}
+langchain-openai = { version = "^0.0.5", optional = true}
 google-api-python-client = { version = "2.95.0", optional = true}
 subgrounds = "^1.8.1"
 loguru = "^0.7.2"