AutoGPT is the vision of accessible AI for everyone, to use and to build on. Our mission is to provide the tools, so that you can focus on what matters.
hotfix(backend): use discriminator for credential matching in run_block (#11908)
Otto2abbb7fbc8ab
diff --git a/autogpt_platform/backend/backend/api/features/chat/tools/run_block.py b/autogpt_platform/backend/backend/api/features/chat/tools/run_block.pyindex 3f57236564..3a7118eb87 100644--- a/autogpt_platform/backend/backend/api/features/chat/tools/run_block.py+++ b/autogpt_platform/backend/backend/api/features/chat/tools/run_block.py@@ -4,6 +4,8 @@ import loggingfrom collections import defaultdictfrom typing import Any+from pydantic_core import PydanticUndefined+from backend.api.features.chat.model import ChatSessionfrom backend.data.block import get_blockfrom backend.data.execution import ExecutionContext@@ -73,15 +75,22 @@ class RunBlockTool(BaseTool):self,user_id: str,block: Any,+ input_data: dict[str, Any] | None = None,) -> tuple[dict[str, CredentialsMetaInput], list[CredentialsMetaInput]]:"""Check if user has required credentials for a block.+ Args:+ user_id: User ID+ block: Block to check credentials for+ input_data: Input data for the block (used to determine provider via discriminator)+Returns:tuple[matched_credentials, missing_credentials]"""matched_credentials: dict[str, CredentialsMetaInput] = {}missing_credentials: list[CredentialsMetaInput] = []+ input_data = input_data or {}# Get credential field info from block's input schemacredentials_fields_info = block.input_schema.get_credentials_fields_info()@@ -94,14 +103,33 @@ class RunBlockTool(BaseTool):available_creds = await creds_manager.store.get_all_creds(user_id)for field_name, field_info in credentials_fields_info.items():- # field_info.provider is a frozenset of acceptable providers- # field_info.supported_types is a frozenset of acceptable types+ effective_field_info = field_info+ if field_info.discriminator and field_info.discriminator_mapping:+ # Get discriminator from input, falling back to schema default+ discriminator_value = input_data.get(field_info.discriminator)+ if discriminator_value is None:+ field = block.input_schema.model_fields.get(+ field_info.discriminator+ )+ if field and field.default is not PydanticUndefined:+ discriminator_value = field.default++ if (+ discriminator_value+ and discriminator_value in field_info.discriminator_mapping+ ):+ effective_field_info = field_info.discriminate(discriminator_value)+ logger.debug(+ f"Discriminated provider for {field_name}: "+ f"{discriminator_value} -> {effective_field_info.provider}"+ )+matching_cred = next((credfor cred in available_creds- if cred.provider in field_info.provider- and cred.type in field_info.supported_types+ if cred.provider in effective_field_info.provider+ and cred.type in effective_field_info.supported_types),None,)@@ -115,8 +143,8 @@ class RunBlockTool(BaseTool):)else:# Create a placeholder for the missing credential- provider = next(iter(field_info.provider), "unknown")- cred_type = next(iter(field_info.supported_types), "api_key")+ provider = next(iter(effective_field_info.provider), "unknown")+ cred_type = next(iter(effective_field_info.supported_types), "api_key")missing_credentials.append(CredentialsMetaInput(id=field_name,@@ -184,10 +212,9 @@ class RunBlockTool(BaseTool):logger.info(f"Executing block {block.name} ({block_id}) for user {user_id}")- # Check credentialscreds_manager = IntegrationCredentialsManager()matched_credentials, missing_credentials = await self._check_block_credentials(- user_id, block+ user_id, block, input_data)if missing_credentials: