From 6575d1be3304ec936d16b13429de80bd25d80fc1 Mon Sep 17 00:00:00 2001 From: Dirk Brand Date: Mon, 10 Mar 2025 12:39:46 +0200 Subject: [PATCH] Fix ID incorrect on model logging --- libs/agno/agno/models/base.py | 5 +++++ libs/agno/agno/models/deepinfra/deepinfra.py | 2 +- libs/agno/agno/models/lmstudio/lmstudio.py | 2 +- libs/agno/agno/models/nvidia/nvidia.py | 2 +- libs/agno/agno/models/openrouter/openrouter.py | 2 +- libs/agno/agno/models/perplexity/perplexity.py | 2 +- libs/agno/agno/models/together/together.py | 2 +- 7 files changed, 11 insertions(+), 6 deletions(-) diff --git a/libs/agno/agno/models/base.py b/libs/agno/agno/models/base.py index 5a6ea2b787..3df1327b39 100644 --- a/libs/agno/agno/models/base.py +++ b/libs/agno/agno/models/base.py @@ -89,6 +89,7 @@ def __post_init__(self): if self.provider is None and self.name is not None: self.provider = f"{self.name} ({self.id})" + def to_dict(self) -> Dict[str, Any]: fields = {"name", "id", "provider"} _dict = {field: getattr(self, field) for field in fields if getattr(self, field) is not None} @@ -161,6 +162,7 @@ def response(self, messages: List[Message]) -> ModelResponse: ModelResponse: The model's response """ logger.debug(f"---------- {self.get_provider()} Response Start ----------") + logger.debug(f"---------- Model: {self.id} ----------") self._log_messages(messages) model_response = ModelResponse() @@ -223,6 +225,7 @@ async def aresponse(self, messages: List[Message]) -> ModelResponse: ModelResponse: The model's response """ logger.debug(f"---------- {self.get_provider()} Async Response Start ----------") + logger.debug(f"---------- Model: {self.id} ----------") self._log_messages(messages) model_response = ModelResponse() @@ -460,6 +463,7 @@ def response_stream(self, messages: List[Message]) -> Iterator[ModelResponse]: Iterator[ModelResponse]: Iterator of model responses """ logger.debug(f"---------- {self.get_provider()} Response Stream Start ----------") + logger.debug(f"---------- Model: {self.id} ----------") self._log_messages(messages) while True: @@ -555,6 +559,7 @@ async def aresponse_stream(self, messages: List[Message]) -> AsyncIterator[Model AsyncIterator[ModelResponse]: Async iterator of model responses """ logger.debug(f"---------- {self.get_provider()} Async Response Stream Start ----------") + logger.debug(f"---------- Model: {self.id} ----------") self._log_messages(messages) while True: diff --git a/libs/agno/agno/models/deepinfra/deepinfra.py b/libs/agno/agno/models/deepinfra/deepinfra.py index 9f17d31175..63ceb63140 100644 --- a/libs/agno/agno/models/deepinfra/deepinfra.py +++ b/libs/agno/agno/models/deepinfra/deepinfra.py @@ -22,7 +22,7 @@ class DeepInfra(OpenAILike): id: str = "meta-llama/Llama-2-70b-chat-hf" name: str = "DeepInfra" - provider: str = "DeepInfra " + id + provider: str = "DeepInfra" api_key: Optional[str] = getenv("DEEPINFRA_API_KEY", None) base_url: str = "https://api.deepinfra.com/v1/openai" diff --git a/libs/agno/agno/models/lmstudio/lmstudio.py b/libs/agno/agno/models/lmstudio/lmstudio.py index 46ee62ef4a..5991de8533 100644 --- a/libs/agno/agno/models/lmstudio/lmstudio.py +++ b/libs/agno/agno/models/lmstudio/lmstudio.py @@ -17,6 +17,6 @@ class LMStudio(OpenAILike): id: str = "qwen2.5-7b-instruct-1m" name: str = "LMStudio" - provider: str = "LMStudio " + id + provider: str = "LMStudio" base_url: str = "http://127.0.0.1:1234/v1" diff --git a/libs/agno/agno/models/nvidia/nvidia.py b/libs/agno/agno/models/nvidia/nvidia.py index 682760a5f7..5c96943acf 100644 --- a/libs/agno/agno/models/nvidia/nvidia.py +++ b/libs/agno/agno/models/nvidia/nvidia.py @@ -20,7 +20,7 @@ class Nvidia(OpenAILike): id: str = "meta/llama-3.3-70b-instruct" name: str = "Nvidia" - provider: str = "Nvidia " + id + provider: str = "Nvidia" api_key: Optional[str] = getenv("NVIDIA_API_KEY", None) base_url: str = "https://integrate.api.nvidia.com/v1" diff --git a/libs/agno/agno/models/openrouter/openrouter.py b/libs/agno/agno/models/openrouter/openrouter.py index 8fd6723600..e2f0a13a2d 100644 --- a/libs/agno/agno/models/openrouter/openrouter.py +++ b/libs/agno/agno/models/openrouter/openrouter.py @@ -21,7 +21,7 @@ class OpenRouter(OpenAILike): id: str = "gpt-4o" name: str = "OpenRouter" - provider: str = "OpenRouter: " + id + provider: str = "OpenRouter" api_key: Optional[str] = getenv("OPENROUTER_API_KEY") base_url: str = "https://openrouter.ai/api/v1" diff --git a/libs/agno/agno/models/perplexity/perplexity.py b/libs/agno/agno/models/perplexity/perplexity.py index 153cb94943..9264d0d52b 100644 --- a/libs/agno/agno/models/perplexity/perplexity.py +++ b/libs/agno/agno/models/perplexity/perplexity.py @@ -23,7 +23,7 @@ class Perplexity(OpenAILike): id: str = "sonar" name: str = "Perplexity" - provider: str = "Perplexity: " + id + provider: str = "Perplexity" api_key: Optional[str] = getenv("PERPLEXITY_API_KEY") base_url: str = "https://api.perplexity.ai/" diff --git a/libs/agno/agno/models/together/together.py b/libs/agno/agno/models/together/together.py index f930673b33..9e549959f6 100644 --- a/libs/agno/agno/models/together/together.py +++ b/libs/agno/agno/models/together/together.py @@ -20,6 +20,6 @@ class Together(OpenAILike): id: str = "mistralai/Mixtral-8x7B-Instruct-v0.1" name: str = "Together" - provider: str = "Together " + id + provider: str = "Together" api_key: Optional[str] = getenv("TOGETHER_API_KEY") base_url: str = "https://api.together.xyz/v1"