dhisana 0.0.1.dev248__py3-none-any.whl → 0.0.1.dev250__py3-none-any.whl

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.dist-info → dhisana-0.0.1.dev250.dist-info}/METADATA

@@ -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.dist-info → dhisana-0.0.1.dev250.dist-info}/RECORD

@@ -12,7 +12,7 @@ dhisana/ui/components.py,sha256=4NXrAyl9tx2wWwoVYyABO-EOGnreGMvql1AkXWajIIo,1431
 dhisana/utils/__init__.py,sha256=jv2YF__bseklT3OWEzlqJ5qE24c4aWd5F4r0TTjOrWQ,65
 dhisana/utils/add_mapping.py,sha256=oq_QNqag86DhgdwINBRRXNx7SOb8Q9M-V0QLP6pTzr8,13837
 dhisana/utils/agent_tools.py,sha256=pzBFvfhU4wfSB4zv1eiRzjmnteJnfhC5V32r_v1m38Y,2321
-dhisana/utils/apollo_tools.py,sha256=i3PVY3vhiGUOTQ_GAOPXCwDyUcqkiV3DrCgo2ozRSeQ,66705
+dhisana/utils/apollo_tools.py,sha256=1b9FaL_3spQKUsOP1k8-kD1kcFxCkG4KJHoN71SjOkU,69796
 dhisana/utils/assistant_tool_tag.py,sha256=rYRl8ubLI7fUUIjg30XTefHBkFgRqNEVC12lF6U6Z-8,119
 dhisana/utils/built_with_api_tools.py,sha256=TFNGhnPb2vFdveVCpjiCvE1WKe_eK95UPpR0Ha5NgMQ,10260
 dhisana/utils/cache_output_tools.py,sha256=sSAruvUZn-WAJQ0lB9T1QjSmkm-_14AuxC9xKmcCQ0k,3428
@@ -95,8 +95,8 @@ dhisana/workflow/agent.py,sha256=esv7_i_XuMkV2j1nz_UlsHov_m6X5WZZiZm_tG4OBHU,565
 dhisana/workflow/flow.py,sha256=xWE3qQbM7j2B3FH8XnY3zOL_QXX4LbTW4ArndnEYJE0,1638
 dhisana/workflow/task.py,sha256=HlWz9mtrwLYByoSnePOemBUBrMEcj7KbgNjEE1oF5wo,1830
 dhisana/workflow/test.py,sha256=E7lRnXK0PguTNzyasHytLzTJdkqIPxG5_4qk4hMEeKc,3399
-dhisana-0.0.1.dev248.dist-info/METADATA,sha256=B6n7vZSB3JheNeY9GWQ8DMaAGE9TKG9hzPyRILaq-xA,1190
-dhisana-0.0.1.dev248.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-dhisana-0.0.1.dev248.dist-info/entry_points.txt,sha256=jujxteZmNI9EkEaK-pOCoWuBujU8TCevdkfl9ZcKHek,49
-dhisana-0.0.1.dev248.dist-info/top_level.txt,sha256=NETTHt6YifG_P7XtRHbQiXZlgSFk9Qh9aR-ng1XTf4s,8
-dhisana-0.0.1.dev248.dist-info/RECORD,,
+dhisana-0.0.1.dev250.dist-info/METADATA,sha256=9bsRxPnqegnPfRGa6sOVugYzcUOSwK1JNSz3SUdzusk,1190
+dhisana-0.0.1.dev250.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+dhisana-0.0.1.dev250.dist-info/entry_points.txt,sha256=jujxteZmNI9EkEaK-pOCoWuBujU8TCevdkfl9ZcKHek,49
+dhisana-0.0.1.dev250.dist-info/top_level.txt,sha256=NETTHt6YifG_P7XtRHbQiXZlgSFk9Qh9aR-ng1XTf4s,8
+dhisana-0.0.1.dev250.dist-info/RECORD,,