prediction-market-agent-tooling 0.56.2.dev145__tar.gz → 0.56.2.dev147__tar.gz

{prediction_market_agent_tooling-0.56.2.dev145 → prediction_market_agent_tooling-0.56.2.dev147}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: prediction-market-agent-tooling
-Version: 0.56.2.dev145
+Version: 0.56.2.dev147
 Summary: Tools to benchmark, deploy and monitor prediction market agents.
 Author: Gnosis
 Requires-Python: >=3.10,<3.12
@@ -26,6 +26,7 @@ Requires-Dist: langchain (>=0.2.6,<0.3.0) ; extra == "langchain"
 Requires-Dist: langchain-community (>=0.0.19)
 Requires-Dist: langchain-openai (>=0.1.0,<0.2.0) ; extra == "langchain"
 Requires-Dist: langfuse (>=2.42.0,<3.0.0)
+Requires-Dist: loguru (>=0.7.2,<0.8.0)
 Requires-Dist: loky (>=3.4.1,<4.0.0)
 Requires-Dist: numpy (>=1.26.4,<2.0.0)
 Requires-Dist: openai (>=1.0.0,<2.0.0) ; extra == "openai"

{prediction_market_agent_tooling-0.56.2.dev145 → prediction_market_agent_tooling-0.56.2.dev147}/prediction_market_agent_tooling/loggers.py

@@ -1,13 +1,16 @@
 import builtins
 import logging
+import sys
 import typing as t
 import warnings
 from enum import Enum
 
+from loguru import logger
 from pydantic_settings import BaseSettings, SettingsConfigDict
 
 
 class LogFormat(str, Enum):
+    DEFAULT = "default"
     GCP = "gcp"
 
 
@@ -24,8 +27,8 @@ class LogConfig(BaseSettings):
         env_file=".env", env_file_encoding="utf-8", extra="ignore"
     )
 
-    LOG_FORMAT: LogFormat = LogFormat.GCP
-    LOG_LEVEL: LogLevel = LogLevel.INFO
+    LOG_FORMAT: LogFormat = LogFormat.DEFAULT
+    LOG_LEVEL: LogLevel = LogLevel.DEBUG
 
 
 class NoNewLineStreamHandler(logging.StreamHandler):  # type: ignore # StreamHandler is not typed in the standard library.
@@ -33,15 +36,18 @@ class NoNewLineStreamHandler(logging.StreamHandler):  # type: ignore # StreamHan
         return super().format(record).replace("\n", " ")
 
 
+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:%(pathname)s:%(funcName)s:%(lineno)d] %(message)s"
+    "%(levelname).1s%(asctime)s %(process)d %(name)s:%(lineno)d] %(message)s"
 ), "%m%d %H:%M:%S"
 
 
 def patch_logger() -> None:
     """
     Function to patch loggers according to the deployed environment.
-    Patches Python's default logger, warnings library and also monkey-patch print function as many libraries just use it.
+    Patches Loguru's logger, Python's default logger, warnings library and also monkey-patch print function as many libraries just use it.
     """
     if not getattr(logger, "_patched", False):
         logger._patched = True  # type: ignore[attr-defined] # Hacky way to store a flag on the logger object, to not patch it multiple times.
@@ -51,34 +57,52 @@ 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_logger
+        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}")
 
     # Change built-in logging.
-    logging.basicConfig(
-        level=config.LOG_LEVEL.value,
-        format=format_logging,
-        datefmt=datefmt_logging,
-        handlers=handlers,
-    )
+    if format_logging is not None:
+        logging.basicConfig(
+            level=config.LOG_LEVEL.value,
+            format=format_logging,
+            datefmt=datefmt_logging,
+            handlers=handlers,
+        )
+
+    # Change loguru.
+    if format_loguru is not None:
+        logger.remove()
+        logger.add(
+            sys.stdout,
+            format=format_loguru,
+            level=config.LOG_LEVEL.value,
+            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)
 
-    # Use logger for prints.
-    builtins.print = print_logging  # type: ignore[assignment] # Monkey patching, it's messy but it works.
+    # Use loguru for prints.
+    if print_logging is not None:
+        builtins.print = print_logging  # type: ignore[assignment] # Monkey patching, it's messy but it works.
 
     logger.info(f"Patched logger for {config.LOG_FORMAT.value} format.")
 
 
-def print_using_logger(
+def print_using_loguru_info(
     *values: object,
     sep: str = " ",
     end: str = "\n",
@@ -97,6 +121,4 @@ def simple_warning_format(message, category, filename, lineno, line=None):  # ty
     )  # Escape new lines, because otherwise logs will be broken.
 
 
-logger = logging.getLogger("prediction-market-agent-tooling")
-
 patch_logger()

{prediction_market_agent_tooling-0.56.2.dev145 → prediction_market_agent_tooling-0.56.2.dev147}/prediction_market_agent_tooling/tools/caches/db_cache.py

@@ -22,7 +22,6 @@ from sqlmodel import Field, Session, SQLModel, create_engine, desc, select
 from prediction_market_agent_tooling.config import APIKeys
 from prediction_market_agent_tooling.loggers import logger
 from prediction_market_agent_tooling.tools.datetime_utc import DatetimeUTC
-from prediction_market_agent_tooling.tools.pickle_utils import InitialiseNonPickable
 from prediction_market_agent_tooling.tools.utils import utcnow
 
 FunctionT = TypeVar("FunctionT", bound=Callable[..., Any])
@@ -91,17 +90,6 @@ def db_cache(
         return decorator
 
     api_keys = api_keys if api_keys is not None else APIKeys()
-    wrapped_engine = InitialiseNonPickable(
-        lambda: create_engine(
-            api_keys.sqlalchemy_db_url.get_secret_value(),
-            # Use custom json serializer and deserializer, because otherwise, for example `datetime` serialization would fail.
-            json_serializer=json_serializer,
-            json_deserializer=json_deserializer,
-        )
-    )
-
-    if api_keys.ENABLE_CACHE:
-        SQLModel.metadata.create_all(wrapped_engine.get_value())
 
     @wraps(func)
     def wrapper(*args: Any, **kwargs: Any) -> Any:
@@ -109,7 +97,14 @@ def db_cache(
         if not api_keys.ENABLE_CACHE:
             return func(*args, **kwargs)
 
-        engine = wrapped_engine.get_value()
+        engine = create_engine(
+            api_keys.sqlalchemy_db_url.get_secret_value(),
+            # Use custom json serializer and deserializer, because otherwise, for example `datetime` serialization would fail.
+            json_serializer=json_serializer,
+            json_deserializer=json_deserializer,
+            pool_size=1,
+        )
+        SQLModel.metadata.create_all(engine)
 
         # Convert *args and **kwargs to a single dictionary, where we have names for arguments passed as args as well.
         signature = inspect.signature(func)

{prediction_market_agent_tooling-0.56.2.dev145 → prediction_market_agent_tooling-0.56.2.dev147}/prediction_market_agent_tooling/tools/relevant_news_analysis/relevant_news_cache.py

@@ -25,9 +25,12 @@ class RelevantNewsCacheModel(SQLModel, table=True):
 class RelevantNewsResponseCache:
     def __init__(self, sqlalchemy_db_url: str | None = None):
         self.engine = create_engine(
-            sqlalchemy_db_url
-            if sqlalchemy_db_url
-            else APIKeys().sqlalchemy_db_url.get_secret_value()
+            (
+                sqlalchemy_db_url
+                if sqlalchemy_db_url
+                else APIKeys().sqlalchemy_db_url.get_secret_value()
+            ),
+            pool_size=1,
         )
         self._initialize_db()
 

{prediction_market_agent_tooling-0.56.2.dev145 → prediction_market_agent_tooling-0.56.2.dev147}/pyproject.toml

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "prediction-market-agent-tooling"
-version = "0.56.2.dev145"
+version = "0.56.2.dev147"
 description = "Tools to benchmark, deploy and monitor prediction market agents."
 authors = ["Gnosis"]
 readme = "README.md"
@@ -35,6 +35,7 @@ langchain = { version = "^0.2.6", optional = true}
 langchain-openai = { version = "^0.1.0", optional = true}
 google-api-python-client = { version = "2.95.0", optional = true}
 subgrounds = "^1.9.1"
+loguru = "^0.7.2"
 safe-eth-py = "^6.0.0b41"
 eth-account = ">=0.8.0,<0.12.0"
 prompt-toolkit = "^3.0.43"

prediction_market_agent_tooling-0.56.2.dev145/prediction_market_agent_tooling/tools/pickle_utils.py

@@ -1,31 +0,0 @@
-import typing as t
-
-InitialisedValue = t.TypeVar("InitialisedValue")
-
-
-class InitialiseNonPickable(t.Generic[InitialisedValue]):
-    """
-    Use this class to wrap values that you want to be shared within a thread,
-    but they are re-initialised for a new processes.
-
-    Initialiser for the value still needs to be pickable.
-    """
-
-    def __init__(self, initialiser: t.Callable[[], InitialisedValue]) -> None:
-        self.value: InitialisedValue | None = None
-        self.initialiser = initialiser
-
-    def __getstate__(self) -> dict[str, t.Any]:
-        # During pickling, always return `value` as just None, which is pickable and this class will re-initialise it in `get_value` when called.
-        return {"value": None, "initialiser": self.initialiser}
-
-    def __setstate__(self, d: dict[str, t.Any]) -> None:
-        self.value = d["value"]
-        self.initialiser = d["initialiser"]
-
-    def get_value(self) -> InitialisedValue:
-        """Use this function to get the wrapped value, which will be initialised if necessary."""
-        if self.value is None:
-            self.value = self.initialiser()
-
-        return self.value