dhisana 0.0.1.dev231__tar.gz → 0.0.1.dev257__tar.gz

{dhisana-0.0.1.dev231 → dhisana-0.0.1.dev257}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: dhisana
-Version: 0.0.1.dev231
+Version: 0.0.1.dev257
 Summary: A Python SDK for Dhisana AI Platform
 Home-page: https://github.com/dhisana-ai/dhisana-python-sdk
 Author: Admin

{dhisana-0.0.1.dev231 → dhisana-0.0.1.dev257}/setup.py

@@ -2,7 +2,7 @@ from setuptools import setup, find_packages
 
 setup(
     name='dhisana',  
-    version='0.0.1-dev231',
+    version='0.0.1-dev257',
     description='A Python SDK for Dhisana AI Platform',
     author='Admin',
     author_email='contact@dhisana.ai',

{dhisana-0.0.1.dev231 → dhisana-0.0.1.dev257}/src/dhisana/schemas/common.py

@@ -378,6 +378,8 @@ class SendEmailContext(BaseModel):
     sender_email: str
     labels: Optional[List[str]]
     body_format: BodyFormat = BodyFormat.AUTO
+    headers: Optional[Dict[str, str]] = None
+    email_open_token: Optional[str] = None
     
 class QueryEmailContext(BaseModel):
     start_time: str
@@ -392,6 +394,8 @@ class ReplyEmailContext(BaseModel):
     reply_body: str
     sender_email: str
     sender_name: str
+    headers: Optional[Dict[str, str]] = None
+    fallback_recipient: Optional[str] = None
     mark_as_read: str = "True"
     add_labels: Optional[List[str]] = None
     reply_body_format: BodyFormat = BodyFormat.AUTO

{dhisana-0.0.1.dev231 → dhisana-0.0.1.dev257}/src/dhisana/schemas/sales.py

@@ -270,6 +270,7 @@ class ChannelType(str, Enum):
     LINKEDIN_CONNECT_MESSAGE = "linkedin_connect_message"
     REPLY_EMAIL = "reply_email"
     LINKEDIN_USER_MESSAGE = "linkedin_user_message"
+    CUSTOM_MESSAGE = "custom_message"
 
 class SenderInfo(BaseModel):
     """
@@ -291,10 +292,14 @@ class MessageGenerationInstructions(BaseModel):
     Holds the user-supplied instructions for generating the message:
       - instructions_to_generate_message: Plain text or template instructions from the user.
       - prompt_engineering_guidance: (Optional) Extra guidelines for structuring the prompt.
+      - allow_html: Whether HTML output is allowed.
+      - html_template: Optional HTML scaffolding or guidance.
     """
     instructions_to_generate_message: Optional[str] = None
     prompt_engineering_guidance: Optional[PromptEngineeringGuidance] = None
     use_cache: Optional[bool] = True
+    allow_html: Optional[bool] = False
+    html_template: Optional[str] = None
 
 class CampaignContext(BaseModel):
     """
@@ -723,7 +728,10 @@ class LeadsQueryFilters(BaseModel):
     # CHANGED: Renamed to be more descriptive
     industries: Optional[List[str]] = Field(
         default=None,
-        description="List of organization industries. Maps to organization_industries in Apollo."
+        description=(
+            "List of organization industries (case sensitive). "
+            "Maps to organization_industries in Apollo."
+        )
     )
 
     # Potential existing fields
@@ -749,7 +757,7 @@ class LeadsQueryFilters(BaseModel):
     # CHANGED: Renamed to be more descriptive
     company_domains: Optional[List[str]] = Field(
         default=None,
-        description="Domains of the person's employer (e.g., ['microsoft.com']). Maps to q_organization_domains."
+        description="Domains of the person's employer (e.g., ['apollo.io', 'microsoft.com']). Maps to q_organization_domains_list in Apollo API. Accepts up to 1,000 domains. Do not include www. or @ symbol."
     )
 
     # CHANGED: Renamed to be more descriptive
@@ -795,7 +803,20 @@ class LeadsQueryFilters(BaseModel):
     # CHANGED: Renamed for consistency
     company_industry_tag_ids: Optional[List[str]] = Field(
         default=None,
-        description="List of industry tag IDs, e.g. ['5567cd4773696439b10b0000']. Maps to organization_industry_tag_ids."
+        description=(
+            "List of industry tag IDs, e.g. ['5567cd4773696439b10b0000']. "
+            "Maps to organization_industry_tag_ids."
+        )
+    )
+    
+    q_organization_keyword_tags: Optional[List[str]] = Field(
+        default=None,
+        description="Organization Keyword tags to search by"
+    )
+    
+    q_not_organization_keyword_tags: Optional[List[str]] = Field(
+        default=None,
+        description="Organization Keyword tags to search by"
     )
 
     q_organization_search_list_id: Optional[str] = Field(
@@ -861,6 +882,16 @@ class CompanyQueryFilters(BaseModel):
         default=None,
         description="List of industry tag IDs, e.g. ['5567cd4773696439b10b0000']."
     )
+    
+    q_organization_keyword_tags: Optional[List[str]] = Field(
+        default=None,
+        description="Organization Keyword tags to search by"
+    )
+    
+    q_not_organization_keyword_tags: Optional[List[str]] = Field(
+        default=None,
+        description="Organization Keyword tags to search by"
+    )
 
     # Revenue filters
     revenue_range_min: Optional[int] = Field(
@@ -938,4 +969,3 @@ class CompanyQueryFilters(BaseModel):
         default=None,
         description="Maximum founding year for the organization."
     )
-

{dhisana-0.0.1.dev231 → dhisana-0.0.1.dev257}/src/dhisana/utils/apollo_tools.py

@@ -547,8 +547,10 @@ async def search_leads_with_apollo(
             "revenueRange[max]": "revenue_range_max",
             "revenueRange[min]": "revenue_range_min",
             "currentlyUsingAnyOfTechnologyUids": "currently_using_any_of_technology_uids",
+            "organizationIndustries": "organization_industries",
             "organizationIndustryTagIds": "organization_industry_tag_ids",
             "notOrganizationIds": "not_organization_ids",
+            "qOrganizationDomainsList": "q_organization_domains_list",
         }
 
         for raw_key, raw_value_list in query_params.items():
@@ -606,13 +608,15 @@ async def search_leads_with_apollo(
                     "person_titles",
                     "person_seniorities",
                     "organization_locations",
-                    "q_organization_domains",
+                    "q_organization_domains_list",
                     "contact_email_status",
                     "organization_ids",
                     "organization_num_employees_ranges",
                     "person_not_titles",  # <--- added so single item is forced into list
                     "q_organization_job_titles",
                     "organization_latest_funding_stage_cd",
+                    "organization_industries",
+                    "organization_industry_tag_ids",
                 ):
                     if isinstance(final_value, str):
                         final_value = [final_value]
@@ -631,17 +635,28 @@ async def search_leads_with_apollo(
     # -----------------------------------
     else:
         dynamic_payload = {
-            "person_titles": query.person_current_titles or [],
-            "person_locations": query.person_locations or [],
-            "search_signal_ids": query.filter_by_signals or [],
-            "q_keywords": query.search_keywords or "",
-            "organization_num_employees_ranges": (
-                query.organization_num_employees_ranges
-                or [f"{query.min_employees_in_organization or 1},{query.max_employees_in_organization or 1000}"]
-            ),
             "page": 1,
             "per_page": min(max_items, 100),
         }
+        
+        # Only add fields if they have values (don't pass empty defaults)
+        if query.person_current_titles:
+            dynamic_payload["person_titles"] = query.person_current_titles
+        if query.person_locations:
+            dynamic_payload["person_locations"] = query.person_locations
+        if query.filter_by_signals:
+            dynamic_payload["search_signal_ids"] = query.filter_by_signals
+        if query.search_keywords:
+            dynamic_payload["q_keywords"] = query.search_keywords
+        
+        # Only add employee ranges if explicitly provided
+        if query.organization_num_employees_ranges:
+            dynamic_payload["organization_num_employees_ranges"] = query.organization_num_employees_ranges
+        elif query.min_employees_in_organization is not None or query.max_employees_in_organization is not None:
+            min_emp = query.min_employees_in_organization or 1
+            max_emp = query.max_employees_in_organization or 1000000
+            dynamic_payload["organization_num_employees_ranges"] = [f"{min_emp},{max_emp}"]
+        
         if query.job_openings_with_titles:
             dynamic_payload["q_organization_job_titles"] = query.job_openings_with_titles
         if query.latest_funding_stages:
@@ -650,6 +665,15 @@ async def search_leads_with_apollo(
             dynamic_payload["sort_by_field"] = query.sort_by_field
         if query.sort_ascending is not None:
             dynamic_payload["sort_ascending"] = query.sort_ascending
+        if query.person_seniorities:
+            dynamic_payload["person_seniorities"] = query.person_seniorities
+        if query.industries:
+            dynamic_payload["organization_industries"] = query.industries
+        if query.company_industry_tag_ids:
+            dynamic_payload["organization_industry_tag_ids"] = query.company_industry_tag_ids
+        # Add company domains to include in search
+        if query.company_domains:
+            dynamic_payload["q_organization_domains_list"] = query.company_domains
 
     # -----------------------------
     # C) Fetch multiple pages
@@ -765,8 +789,10 @@ async def search_leads_with_apollo_page(
             "revenueRange[max]": "revenue_range_max",
             "revenueRange[min]": "revenue_range_min",
             "currentlyUsingAnyOfTechnologyUids": "currently_using_any_of_technology_uids",
+            "organizationIndustries": "organization_industries",
             "organizationIndustryTagIds": "organization_industry_tag_ids",
             "notOrganizationIds": "not_organization_ids",
+            "qOrganizationDomainsList": "q_organization_domains_list",
         }
 
         for raw_key, raw_value_list in query_params.items():
@@ -809,13 +835,15 @@ async def search_leads_with_apollo_page(
                     "person_titles",
                     "person_seniorities",
                     "organization_locations",
-                    "q_organization_domains",
+                    "q_organization_domains_list",
                     "contact_email_status",
                     "organization_ids",
                     "organization_num_employees_ranges",
                     "person_not_titles",
                     "q_organization_job_titles",
                     "organization_latest_funding_stage_cd",
+                    "organization_industries",
+                    "organization_industry_tag_ids",
                 ):
                     if isinstance(final_value, str):
                         final_value = [final_value]
@@ -829,16 +857,26 @@ async def search_leads_with_apollo_page(
     # B) No example_url -> build from `query`
     # -----------------------------------
     else:
-        dynamic_payload = {
-            "person_titles": query.person_current_titles or [],
-            "person_locations": query.person_locations or [],
-            "search_signal_ids": query.filter_by_signals or [],
-            "q_keywords": query.search_keywords or "",
-            "organization_num_employees_ranges": (
-                query.organization_num_employees_ranges
-                or [f"{query.min_employees_in_organization or 1},{query.max_employees_in_organization or 1000}"]
-            ),
-        }
+        dynamic_payload = {}
+        
+        # Only add fields if they have values (don't pass empty defaults)
+        if query.person_current_titles:
+            dynamic_payload["person_titles"] = query.person_current_titles
+        if query.person_locations:
+            dynamic_payload["person_locations"] = query.person_locations
+        if query.filter_by_signals:
+            dynamic_payload["search_signal_ids"] = query.filter_by_signals
+        if query.search_keywords:
+            dynamic_payload["q_keywords"] = query.search_keywords
+        
+        # Only add employee ranges if explicitly provided
+        if query.organization_num_employees_ranges:
+            dynamic_payload["organization_num_employees_ranges"] = query.organization_num_employees_ranges
+        elif query.min_employees_in_organization is not None or query.max_employees_in_organization is not None:
+            min_emp = query.min_employees_in_organization or 1
+            max_emp = query.max_employees_in_organization or 1000000
+            dynamic_payload["organization_num_employees_ranges"] = [f"{min_emp},{max_emp}"]
+        
         if query.job_openings_with_titles:
             dynamic_payload["q_organization_job_titles"] = query.job_openings_with_titles
         if query.latest_funding_stages:
@@ -847,6 +885,19 @@ async def search_leads_with_apollo_page(
             dynamic_payload["sort_by_field"] = query.sort_by_field
         if query.sort_ascending is not None:
             dynamic_payload["sort_ascending"] = query.sort_ascending
+        if query.q_organization_keyword_tags:
+            dynamic_payload["q_organization_keyword_tags"] = query.q_organization_keyword_tags
+            
+        if query.q_not_organization_keyword_tags:
+            dynamic_payload["q_not_organization_keyword_tags"] = query.q_not_organization_keyword_tags
+        if query.industries:
+            dynamic_payload["organization_industries"] = query.industries
+        if query.company_industry_tag_ids:
+            dynamic_payload["organization_industry_tag_ids"] = query.company_industry_tag_ids
+
+        # Add company domains to include in search (Apollo API: q_organization_domains_list[])
+        if query.company_domains:
+            dynamic_payload["q_organization_domains_list"] = query.company_domains
 
     page_payload = dict(dynamic_payload)
     page_payload["page"] = page
@@ -1250,62 +1301,131 @@ def fill_in_company_properties(company_data: dict) -> dict:
         company_data: Raw company data from Apollo API
         
     Returns:
-        Dictionary with standardized company properties
+        Dictionary matching the SmartList `Account` schema shape.
     """
-    company_properties = {}
+    def _parse_keywords(value: Any) -> List[Any]:
+        if value is None:
+            return []
+        if isinstance(value, list):
+            return value
+        if isinstance(value, str):
+            text = value.strip()
+            if not text:
+                return []
+            if "," in text:
+                return [part.strip() for part in text.split(",") if part.strip()]
+            return [text]
+        return [value]
+
+    def _parse_compact_number(value: Any) -> Optional[float]:
+        if value is None:
+            return None
+        if isinstance(value, (int, float)):
+            return float(value)
+        text = str(value).strip()
+        if not text:
+            return None
+        text = text.replace("$", "").replace(",", "").strip()
+        multiplier = 1.0
+        suffix = text[-1:].upper()
+        if suffix in ("K", "M", "B"):
+            multiplier = {"K": 1e3, "M": 1e6, "B": 1e9}[suffix]
+            text = text[:-1].strip()
+        try:
+            return float(text) * multiplier
+        except ValueError:
+            return None
 
-    # Basic company information
-    company_properties["organization_name"] = company_data.get("name", "")
-    company_properties["primary_domain"] = company_data.get("primary_domain", "")
-    company_properties["website_url"] = company_data.get("website_url", "")
-    company_properties["organization_linkedin_url"] = company_data.get("linkedin_url", "")
-    
-    # Location information
-    company_properties["organization_city"] = company_data.get("city", "")
-    company_properties["organization_state"] = company_data.get("state", "")
-    company_properties["organization_country"] = company_data.get("country", "")
-    
-    # Create a combined location string
-    location_parts = [
-        company_data.get("city", ""),
-        company_data.get("state", ""),
-        company_data.get("country", "")
-    ]
-    company_properties["organization_location"] = ", ".join([part for part in location_parts if part])
-
-    # Company size and financial info
-    company_properties["employee_count"] = company_data.get("estimated_num_employees", 0)
-    company_properties["annual_revenue"] = company_data.get("annual_revenue", 0)
-    
-    # Industry and business info
-    company_properties["industry"] = company_data.get("industry", "")
-    company_properties["keywords"] = ", ".join(company_data.get("keywords", []))
-    company_properties["description"] = company_data.get("description", "")
-    
-    # Funding and growth
-    company_properties["founded_year"] = company_data.get("founded_year", "")
-    company_properties["funding_stage"] = company_data.get("latest_funding_stage", "")
-    company_properties["total_funding"] = company_data.get("total_funding", 0)
-    
-    # Technology stack
-    tech_stack = company_data.get("technology_names", [])
-    if tech_stack:
-        company_properties["technology_stack"] = ", ".join(tech_stack)
-    
-    # Apollo-specific IDs
-    company_properties["apollo_organization_id"] = company_data.get("id", "")
-    
-    # Additional metadata
-    company_properties["phone"] = company_data.get("phone", "")
-    company_properties["facebook_url"] = company_data.get("facebook_url", "")
-    company_properties["twitter_url"] = company_data.get("twitter_url", "")
-    
-    # Store raw data for reference
-    company_properties["additional_properties"] = {
-        "apollo_organization_data": json.dumps(cleanup_properties(company_data))
+    annual_revenue = (
+        company_data.get("organization_revenue")
+        if company_data.get("organization_revenue") is not None
+        else company_data.get("annual_revenue")
+    )
+    annual_revenue = _parse_compact_number(annual_revenue)
+    if annual_revenue is None:
+        annual_revenue = _parse_compact_number(company_data.get("organization_revenue_printed"))
+
+    company_size = company_data.get("estimated_num_employees")
+    if company_size is not None:
+        try:
+            company_size = int(company_size)
+        except (TypeError, ValueError):
+            company_size = None
+
+    founded_year = company_data.get("founded_year")
+    if founded_year is not None:
+        try:
+            founded_year = int(founded_year)
+        except (TypeError, ValueError):
+            founded_year = None
+
+    primary_phone = company_data.get("primary_phone")
+    primary_phone_number = None
+    if isinstance(primary_phone, dict):
+        primary_phone_number = primary_phone.get("number") or primary_phone.get(
+            "sanitized_number"
+        )
+
+    phone = (
+        primary_phone_number
+        or company_data.get("phone")
+        or company_data.get("primary_phone_number")
+        or company_data.get("sanitized_phone")
+    )
+
+    industry = company_data.get("industry")
+    if not industry and isinstance(company_data.get("industries"), list):
+        industries = [str(x).strip() for x in company_data["industries"] if str(x).strip()]
+        industry = industries[0] if industries else None
+
+    billing_street = (
+        company_data.get("street_address")
+        or company_data.get("billing_street")
+        or company_data.get("address")
+        or company_data.get("raw_address")
+    )
+
+    account: Dict[str, Any] = {
+        "name": company_data.get("name"),
+        "domain": company_data.get("primary_domain"),
+        "website": company_data.get("website_url"),
+        "phone": phone,
+        "fax": company_data.get("fax") or company_data.get("fax_number"),
+        "industry": industry,
+        "company_size": company_size,
+        "founded_year": founded_year,
+        "annual_revenue": annual_revenue,
+        "type": company_data.get("type") or company_data.get("organization_type"),
+        "ownership": company_data.get("ownership"),
+        "organization_linkedin_url": company_data.get("linkedin_url"),
+        "billing_street": billing_street,
+        "billing_city": company_data.get("city"),
+        "billing_state": company_data.get("state"),
+        "billing_zip": company_data.get("postal_code")
+        or company_data.get("zip")
+        or company_data.get("zipcode"),
+        "billing_country": company_data.get("country"),
+        "description": company_data.get("description"),
+        "keywords": _parse_keywords(company_data.get("keywords")),
+        "tags": [],
+        "notes": [],
+        "additional_properties": {
+            "apollo_organization_id": company_data.get("id"),
+            "facebook_url": company_data.get("facebook_url"),
+            "twitter_url": company_data.get("twitter_url"),
+            "funding_stage": company_data.get("latest_funding_stage"),
+            "total_funding": company_data.get("total_funding"),
+            "technology_names": company_data.get("technology_names"),
+            "primary_phone": primary_phone if isinstance(primary_phone, dict) else None,
+            "raw_address": company_data.get("raw_address"),
+            "organization_revenue_printed": company_data.get("organization_revenue_printed"),
+            "apollo_organization_data": json.dumps(cleanup_properties(company_data)),
+        },
+        "research_summary": None,
+        "enchrichment_status": None,
     }
 
-    return company_properties
+    return account
 
 
 @assistant_tool
@@ -1363,7 +1483,7 @@ async def search_companies_with_apollo_page(
             "organizationIndustries": "organization_industries",
             "organizationIndustryTagIds": "organization_industry_tag_ids",
             "qKeywords": "q_keywords",
-            "qOrganizationDomains": "q_organization_domains",
+            "qOrganizationDomainsList": "q_organization_domains_list",
             "sortAscending": "sort_ascending",
             "sortByField": "sort_by_field",
             "organizationLatestFundingStageCd": "organization_latest_funding_stage_cd",
@@ -1427,7 +1547,7 @@ async def search_companies_with_apollo_page(
                     "organization_locations",
                     "organization_industries",
                     "organization_industry_tag_ids",
-                    "q_organization_domains",
+                    "q_organization_domains_list",
                     "q_organization_keyword_tags",
                     "organization_ids",
                     "not_organization_ids",
@@ -1448,7 +1568,7 @@ async def search_companies_with_apollo_page(
     # -----------------------------------
     else:
         dynamic_payload = {}
-        
+         
         # Only add fields if they have values (Apollo doesn't like empty arrays)
         if query.organization_locations:
             dynamic_payload["organization_locations"] = query.organization_locations
@@ -1468,15 +1588,39 @@ async def search_companies_with_apollo_page(
             dynamic_payload["organization_num_employees_ranges"] = employee_ranges
 
         # Add optional parameters only if they have values
+        def _normalize_string_list(value: Any) -> List[str]:
+            if value is None:
+                return []
+            if isinstance(value, str):
+                return [part.strip() for part in value.split(",") if part.strip()]
+            if isinstance(value, list):
+                normalized: List[str] = []
+                for item in value:
+                    if item is None:
+                        continue
+                    text = str(item).strip()
+                    if not text:
+                        continue
+                    normalized.extend([part.strip() for part in text.split(",") if part.strip()])
+                return normalized
+            text = str(value).strip()
+            return [text] if text else []
+
         if query.q_keywords:
-            # Split comma-separated keywords into an array for company search
-            if isinstance(query.q_keywords, str):
-                keyword_tags = [tag.strip() for tag in query.q_keywords.split(",") if tag.strip()]
-            else:
-                keyword_tags = query.q_keywords
-            dynamic_payload["q_organization_keyword_tags"] = keyword_tags
+            keywords = _normalize_string_list(query.q_keywords)
+            if keywords:
+                dynamic_payload["q_keywords"] = " ".join(keywords)
+
+        org_keyword_tags = _normalize_string_list(query.q_organization_keyword_tags)
+        if org_keyword_tags:
+            dynamic_payload["q_organization_keyword_tags"] = org_keyword_tags
+
+        not_org_keyword_tags = _normalize_string_list(query.q_not_organization_keyword_tags)
+        if not_org_keyword_tags:
+            dynamic_payload["q_not_organization_keyword_tags"] = not_org_keyword_tags
+         
         if query.q_organization_domains:
-            dynamic_payload["q_organization_domains"] = query.q_organization_domains
+            dynamic_payload["q_organization_domains_list"] = query.q_organization_domains
         if query.revenue_range_min is not None:
             dynamic_payload["revenue_range_min"] = query.revenue_range_min
         if query.revenue_range_max is not None:

{dhisana-0.0.1.dev231 → dhisana-0.0.1.dev257}/src/dhisana/utils/cache_output_tools.py

@@ -2,6 +2,7 @@ import os
 import hashlib
 import json
 import logging
+from datetime import datetime, timezone
 
 from azure.storage.blob import BlobServiceClient
 from azure.core.exceptions import ResourceNotFoundError, AzureError
@@ -49,10 +50,11 @@ def cache_output(tool_name: str, key: str, value, ttl: int = None) -> bool:
     # Construct the blob name using a virtual folder for the tool name
     blob_name = f"{tool_name}/{key_hash}.json"
 
-    # Prepare the cache data
+    # Prepare the cache data with timestamp for TTL expiration checking
     cache_data = {
         "value": value,
-        "ttl": ttl
+        "ttl": ttl,
+        "cached_at": datetime.now(timezone.utc).isoformat()
     }
     data = json.dumps(cache_data)
 
@@ -88,6 +90,24 @@ def retrieve_output(tool_name: str, key: str):
         download_stream = blob_client.download_blob()
         content = download_stream.readall()  # content is in bytes
         cache_data = json.loads(content.decode("utf-8"))
+        
+        # Check if TTL has expired
+        ttl = cache_data.get("ttl")
+        cached_at = cache_data.get("cached_at")
+        
+        if ttl is not None and cached_at is not None:
+            try:
+                cached_time = datetime.fromisoformat(cached_at)
+                now = datetime.now(timezone.utc)
+                elapsed_seconds = (now - cached_time).total_seconds()
+                if elapsed_seconds > ttl:
+                    logger.info(f"Cache expired for blob '{blob_name}' (elapsed: {elapsed_seconds}s, ttl: {ttl}s)")
+                    return None
+            except (ValueError, TypeError) as e:
+                logger.warning(f"Error parsing cached_at timestamp: {e}")
+                # If we can't parse the timestamp, treat as expired for safety
+                return None
+        
         return cache_data.get("value")
     except ResourceNotFoundError:
         # Blob does not exist

{dhisana-0.0.1.dev231 → dhisana-0.0.1.dev257}/src/dhisana/utils/check_email_validity_tools.py

@@ -514,8 +514,8 @@ async def guess_email_with_apollo(
     if not apollo_email:
         return {"email": "", "email_confidence": "low"}
 
-    # quick re‑check with Hunter
-    validation = await check_email_validity_with_hunter(apollo_email, tool_config)
+    # quick re‑check with ZeroBounce
+    validation = await check_email_validity_with_zero_bounce(apollo_email, tool_config)
     conf = validation.get("confidence", "low")
     return {"email": apollo_email, "email_confidence": conf}
 
@@ -547,7 +547,7 @@ async def check_email_validity(
         return {"email": email_id, "confidence": "low", "is_valid": False}
 
     names = [c.get("name") for c in tool_config if c.get("name")]
-    priority = ["findymail", "hunter", "zerobounce"]
+    priority = ["zerobounce", "findymail", "hunter"]
 
     result: Dict[str, Any] = {"email": email_id, "confidence": "low", "is_valid": False}
 
@@ -586,7 +586,7 @@ async def guess_email(
         return {"email": "", "email_confidence": "low"}
 
     names = [c.get("name") for c in tool_config if c.get("name")]
-    priority = ["findymail", "hunter", "zerobounce", "apollo"]
+    priority = ["apollo", "findymail", "hunter", "zerobounce"]
 
     result: Dict[str, Any] = {"email": "", "email_confidence": "low"}
 

{dhisana-0.0.1.dev231 → dhisana-0.0.1.dev257}/src/dhisana/utils/enrich_lead_information.py

@@ -765,16 +765,32 @@ async def enrich_organization_info_from_company_url(
     organization_linkedin_url: str,
     use_strict_check: bool = True,
     tool_config: Optional[List[Dict[str, Any]]] = None,
+    categories: Optional[bool] = None,
+    funding_data: Optional[bool] = None,
+    exit_data: Optional[bool] = None,
+    acquisitions: Optional[bool] = None,
+    extra: Optional[bool] = None,
+    use_cache: Optional[str] = "if-present",
+    fallback_to_cache: Optional[str] = "on-error",
 ) -> Dict[str, Any]:
     """
     Given an organization LinkedIn URL, attempt to enrich its data (e.g. name, website)
-    via ProxyCurl. If data is found, set domain, then return the dict. Otherwise, return {}.
+    via ProxyCurl. Additional Proxycurl Company API boolean flags (categories, funding_data, etc.)
+    can be supplied to control the returned payload (True -> "include"). If data is found,
+    set domain, then return the dict. Otherwise, return {}.
     """
 
     # Call ProxyCurl to enrich
     company_data = await enrich_organization_info_from_proxycurl(
         organization_linkedin_url=organization_linkedin_url,
-        tool_config=tool_config
+        tool_config=tool_config,
+        categories=categories,
+        funding_data=funding_data,
+        exit_data=exit_data,
+        acquisitions=acquisitions,
+        extra=extra,
+        use_cache=use_cache,
+        fallback_to_cache=fallback_to_cache,
     )
 
     # If ProxyCurl returned any data, set domain, then return