prediction-market-agent-tooling 0.45.0__tar.gz → 0.46.0__tar.gz

{prediction_market_agent_tooling-0.45.0 → prediction_market_agent_tooling-0.46.0}/PKG-INFO

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

{prediction_market_agent_tooling-0.45.0 → prediction_market_agent_tooling-0.46.0}/prediction_market_agent_tooling/loggers.py

@@ -31,6 +31,11 @@ class LogConfig(BaseSettings):
     LOG_LEVEL: LogLevel = LogLevel.DEBUG
 
 
+class NoNewLineStreamHandler(logging.StreamHandler):  # type: ignore # StreamHandler is not typed in the standard library.
+    def format(self, record: logging.LogRecord) -> str:
+        return super().format(record).replace("\n", " ")
+
+
 GCP_LOG_LOGURU_FORMAT = (
     "{level:<.1}{time:MMDD HH:mm:ss} {process} {name}:{line}] {message}"
 )
@@ -40,6 +45,10 @@ GCP_LOG_LOGGING_FORMAT, GCP_LOG_FORMAT_LOGGING_DATEFMT = (
 
 
 def patch_logger() -> None:
+    """
+    Function to patch loggers according to the deployed environment.
+    Patches Loguru's logger, Python's default logger, warnings library and also monkey-patch print function as many libraries just use it.
+    """
     config = LogConfig()
 
     if config.LOG_FORMAT == LogFormat.GCP:
@@ -47,10 +56,12 @@ def patch_logger() -> None:
         format_logging = GCP_LOG_LOGGING_FORMAT
         datefmt_logging = GCP_LOG_FORMAT_LOGGING_DATEFMT
         print_logging = print_using_loguru_info
+        handlers = [NoNewLineStreamHandler()]
 
     elif config.LOG_FORMAT == LogFormat.DEFAULT:
         format_loguru, format_logging, datefmt_logging = None, None, None
         print_logging = None
+        handlers = None
 
     else:
         raise ValueError(f"Unknown log format: {config.LOG_FORMAT}")
@@ -58,7 +69,10 @@ def patch_logger() -> None:
     # Change built-in logging.
     if format_logging is not None:
         logging.basicConfig(
-            level=config.LOG_LEVEL.value, format=format_logging, datefmt=datefmt_logging
+            level=config.LOG_LEVEL.value,
+            format=format_logging,
+            datefmt=datefmt_logging,
+            handlers=handlers,
         )
 
     # Change loguru.

{prediction_market_agent_tooling-0.45.0 → prediction_market_agent_tooling-0.46.0}/prediction_market_agent_tooling/markets/omen/data_models.py

@@ -31,6 +31,7 @@ from prediction_market_agent_tooling.tools.web3_utils import wei_to_xdai
 OMEN_TRUE_OUTCOME = "Yes"
 OMEN_FALSE_OUTCOME = "No"
 INVALID_ANSWER = 0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF
+INVALID_ANSWER_HEX_BYTES = HexBytes(INVALID_ANSWER)
 OMEN_BASE_URL = "https://aiomen.eth.limo"
 PRESAGIO_BASE_URL = "https://presagio.pages.dev"
 

{prediction_market_agent_tooling-0.45.0 → prediction_market_agent_tooling-0.46.0}/prediction_market_agent_tooling/markets/omen/omen_contracts.py

@@ -22,6 +22,9 @@ from prediction_market_agent_tooling.gtypes import (
     wei_type,
     xdai_type,
 )
+from prediction_market_agent_tooling.markets.omen.data_models import (
+    INVALID_ANSWER_HEX_BYTES,
+)
 from prediction_market_agent_tooling.tools.contract import (
     ContractDepositableWrapperERC20OnGnosisChain,
     ContractERC20OnGnosisChain,
@@ -562,8 +565,7 @@ class OmenRealitioContract(ContractOnGnosisChain):
         self,
         api_keys: APIKeys,
         question_id: HexBytes,
-        answer: str,
-        outcomes: list[str],
+        answer: HexBytes,
         bond: Wei,
         max_previous: Wei | None = None,
         web3: Web3 | None = None,
@@ -573,24 +575,60 @@ class OmenRealitioContract(ContractOnGnosisChain):
             # same as on Omen website: https://github.com/protofire/omen-exchange/blob/763d9c9d05ebf9edacbc1dbaa561aa5d08813c0f/app/src/services/realitio.ts#L363.
             max_previous = Wei(0)
 
-        # Normalise the answer to lowercase, to match Enum values as [YES, NO] against outcomes as ["Yes", "No"].
-        answer = answer.lower()
-        outcomes = [o.lower() for o in outcomes]
-
         return self.send_with_value(
             api_keys=api_keys,
             function_name="submitAnswer",
             function_params=dict(
                 question_id=question_id,
-                answer=int_to_hexbytes(
-                    outcomes.index(answer)
-                ),  # Contract's method expects answer index in bytes.
+                answer=answer,
                 max_previous=max_previous,
             ),
             amount_wei=bond,
             web3=web3,
         )
 
+    def submit_answer(
+        self,
+        api_keys: APIKeys,
+        question_id: HexBytes,
+        answer: str,
+        outcomes: list[str],
+        bond: Wei,
+        max_previous: Wei | None = None,
+        web3: Web3 | None = None,
+    ) -> TxReceipt:
+        # Normalise the answer to lowercase, to match Enum values as [YES, NO] against outcomes as ["Yes", "No"].
+        answer = answer.lower()
+        outcomes = [o.lower() for o in outcomes]
+
+        return self.submitAnswer(
+            api_keys=api_keys,
+            question_id=question_id,
+            answer=int_to_hexbytes(
+                outcomes.index(answer)
+            ),  # Contract's method expects answer index in bytes.
+            bond=bond,
+            max_previous=max_previous,
+            web3=web3,
+        )
+
+    def submit_answer_invalid(
+        self,
+        api_keys: APIKeys,
+        question_id: HexBytes,
+        bond: Wei,
+        max_previous: Wei | None = None,
+        web3: Web3 | None = None,
+    ) -> TxReceipt:
+        return self.submitAnswer(
+            api_keys=api_keys,
+            question_id=question_id,
+            answer=INVALID_ANSWER_HEX_BYTES,
+            bond=bond,
+            max_previous=max_previous,
+            web3=web3,
+        )
+
     def claimWinnings(
         self,
         api_keys: APIKeys,

{prediction_market_agent_tooling-0.45.0 → prediction_market_agent_tooling-0.46.0}/prediction_market_agent_tooling/markets/omen/omen_resolving.py

@@ -1,3 +1,5 @@
+from datetime import datetime
+
 from web3 import Web3
 
 from prediction_market_agent_tooling.config import APIKeys
@@ -140,6 +142,7 @@ def claim_bonds_on_realitio_question(
 def finalize_markets(
     api_keys: APIKeys,
     markets_with_resolutions: list[tuple[OmenMarket, Resolution | None]],
+    wait_n_days_before_invalid: int = 30,
     web3: Web3 | None = None,
 ) -> list[HexAddress]:
     finalized_markets: list[HexAddress] = []
@@ -148,9 +151,24 @@ def finalize_markets(
         logger.info(
             f"[{idx+1} / {len(markets_with_resolutions)}] Looking into {market.url=} {market.question_title=}"
         )
+        closed_before_days = (datetime.now() - market.close_time).days
 
         if resolution is None:
-            logger.warning(f"No resolution provided for {market.url=}")
+            if closed_before_days > wait_n_days_before_invalid:
+                logger.warning(
+                    f"Finalizing as invalid, market closed before {closed_before_days} days: {market.url=}"
+                )
+                omen_submit_invalid_answer_market_tx(
+                    api_keys,
+                    market,
+                    OMEN_DEFAULT_REALITIO_BOND_VALUE,
+                    web3=web3,
+                )
+
+            else:
+                logger.warning(
+                    f"Skipping, no resolution provided, market closed before {closed_before_days} days: {market.url=}"
+                )
 
         elif resolution in (Resolution.YES, Resolution.NO):
             logger.info(f"Found resolution {resolution.value=} for {market.url=}")
@@ -165,7 +183,15 @@ def finalize_markets(
             logger.info(f"Finalized {market.url=}")
 
         else:
-            logger.error(f"Invalid resolution found, {resolution=}, for {market.url=}")
+            logger.warning(
+                f"Invalid resolution found, {resolution=}, for {market.url=}, finalizing as invalid."
+            )
+            omen_submit_invalid_answer_market_tx(
+                api_keys,
+                market,
+                OMEN_DEFAULT_REALITIO_BOND_VALUE,
+                web3=web3,
+            )
 
     return finalized_markets
 
@@ -199,7 +225,7 @@ def omen_submit_answer_market_tx(
     And after the period is over, you need to resolve the market using `omen_resolve_market_tx`.
     """
     realitio_contract = OmenRealitioContract()
-    realitio_contract.submitAnswer(
+    realitio_contract.submit_answer(
         api_keys=api_keys,
         question_id=market.question.id,
         answer=resolution.value,
@@ -209,6 +235,25 @@ def omen_submit_answer_market_tx(
     )
 
 
+def omen_submit_invalid_answer_market_tx(
+    api_keys: APIKeys,
+    market: OmenMarket,
+    bond: xDai,
+    web3: Web3 | None = None,
+) -> None:
+    """
+    After the answer is submitted, there is 24h waiting period where the answer can be challenged by others.
+    And after the period is over, you need to resolve the market using `omen_resolve_market_tx`.
+    """
+    realitio_contract = OmenRealitioContract()
+    realitio_contract.submit_answer_invalid(
+        api_keys=api_keys,
+        question_id=market.question.id,
+        bond=xdai_to_wei(bond),
+        web3=web3,
+    )
+
+
 def omen_resolve_market_tx(
     api_keys: APIKeys,
     market: OmenMarket,

{prediction_market_agent_tooling-0.45.0 → prediction_market_agent_tooling-0.46.0}/pyproject.toml

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