prediction-market-agent-tooling 0.64.2.dev603__tar.gz → 0.64.3__tar.gz

{prediction_market_agent_tooling-0.64.2.dev603 → prediction_market_agent_tooling-0.64.3}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.3
 Name: prediction-market-agent-tooling
-Version: 0.64.2.dev603
+Version: 0.64.3
 Summary: Tools to benchmark, deploy and monitor prediction market agents.
 Author: Gnosis
 Requires-Python: >=3.10,<3.13
@@ -46,6 +46,7 @@ Requires-Dist: pydantic-settings (>=2.4.0,<3.0.0)
 Requires-Dist: pymongo (>=4.8.0,<5.0.0)
 Requires-Dist: pytest-postgresql (>=6.1.1,<7.0.0)
 Requires-Dist: python-dateutil (>=2.9.0.post0,<3.0.0)
+Requires-Dist: python-json-logger (>=3.3.0,<4.0.0)
 Requires-Dist: safe-cli (>=1.0.0,<2.0.0)
 Requires-Dist: safe-eth-py (>=6.0.0b41,<7.0.0)
 Requires-Dist: scikit-learn (>=1.3.1,<2.0.0)

{prediction_market_agent_tooling-0.64.2.dev603 → prediction_market_agent_tooling-0.64.3}/prediction_market_agent_tooling/loggers.py

@@ -2,11 +2,12 @@ import builtins
 import logging
 import sys
 import typing as t
-import warnings
 from enum import Enum
 
+import typer.main
 from loguru import logger
 from pydantic_settings import BaseSettings, SettingsConfigDict
+from pythonjsonlogger import jsonlogger
 
 
 class LogFormat(str, Enum):
@@ -31,17 +32,35 @@ 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", " ")
-
+class _CustomJsonFormatter(jsonlogger.JsonFormatter):
+    def add_fields(
+        self,
+        log_record: dict[str, t.Any],
+        record: logging.LogRecord,
+        message_dict: dict[str, t.Any],
+    ) -> None:
+        super().add_fields(log_record, record, message_dict)
+        # Include "level" and "severity" with the same value as "levelname" to be friendly with log aggregators.
+        if log_record.get("levelname"):
+            log_record["level"] = log_record["levelname"]
+            log_record["severity"] = log_record["levelname"]
+
+    @staticmethod
+    def get_handler() -> logging.StreamHandler:  # type: ignore # Seems correct, but mypy doesn't like it.
+        logHandler = logging.StreamHandler()
+        formatter = _CustomJsonFormatter("%(asctime)s %(levelname)s %(message)s")
+        logHandler.setFormatter(formatter)
+        return logHandler
+
+
+def _handle_exception(
+    exc_type: type[BaseException], exc_value: BaseException, exc_traceback: t.Any
+) -> None:
+    if issubclass(exc_type, KeyboardInterrupt):
+        sys.__excepthook__(exc_type, exc_value, exc_traceback)
+        return
 
-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"
+    logger.error("Uncaught exception", exc_info=(exc_type, exc_value, exc_traceback))
 
 
 def patch_logger() -> None:
@@ -57,49 +76,44 @@ 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
-        print_logging = print_using_loguru_info
-        handlers: list[logging.Handler] | None = [NoNewLineStreamHandler()]
+        handler = _CustomJsonFormatter.get_handler()
+        print_logging = print_using_logger_info
+        sys.excepthook = _handle_exception
+        typer.main.except_hook = _handle_exception  # type: ignore # Monkey patching, it's messy but it works.
 
     elif config.LOG_FORMAT == LogFormat.DEFAULT:
-        format_loguru, format_logging, datefmt_logging = None, None, None
+        handler = None
         print_logging = None
-        handlers = None
 
     else:
         raise ValueError(f"Unknown log format: {config.LOG_FORMAT}")
 
     # Change built-in logging.
-    if format_logging is not None:
+    if handler is not None:
         logging.basicConfig(
             level=config.LOG_LEVEL.value,
-            format=format_logging,
-            datefmt=datefmt_logging,
-            handlers=handlers,
+            handlers=[handler],
         )
-
         # Configure all existing loggers
         for logger_name in logging.root.manager.loggerDict:
             existing_logger = logging.getLogger(logger_name)
             existing_logger.setLevel(config.LOG_LEVEL.value)
-            if handlers is not None:
-                existing_logger.handlers = handlers
+            # Remove existing handlers
+            if existing_logger.hasHandlers():
+                existing_logger.handlers.clear()
+            # And add ours only
+            existing_logger.addHandler(handler)
             existing_logger.propagate = False
 
     # Change loguru.
-    if format_loguru is not None:
+    if handler is not None:
         logger.remove()
         logger.add(
-            sys.stdout,
-            format=format_loguru,
+            handler,
             level=config.LOG_LEVEL.value,
-            colorize=True,
+            colorize=False,
         )
 
-    # 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)
 
@@ -110,23 +124,13 @@ def patch_logger() -> None:
     logger.info(f"Patched logger for {config.LOG_FORMAT.value} format.")
 
 
-def print_using_loguru_info(
+def print_using_logger_info(
     *values: object,
     sep: str = " ",
     end: str = "\n",
     **kwargs: t.Any,
 ) -> None:
-    message = sep.join(map(str, values)) + end
-    message = message.strip().replace(
-        "\n", "\\n"
-    )  # Escape new lines, because otherwise logs will be broken.
-    logger.info(message)
-
-
-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}".strip().replace(
-        "\n", "\\n"
-    )  # Escape new lines, because otherwise logs will be broken.
+    logger.info(sep.join(map(str, values)) + end)
 
 
 patch_logger()

{prediction_market_agent_tooling-0.64.2.dev603 → prediction_market_agent_tooling-0.64.3}/prediction_market_agent_tooling/tools/caches/db_cache.py

@@ -3,6 +3,7 @@ import inspect
 import json
 from datetime import timedelta
 from functools import wraps
+from types import UnionType
 from typing import (
     Any,
     Callable,
@@ -276,6 +277,17 @@ def convert_cached_output_to_pydantic(return_type: Any, data: Any) -> Any:
                 ): convert_cached_output_to_pydantic(value_type, v)
                 for k, v in data.items()
             }
+        # If the origin is a union and one of the unions is basemodel, convert it to it.
+        elif (
+            origin is UnionType
+            and (
+                base_model_from_args := next(
+                    (x for x in args if issubclass(x, BaseModel)), None
+                )
+            )
+            is not None
+        ):
+            return base_model_from_args.model_validate(data)
         else:
             # If the origin is not a dictionary, return the data as is
             return data

{prediction_market_agent_tooling-0.64.2.dev603 → prediction_market_agent_tooling-0.64.3}/pyproject.toml

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "prediction-market-agent-tooling"
-version = "0.64.2.dev603"
+version = "0.64.3"
 description = "Tools to benchmark, deploy and monitor prediction market agents."
 authors = ["Gnosis"]
 readme = "README.md"
@@ -60,6 +60,7 @@ eth-keys = "^0.6.1"
 proto-plus = "^1.0.0"
 protobuf = "^5.0.0"
 types-cachetools = "^5.5.0.20240820"
+python-json-logger = "^3.3.0"
 
 [tool.poetry.extras]
 openai = ["openai"]