prediction-market-agent-tooling 0.21.1__tar.gz → 0.23.0__tar.gz

{prediction_market_agent_tooling-0.21.1 → prediction_market_agent_tooling-0.23.0}/PKG-INFO

@@ -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 → prediction_market_agent_tooling-0.23.0}/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-0.23.0/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-0.21.1 → prediction_market_agent_tooling-0.23.0}/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-0.21.1 → prediction_market_agent_tooling-0.23.0}/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-0.21.1 → prediction_market_agent_tooling-0.23.0}/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-0.21.1 → prediction_market_agent_tooling-0.23.0}/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-0.21.1 → prediction_market_agent_tooling-0.23.0}/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-0.21.1 → prediction_market_agent_tooling-0.23.0}/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-0.21.1 → prediction_market_agent_tooling-0.23.0}/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-0.21.1 → prediction_market_agent_tooling-0.23.0}/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-0.21.1 → prediction_market_agent_tooling-0.23.0}/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-0.21.1 → prediction_market_agent_tooling-0.23.0}/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-0.21.1 → prediction_market_agent_tooling-0.23.0}/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 → prediction_market_agent_tooling-0.23.0}/pyproject.toml

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