dhisana 0.0.1.dev248__tar.gz → 0.0.1.dev250__tar.gz

{dhisana-0.0.1.dev248 → dhisana-0.0.1.dev250}/PKG-INFO

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

{dhisana-0.0.1.dev248 → dhisana-0.0.1.dev250}/setup.py

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

{dhisana-0.0.1.dev248 → dhisana-0.0.1.dev250}/src/dhisana/utils/apollo_tools.py

@@ -1287,62 +1287,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
@@ -1485,7 +1554,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
@@ -1505,19 +1574,37 @@ 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
-        
-        if query.q_organization_keyword_tags:
-            dynamic_payload["q_organization_keyword_tags"] = keyword_tags
-        
-        if query.q_not_organization_keyword_tags:
-            dynamic_payload["q_not_organization_keyword_tags"] = query.q_not_organization_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_list"] = query.q_organization_domains
         if query.revenue_range_min is not None:

{dhisana-0.0.1.dev248 → dhisana-0.0.1.dev250}/src/dhisana.egg-info/PKG-INFO

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

{dhisana-0.0.1.dev248 → dhisana-0.0.1.dev250}/tests/test_apollo_company_search.py

@@ -1,8 +1,6 @@
-import asyncio
-import json
-import pytest
 import unittest
-from unittest.mock import patch, MagicMock, AsyncMock
+from unittest.mock import patch
+
 from src.dhisana.schemas.sales import CompanyQueryFilters
 from src.dhisana.utils.apollo_tools import (
     search_companies_with_apollo_page,
@@ -11,7 +9,7 @@ from src.dhisana.utils.apollo_tools import (
 )
 
 
-class TestApolloCompanySearch(unittest.TestCase):
+class TestApolloCompanySearch(unittest.IsolatedAsyncioTestCase):
     """Test cases for Apollo company search functionality."""
     
     def setUp(self):
@@ -86,31 +84,37 @@ class TestApolloCompanySearch(unittest.TestCase):
         company_data = self.mock_apollo_response["organizations"][0]
         result = fill_in_company_properties(company_data)
         
-        self.assertEqual(result["organization_name"], "Example Corp")
-        self.assertEqual(result["primary_domain"], "example.com")
-        self.assertEqual(result["website_url"], "https://example.com")
-        self.assertEqual(result["organization_linkedin_url"], "https://linkedin.com/company/example-corp")
-        self.assertEqual(result["organization_city"], "San Francisco")
-        self.assertEqual(result["organization_state"], "California")
-        self.assertEqual(result["organization_country"], "United States")
-        self.assertEqual(result["organization_location"], "San Francisco, California, United States")
-        self.assertEqual(result["employee_count"], 150)
-        self.assertEqual(result["annual_revenue"], 10000000)
+        self.assertEqual(result["name"], "Example Corp")
+        self.assertEqual(result["domain"], "example.com")
+        self.assertEqual(result["website"], "https://example.com")
+        self.assertEqual(
+            result["organization_linkedin_url"],
+            "https://linkedin.com/company/example-corp",
+        )
+        self.assertEqual(result["billing_city"], "San Francisco")
+        self.assertEqual(result["billing_state"], "California")
+        self.assertEqual(result["billing_country"], "United States")
+        self.assertEqual(result["company_size"], 150)
+        self.assertEqual(result["annual_revenue"], 10000000.0)
         self.assertEqual(result["industry"], "Technology")
-        self.assertEqual(result["keywords"], "saas, software")
+        self.assertEqual(result["keywords"], ["saas", "software"])
         self.assertEqual(result["description"], "A technology company")
         self.assertEqual(result["founded_year"], 2010)
-        self.assertEqual(result["funding_stage"], "Series B")
-        self.assertEqual(result["total_funding"], 5000000)
-        self.assertEqual(result["technology_stack"], "React, Python, AWS")
-        self.assertEqual(result["apollo_organization_id"], "123456")
         self.assertEqual(result["phone"], "+1-555-123-4567")
-        self.assertEqual(result["facebook_url"], "https://facebook.com/example-corp")
-        self.assertEqual(result["twitter_url"], "https://twitter.com/example_corp")
         
         # Check that additional_properties contains the raw data
         self.assertIn("additional_properties", result)
         self.assertIn("apollo_organization_data", result["additional_properties"])
+        self.assertEqual(result["additional_properties"]["apollo_organization_id"], "123456")
+        self.assertEqual(
+            result["additional_properties"]["facebook_url"], "https://facebook.com/example-corp"
+        )
+        self.assertEqual(
+            result["additional_properties"]["twitter_url"], "https://twitter.com/example_corp"
+        )
+        self.assertEqual(result["additional_properties"]["funding_stage"], "Series B")
+        self.assertEqual(result["additional_properties"]["total_funding"], 5000000)
+        self.assertEqual(result["additional_properties"]["technology_names"], ["React", "Python", "AWS"])
 
     @patch('src.dhisana.utils.apollo_tools.fetch_apollo_data')
     @patch('src.dhisana.utils.apollo_tools.get_apollo_access_token')
@@ -143,18 +147,42 @@ class TestApolloCompanySearch(unittest.TestCase):
         
         # Check results
         self.assertEqual(len(result["results"]), 2)
-        self.assertEqual(result["results"][0]["organization_name"], "Example Corp")
-        self.assertEqual(result["results"][1]["organization_name"], "Test Inc")
+        self.assertEqual(result["results"][0]["name"], "Example Corp")
+        self.assertEqual(result["results"][1]["name"], "Test Inc")
         
         # Verify API call was made correctly
         mock_fetch_data.assert_called_once()
-        call_args = mock_fetch_data.call_args
-        payload = call_args[1]["payload"]
+        payload = mock_fetch_data.call_args.args[3]
         self.assertEqual(payload["page"], 1)
         self.assertEqual(payload["per_page"], 25)
         self.assertIn("organization_locations", payload)
         self.assertIn("organization_num_employees_ranges", payload)
 
+    @patch('src.dhisana.utils.apollo_tools.fetch_apollo_data')
+    @patch('src.dhisana.utils.apollo_tools.get_apollo_access_token')
+    async def test_search_companies_with_apollo_page_accepts_keyword_tags_without_q_keywords(
+        self, mock_get_token, mock_fetch_data
+    ):
+        mock_get_token.return_value = ("test_api_key", False)
+        mock_fetch_data.return_value = self.mock_apollo_response
+
+        query = CompanyQueryFilters(
+            q_organization_keyword_tags=["Marketing and Advertising", "Media Production"]
+        )
+
+        await search_companies_with_apollo_page(
+            query=query,
+            page=1,
+            per_page=25,
+            tool_config=self.tool_config,
+        )
+
+        payload = mock_fetch_data.call_args.args[3]
+        self.assertEqual(
+            payload["q_organization_keyword_tags"],
+            ["Marketing and Advertising", "Media Production"],
+        )
+
     def test_company_query_filters_initialization(self):
         """Test that CompanyQueryFilters can be initialized with various parameters."""
         query = CompanyQueryFilters(
@@ -185,6 +213,22 @@ class TestApolloCompanySearch(unittest.TestCase):
         self.assertEqual(query.sort_by_field, "employee_count")
         self.assertFalse(query.sort_ascending)
 
+    def test_fill_in_company_properties_prefers_primary_phone_and_org_revenue(self):
+        company_data = dict(self.mock_apollo_response["organizations"][0])
+        company_data["primary_phone"] = {
+            "number": "+971 4 433 2589",
+            "source": "Account",
+            "sanitized_number": "+97144332589",
+        }
+        company_data.pop("annual_revenue", None)
+        company_data["organization_revenue_printed"] = "35M"
+        company_data["organization_revenue"] = 35000000.0
+
+        result = fill_in_company_properties(company_data)
+        self.assertEqual(result["phone"], "+971 4 433 2589")
+        self.assertEqual(result["annual_revenue"], 35000000.0)
+        self.assertEqual(result["additional_properties"]["organization_revenue_printed"], "35M")
+
     @patch('src.dhisana.utils.apollo_tools.fetch_apollo_data')
     @patch('src.dhisana.utils.apollo_tools.get_apollo_access_token')
     async def test_search_companies_with_apollo_basic(self, mock_get_token, mock_fetch_data):