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.
fix(block): Avoid Apollo enrich_info feature overriding already existing search info
Zamil Majdy59e96d475914
diff --git a/autogpt_platform/backend/backend/blocks/apollo/_api.py b/autogpt_platform/backend/backend/blocks/apollo/_api.pyindex fa536ac8f4..2e71cf79b0 100644--- a/autogpt_platform/backend/backend/blocks/apollo/_api.py+++ b/autogpt_platform/backend/backend/blocks/apollo/_api.py@@ -140,4 +140,6 @@ class ApolloClient:if "person" not in data:raise ValueError(f"Person not found or enrichment failed: {data}")- return Contact(**data["person"])+ contact = Contact(**data["person"])+ contact.email = contact.email or "-"+ return contactdiff --git a/autogpt_platform/backend/backend/blocks/apollo/people.py b/autogpt_platform/backend/backend/blocks/apollo/people.pyindex ecfc7cffb0..3422dc4324 100644--- a/autogpt_platform/backend/backend/blocks/apollo/people.py+++ b/autogpt_platform/backend/backend/blocks/apollo/people.py@@ -310,6 +310,35 @@ class SearchPeopleBlock(Block):client = ApolloClient(credentials)return await client.enrich_person(query)+ @staticmethod+ def merge_contact_data(original: Contact, enriched: Contact) -> Contact:+ """+ Merge contact data from original search with enriched data.+ Enriched data complements original data, only filling in missing values.+ """+ merged_data = original.model_dump()+ enriched_data = enriched.model_dump()++ # Only update fields that are None, empty string, empty list, or default values in original+ for key, enriched_value in enriched_data.items():+ original_value = merged_data.get(key)++ # Skip if enriched value is None, empty string, or empty list+ if enriched_value is None or enriched_value == "" or enriched_value == []:+ continue++ # Update if original value is None, empty string, empty list, or zero+ if (+ original_value is None+ or original_value == ""+ or original_value == []+ or original_value == 0+ or original_value == 0.0+ ):+ merged_data[key] = enriched_value++ return Contact(**merged_data)+async def run(self,input_data: Input,@@ -327,7 +356,11 @@ class SearchPeopleBlock(Block):async def enrich_or_fallback(person):try:enrich_query = EnrichPersonRequest(person_id=person.person_id)- return await self.enrich_person(enrich_query, credentials)+ enriched_person = await self.enrich_person(+ enrich_query, credentials+ )+ # Merge enriched data with original data, complementing instead of replacing+ return self.merge_contact_data(person, enriched_person)except Exception:return person # If enrichment fails, use original person datadiff --git a/autogpt_platform/backend/backend/blocks/branching.py b/autogpt_platform/backend/backend/blocks/branching.pyindex 17cfd6d5c1..fa66c2d30d 100644--- a/autogpt_platform/backend/backend/blocks/branching.py+++ b/autogpt_platform/backend/backend/blocks/branching.py@@ -3,6 +3,7 @@ from typing import Anyfrom backend.data.block import Block, BlockCategory, BlockOutput, BlockSchemafrom backend.data.model import SchemaField+from backend.util.type import convertclass ComparisonOperator(Enum):@@ -181,7 +182,23 @@ class IfInputMatchesBlock(Block):)async def run(self, input_data: Input, **kwargs) -> BlockOutput:- if input_data.input == input_data.value or input_data.input is input_data.value:++ # If input_data.value is not matching input_data.input, convert value to type of input+ if (+ input_data.input != input_data.value+ and input_data.input is not input_data.value+ ):+ try:+ # Only attempt conversion if input is not None and value is not None+ if input_data.input is not None and input_data.value is not None:+ input_type = type(input_data.input)+ # Avoid converting if input_type is Any or object+ if input_type not in (Any, object):+ input_data.value = convert(input_data.value, input_type)+ except Exception:+ pass # If conversion fails, just leave value as is++ if input_data.input == input_data.value:yield "result", Trueyield "yes_output", input_data.yes_valueelse: