diff --git a/python/packages/autogen-agentchat/src/autogen_agentchat/logging/__init__.py b/python/packages/autogen-agentchat/src/autogen_agentchat/logging/__init__.py deleted file mode 100644 index 8da6243cc..000000000 --- a/python/packages/autogen-agentchat/src/autogen_agentchat/logging/__init__.py +++ /dev/null @@ -1,4 +0,0 @@ -from ._console_log_handler import ConsoleLogHandler -from ._file_log_handler import FileLogHandler - -__all__ = ["ConsoleLogHandler", "FileLogHandler"] diff --git a/python/packages/autogen-agentchat/src/autogen_agentchat/logging/_console_log_handler.py b/python/packages/autogen-agentchat/src/autogen_agentchat/logging/_console_log_handler.py deleted file mode 100644 index cc292e76c..000000000 --- a/python/packages/autogen-agentchat/src/autogen_agentchat/logging/_console_log_handler.py +++ /dev/null @@ -1,20 +0,0 @@ -import json -import logging -import sys -from datetime import datetime - -from pydantic import BaseModel - - -class ConsoleLogHandler(logging.Handler): - def emit(self, record: logging.LogRecord) -> None: - ts = datetime.fromtimestamp(record.created).isoformat() - if isinstance(record.msg, BaseModel): - record.msg = json.dumps( - { - "timestamp": ts, - "message": record.msg.model_dump_json(indent=2), - "type": record.msg.__class__.__name__, - }, - ) - sys.stdout.write(f"{record.msg}\n") diff --git a/python/packages/autogen-agentchat/tests/test_assistant_agent.py b/python/packages/autogen-agentchat/tests/test_assistant_agent.py index 69a71a65b..2828893bc 100644 --- a/python/packages/autogen-agentchat/tests/test_assistant_agent.py +++ b/python/packages/autogen-agentchat/tests/test_assistant_agent.py @@ -7,7 +7,6 @@ import pytest from autogen_agentchat import EVENT_LOGGER_NAME from autogen_agentchat.agents import AssistantAgent from autogen_agentchat.base import Handoff, TaskResult -from autogen_agentchat.logging import FileLogHandler from autogen_agentchat.messages import ( HandoffMessage, MultiModalMessage, @@ -24,6 +23,7 @@ from openai.types.chat.chat_completion_chunk import ChatCompletionChunk from openai.types.chat.chat_completion_message import ChatCompletionMessage from openai.types.chat.chat_completion_message_tool_call import ChatCompletionMessageToolCall, Function from openai.types.completion_usage import CompletionUsage +from utils import FileLogHandler logger = logging.getLogger(EVENT_LOGGER_NAME) logger.setLevel(logging.DEBUG) diff --git a/python/packages/autogen-agentchat/tests/test_group_chat.py b/python/packages/autogen-agentchat/tests/test_group_chat.py index 2cf862aaa..bd901d45b 100644 --- a/python/packages/autogen-agentchat/tests/test_group_chat.py +++ b/python/packages/autogen-agentchat/tests/test_group_chat.py @@ -12,7 +12,6 @@ from autogen_agentchat.agents import ( CodeExecutorAgent, ) from autogen_agentchat.base import Handoff, Response, TaskResult -from autogen_agentchat.logging import FileLogHandler from autogen_agentchat.messages import ( AgentMessage, ChatMessage, @@ -41,6 +40,7 @@ from openai.types.chat.chat_completion_chunk import ChatCompletionChunk from openai.types.chat.chat_completion_message import ChatCompletionMessage from openai.types.chat.chat_completion_message_tool_call import ChatCompletionMessageToolCall, Function from openai.types.completion_usage import CompletionUsage +from utils import FileLogHandler logger = logging.getLogger(EVENT_LOGGER_NAME) logger.setLevel(logging.DEBUG) diff --git a/python/packages/autogen-agentchat/tests/test_magentic_one_group_chat.py b/python/packages/autogen-agentchat/tests/test_magentic_one_group_chat.py index a5c8d5761..1ce4bf11a 100644 --- a/python/packages/autogen-agentchat/tests/test_magentic_one_group_chat.py +++ b/python/packages/autogen-agentchat/tests/test_magentic_one_group_chat.py @@ -9,7 +9,6 @@ from autogen_agentchat.agents import ( BaseChatAgent, ) from autogen_agentchat.base import Response -from autogen_agentchat.logging import FileLogHandler from autogen_agentchat.messages import ( ChatMessage, TextMessage, @@ -19,6 +18,7 @@ from autogen_agentchat.teams import ( ) from autogen_core.base import CancellationToken from autogen_ext.models import ReplayChatCompletionClient +from utils import FileLogHandler logger = logging.getLogger(EVENT_LOGGER_NAME) logger.setLevel(logging.DEBUG) diff --git a/python/packages/autogen-agentchat/src/autogen_agentchat/logging/_file_log_handler.py b/python/packages/autogen-agentchat/tests/utils.py similarity index 58% rename from python/packages/autogen-agentchat/src/autogen_agentchat/logging/_file_log_handler.py rename to python/packages/autogen-agentchat/tests/utils.py index 1e4b402da..90d66f0ba 100644 --- a/python/packages/autogen-agentchat/src/autogen_agentchat/logging/_file_log_handler.py +++ b/python/packages/autogen-agentchat/tests/utils.py @@ -1,5 +1,6 @@ import json import logging +import sys from datetime import datetime from pydantic import BaseModel @@ -22,3 +23,17 @@ class FileLogHandler(logging.Handler): }, ) self.file_handler.emit(record) + + +class ConsoleLogHandler(logging.Handler): + def emit(self, record: logging.LogRecord) -> None: + ts = datetime.fromtimestamp(record.created).isoformat() + if isinstance(record.msg, BaseModel): + record.msg = json.dumps( + { + "timestamp": ts, + "message": record.msg.model_dump_json(indent=2), + "type": record.msg.__class__.__name__, + }, + ) + sys.stdout.write(f"{record.msg}\n")