Skip to content

Ensure SecretStr is cast to str on load for model clients #5947

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.

Sign up for GitHub

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

Merged
ekzhu merged 2 commits into from
Mar 14, 2025
Merged

Ensure SecretStr is cast to str on load for model clients #5947

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
ff6a6fa
initial fix to ensure secretstr get cast to str
victordibia Mar 14, 2025
e2a1e5d
lint fixes
victordibia Mar 14, 2025
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
6 changes: 6 additions & 0 deletions python/packages/autogen-ext/src/autogen_ext/models/anthropic/_anthropic_client.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -61,6 +61,7 @@
validate_model_info,
)
from autogen_core.tools import Tool, ToolSchema
from pydantic import SecretStr
from typing_extensions import Self, Unpack

from . import _model_info
Expand Down Expand Up @@ -1002,4 +1003,9 @@ def _to_config(self) -> AnthropicClientConfigurationConfigModel:
@classmethod
def _from_config(cls, config: AnthropicClientConfigurationConfigModel) -> Self:
copied_config = config.model_copy().model_dump(exclude_none=True)

# Handle api_key as SecretStr
if "api_key" in copied_config and isinstance(config.api_key, SecretStr):
copied_config["api_key"] = config.api_key.get_secret_value()

return cls(**copied_config)
12 changes: 11 additions & 1 deletion python/packages/autogen-ext/src/autogen_ext/models/openai/_openai_client.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -70,7 +70,7 @@
from openai.types.chat.chat_completion import Choice
from openai.types.chat.chat_completion_chunk import Choice as ChunkChoice
from openai.types.shared_params import FunctionDefinition, FunctionParameters
from pydantic import BaseModel
from pydantic import BaseModel, SecretStr
from typing_extensions import Self, Unpack

from .._utils.normalize_stop_reason import normalize_stop_reason
Expand Down Expand Up @@ -1298,6 +1298,11 @@ def _to_config(self) -> OpenAIClientConfigurationConfigModel:
@classmethod
def _from_config(cls, config: OpenAIClientConfigurationConfigModel) -> Self:
copied_config = config.model_copy().model_dump(exclude_none=True)

# Handle api_key as SecretStr
if "api_key" in copied_config and isinstance(config.api_key, SecretStr):
copied_config["api_key"] = config.api_key.get_secret_value()

return cls(**copied_config)


Expand Down Expand Up @@ -1459,6 +1464,11 @@ def _from_config(cls, config: AzureOpenAIClientConfigurationConfigModel) -> Self
from ...auth.azure import AzureTokenProvider

copied_config = config.model_copy().model_dump(exclude_none=True)

# Handle api_key as SecretStr
if "api_key" in copied_config and isinstance(config.api_key, SecretStr):
copied_config["api_key"] = config.api_key.get_secret_value()

if "azure_ad_token_provider" in copied_config:
copied_config["azure_ad_token_provider"] = AzureTokenProvider.load_component(
copied_config["azure_ad_token_provider"]
Expand Down