prediction-market-agent-tooling 0.44.0__py3-none-any.whl → 0.45.1__py3-none-any.whl

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/tools/betting_strategies/kelly_criterion.py

@@ -1,110 +1,67 @@
-import typing as t
+from enum import Enum
 
-from prediction_market_agent_tooling.gtypes import Probability, wei_type, xDai
-from prediction_market_agent_tooling.markets.omen.data_models import OmenMarket
-from prediction_market_agent_tooling.tools.utils import check_not_none
-from prediction_market_agent_tooling.tools.web3_utils import (
-    ONE_XDAI,
-    wei_to_xdai,
-    xdai_to_wei,
-)
+from pydantic import BaseModel
 
-OutcomeIndex = t.Literal[0, 1]
 
+class BetDirection(str, Enum):
+    YES = "Yes"
+    NO = "No"
 
-def _get_kelly_criterion_bet(
-    x: int, y: int, p: float, c: float, b: int, f: float
-) -> int:
+
+class KellyBet(BaseModel):
+    direction: BetDirection
+    size: float
+
+
+def check_is_valid_probability(probability: float) -> None:
+    if not 0 <= probability <= 1:
+        raise ValueError("Probability must be between 0 and 1")
+
+
+def get_kelly_bet(
+    max_bet: float,
+    market_p_yes: float,
+    estimated_p_yes: float,
+    confidence: float,
+) -> KellyBet:
     """
-    Implments https://en.wikipedia.org/wiki/Kelly_criterion
-
-    Taken from https://github.com/valory-xyz/trader/blob/main/strategies/kelly_criterion/kelly_criterion.py
-
-    ```
-    Licensed under the Apache License, Version 2.0 (the "License");
-    you may not use this file except in compliance with the License.
-    You may obtain a copy of the License at
-
-        http://www.apache.org/licenses/LICENSE-2.0
-
-    Unless required by applicable law or agreed to in writing, software
-    distributed under the License is distributed on an "AS IS" BASIS,
-    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-    See the License for the specific language governing permissions and
-    limitations under the License.
-    ```
-
-    x: Number of tokens in the selected outcome pool
-    y: Number of tokens in the other outcome pool
-    p: Probability of winning
-    c: Confidence
-    b: Bankroll
-    f: Fee fraction
+    Calculate the optimal bet amount using the Kelly Criterion for a binary outcome market.
+
+    From https://en.wikipedia.org/wiki/Kelly_criterion:
+
+    f* = p - q / b
+
+    where:
+    - f* is the fraction of the current bankroll to wager
+    - p is the probability of a win
+    - q = 1-p is the probability of a loss
+    - b is the proportion of the bet gained with a win
+
+    Note: this calculation does not factor in that the bet changes the market
+    odds. This means the calculation is only accurate if the bet size is small
+    compared to the market volume. See discussion here for more detail:
+    https://github.com/gnosis/prediction-market-agent-tooling/pull/330#discussion_r1698269328
     """
-    if b == 0:
-        return 0
-    numerator = (
-        -4 * x**2 * y
-        + b * y**2 * p * c * f
-        + 2 * b * x * y * p * c * f
-        + b * x**2 * p * c * f
-        - 2 * b * y**2 * f
-        - 2 * b * x * y * f
-        + (
-            (
-                4 * x**2 * y
-                - b * y**2 * p * c * f
-                - 2 * b * x * y * p * c * f
-                - b * x**2 * p * c * f
-                + 2 * b * y**2 * f
-                + 2 * b * x * y * f
-            )
-            ** 2
-            - (
-                4
-                * (x**2 * f - y**2 * f)
-                * (
-                    -4 * b * x * y**2 * p * c
-                    - 4 * b * x**2 * y * p * c
-                    + 4 * b * x * y**2
-                )
-            )
-        )
-        ** (1 / 2)
-    )
-    denominator = 2 * (x**2 * f - y**2 * f)
-    if denominator == 0:
-        return 0
-    kelly_bet_amount = numerator / denominator
-    return int(kelly_bet_amount)
-
-
-def get_kelly_criterion_bet(
-    market: OmenMarket,
-    estimated_p_yes: Probability,
-    max_bet: xDai,
-) -> t.Tuple[xDai, OutcomeIndex]:
-    if len(market.outcomeTokenAmounts) != 2:
-        raise ValueError("Only binary markets are supported.")
-
-    current_p_yes = check_not_none(
-        market.outcomeTokenProbabilities, "No probabilities, is marked closed?"
-    )[0]
-    outcome_index: OutcomeIndex = 0 if estimated_p_yes > current_p_yes else 1
-    estimated_p_win = estimated_p_yes if outcome_index == 0 else 1 - estimated_p_yes
-
-    kelly_bet_wei = wei_type(
-        _get_kelly_criterion_bet(
-            x=market.outcomeTokenAmounts[outcome_index],
-            y=market.outcomeTokenAmounts[1 - outcome_index],
-            p=estimated_p_win,
-            c=1,  # confidence
-            b=xdai_to_wei(max_bet),  # bankroll, or max bet, in Wei
-            f=(
-                xdai_to_wei(ONE_XDAI)
-                - check_not_none(market.fee, "No fee for the market.")
-            )
-            / xdai_to_wei(ONE_XDAI),  # fee fraction
-        )
-    )
-    return wei_to_xdai(kelly_bet_wei), outcome_index
+    check_is_valid_probability(market_p_yes)
+    check_is_valid_probability(estimated_p_yes)
+    check_is_valid_probability(confidence)
+
+    if estimated_p_yes > market_p_yes:
+        bet_direction = BetDirection.YES
+        market_prob = market_p_yes
+    else:
+        bet_direction = BetDirection.NO
+        market_prob = 1 - market_p_yes
+
+    # Handle the case where market_prob is 0
+    if market_prob == 0:
+        market_prob = 1e-10
+
+    edge = abs(estimated_p_yes - market_p_yes) * confidence
+    odds = (1 / market_prob) - 1
+    kelly_fraction = edge / odds
+
+    # Ensure bet size is non-negative does not exceed the wallet balance
+    bet_size = min(kelly_fraction * max_bet, max_bet)
+
+    return KellyBet(direction=bet_direction, size=bet_size)

{prediction_market_agent_tooling-0.44.0.dist-info → prediction_market_agent_tooling-0.45.1.dist-info}/METADATA

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

{prediction_market_agent_tooling-0.44.0.dist-info → prediction_market_agent_tooling-0.45.1.dist-info}/RECORD

@@ -22,7 +22,7 @@ prediction_market_agent_tooling/deploy/gcp/deploy.py,sha256=CYUgnfy-9XVk04kkxA_5
 prediction_market_agent_tooling/deploy/gcp/kubernetes_models.py,sha256=qYIHRxQLac3yxtZ8ChikiPG9O1aUQucHW0muTSm1nto,2627
 prediction_market_agent_tooling/deploy/gcp/utils.py,sha256=oyW0jgrUT2Tr49c7GlpcMsYNQjoCSOcWis3q-MmVAhU,6089
 prediction_market_agent_tooling/gtypes.py,sha256=ezM2iAycTRJ0uHKK03s0z76a8YFSF438kjOwT_BAqz4,2474
-prediction_market_agent_tooling/loggers.py,sha256=ua9rynYmsbOJZjxPIFxRBooomeN08zuLSJ7lxZMDS7w,3133
+prediction_market_agent_tooling/loggers.py,sha256=JiBTgvb34O9dKHYKZyQ0UzojPUy6KSFQSTfbBIXopSY,3721
 prediction_market_agent_tooling/markets/agent_market.py,sha256=BELq6x3F4xLZwi0XmoN84RA7ttRQIclyHL2CY6a4Ixc,8409
 prediction_market_agent_tooling/markets/categorize.py,sha256=HyKSFHXPL7Hfe90ahbF7xszamYREUVrPkLcpifw1V9Y,935
 prediction_market_agent_tooling/markets/data_models.py,sha256=qD0LyFkzimaMkDVE0QO2a4I9fQ8qpO2qPmVzb-0JBik,2085
@@ -56,7 +56,7 @@ prediction_market_agent_tooling/monitor/monitor_app.py,sha256=THyZ67baByakoOm3hI
 prediction_market_agent_tooling/monitor/monitor_settings.py,sha256=Xiozs3AsufuJ04JOe1vjUri-IAMWHjjmc2ugGGiHNH4,947
 prediction_market_agent_tooling/py.typed,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 prediction_market_agent_tooling/tools/balances.py,sha256=nR8_dSfbm3yTOOmMAwhGlurftEiNo1w1WIVzbskjdmM,837
-prediction_market_agent_tooling/tools/betting_strategies/kelly_criterion.py,sha256=IbhQPoKsQnjnag_n_wAL12n8QdCe7tAMRNV2QS8yYxY,3520
+prediction_market_agent_tooling/tools/betting_strategies/kelly_criterion.py,sha256=d3QEg1Bia8D7SPHGr-SgP0OHSLIzm_hf4sN4iz06qiM,1951
 prediction_market_agent_tooling/tools/betting_strategies/market_moving.py,sha256=wtrHVQRuA0uDx06z0OxQLYbswuOpHQ1UyCWwLCrD_oM,4400
 prediction_market_agent_tooling/tools/betting_strategies/minimum_bet_to_win.py,sha256=-FUSuQQgjcWSSnoFxnlAyTeilY6raJABJVM2QKkFqAY,438
 prediction_market_agent_tooling/tools/betting_strategies/stretch_bet_between.py,sha256=THMXwFlskvzbjnX_OiYtDSzI8XVFyULWfP2525_9UGc,429
@@ -75,8 +75,8 @@ prediction_market_agent_tooling/tools/singleton.py,sha256=CiIELUiI-OeS7U7eeHEt0r
 prediction_market_agent_tooling/tools/streamlit_user_login.py,sha256=NXEqfjT9Lc9QtliwSGRASIz1opjQ7Btme43H4qJbzgE,3010
 prediction_market_agent_tooling/tools/utils.py,sha256=JE9YWtPPhnTgLiOyGAZDNG5K8nCwUY9IZEuAlm9UcxA,6611
 prediction_market_agent_tooling/tools/web3_utils.py,sha256=nKRHmdLnWSKd3wpo-cysXGvhhrJ2Yf69sN2FFQfSt6s,10578
-prediction_market_agent_tooling-0.44.0.dist-info/LICENSE,sha256=6or154nLLU6bELzjh0mCreFjt0m2v72zLi3yHE0QbeE,7650
-prediction_market_agent_tooling-0.44.0.dist-info/METADATA,sha256=uEMgSr-fSEh1CWW385kM1dmHFcmhPX5u_BcLj0NETvM,7634
-prediction_market_agent_tooling-0.44.0.dist-info/WHEEL,sha256=sP946D7jFCHeNz5Iq4fL4Lu-PrWrFsgfLXbbkciIZwg,88
-prediction_market_agent_tooling-0.44.0.dist-info/entry_points.txt,sha256=m8PukHbeH5g0IAAmOf_1Ahm-sGAMdhSSRQmwtpmi2s8,81
-prediction_market_agent_tooling-0.44.0.dist-info/RECORD,,
+prediction_market_agent_tooling-0.45.1.dist-info/LICENSE,sha256=6or154nLLU6bELzjh0mCreFjt0m2v72zLi3yHE0QbeE,7650
+prediction_market_agent_tooling-0.45.1.dist-info/METADATA,sha256=cuop8gl4vJj_cojxAvKj9nQX4tDKPhxjIuahsc1CCX0,7634
+prediction_market_agent_tooling-0.45.1.dist-info/WHEEL,sha256=sP946D7jFCHeNz5Iq4fL4Lu-PrWrFsgfLXbbkciIZwg,88
+prediction_market_agent_tooling-0.45.1.dist-info/entry_points.txt,sha256=m8PukHbeH5g0IAAmOf_1Ahm-sGAMdhSSRQmwtpmi2s8,81
+prediction_market_agent_tooling-0.45.1.dist-info/RECORD,,