Skip to content

Commit

Permalink
refactor: move logger to the root (#504)
Browse files Browse the repository at this point in the history
  • Loading branch information
Tomas2D authored Mar 6, 2025
1 parent 0dbacf9 commit efa476f
Show file tree
Hide file tree
Showing 26 changed files with 28 additions and 28 deletions.
2 changes: 1 addition & 1 deletion python/beeai_framework/adapters/groq/backend/chat.py
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@

from beeai_framework.adapters.litellm.chat import LiteLLMChatModel
from beeai_framework.backend.constants import ProviderName
from beeai_framework.utils.custom_logger import BeeLogger
from beeai_framework.logger import BeeLogger

logger = BeeLogger(__name__)

Expand Down
2 changes: 1 addition & 1 deletion python/beeai_framework/adapters/litellm/chat.py
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@
)
from beeai_framework.backend.utils import parse_broken_json
from beeai_framework.context import RunContext
from beeai_framework.utils.custom_logger import BeeLogger
from beeai_framework.logger import BeeLogger
from beeai_framework.utils.dicts import exclude_keys, exclude_none, include_keys

logger = BeeLogger(__name__)
Expand Down
2 changes: 1 addition & 1 deletion python/beeai_framework/adapters/ollama/backend/chat.py
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@

from beeai_framework.adapters.litellm.chat import LiteLLMChatModel
from beeai_framework.backend.constants import ProviderName
from beeai_framework.utils.custom_logger import BeeLogger
from beeai_framework.logger import BeeLogger

logger = BeeLogger(__name__)

Expand Down
2 changes: 1 addition & 1 deletion python/beeai_framework/adapters/openai/backend/chat.py
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@

from beeai_framework.adapters.litellm.chat import LiteLLMChatModel
from beeai_framework.backend.constants import ProviderName
from beeai_framework.utils.custom_logger import BeeLogger
from beeai_framework.logger import BeeLogger

logger = BeeLogger(__name__)

Expand Down
2 changes: 1 addition & 1 deletion python/beeai_framework/adapters/vertexai/backend/chat.py
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@

from beeai_framework.adapters.litellm.chat import LiteLLMChatModel
from beeai_framework.backend.constants import ProviderName
from beeai_framework.utils.custom_logger import BeeLogger
from beeai_framework.logger import BeeLogger

logger = BeeLogger(__name__)

Expand Down
2 changes: 1 addition & 1 deletion python/beeai_framework/adapters/watsonx/backend/chat.py
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@

from beeai_framework.adapters.litellm.chat import LiteLLMChatModel
from beeai_framework.backend.constants import ProviderName
from beeai_framework.utils.custom_logger import BeeLogger
from beeai_framework.logger import BeeLogger

logger = BeeLogger(__name__)

Expand Down
2 changes: 1 addition & 1 deletion python/beeai_framework/adapters/xai/backend/chat.py
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@

from beeai_framework.adapters.litellm.chat import LiteLLMChatModel
from beeai_framework.backend.constants import ProviderName
from beeai_framework.utils.custom_logger import BeeLogger
from beeai_framework.logger import BeeLogger

logger = BeeLogger(__name__)

Expand Down
2 changes: 1 addition & 1 deletion python/beeai_framework/backend/chat.py
Original file line number Diff line number Diff line change
Expand Up @@ -26,10 +26,10 @@
from beeai_framework.cancellation import AbortController, AbortSignal
from beeai_framework.context import Run, RunContext, RunContextInput, RunInstance
from beeai_framework.emitter import Emitter
from beeai_framework.logger import BeeLogger
from beeai_framework.retryable import Retryable, RetryableConfig, RetryableContext, RetryableInput
from beeai_framework.template import PromptTemplate, PromptTemplateInput
from beeai_framework.tools.tool import Tool
from beeai_framework.utils.custom_logger import BeeLogger
from beeai_framework.utils.lists import flatten
from beeai_framework.utils.models import ModelLike
from beeai_framework.utils.strings import to_json
Expand Down
2 changes: 1 addition & 1 deletion python/beeai_framework/cancellation.py
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@
from pydantic import BaseModel

from beeai_framework.errors import AbortError
from beeai_framework.utils.custom_logger import BeeLogger
from beeai_framework.logger import BeeLogger

logger = BeeLogger(__name__)

Expand Down
2 changes: 1 addition & 1 deletion python/beeai_framework/context.py
Original file line number Diff line number Diff line change
Expand Up @@ -27,8 +27,8 @@
from beeai_framework.cancellation import AbortController, AbortSignal, register_signals
from beeai_framework.emitter import Emitter, EventTrace
from beeai_framework.errors import AbortError, FrameworkError
from beeai_framework.logger import BeeLogger
from beeai_framework.utils.asynchronous import ensure_async
from beeai_framework.utils.custom_logger import BeeLogger

R = TypeVar("R")

Expand Down
File renamed without changes.
2 changes: 1 addition & 1 deletion python/beeai_framework/memory/file_cache.py
Original file line number Diff line number Diff line change
Expand Up @@ -21,10 +21,10 @@

import aiofiles

from beeai_framework.logger import BeeLogger
from beeai_framework.memory.base_cache import BaseCache
from beeai_framework.memory.serializer import Serializer
from beeai_framework.memory.sliding_cache import SlidingCache
from beeai_framework.utils import BeeLogger

logger = BeeLogger(__name__)

Expand Down
2 changes: 1 addition & 1 deletion python/beeai_framework/retryable.py
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@

from beeai_framework.cancellation import AbortSignal, abort_signal_handler
from beeai_framework.errors import FrameworkError
from beeai_framework.utils.custom_logger import BeeLogger
from beeai_framework.logger import BeeLogger
from beeai_framework.utils.models import ModelLike, to_model

T = TypeVar("T", bound=BaseModel)
Expand Down
2 changes: 1 addition & 1 deletion python/beeai_framework/tools/mcp_tools.py
Original file line number Diff line number Diff line change
Expand Up @@ -22,9 +22,9 @@

from beeai_framework.context import RunContext
from beeai_framework.emitter import Emitter
from beeai_framework.logger import BeeLogger
from beeai_framework.tools import Tool
from beeai_framework.tools.tool import JSONToolOutput, ToolOutput, ToolRunOptions
from beeai_framework.utils import BeeLogger
from beeai_framework.utils.models import JSONSchemaModel
from beeai_framework.utils.strings import to_safe_word

Expand Down
2 changes: 1 addition & 1 deletion python/beeai_framework/tools/search/duckduckgo.py
Original file line number Diff line number Diff line change
Expand Up @@ -18,10 +18,10 @@

from beeai_framework.context import RunContext
from beeai_framework.emitter.emitter import Emitter
from beeai_framework.logger import BeeLogger
from beeai_framework.tools import ToolError
from beeai_framework.tools.search import SearchToolOutput, SearchToolResult
from beeai_framework.tools.tool import Tool, ToolRunOptions
from beeai_framework.utils import BeeLogger

logger = BeeLogger(__name__)

Expand Down
2 changes: 1 addition & 1 deletion python/beeai_framework/tools/tool.py
Original file line number Diff line number Diff line change
Expand Up @@ -25,9 +25,9 @@
from beeai_framework.cancellation import AbortSignal
from beeai_framework.context import Run, RunContext, RunContextInput, RunInstance
from beeai_framework.emitter.emitter import Emitter
from beeai_framework.logger import BeeLogger
from beeai_framework.retryable import Retryable, RetryableConfig, RetryableContext, RetryableInput
from beeai_framework.tools.errors import ToolError, ToolInputValidationError
from beeai_framework.utils import BeeLogger
from beeai_framework.utils.strings import to_json, to_safe_word

logger = BeeLogger(__name__)
Expand Down
2 changes: 1 addition & 1 deletion python/beeai_framework/tools/weather/openmeteo.py
Original file line number Diff line number Diff line change
Expand Up @@ -25,9 +25,9 @@

from beeai_framework.context import RunContext
from beeai_framework.emitter.emitter import Emitter
from beeai_framework.logger import BeeLogger
from beeai_framework.tools import ToolInputValidationError
from beeai_framework.tools.tool import StringToolOutput, Tool, ToolRunOptions
from beeai_framework.utils import BeeLogger

logger = BeeLogger(__name__)

Expand Down
3 changes: 1 addition & 2 deletions python/beeai_framework/utils/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,6 @@


from beeai_framework.utils.config import CONFIG
from beeai_framework.utils.custom_logger import BeeLogger
from beeai_framework.utils.events import MessageEvent

__all__ = ["CONFIG", "BeeLogger", "MessageEvent"]
__all__ = ["CONFIG", "MessageEvent"]
6 changes: 3 additions & 3 deletions python/docs/logger.md
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ In the BeeAI framework, the `Logger` class is an abstraction built on top of Pyt

> [!NOTE]
>
> Location within the framework: [beeai_framework/utils](/python/beeai_framework/utils).
> Location within the framework: [beeai_framework/logger](/python/beeai_framework/logger).
---

Expand All @@ -49,7 +49,7 @@ To use the logger in your application:
```py
import logging

from beeai_framework.utils import BeeLogger
from beeai_framework.logger import BeeLogger

# Configure logger with default log level
logger = BeeLogger("app", level=logging.TRACE)
Expand Down Expand Up @@ -127,8 +127,8 @@ from beeai_framework.agents.bee.agent import BeeAgent
from beeai_framework.agents.types import BeeRunOutput
from beeai_framework.backend.chat import ChatModel
from beeai_framework.errors import FrameworkError
from beeai_framework.logger import BeeLogger
from beeai_framework.memory.unconstrained_memory import UnconstrainedMemory
from beeai_framework.utils import BeeLogger


async def main() -> None:
Expand Down
2 changes: 1 addition & 1 deletion python/docs/tools.md
Original file line number Diff line number Diff line change
Expand Up @@ -157,9 +157,9 @@ from beeai_framework import BeeAgent, tool
from beeai_framework.agents.types import AgentExecutionConfig
from beeai_framework.backend.chat import ChatModel
from beeai_framework.errors import FrameworkError
from beeai_framework.logger import BeeLogger
from beeai_framework.memory.unconstrained_memory import UnconstrainedMemory
from beeai_framework.tools.tool import StringToolOutput
from beeai_framework.utils import BeeLogger

logger = BeeLogger(__name__)

Expand Down
2 changes: 1 addition & 1 deletion python/examples/agents/bee.py
Original file line number Diff line number Diff line change
Expand Up @@ -14,10 +14,10 @@
from beeai_framework.emitter.emitter import Emitter, EventMeta
from beeai_framework.emitter.types import EmitterOptions
from beeai_framework.errors import FrameworkError
from beeai_framework.logger import BeeLogger
from beeai_framework.memory.token_memory import TokenMemory
from beeai_framework.tools.search import DuckDuckGoSearchTool, WikipediaTool
from beeai_framework.tools.weather.openmeteo import OpenMeteoTool
from beeai_framework.utils.custom_logger import BeeLogger
from examples.helpers.io import ConsoleReader

# Load environment variables
Expand Down
2 changes: 1 addition & 1 deletion python/examples/logger/agent.py
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,8 @@
from beeai_framework.agents.types import BeeRunOutput
from beeai_framework.backend.chat import ChatModel
from beeai_framework.errors import FrameworkError
from beeai_framework.logger import BeeLogger
from beeai_framework.memory.unconstrained_memory import UnconstrainedMemory
from beeai_framework.utils import BeeLogger


async def main() -> None:
Expand Down
2 changes: 1 addition & 1 deletion python/examples/logger/base.py
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import logging

from beeai_framework.utils import BeeLogger
from beeai_framework.logger import BeeLogger

# Configure logger with default log level
logger = BeeLogger("app", level=logging.TRACE)
Expand Down
2 changes: 1 addition & 1 deletion python/examples/tools/decorator.py
Original file line number Diff line number Diff line change
Expand Up @@ -10,9 +10,9 @@
from beeai_framework.agents.types import AgentExecutionConfig
from beeai_framework.backend.chat import ChatModel
from beeai_framework.errors import FrameworkError
from beeai_framework.logger import BeeLogger
from beeai_framework.memory.unconstrained_memory import UnconstrainedMemory
from beeai_framework.tools.tool import StringToolOutput
from beeai_framework.utils import BeeLogger

logger = BeeLogger(__name__)

Expand Down
2 changes: 1 addition & 1 deletion python/examples/tools/mcp_agent.py
Original file line number Diff line number Diff line change
Expand Up @@ -16,9 +16,9 @@
from beeai_framework.emitter.emitter import Emitter, EventMeta
from beeai_framework.emitter.types import EmitterOptions
from beeai_framework.errors import FrameworkError
from beeai_framework.logger import BeeLogger
from beeai_framework.memory.token_memory import TokenMemory
from beeai_framework.tools.mcp_tools import MCPTool
from beeai_framework.utils.custom_logger import BeeLogger
from examples.helpers.io import ConsoleReader

# Load environment variables
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,8 @@
import pytest

from beeai_framework.backend import Role
from beeai_framework.utils import BeeLogger, MessageEvent
from beeai_framework.logger import BeeLogger
from beeai_framework.utils import MessageEvent

"""
Unit Tests
Expand Down

0 comments on commit efa476f

Please # to comment.