dhisana 0.0.1.dev222__py3-none-any.whl → 0.0.1.dev224__py3-none-any.whl

dhisana/utils/apollo_tools.py

@@ -1,5 +1,4 @@
 import asyncio
-import hashlib
 import json
 import logging
 import os
@@ -8,7 +7,6 @@ import aiohttp
 import backoff
 
 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, Tuple, Union
@@ -141,10 +139,6 @@ async def enrich_person_info_from_apollo(
     if linkedin_url:
         logger.debug(f"LinkedIn URL provided: {linkedin_url}")
         data['linkedin_url'] = linkedin_url
-        cached_response = retrieve_output("enrich_person_info_from_apollo", linkedin_url)
-        if cached_response is not None:
-            logger.info(f"Cache hit for LinkedIn URL: {linkedin_url}")
-            return cached_response
     if email:
         logger.debug(f"Email provided: {email}")
         data['email'] = email
@@ -165,8 +159,6 @@ async def enrich_person_info_from_apollo(
                 logger.debug(f"Received response status: {response.status}")
                 if response.status == 200:
                     result = await response.json()
-                    if linkedin_url:
-                        cache_output("enrich_person_info_from_apollo", linkedin_url, result)
                     logger.info("Successfully retrieved person info from Apollo.")
                     return result
                 elif response.status == 429:
@@ -232,16 +224,6 @@ async def lookup_person_in_apollo_by_name(
         "per_page": 10
     }
 
-    # Build a cache key that includes full_name and company_name (if provided)
-    # so that results are correctly cached and retrieved.
-    key_item = f"lookup_person_in_apollo_by_name_{full_name}_{company_name or ''}".lower()
-
-    # Attempt to retrieve a cached response first
-    cached_response = retrieve_output("lookup_person_in_apollo_by_name", key_item)
-    if cached_response is not None:
-        logger.info(f"Cache hit for user: {full_name}, company: {company_name or ''}")
-        return cached_response
-
     url = 'https://api.apollo.io/api/v1/mixed_people/search'
     logger.debug(f"Making request to Apollo with payload: {data}")
 
@@ -252,7 +234,6 @@ async def lookup_person_in_apollo_by_name(
                 if response.status == 200:
                     result = await response.json()
                     logger.info("Successfully looked up person by name on Apollo.")
-                    cache_output("lookup_person_in_apollo_by_name", key_item, result)
                     return result
                 elif response.status == 429:
                     msg = "Rate limit exceeded"
@@ -312,11 +293,6 @@ async def enrich_organization_info_from_apollo(
     else:
         headers["X-Api-Key"] = token
 
-    cached_response = retrieve_output("enrich_organization_info_from_apollo", organization_domain)
-    if cached_response is not None:
-        logger.info(f"Cache hit for organization domain: {organization_domain}")
-        return cached_response
-
     url = f'https://api.apollo.io/api/v1/organizations/enrich?domain={organization_domain}'
     logger.debug(f"Making GET request to Apollo for organization domain: {organization_domain}")
 
@@ -326,7 +302,6 @@ async def enrich_organization_info_from_apollo(
                 logger.debug(f"Received response status: {response.status}")
                 if response.status == 200:
                     result = await response.json()
-                    cache_output("enrich_organization_info_from_apollo", organization_domain, result)
                     logger.info("Successfully retrieved organization info from Apollo.")
                     return result
                 elif response.status == 429:
@@ -358,22 +333,12 @@ async def enrich_organization_info_from_apollo(
 )
 async def fetch_apollo_data(session, url: str, headers: Dict[str, str], payload: Dict[str, Any]) -> Optional[Dict[str, Any]]:
     logger.info("Entering fetch_apollo_data")
-    key_data = f"{url}_{json.dumps(payload, sort_keys=True)}"
-    key_hash = hashlib.sha256(key_data.encode()).hexdigest()
-    logger.debug(f"Cache key hash: {key_hash}")
-
-    cached_response = retrieve_output("fetch_apollo_data", key_hash)
-    if cached_response is not None:
-        logger.info("Cache hit for fetch_apollo_data.")
-        return cached_response
-
-    logger.debug("No cache hit. Making POST request to Apollo.")
+    logger.debug("Making POST request to Apollo.")
     async with session.post(url, headers=headers, json=payload) as response:
         logger.debug(f"Received response status: {response.status}")
         if response.status == 200:
             result = await response.json()
-            cache_output("fetch_apollo_data", key_hash, result)
-            logger.info("Successfully fetched data from Apollo and cached it.")
+            logger.info("Successfully fetched data from Apollo.")
             return result
         elif response.status == 429:
             msg = "Rate limit exceeded"
@@ -1019,11 +984,6 @@ async def get_organization_details_from_apollo(
     else:
         headers["X-Api-Key"] = token
 
-    cached_response = retrieve_output("get_organization_details_from_apollo", organization_id)
-    if cached_response is not None:
-        logger.info(f"Cache hit for organization ID: {organization_id}")
-        return cached_response
-
     url = f'https://api.apollo.io/api/v1/organizations/{organization_id}'
     logger.debug(f"Making GET request to Apollo for organization ID: {organization_id}")
 
@@ -1035,7 +995,6 @@ async def get_organization_details_from_apollo(
                     result = await response.json()
                     org_details = result.get('organization', {})
                     if org_details:
-                        cache_output("get_organization_details_from_apollo", organization_id, org_details)
                         logger.info("Successfully retrieved organization details from Apollo.")
                         return org_details
                     else:

dhisana/utils/test_connect.py

@@ -1055,6 +1055,109 @@ async def test_jinaai(api_key: str) -> Dict[str, Any]:
         return {"success": False, "status_code": 0, "error_message": str(exc)}
 
 
+async def test_firefliesai(api_key: str) -> Dict[str, Any]:
+    """Validate Fireflies.ai API key by querying user metadata via GraphQL."""
+    url = "https://api.fireflies.ai/graphql"
+    headers = {
+        "Authorization": f"Bearer {api_key}",
+        "Content-Type": "application/json",
+    }
+
+    # Try a couple of documented/observed query shapes — Fireflies occasionally
+    # aliases the viewer field, so we fall back if the first choice is rejected.
+    queries = [
+        ("users", {"query": "{ users { name user_id } }"}, ("data", "users")),
+        ("viewer", {"query": "query { viewer { id email } }"}, ("data", "viewer")),
+        ("me", {"query": "query { me { id email } }"}, ("data", "me")),
+        ("currentUser", {"query": "query { currentUser { id email } }"}, ("data", "currentUser")),
+    ]
+
+    def extract_error(payload: Optional[Dict[str, Any]]) -> Optional[str]:
+        if not isinstance(payload, dict):
+            return None
+        errors = payload.get("errors")
+        if isinstance(errors, list):
+            messages = [
+                err.get("message") for err in errors
+                if isinstance(err, dict) and err.get("message")
+            ]
+            if messages:
+                return "; ".join(messages)
+        elif errors:
+            return str(errors)
+        return (
+            payload.get("message")
+            or payload.get("error_description")
+            or payload.get("error")
+        )
+
+    try:
+        timeout = aiohttp.ClientTimeout(total=10)
+        async with aiohttp.ClientSession(timeout=timeout) as session:
+            last_error: Optional[str] = None
+
+            for query_name, payload, data_path in queries:
+                async with session.post(url, headers=headers, json=payload) as response:
+                    status = response.status
+                    data = await safe_json(response)
+
+                    if status != 200:
+                        error_message = extract_error(data)
+                        if (
+                            error_message
+                            and "Cannot query field" in error_message
+                            and query_name != queries[-1][0]
+                        ):
+                            last_error = error_message
+                            continue
+                        return {
+                            "success": False,
+                            "status_code": status,
+                            "error_message": error_message or f"Non-200 from Fireflies.ai ({query_name})",
+                        }
+
+                    if not isinstance(data, dict):
+                        return {
+                            "success": False,
+                            "status_code": status,
+                            "error_message": "Fireflies.ai returned non-JSON response.",
+                        }
+
+                    error_message = extract_error(data)
+                    if error_message:
+                        last_error = error_message
+                        # If the error indicates the field is unknown, try the next query option.
+                        if "Cannot query field" in error_message and query_name != queries[-1][0]:
+                            continue
+                        return {
+                            "success": False,
+                            "status_code": status,
+                            "error_message": error_message,
+                        }
+
+                    # Walk the data path to ensure the expected field exists.
+                    cursor: Any = data
+                    for key in data_path:
+                        if not isinstance(cursor, dict):
+                            cursor = None
+                            break
+                        cursor = cursor.get(key)
+
+                    if cursor is not None:
+                        return {"success": True, "status_code": status, "error_message": None}
+
+                    last_error = f"Fireflies.ai {query_name} response missing expected fields."
+
+            return {
+                "success": False,
+                "status_code": 200,
+                "error_message": last_error or "Fireflies.ai queries did not return user data.",
+            }
+    except Exception as exc:
+        logger.error(f"Fireflies.ai connectivity test failed: {exc}")
+        return {"success": False, "status_code": 0, "error_message": str(exc)}
+
+
 async def test_firecrawl(api_key: str) -> Dict[str, Any]:
     """Quick check for Firecrawl API key validity."""
     url = "https://api.firecrawl.com/v1/scrape"
@@ -1250,6 +1353,7 @@ async def test_connectivity(tool_config: List[Dict[str, Any]]) -> Dict[str, Dict
         "findymail":        test_findyemail,
         "datagma":          test_datagma,
         "jinaai":           test_jinaai,
+        "firefliesai":      test_firefliesai,
         "firecrawl":        test_firecrawl,
         "youtube":          test_youtube,
         "salesforce":       test_salesforce,

{dhisana-0.0.1.dev222.dist-info → dhisana-0.0.1.dev224.dist-info}/METADATA

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

{dhisana-0.0.1.dev222.dist-info → dhisana-0.0.1.dev224.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=aOJYxFlSWaFa_uCt0ZTDEvX6qZTrnAO5NrZgDBYWPN4,66506
+dhisana/utils/apollo_tools.py,sha256=DUg9HQBHwD9ZjqbdLP2QPWxbPSAN7aN2d_Brq4svSg0,64297
 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=-5Wxc1D4KyCuNJjf9UvIXqK-eXmcr_1MpUg4u_B06SQ,60749
+dhisana/utils/test_connect.py,sha256=AhaGFV1-E5YhzkWyDtXypuAeFxgB6tIBHAs5eSSL-6k,65210
 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.dev222.dist-info/METADATA,sha256=ahyrM5wSavdXGW7dSp2J-g-GKaFH-DgxqQo_nVsIOGk,1190
-dhisana-0.0.1.dev222.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-dhisana-0.0.1.dev222.dist-info/entry_points.txt,sha256=jujxteZmNI9EkEaK-pOCoWuBujU8TCevdkfl9ZcKHek,49
-dhisana-0.0.1.dev222.dist-info/top_level.txt,sha256=NETTHt6YifG_P7XtRHbQiXZlgSFk9Qh9aR-ng1XTf4s,8
-dhisana-0.0.1.dev222.dist-info/RECORD,,
+dhisana-0.0.1.dev224.dist-info/METADATA,sha256=KjVLbvbvTN_2Gsf_Q3mP3vINRSR2Nvkhi78oN5uk6R8,1190
+dhisana-0.0.1.dev224.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+dhisana-0.0.1.dev224.dist-info/entry_points.txt,sha256=jujxteZmNI9EkEaK-pOCoWuBujU8TCevdkfl9ZcKHek,49
+dhisana-0.0.1.dev224.dist-info/top_level.txt,sha256=NETTHt6YifG_P7XtRHbQiXZlgSFk9Qh9aR-ng1XTf4s,8
+dhisana-0.0.1.dev224.dist-info/RECORD,,