fix: james comments

Author: cevian

projects/pgai/pgai/__init__.py

@@ -1,10 +1,9 @@
 __version__ = "0.10.2"
 
 from pgai._install.install import ainstall, install
-from pgai.logger import get_logger, set_level
 
 from .tracing import configure_tracing
 
 configure_tracing()
 
-__all__ = ["ainstall", "install", "get_logger", "set_level"]
+__all__ = ["ainstall", "install"]

projects/pgai/pgai/_install/install.py

@@ -1,15 +1,15 @@
+import logging
 from importlib.resources import files
 
 import psycopg
 import semver
 from psycopg import sql as sql_lib
 
 from .. import __version__
-from ..logger import get_logger
 
 GUC_VECTORIZER_URL = "ai.external_functions_executor_url"
 
-log = get_logger(__name__)
+log = logging.getLogger(__name__)
 
 
 def _get_sql(vector_extension_schema: str) -> str:

projects/pgai/pgai/cli.py

@@ -13,11 +13,10 @@
 from pytimeparse import parse  # type: ignore
 
 from .__init__ import __version__
-from .logger import get_logger, set_level
 
 load_dotenv()
 
-log = get_logger()
+log = logging.getLogger(__name__)
 
 
 def asbool(value: str | None):
@@ -189,7 +188,7 @@ async def async_run_vectorizer_worker(
     signal.signal(signal.SIGTERM, shutdown_handler)
 
     # Configure the logging level for pgai loggers
-    set_level(get_log_level(log_level))
+    logging.getLogger("pgai").setLevel(get_log_level(log_level))
 
     worker = Worker(
         db_url,

projects/pgai/pgai/logger.py

@@ -1,5 +1,4 @@
 import json
-import logging
 from collections.abc import Callable
 from typing import Any, TypeVar
 
@@ -25,7 +24,7 @@ def __str__(self) -> str:
 
     @staticmethod
     def default_renderer(msg: str, kwargs: dict[str, Any]) -> str:
-        return f"{msg} >>> {json.dumps(kwargs)}"
+        return f"{msg} >>> {json.dumps(kwargs, default=str)}"
 
     @classmethod
     def set_renderer(cls: type[T], renderer_func: RendererType) -> None:
@@ -34,38 +33,3 @@ def set_renderer(cls: type[T], renderer_func: RendererType) -> None:
 
 def set_renderer(renderer_func: RendererType) -> None:
     StructuredMessage.set_renderer(renderer_func)
-
-
-def get_logger(name: str = "") -> logging.Logger:
-    """Get a logger instance with the pgai namespace.
-
-    Args:
-        name: The logger name, which will be prefixed with 'pgai.'
-
-    Returns:
-        A Logger instance with the appropriate namespace
-    """
-    if name:
-        logger_name: str = f"pgai.{name}"
-    else:
-        logger_name: str = "pgai"
-
-    return logging.getLogger(logger_name)
-
-
-def set_level(level: int | str) -> None:
-    """Set the log level for all pgai loggers.
-
-    This does not affect the root logger or any other loggers outside
-    the pgai namespace.
-
-    Args:
-        level: The logging level (e.g., logging.INFO, logging.DEBUG)
-              or a string level name ('INFO', 'DEBUG', etc.)
-    """
-    if isinstance(level, str):
-        numeric_level: int = getattr(logging, level.upper(), logging.INFO)
-    else:
-        numeric_level = level
-
-    logging.getLogger("pgai").setLevel(numeric_level)

projects/pgai/pgai/vectorizer/embedders/voyageai.py

@@ -40,7 +40,7 @@ def voyage_token_counter(model: str) -> Callable[[str], int] | None:
         tokenizer: Tokenizer = client.tokenizer(model)
         return lambda text: len(tokenizer.encode(text).tokens)
     except BaseException:
-        logger.warn(f"Tokenizer for model '{model}' not found")
+        logger.warning(f"Tokenizer for model '{model}' not found")
         return None
 
 

projects/pgai/pgai/vectorizer/embeddings.py

@@ -1,3 +1,4 @@
+import logging
 import time
 from abc import ABC, abstractmethod
 from collections.abc import AsyncGenerator
@@ -6,9 +7,9 @@
 
 from ddtrace import tracer
 
-from ..logger import StructuredMessage, get_logger
+from ..logger import StructuredMessage
 
-logger = get_logger(__name__)
+logger = logging.getLogger(__name__)
 
 EmbeddingVector: TypeAlias = list[float]
 

projects/pgai/pgai/vectorizer/migrations/__init__.py

@@ -1,4 +1,5 @@
 import importlib
+import logging
 import pkgutil
 import sys
 from collections.abc import Callable
@@ -7,9 +8,7 @@
 
 import semver
 
-from ...logger import get_logger
-
-logger = get_logger(__name__)
+logger = logging.getLogger(__name__)
 
 # config generic type
 C = TypeVar("C")

projects/pgai/pgai/vectorizer/vectorizer.py

@@ -1,5 +1,6 @@
 import asyncio
 import json
+import logging
 import os
 import sys
 import threading
@@ -20,7 +21,7 @@
 from pydantic_core._pydantic_core import ArgsKwargs
 from typing_extensions import override
 
-from ..logger import StructuredMessage, get_logger
+from ..logger import StructuredMessage
 from .chunking import (
     LangChainCharacterTextSplitter,
     LangChainRecursiveCharacterTextSplitter,
@@ -36,7 +37,7 @@
 from .processing import ProcessingDefault
 from .worker_tracking import WorkerTracking
 
-logger = get_logger(__name__)
+logger = logging.getLogger(__name__)
 
 VectorizerErrorRecord: TypeAlias = tuple[int, str, Jsonb]
 EmbeddingRecord: TypeAlias = list[Any]

projects/pgai/pgai/vectorizer/worker.py

@@ -1,5 +1,6 @@
 import asyncio
 import datetime
+import logging
 import os
 import random
 import sys
@@ -12,7 +13,7 @@
 from psycopg.rows import dict_row, namedtuple_row
 
 from .. import __version__
-from ..logger import StructuredMessage, get_logger
+from ..logger import StructuredMessage
 from .embeddings import ApiKeyMixin
 from .features import Features
 from .vectorizer import Vectorizer
@@ -24,7 +25,7 @@
     # For Python 3.10 and below, use the backport
     from exceptiongroup import BaseExceptionGroup
 
-logger = get_logger(__name__)
+logger = logging.getLogger(__name__)
 
 
 @dataclass

projects/pgai/pgai/vectorizer/worker_tracking/worker_tracking.py

@@ -1,13 +1,14 @@
 import asyncio
 import datetime
+import logging
 from uuid import UUID
 
 import psycopg
 
-from ...logger import StructuredMessage, get_logger
+from ...logger import StructuredMessage
 from ..features import Features
 
-log = get_logger(__name__)
+log = logging.getLogger(__name__)
 
 
 class WorkerTracking: