dhisana 0.0.1.dev219__py3-none-any.whl → 0.0.1.dev221__py3-none-any.whl

dhisana/utils/apollo_tools.py

@@ -11,7 +11,7 @@ from dhisana.schemas.sales import LeadsQueryFilters, CompanyQueryFilters
 from dhisana.utils.cache_output_tools import cache_output, retrieve_output
 from dhisana.utils.assistant_tool_tag import assistant_tool
 from urllib.parse import urlparse, parse_qs
-from typing import Any, Dict, List, Optional, Union
+from typing import Any, Dict, List, Optional, Tuple, Union
 
 from dhisana.utils.clean_properties import cleanup_properties
 
@@ -19,50 +19,81 @@ logging.basicConfig(level=logging.INFO)
 logger = logging.getLogger(__name__)
 
 
-def get_apollo_access_token(tool_config: Optional[List[Dict]] = None) -> str:
+def get_apollo_access_token(tool_config: Optional[List[Dict]] = None) -> Tuple[str, bool]:
     """
-    Retrieves the APOLLO_API_KEY access token from the provided tool configuration.
+    Retrieves an Apollo access token from tool configuration or environment variables.
 
     Args:
-        tool_config (list): A list of dictionaries containing the tool configuration. 
-                            Each dictionary should have a "name" key and a "configuration" key,
-                            where "configuration" is a list of dictionaries containing "name" and "value" keys.
+        tool_config (list): Optional tool configuration payload provided to the tool.
 
     Returns:
-        str: The APOLLO_API_KEY access token.
+        Tuple[str, bool]: A tuple containing the token string and a boolean flag indicating
+            whether the token represents an OAuth bearer token (``True``) or an API key (``False``).
 
     Raises:
         ValueError: If the Apollo integration has not been configured.
     """
-    APOLLO_API_KEY = None
+    token: Optional[str] = None
+    is_oauth = False
 
     if tool_config:
-        logger.debug(f"Tool config provided: {tool_config}")
         apollo_config = next(
             (item for item in tool_config if item.get("name") == "apollo"), None
         )
         if apollo_config:
             config_map = {
-                item["name"]: item["value"]
+                item["name"]: item.get("value")
                 for item in apollo_config.get("configuration", [])
                 if item
             }
-            APOLLO_API_KEY = config_map.get("apiKey")
+
+            raw_oauth = config_map.get("oauth_tokens")
+            if isinstance(raw_oauth, str):
+                try:
+                    raw_oauth = json.loads(raw_oauth)
+                except Exception:
+                    raw_oauth = None
+            if isinstance(raw_oauth, dict):
+                token = (
+                    raw_oauth.get("access_token")
+                    or raw_oauth.get("token")
+                )
+                if token:
+                    is_oauth = True
+
+            if not token:
+                direct_access_token = config_map.get("access_token")
+                if direct_access_token:
+                    token = direct_access_token
+                    is_oauth = True
+
+            if not token:
+                api_key = config_map.get("apiKey") or config_map.get("api_key")
+                if api_key:
+                    token = api_key
+                    is_oauth = False
         else:
             logger.warning("No 'apollo' config item found in tool_config.")
-    else:
-        logger.debug("No tool_config provided or it's None.")
 
-    # Check environment variable if no key found yet
-    APOLLO_API_KEY = APOLLO_API_KEY or os.getenv("APOLLO_API_KEY")
+    if not token:
+        env_oauth_token = os.getenv("APOLLO_ACCESS_TOKEN")
+        if env_oauth_token:
+            token = env_oauth_token
+            is_oauth = True
 
-    if not APOLLO_API_KEY:
+    if not token:
+        env_api_key = os.getenv("APOLLO_API_KEY")
+        if env_api_key:
+            token = env_api_key
+            is_oauth = False
+
+    if not token:
         logger.error("Apollo integration is not configured.")
         raise ValueError(
             "Apollo integration is not configured. Please configure the connection to Apollo in Integrations."
         )
 
-    return APOLLO_API_KEY
+    return token, is_oauth
 
 
 @assistant_tool
@@ -94,16 +125,17 @@ async def enrich_person_info_from_apollo(
     """
     logger.info("Entering enrich_person_info_from_apollo")
 
-    APOLLO_API_KEY = get_apollo_access_token(tool_config)
+    token, is_oauth = get_apollo_access_token(tool_config)
 
     if not linkedin_url and not email and not phone:
         logger.warning("No linkedin_url, email, or phone provided. At least one is required.")
         return {'error': "At least one of linkedin_url, email, or phone must be provided"}
 
-    headers = {
-        "X-Api-Key": f"{APOLLO_API_KEY}",
-        "Content-Type": "application/json"
-    }
+    headers = {"Content-Type": "application/json"}
+    if is_oauth:
+        headers["Authorization"] = f"Bearer {token}"
+    else:
+        headers["X-Api-Key"] = token
 
     data = {}
     if linkedin_url:
@@ -186,11 +218,12 @@ async def lookup_person_in_apollo_by_name(
         logger.warning("No full_name provided.")
         return {'error': "Full name is required"}
 
-    APOLLO_API_KEY = get_apollo_access_token(tool_config)
-    headers = {
-        "X-Api-Key": f"{APOLLO_API_KEY}",
-        "Content-Type": "application/json"
-    }
+    token, is_oauth = get_apollo_access_token(tool_config)
+    headers = {"Content-Type": "application/json"}
+    if is_oauth:
+        headers["Authorization"] = f"Bearer {token}"
+    else:
+        headers["X-Api-Key"] = token
 
     # Construct the query payload
     data = {
@@ -263,18 +296,21 @@ async def enrich_organization_info_from_apollo(
     """
     logger.info("Entering enrich_organization_info_from_apollo")
 
-    APOLLO_API_KEY = get_apollo_access_token(tool_config)
+    token, is_oauth = get_apollo_access_token(tool_config)
 
     if not organization_domain:
         logger.warning("No organization domain provided.")
         return {'error': "organization domain must be provided"}
 
     headers = {
-        "X-Api-Key": f"{APOLLO_API_KEY}",
         "Content-Type": "application/json",
         "Cache-Control": "no-cache",
         "accept": "application/json"
     }
+    if is_oauth:
+        headers["Authorization"] = f"Bearer {token}"
+    else:
+        headers["X-Api-Key"] = token
 
     cached_response = retrieve_output("enrich_organization_info_from_apollo", organization_domain)
     if cached_response is not None:
@@ -364,12 +400,15 @@ async def search_people_with_apollo(
         logger.warning("No payload given; returning empty result.")
         return []
 
-    api_key = get_apollo_access_token(tool_config)
+    token, is_oauth = get_apollo_access_token(tool_config)
     headers = {
         "Cache-Control": "no-cache",
         "Content-Type": "application/json",
-        "X-Api-Key": api_key,
     }
+    if is_oauth:
+        headers["Authorization"] = f"Bearer {token}"
+    else:
+        headers["X-Api-Key"] = token
 
     url = "https://api.apollo.io/api/v1/mixed_people/search"
     logger.info(f"Sending payload to Apollo (single page): {json.dumps(dynamic_payload, indent=2)}")
@@ -534,7 +573,7 @@ async def search_leads_with_apollo(
             # Important: handle personNotTitles as well
             "personNotTitles": "person_not_titles",
 
-            "qOrganizationJobTitles": "q_keywords",
+            "qOrganizationJobTitles": "q_organization_job_titles",
             "sortAscending": "sort_ascending",
             "sortByField": "sort_by_field",
             "contactEmailStatusV2": "contact_email_status",
@@ -607,6 +646,8 @@ async def search_leads_with_apollo(
                     "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",
                 ):
                     if isinstance(final_value, str):
                         final_value = [final_value]
@@ -636,6 +677,10 @@ async def search_leads_with_apollo(
             "page": 1,
             "per_page": min(max_items, 100),
         }
+        if query.job_openings_with_titles:
+            dynamic_payload["q_organization_job_titles"] = query.job_openings_with_titles
+        if query.latest_funding_stages:
+            dynamic_payload["organization_latest_funding_stage_cd"] = query.latest_funding_stages
         if query.sort_by_field is not None:
             dynamic_payload["sort_by_field"] = query.sort_by_field
         if query.sort_ascending is not None:
@@ -746,7 +791,7 @@ async def search_leads_with_apollo_page(
             "organizationNumEmployeesRanges": "organization_num_employees_ranges",
             "personTitles": "person_titles",
             "personNotTitles": "person_not_titles",
-            "qOrganizationJobTitles": "q_keywords",
+            "qOrganizationJobTitles": "q_organization_job_titles",
             "sortAscending": "sort_ascending",
             "sortByField": "sort_by_field",
             "contactEmailStatusV2": "contact_email_status",
@@ -804,6 +849,8 @@ async def search_leads_with_apollo_page(
                     "organization_ids",
                     "organization_num_employees_ranges",
                     "person_not_titles",
+                    "q_organization_job_titles",
+                    "organization_latest_funding_stage_cd",
                 ):
                     if isinstance(final_value, str):
                         final_value = [final_value]
@@ -827,6 +874,10 @@ async def search_leads_with_apollo_page(
                 or [f"{query.min_employees_in_organization or 1},{query.max_employees_in_organization or 1000}"]
             ),
         }
+        if query.job_openings_with_titles:
+            dynamic_payload["q_organization_job_titles"] = query.job_openings_with_titles
+        if query.latest_funding_stages:
+            dynamic_payload["organization_latest_funding_stage_cd"] = query.latest_funding_stages
         if query.sort_by_field is not None:
             dynamic_payload["sort_by_field"] = query.sort_by_field
         if query.sort_ascending is not None:
@@ -840,12 +891,15 @@ async def search_leads_with_apollo_page(
           f" Payload: {json.dumps(page_payload, indent=2)}")
 
     # Get the full Apollo API response with pagination metadata
-    api_key = get_apollo_access_token(tool_config)
+    token, is_oauth = get_apollo_access_token(tool_config)
     headers = {
         "Cache-Control": "no-cache",
         "Content-Type": "application/json",
-        "X-Api-Key": api_key,
     }
+    if is_oauth:
+        headers["Authorization"] = f"Bearer {token}"
+    else:
+        headers["X-Api-Key"] = token
 
     url = "https://api.apollo.io/api/v1/mixed_people/search"
     
@@ -950,17 +1004,20 @@ async def get_organization_details_from_apollo(
     """
     logger.info("Entering get_organization_details_from_apollo")
 
-    APOLLO_API_KEY = get_apollo_access_token(tool_config)
+    token, is_oauth = get_apollo_access_token(tool_config)
     if not organization_id:
         logger.warning("No organization_id provided.")
         return {'error': "Organization ID must be provided"}
 
     headers = {
-        "X-Api-Key": APOLLO_API_KEY,
         "Content-Type": "application/json",
         "Cache-Control": "no-cache",
         "Accept": "application/json"
     }
+    if is_oauth:
+        headers["Authorization"] = f"Bearer {token}"
+    else:
+        headers["X-Api-Key"] = token
 
     cached_response = retrieve_output("get_organization_details_from_apollo", organization_id)
     if cached_response is not None:
@@ -1202,12 +1259,15 @@ async def search_companies_with_apollo(
         logger.warning("No payload given; returning empty result.")
         return []
 
-    api_key = get_apollo_access_token(tool_config)
+    token, is_oauth = get_apollo_access_token(tool_config)
     headers = {
         "Cache-Control": "no-cache",
         "Content-Type": "application/json",
-        "X-Api-Key": api_key,
     }
+    if is_oauth:
+        headers["Authorization"] = f"Bearer {token}"
+    else:
+        headers["X-Api-Key"] = token
 
     url = "https://api.apollo.io/api/v1/organizations/search"
     logger.info(f"Sending payload to Apollo organizations endpoint (single page): {json.dumps(dynamic_payload, indent=2)}")
@@ -1508,12 +1568,15 @@ async def search_companies_with_apollo_page(
           f" Payload: {json.dumps(cleaned_payload, indent=2)}")
 
     # Get the full Apollo API response with pagination metadata
-    api_key = get_apollo_access_token(tool_config)
+    token, is_oauth = get_apollo_access_token(tool_config)
     headers = {
         "Cache-Control": "no-cache",
         "Content-Type": "application/json",
-        "X-Api-Key": api_key,
     }
+    if is_oauth:
+        headers["Authorization"] = f"Bearer {token}"
+    else:
+        headers["X-Api-Key"] = token
 
     url = "https://api.apollo.io/api/v1/organizations/search"
     

dhisana/utils/test_connect.py

@@ -296,6 +296,68 @@ async def test_proxycurl(api_key: str) -> Dict[str, Any]:
         return {"success": False, "status_code": 0, "error_message": str(e)}
 
 
+async def test_exa(api_key: str) -> Dict[str, Any]:
+    """Verify Exa connectivity by issuing a minimal search request."""
+
+    url = "https://api.exa.ai/search"
+    headers = {
+        "x-api-key": api_key,
+        "Content-Type": "application/json",
+        "Accept": "application/json",
+    }
+    payload = {
+        "query": "Dhisana connectivity check",
+        "numResults": 1,
+    }
+
+    try:
+        timeout = aiohttp.ClientTimeout(total=10)
+        async with aiohttp.ClientSession(timeout=timeout) as session:
+            async with session.post(url, headers=headers, json=payload) as response:
+                status = response.status
+                data = await safe_json(response)
+
+                if status != 200:
+                    err_message = None
+                    if isinstance(data, dict):
+                        err_message = (
+                            data.get("message")
+                            or data.get("error")
+                            or data.get("detail")
+                        )
+                        if isinstance(err_message, dict):
+                            err_message = err_message.get("message") or str(err_message)
+                    return {
+                        "success": False,
+                        "status_code": status,
+                        "error_message": err_message or f"Non-200 from Exa: {status}",
+                    }
+
+                if isinstance(data, dict):
+                    if "error" in data:
+                        error_value = data["error"]
+                        if isinstance(error_value, dict):
+                            error_value = error_value.get("message") or str(error_value)
+                        return {
+                            "success": False,
+                            "status_code": status,
+                            "error_message": str(error_value),
+                        }
+
+                    results = data.get("results")
+                    if isinstance(results, list):
+                        return {"success": True, "status_code": status, "error_message": None}
+
+                return {
+                    "success": False,
+                    "status_code": status,
+                    "error_message": "Unexpected response from Exa API.",
+                }
+    except Exception as exc:
+        logger.error(f"Exa test failed: {exc}")
+        return {"success": False, "status_code": 0, "error_message": str(exc)}
+
+
 async def test_apollo(api_key: str) -> Dict[str, Any]:
     organization_domain = 'microsoft.com'
     url = f'https://api.apollo.io/api/v1/organizations/enrich?domain={organization_domain}'
@@ -1179,6 +1241,7 @@ async def test_connectivity(tool_config: List[Dict[str, Any]]) -> Dict[str, Dict
         "serpapi":          test_serpapi,
         "serperdev":        test_serperdev,
         "proxycurl":        test_proxycurl,
+        "exa":             test_exa,
         "apollo":           test_apollo,
         "hubspot":          test_hubspot,
         "github":           test_github,

{dhisana-0.0.1.dev219.dist-info → dhisana-0.0.1.dev221.dist-info}/METADATA

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

{dhisana-0.0.1.dev219.dist-info → dhisana-0.0.1.dev221.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=no-PwDVtPfOSDr6eZ-cN5C3C_Yf2SeElft5ksap24Gg,64136
+dhisana/utils/apollo_tools.py,sha256=aOJYxFlSWaFa_uCt0ZTDEvX6qZTrnAO5NrZgDBYWPN4,66506
 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
@@ -78,7 +78,7 @@ dhisana/utils/serperdev_google_jobs.py,sha256=m5_2f_5y79FOFZz1A_go6m0hIUfbbAoZ0Y
 dhisana/utils/serperdev_local_business.py,sha256=JoZfTg58Hojv61cyuwA2lcnPdLT1lawnWaBNrUYWnuQ,6447
 dhisana/utils/serperdev_search.py,sha256=_iBKIfHMq4gFv5StYz58eArriygoi1zW6VnLlux8vto,9363
 dhisana/utils/smtp_email_tools.py,sha256=kx0VSa0JQyVLD020oARCHhOBZJxDwMIri1Z7jPN0nP4,15843
-dhisana/utils/test_connect.py,sha256=1rupW6dIfRzBKUH1AcWqfhYWhW-wETD475AJlCbgvFw,58254
+dhisana/utils/test_connect.py,sha256=-5Wxc1D4KyCuNJjf9UvIXqK-eXmcr_1MpUg4u_B06SQ,60749
 dhisana/utils/trasform_json.py,sha256=s48DoyzVVCI4dTvSUwF5X-exX6VH6nPWrjbUENkYuNE,6979
 dhisana/utils/web_download_parse_tools.py,sha256=ouXwH7CmjcRjoBfP5BWat86MvcGO-8rLCmWQe_eZKjc,7810
 dhisana/utils/workflow_code_model.py,sha256=YPWse5vBb3O6Km2PvKh1Q3AB8qBkzLt1CrR5xOL9Mro,99
@@ -92,8 +92,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=kwW8jWqSBNcRmoyaxlTuZCMOpGJpTbJQgHI7gSjwdzM,3399
-dhisana-0.0.1.dev219.dist-info/METADATA,sha256=T-dWWhSYokCE-P7SB5slEkbuuHfXlpm7lrWGRXiSaV0,1190
-dhisana-0.0.1.dev219.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-dhisana-0.0.1.dev219.dist-info/entry_points.txt,sha256=jujxteZmNI9EkEaK-pOCoWuBujU8TCevdkfl9ZcKHek,49
-dhisana-0.0.1.dev219.dist-info/top_level.txt,sha256=NETTHt6YifG_P7XtRHbQiXZlgSFk9Qh9aR-ng1XTf4s,8
-dhisana-0.0.1.dev219.dist-info/RECORD,,
+dhisana-0.0.1.dev221.dist-info/METADATA,sha256=b-NJrLnqGwpHzBkbkln7ZoEUSbUG9-48gIwjJiicSxE,1190
+dhisana-0.0.1.dev221.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+dhisana-0.0.1.dev221.dist-info/entry_points.txt,sha256=jujxteZmNI9EkEaK-pOCoWuBujU8TCevdkfl9ZcKHek,49
+dhisana-0.0.1.dev221.dist-info/top_level.txt,sha256=NETTHt6YifG_P7XtRHbQiXZlgSFk9Qh9aR-ng1XTf4s,8
+dhisana-0.0.1.dev221.dist-info/RECORD,,