Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix ID incorrect on model logging #2348

Merged
merged 1 commit into from
Mar 10, 2025
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 5 additions & 0 deletions libs/agno/agno/models/base.py
Original file line number Diff line number Diff line change
Expand Up @@ -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}
Expand Down Expand Up @@ -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()

Expand Down Expand Up @@ -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()

Expand Down Expand Up @@ -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:
Expand Down Expand Up @@ -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:
Expand Down
2 changes: 1 addition & 1 deletion libs/agno/agno/models/deepinfra/deepinfra.py
Original file line number Diff line number Diff line change
Expand Up @@ -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"
2 changes: 1 addition & 1 deletion libs/agno/agno/models/lmstudio/lmstudio.py
Original file line number Diff line number Diff line change
Expand Up @@ -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"
2 changes: 1 addition & 1 deletion libs/agno/agno/models/nvidia/nvidia.py
Original file line number Diff line number Diff line change
Expand Up @@ -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"
2 changes: 1 addition & 1 deletion libs/agno/agno/models/openrouter/openrouter.py
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
2 changes: 1 addition & 1 deletion libs/agno/agno/models/perplexity/perplexity.py
Original file line number Diff line number Diff line change
Expand Up @@ -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/"
Expand Down
2 changes: 1 addition & 1 deletion libs/agno/agno/models/together/together.py
Original file line number Diff line number Diff line change
Expand Up @@ -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"