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(blocks): Fix broken Apollo Blocks (#10197)
Zamil Majdy91ea32288715
diff --git a/autogpt_platform/backend/backend/blocks/apollo/_api.py b/autogpt_platform/backend/backend/blocks/apollo/_api.pyindex f4915561b3..dd4e6aa741 100644--- a/autogpt_platform/backend/backend/blocks/apollo/_api.py+++ b/autogpt_platform/backend/backend/blocks/apollo/_api.py@@ -29,10 +29,10 @@ class ApolloClient:async def search_people(self, query: SearchPeopleRequest) -> List[Contact]:"""Search for people in Apollo"""- response = await self.requests.get(+ response = await self.requests.post(f"{self.API_URL}/mixed_people/search",headers=self._get_headers(),- params=query.model_dump(exclude={"credentials", "max_results"}),+ json=query.model_dump(exclude={"max_results"}),)data = response.json()parsed_response = SearchPeopleResponse(**data)@@ -53,10 +53,10 @@ class ApolloClient:and len(parsed_response.people) > 0):query.page += 1- response = await self.requests.get(+ response = await self.requests.post(f"{self.API_URL}/mixed_people/search",headers=self._get_headers(),- params=query.model_dump(exclude={"credentials", "max_results"}),+ json=query.model_dump(exclude={"max_results"}),)data = response.json()parsed_response = SearchPeopleResponse(**data)@@ -69,10 +69,10 @@ class ApolloClient:self, query: SearchOrganizationsRequest) -> List[Organization]:"""Search for organizations in Apollo"""- response = await self.requests.get(+ response = await self.requests.post(f"{self.API_URL}/mixed_companies/search",headers=self._get_headers(),- params=query.model_dump(exclude={"credentials", "max_results"}),+ json=query.model_dump(exclude={"max_results"}),)data = response.json()parsed_response = SearchOrganizationsResponse(**data)@@ -93,10 +93,10 @@ class ApolloClient:and len(parsed_response.organizations) > 0):query.page += 1- response = await self.requests.get(+ response = await self.requests.post(f"{self.API_URL}/mixed_companies/search",headers=self._get_headers(),- params=query.model_dump(exclude={"credentials", "max_results"}),+ json=query.model_dump(exclude={"max_results"}),)data = response.json()parsed_response = SearchOrganizationsResponse(**data)diff --git a/autogpt_platform/backend/backend/blocks/apollo/models.py b/autogpt_platform/backend/backend/blocks/apollo/models.pyindex 25fbb4d669..f97da43eaf 100644--- a/autogpt_platform/backend/backend/blocks/apollo/models.py+++ b/autogpt_platform/backend/backend/blocks/apollo/models.py@@ -1,17 +1,31 @@from enum import Enumfrom typing import Any, Optional-from pydantic import BaseModel, ConfigDict+from pydantic import BaseModel as OriginalBaseModel+from pydantic import ConfigDictfrom backend.data.model import SchemaField+class BaseModel(OriginalBaseModel):+ def model_dump(self, *args, exclude: set[str] | None = None, **kwargs):+ if exclude is None:+ exclude = set("credentials")+ else:+ exclude.add("credentials")++ kwargs.setdefault("exclude_none", True)+ kwargs.setdefault("exclude_unset", True)+ kwargs.setdefault("exclude_defaults", True)+ return super().model_dump(*args, exclude=exclude, **kwargs)++class PrimaryPhone(BaseModel):"""A primary phone in Apollo"""- number: str- source: str- sanitized_number: str+ number: str = ""+ source: str = ""+ sanitized_number: str = ""class SenorityLevels(str, Enum):@@ -42,88 +56,88 @@ class ContactEmailStatuses(str, Enum):class RuleConfigStatus(BaseModel):"""A rule config status in Apollo"""- _id: str- created_at: str- rule_action_config_id: str- rule_config_id: str- status_cd: str- updated_at: str- id: str- key: str+ _id: str = ""+ created_at: str = ""+ rule_action_config_id: str = ""+ rule_config_id: str = ""+ status_cd: str = ""+ updated_at: str = ""+ id: str = ""+ key: str = ""class ContactCampaignStatus(BaseModel):"""A contact campaign status in Apollo"""- id: str- emailer_campaign_id: str- send_email_from_user_id: str- inactive_reason: str- status: str- added_at: str- added_by_user_id: str- finished_at: str- paused_at: str- auto_unpause_at: str- send_email_from_email_address: str- send_email_from_email_account_id: str- manually_set_unpause: str- failure_reason: str- current_step_id: str- in_response_to_emailer_message_id: str- cc_emails: str- bcc_emails: str- to_emails: str+ id: str = ""+ emailer_campaign_id: str = ""+ send_email_from_user_id: str = ""+ inactive_reason: str = ""+ status: str = ""+ added_at: str = ""+ added_by_user_id: str = ""+ finished_at: str = ""+ paused_at: str = ""+ auto_unpause_at: str = ""+ send_email_from_email_address: str = ""+ send_email_from_email_account_id: str = ""+ manually_set_unpause: str = ""+ failure_reason: str = ""+ current_step_id: str = ""+ in_response_to_emailer_message_id: str = ""+ cc_emails: str = ""+ bcc_emails: str = ""+ to_emails: str = ""class Account(BaseModel):"""An account in Apollo"""- id: str- name: str- website_url: str- blog_url: str- angellist_url: str- linkedin_url: str- twitter_url: str- facebook_url: str- primary_phone: PrimaryPhone+ id: str = ""+ name: str = ""+ website_url: str = ""+ blog_url: str = ""+ angellist_url: str = ""+ linkedin_url: str = ""+ twitter_url: str = ""+ facebook_url: str = ""+ primary_phone: PrimaryPhone = PrimaryPhone()languages: list[str]- alexa_ranking: int- phone: str- linkedin_uid: str- founded_year: int- publicly_traded_symbol: str- publicly_traded_exchange: str- logo_url: str- chrunchbase_url: str- primary_domain: str- domain: str- team_id: str- organization_id: str- account_stage_id: str- source: str- original_source: str- creator_id: str- owner_id: str- created_at: str- phone_status: str- hubspot_id: str- salesforce_id: str- crm_owner_id: str- parent_account_id: str- sanitized_phone: str+ alexa_ranking: int = 0+ phone: str = ""+ linkedin_uid: str = ""+ founded_year: int = 0+ publicly_traded_symbol: str = ""+ publicly_traded_exchange: str = ""+ logo_url: str = ""+ chrunchbase_url: str = ""+ primary_domain: str = ""+ domain: str = ""+ team_id: str = ""+ organization_id: str = ""+ account_stage_id: str = ""+ source: str = ""+ original_source: str = ""+ creator_id: str = ""+ owner_id: str = ""+ created_at: str = ""+ phone_status: str = ""+ hubspot_id: str = ""+ salesforce_id: str = ""+ crm_owner_id: str = ""+ parent_account_id: str = ""+ sanitized_phone: str = ""# no listed type on the API docs- account_playbook_statues: list[Any]- account_rule_config_statuses: list[RuleConfigStatus]- existence_level: str- label_ids: list[str]+ account_playbook_statues: list[Any] = []+ account_rule_config_statuses: list[RuleConfigStatus] = []+ existence_level: str = ""+ label_ids: list[str] = []typed_custom_fields: Anycustom_field_errors: Any- modality: str- source_display_name: str- salesforce_record_id: str- crm_record_url: str+ modality: str = ""+ source_display_name: str = ""+ salesforce_record_id: str = ""+ crm_record_url: str = ""class ContactEmail(BaseModel):@@ -205,7 +219,7 @@ class Pagination(BaseModel):class DialerFlags(BaseModel):"""A dialer flags in Apollo"""- country_name: str+ country_name: str = ""country_enabled: boolhigh_risk_calling_enabled: boolpotential_high_risk_number: booldiff --git a/autogpt_platform/backend/backend/blocks/apollo/organization.py b/autogpt_platform/backend/backend/blocks/apollo/organization.pyindex 869f1be050..e21b0ab5d9 100644--- a/autogpt_platform/backend/backend/blocks/apollo/organization.py+++ b/autogpt_platform/backend/backend/blocks/apollo/organization.py@@ -210,9 +210,7 @@ To find IDs, identify the values for organization_id when you call this endpointasync def run(self, input_data: Input, *, credentials: ApolloCredentials, **kwargs) -> BlockOutput:- query = SearchOrganizationsRequest(- **input_data.model_dump(exclude={"credentials"})- )+ query = SearchOrganizationsRequest(**input_data.model_dump())organizations = await self.search_organizations(query, credentials)for organization in organizations:yield "organization", organizationdiff --git a/autogpt_platform/backend/backend/blocks/apollo/people.py b/autogpt_platform/backend/backend/blocks/apollo/people.pyindex 4eb8bd3de7..c6d8620b7d 100644--- a/autogpt_platform/backend/backend/blocks/apollo/people.py+++ b/autogpt_platform/backend/backend/blocks/apollo/people.py@@ -107,6 +107,7 @@ class SearchPeopleBlock(Block):default_factory=list,)person: Contact = SchemaField(+ title="Person",description="Each found person, one at a time",)error: str = SchemaField(@@ -387,7 +388,7 @@ class SearchPeopleBlock(Block):**kwargs,) -> BlockOutput:- query = SearchPeopleRequest(**input_data.model_dump(exclude={"credentials"}))+ query = SearchPeopleRequest(**input_data.model_dump())people = await self.search_people(query, credentials)for person in people:yield "person", persondiff --git a/autogpt_platform/frontend/src/components/NodeOutputs.tsx b/autogpt_platform/frontend/src/components/NodeOutputs.tsxindex fcedf1f408..1a6ad26e0a 100644--- a/autogpt_platform/frontend/src/components/NodeOutputs.tsx+++ b/autogpt_platform/frontend/src/components/NodeOutputs.tsx@@ -26,15 +26,23 @@ export default function NodeOutputs({<div className="mt-2"><strong className="mr-2">Data:</strong><div className="mt-1">- {dataArray.map((item, index) => (+ {dataArray.slice(0, 10).map((item, index) => (<React.Fragment key={index}><ContentRenderervalue={item}truncateLongData={truncateLongData}/>- {index < dataArray.length - 1 && ", "}+ {index < Math.min(dataArray.length, 10) - 1 && ", "}</React.Fragment>))}+ {dataArray.length > 10 && (+ <span style={{ color: "#888" }}>+ <br />+ <b>⋮</b>+ <br />+ <span>and {dataArray.length - 10} more</span>+ </span>+ )}</div><Separator.Root className="my-4 h-[1px] bg-gray-300" /></div>