prediction-market-agent-tooling 0.21.1__py3-none-any.whl → 0.23.0__py3-none-any.whl

prediction_market_agent_tooling/deploy/agent.py

@@ -5,7 +5,6 @@ import time
 import typing as t
 from datetime import datetime, timedelta
 
-from loguru import logger
 from pydantic import BaseModel, BeforeValidator
 from typing_extensions import Annotated
 
@@ -24,6 +23,7 @@ from prediction_market_agent_tooling.deploy.gcp.utils import (
     gcp_resolve_api_keys_secrets,
 )
 from prediction_market_agent_tooling.gtypes import Probability
+from prediction_market_agent_tooling.loggers import logger
 from prediction_market_agent_tooling.markets.agent_market import (
     AgentMarket,
     FilterBy,

prediction_market_agent_tooling/loggers.py

@@ -0,0 +1,75 @@
+import logging
+import sys
+import warnings
+from enum import Enum
+
+from loguru import logger
+from pydantic_settings import BaseSettings, SettingsConfigDict
+
+
+class LogFormat(str, Enum):
+    DEFAULT = "default"
+    GCP = "gcp"
+
+
+class LogConfig(BaseSettings):
+    model_config = SettingsConfigDict(
+        env_file=".env", env_file_encoding="utf-8", extra="ignore"
+    )
+
+    LOG_FORMAT: LogFormat = LogFormat.DEFAULT
+
+
+GCP_LOG_LOGURU_FORMAT = (
+    "{level:<.1}{time:MMDD HH:mm:ss} {process} {name}:{line}] {message}"
+)
+GCP_LOG_LOGGING_FORMAT, GCP_LOG_FORMAT_LOGGING_DATEFMT = (
+    "%(levelname).1s%(asctime)s %(process)d %(name)s:%(lineno)d] %(message)s"
+), "%m%d %H:%M:%S"
+
+
+def patch_logger() -> None:
+    config = LogConfig()
+
+    if config.LOG_FORMAT == LogFormat.GCP:
+        format_loguru = GCP_LOG_LOGURU_FORMAT
+        format_logging = GCP_LOG_LOGGING_FORMAT
+        datefmt_logging = GCP_LOG_FORMAT_LOGGING_DATEFMT
+
+    elif config.LOG_FORMAT == LogFormat.DEFAULT:
+        format_loguru, format_logging, datefmt_logging = None, None, None
+
+    else:
+        raise ValueError(f"Unknown log format: {config.LOG_FORMAT}")
+
+    # Change built-in logging.
+    if format_logging is not None:
+        logging.basicConfig(
+            level=logging.DEBUG, format=format_logging, datefmt=datefmt_logging
+        )
+
+    # Change loguru.
+    if format_loguru is not None:
+        logger.remove()
+        logger.add(
+            sys.stdout,
+            format=format_loguru,
+            level="DEBUG",  # Can be the lowest level, higher ones will use by default this one.
+            colorize=True,
+        )
+
+    # Change warning formatting to a simpler one (no source code in a new line).
+    warnings.formatwarning = simple_warning_format
+    # Use logging module for warnings.
+    logging.captureWarnings(True)
+
+    logger.info(f"Patched logger for {config.LOG_FORMAT.value} format.")
+
+
+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}"
+
+
+if not getattr(logger, "_patched", False):
+    patch_logger()
+    logger._patched = True  # type: ignore[attr-defined] # Hacky way to store a flag on the logger object, to not patch it multiple times.

prediction_market_agent_tooling/markets/manifold/api.py

@@ -3,9 +3,9 @@ from datetime import datetime
 
 import requests
 import tenacity
-from loguru import logger
 
 from prediction_market_agent_tooling.gtypes import Mana, SecretStr
+from prediction_market_agent_tooling.loggers import logger
 from prediction_market_agent_tooling.markets.data_models import (
     BetAmount,
     Currency,

prediction_market_agent_tooling/markets/omen/omen.py

@@ -2,7 +2,6 @@ import sys
 import typing as t
 from datetime import datetime
 
-from loguru import logger
 from web3 import Web3
 from web3.constants import HASH_ZERO
 
@@ -18,6 +17,7 @@ from prediction_market_agent_tooling.gtypes import (
     xDai,
     xdai_type,
 )
+from prediction_market_agent_tooling.loggers import logger
 from prediction_market_agent_tooling.markets.agent_market import (
     AgentMarket,
     FilterBy,

prediction_market_agent_tooling/markets/omen/omen_resolving.py

@@ -1,4 +1,3 @@
-from loguru import logger
 from web3 import Web3
 
 from prediction_market_agent_tooling.config import PrivateCredentials
@@ -9,6 +8,7 @@ from prediction_market_agent_tooling.gtypes import (
     Wei,
     xDai,
 )
+from prediction_market_agent_tooling.loggers import logger
 from prediction_market_agent_tooling.markets.data_models import Resolution
 from prediction_market_agent_tooling.markets.manifold.utils import (
     find_resolution_on_manifold,

prediction_market_agent_tooling/markets/omen/omen_subgraph_handler.py

@@ -4,10 +4,10 @@ from datetime import datetime
 
 import tenacity
 from eth_typing import ChecksumAddress
-from loguru import logger
 from subgrounds import FieldPath, Subgrounds
 
 from prediction_market_agent_tooling.gtypes import HexAddress, HexBytes, Wei, wei_type
+from prediction_market_agent_tooling.loggers import logger
 from prediction_market_agent_tooling.markets.agent_market import FilterBy, SortBy
 from prediction_market_agent_tooling.markets.omen.data_models import (
     OMEN_FALSE_OUTCOME,

prediction_market_agent_tooling/markets/polymarket/data_models_web.py

@@ -10,10 +10,10 @@ import typing as t
 from datetime import datetime
 
 import requests
-from loguru import logger
 from pydantic import BaseModel, field_validator
 
 from prediction_market_agent_tooling.gtypes import USDC, HexAddress
+from prediction_market_agent_tooling.loggers import logger
 from prediction_market_agent_tooling.markets.data_models import Resolution
 
 POLYMARKET_BASE_URL = "https://polymarket.com"

prediction_market_agent_tooling/monitor/monitor.py

@@ -8,7 +8,6 @@ import numpy as np
 import pandas as pd
 import streamlit as st
 from google.cloud.functions_v2.types.functions import Function
-from loguru import logger
 from pydantic import BaseModel, field_validator
 
 from prediction_market_agent_tooling.config import APIKeys
@@ -22,6 +21,7 @@ from prediction_market_agent_tooling.deploy.gcp.utils import (
     list_gcp_cronjobs,
     list_gcp_functions,
 )
+from prediction_market_agent_tooling.loggers import logger
 from prediction_market_agent_tooling.markets.agent_market import AgentMarket
 from prediction_market_agent_tooling.markets.data_models import Resolution, ResolvedBet
 from prediction_market_agent_tooling.tools.parallelism import par_map

prediction_market_agent_tooling/tools/betting_strategies/market_moving.py

@@ -2,9 +2,9 @@ import typing as t
 from functools import reduce
 
 import numpy as np
-from loguru import logger
 
 from prediction_market_agent_tooling.gtypes import Probability, wei_type, xDai
+from prediction_market_agent_tooling.loggers import logger
 from prediction_market_agent_tooling.markets.omen.data_models import OmenMarket
 from prediction_market_agent_tooling.markets.omen.omen import OmenAgentMarket
 from prediction_market_agent_tooling.tools.utils import check_not_none

prediction_market_agent_tooling/tools/google.py

@@ -2,9 +2,9 @@ import typing as t
 
 import tenacity
 from googleapiclient.discovery import build
-from loguru import logger
 
 from prediction_market_agent_tooling.config import APIKeys
+from prediction_market_agent_tooling.loggers import logger
 from prediction_market_agent_tooling.tools.cache import persistent_inmemory_cache
 
 

prediction_market_agent_tooling/tools/safe.py

@@ -5,7 +5,6 @@ from gnosis.eth.constants import NULL_ADDRESS
 from gnosis.eth.contracts import get_safe_V1_4_1_contract
 from gnosis.safe.proxy_factory import ProxyFactoryV141
 from gnosis.safe.safe import Safe
-from loguru import logger
 from safe_cli.safe_addresses import (
     get_default_fallback_handler_address,
     get_proxy_factory_address,
@@ -14,6 +13,7 @@ from safe_cli.safe_addresses import (
 )
 from web3.types import Wei
 
+from prediction_market_agent_tooling.loggers import logger
 from prediction_market_agent_tooling.tools.hexbytes_custom import HexBytes
 from prediction_market_agent_tooling.tools.web3_utils import wei_to_xdai
 

prediction_market_agent_tooling/tools/utils.py

@@ -6,7 +6,6 @@ from typing import Any, NoReturn, Optional, Type, TypeVar, cast
 
 import pytz
 import requests
-from loguru import logger
 from pydantic import BaseModel, ValidationError
 from scipy.stats import entropy
 
@@ -15,6 +14,7 @@ from prediction_market_agent_tooling.gtypes import (
     Probability,
     SecretStr,
 )
+from prediction_market_agent_tooling.loggers import logger
 
 T = TypeVar("T")
 

prediction_market_agent_tooling/tools/web3_utils.py

@@ -5,7 +5,6 @@ from eth_account import Account
 from eth_typing import URI
 from gnosis.eth import EthereumClient
 from gnosis.safe.safe import Safe
-from loguru import logger
 from pydantic.types import SecretStr
 from web3 import Web3
 from web3.constants import HASH_ZERO
@@ -21,6 +20,7 @@ from prediction_market_agent_tooling.gtypes import (
     xDai,
     xdai_type,
 )
+from prediction_market_agent_tooling.loggers import logger
 
 ONE_NONCE = Nonce(1)
 ONE_XDAI = xdai_type(1)

{prediction_market_agent_tooling-0.21.1.dist-info → prediction_market_agent_tooling-0.23.0.dist-info}/METADATA

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

{prediction_market_agent_tooling-0.21.1.dist-info → prediction_market_agent_tooling-0.23.0.dist-info}/RECORD

@@ -12,60 +12,61 @@ prediction_market_agent_tooling/benchmark/agents.py,sha256=HPIFJvackW110ch3Ukktb
 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=FI8feNLmA0QYmN-llvyDh3c6tN2ZGl7Eerw1e27v51A,4757
-prediction_market_agent_tooling/deploy/agent.py,sha256=aXlrfOymjvLdpxgF88XsFBsPnCG0Q3-EqreV1WYqxro,9985
+prediction_market_agent_tooling/deploy/agent.py,sha256=OxSL1w51GumyBUxN2cx6VPgvf8NWsq3-7wAy9g3hsFA,10018
 prediction_market_agent_tooling/deploy/agent_example.py,sha256=KaTJm43cwbBZR2BmTEyB1ohChAqwYlBUqaaVumsWQe4,891
 prediction_market_agent_tooling/deploy/constants.py,sha256=M5ty8URipYMGe_G-RzxRydK3AFL6CyvmqCraJUrLBnE,82
 prediction_market_agent_tooling/deploy/gcp/deploy.py,sha256=CYUgnfy-9XVk04kkxA_5yp0GE9Mw5caYqlFUZQ2j3ks,3739
 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=xGSJXw12hzp8LwvQ956l01GiZMWd07MZTYqo8CXVeLY,2417
+prediction_market_agent_tooling/loggers.py,sha256=0znHrzxSbeBaDiB920EZC6a2TiF0tw80Sa_yoLwvo_w,2289
 prediction_market_agent_tooling/markets/agent_market.py,sha256=qeuIXEujziDu_gQPvMiHsGSejhkPQtHhO_E7l16NOL0,5997
 prediction_market_agent_tooling/markets/categorize.py,sha256=yTd-lDMPW4ESDSzmxeLLBuzLX0FggOF7Vbswh7295o0,941
 prediction_market_agent_tooling/markets/data_models.py,sha256=uODY3aoFp8YYeLAUcrzMk1yU8pIKsTLobB9xIEGTmKs,1170
 prediction_market_agent_tooling/markets/manifold/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-prediction_market_agent_tooling/markets/manifold/api.py,sha256=K79zWSqBs3rpkZwpp6moKkPBB81p5jWn1wFuk-rLVi4,7274
+prediction_market_agent_tooling/markets/manifold/api.py,sha256=m6qOzDiyQfxj62Eo_SzzQLkX4ijpi8KtQKGd4CpKAsk,7307
 prediction_market_agent_tooling/markets/manifold/data_models.py,sha256=2DZIxwtDp-PH0UWTGiktMFIGAAQoVutI07UsxjNyTyE,5296
 prediction_market_agent_tooling/markets/manifold/manifold.py,sha256=DJZ88r5BGtAugUw5SIyDfzK1S70titba_fwT7OYXuAY,3896
 prediction_market_agent_tooling/markets/manifold/utils.py,sha256=cPPFWXm3vCYH1jy7_ctJZuQH9ZDaPL4_AgAYzGWkoow,513
 prediction_market_agent_tooling/markets/markets.py,sha256=TXo2qNmjUXhbTK0d-V7hW_aaJDpqP9RWHxm7mayhI0o,3042
 prediction_market_agent_tooling/markets/omen/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 prediction_market_agent_tooling/markets/omen/data_models.py,sha256=g6A_DQ54m-_3XQO02AM4NliDycsgYvg8hgpt8Dri5cg,14111
-prediction_market_agent_tooling/markets/omen/omen.py,sha256=TbyZ39rcMsM1xpsW1CtHJSKBN3CIufN-O0RwGKW1IyQ,31823
+prediction_market_agent_tooling/markets/omen/omen.py,sha256=GZEMVVTT53XLCnDgg3BzvAHMYv-7u4Diy_RgB6J_F8M,31856
 prediction_market_agent_tooling/markets/omen/omen_contracts.py,sha256=cHL-VYQDzLWLtqS_4l91HGaKAOKoFjXHN76OYfIU2T0,20537
-prediction_market_agent_tooling/markets/omen/omen_resolving.py,sha256=uAUUn-8jXgaP-xiWTDfBnSYAd2ORlD7Himry0SzPZz4,9034
-prediction_market_agent_tooling/markets/omen/omen_subgraph_handler.py,sha256=F2JyAYqCR4REOnFB2cngbngh7ib7SMt0VtFw7mGt2Yc,22266
+prediction_market_agent_tooling/markets/omen/omen_resolving.py,sha256=WbVAQyhFlwFCk1wncs3Uf2PM6YZ9hV7pUbkFIGGu8iw,9067
+prediction_market_agent_tooling/markets/omen/omen_subgraph_handler.py,sha256=QZWwkqvOqQ-b15jidwTNsn1K64x3FY_Un-l6A6g3Twg,22299
 prediction_market_agent_tooling/markets/polymarket/api.py,sha256=p1JkqL9kF8C04qbmqFzF0hgtzD5kN3yup2hYOjxazQ4,4188
 prediction_market_agent_tooling/markets/polymarket/data_models.py,sha256=srTl8-0FM76AGLRDWzjLpf46ikWloaBCgkn0XqZoKCI,4248
-prediction_market_agent_tooling/markets/polymarket/data_models_web.py,sha256=ueL_sNYZO5vC8fTsqp7xfjNa7eJQVYkm_kM50HSoQbY,10854
+prediction_market_agent_tooling/markets/polymarket/data_models_web.py,sha256=qop9lK4-3VfEJ9SuSCJdYPhjMqP4g6F5FpHziJv8HDY,10887
 prediction_market_agent_tooling/markets/polymarket/polymarket.py,sha256=zqGfiUOH9f7jmDcQAt30wrHyfmqLMNwCYtotsxFoJmA,2678
 prediction_market_agent_tooling/markets/polymarket/utils.py,sha256=Gwd2kOK_DrsjtyqgO6ob8oK7tjsB1Yo-Hf7IS5UGnio,1960
 prediction_market_agent_tooling/monitor/langfuse/langfuse_wrapper.py,sha256=b6T69YB1x8kSUvW9uRFuSWPLOrXzapZG7m5O5SU0QTQ,895
 prediction_market_agent_tooling/monitor/markets/manifold.py,sha256=GdYpgRX1GahDi-75Mr53jgtEg6nWcs_rHDUkg4o_7dQ,3352
 prediction_market_agent_tooling/monitor/markets/omen.py,sha256=cYyKdX4qhGo-VqsboOyWHmMyFsdcX899RrHH5oMEwRI,3503
 prediction_market_agent_tooling/monitor/markets/polymarket.py,sha256=j_CHY03LAhg84p-TpwbkuzzIdd5YUWapW3hk7U79Phs,1879
-prediction_market_agent_tooling/monitor/monitor.py,sha256=zTluK6Ha_pis6JWd8SF8Pbu_OJLpRBv0T3PVLQKc1ds,13354
+prediction_market_agent_tooling/monitor/monitor.py,sha256=elvCqCASCd3fOnM7f2kajb_Oy3RMUmGh88jzpworrEU,13387
 prediction_market_agent_tooling/monitor/monitor_app.py,sha256=rDxgdDJqSK0ARx0TJFMkS76npkHZJz0__Rp0xTpiRok,4611
 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=efDKEe-SsuSmGWKuGNiuHEWCGuCrcwjrCdTz1iKFtqw,749
 prediction_market_agent_tooling/tools/betting_strategies/kelly_criterion.py,sha256=IbhQPoKsQnjnag_n_wAL12n8QdCe7tAMRNV2QS8yYxY,3520
-prediction_market_agent_tooling/tools/betting_strategies/market_moving.py,sha256=0qPFA0hNzgUKt49xovwwFaSYrunFgpWZ0Di1Lo3g5qw,4367
+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
 prediction_market_agent_tooling/tools/cache.py,sha256=tGHHd9HCiE_hCCtPtloHZQdDfBuiow9YsqJNYi2Tx_0,499
 prediction_market_agent_tooling/tools/contract.py,sha256=FTC5povNDOyTWJNKieCmoMkUK25_sHcTQkBuCVWh5Ck,7290
 prediction_market_agent_tooling/tools/costs.py,sha256=EaAJ7v9laD4VEV3d8B44M4u3_oEO_H16jRVCdoZ93Uw,954
 prediction_market_agent_tooling/tools/gnosis_rpc.py,sha256=_MYSoyOR2MgAJkop1ERf8RhLum-M8S6OjaAsaqUW41w,203
-prediction_market_agent_tooling/tools/google.py,sha256=P-ifiMk7bxQdU1ceON9apcZlw4rLHeOcYwxdeE4Of6Q,1761
+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/is_predictable.py,sha256=QqcJ2k05oBnd-8JkkSMr9_FT-yZICmzUA41gSxJeP98,2793
 prediction_market_agent_tooling/tools/parallelism.py,sha256=8mgkF5sBwFGS5GMvlpzam82Y3p2swPYuNsywpQuy-a4,1508
-prediction_market_agent_tooling/tools/safe.py,sha256=gNgcY6ugckx3DbupR8VBezDgh1dZXpc8oZlPerZ3Atg,5162
+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/utils.py,sha256=6MRfLr5xGPEQGobLz_eCsE_p-XaAeOCcmygwgNCIvqE,5044
-prediction_market_agent_tooling/tools/web3_utils.py,sha256=-IAt12kudrx0BaW_IFQu2nAsJJXVGn8hNH43xjQeIw4,9822
-prediction_market_agent_tooling-0.21.1.dist-info/LICENSE,sha256=6or154nLLU6bELzjh0mCreFjt0m2v72zLi3yHE0QbeE,7650
-prediction_market_agent_tooling-0.21.1.dist-info/METADATA,sha256=0H8Zrp04nJsKlLDUirfYurQOvHwDnnJO_ME2fJf_1_s,5563
-prediction_market_agent_tooling-0.21.1.dist-info/WHEEL,sha256=sP946D7jFCHeNz5Iq4fL4Lu-PrWrFsgfLXbbkciIZwg,88
-prediction_market_agent_tooling-0.21.1.dist-info/entry_points.txt,sha256=m8PukHbeH5g0IAAmOf_1Ahm-sGAMdhSSRQmwtpmi2s8,81
-prediction_market_agent_tooling-0.21.1.dist-info/RECORD,,
+prediction_market_agent_tooling/tools/utils.py,sha256=zkmwPi3YisgZDPCeNwaRbL8sInOYOkvFgFY4Q8PbEo4,5077
+prediction_market_agent_tooling/tools/web3_utils.py,sha256=cboATXNmEdn5RmPbVblHOwOdUMKBYrUK3GiI6i6Vzxo,9855
+prediction_market_agent_tooling-0.23.0.dist-info/LICENSE,sha256=6or154nLLU6bELzjh0mCreFjt0m2v72zLi3yHE0QbeE,7650
+prediction_market_agent_tooling-0.23.0.dist-info/METADATA,sha256=gkLdQmTB2vbEO3toPUFru7h7BqsIvLm50aXGbNDK1xM,5563
+prediction_market_agent_tooling-0.23.0.dist-info/WHEEL,sha256=sP946D7jFCHeNz5Iq4fL4Lu-PrWrFsgfLXbbkciIZwg,88
+prediction_market_agent_tooling-0.23.0.dist-info/entry_points.txt,sha256=m8PukHbeH5g0IAAmOf_1Ahm-sGAMdhSSRQmwtpmi2s8,81
+prediction_market_agent_tooling-0.23.0.dist-info/RECORD,,