dhisana 0.0.1.dev301__tar.gz → 0.0.1.dev302__tar.gz

{dhisana-0.0.1.dev301 → dhisana-0.0.1.dev302}/PKG-INFO

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

{dhisana-0.0.1.dev301 → dhisana-0.0.1.dev302}/setup.py

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

{dhisana-0.0.1.dev301 → dhisana-0.0.1.dev302}/src/dhisana/utils/apollo_tools.py

@@ -11,12 +11,15 @@ 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
 
+from dhisana.utils.cache_output_tools import cache_output, retrieve_output
 from dhisana.utils.clean_properties import cleanup_properties
 from dhisana.utils.company_utils import normalize_company_name
 
 logging.basicConfig(level=logging.INFO)
 logger = logging.getLogger(__name__)
 
+APOLLO_CACHE_TTL = 14 * 24 * 60 * 60  # 14 days in seconds
+
 
 def get_apollo_access_token(tool_config: Optional[List[Dict]] = None) -> Tuple[str, bool]:
     """
@@ -109,6 +112,7 @@ async def enrich_person_info_from_apollo(
     phone: Optional[str] = None,
     fetch_valid_phone_number: Optional[bool] = False,
     tool_config: Optional[List[Dict]] = None,
+    organization_id: Optional[str] = None,
 ) -> Dict[str, Any]:
     """
     Fetch a person's details from Apollo using LinkedIn URL, email, or phone number.
@@ -118,6 +122,7 @@ async def enrich_person_info_from_apollo(
     - **email** (*str*, optional): Email address of the person.
     - **phone** (*str*, optional): Phone number of the person.
     - **fetch_valid_phone_number** (*bool*, optional): If True, include phone numbers in the API response. Defaults to False.
+    - **organization_id** (*str*, optional): Organization ID used as prefix for cache keys to scope caching per tenant.
 
     Returns:
     - **dict**: JSON response containing person information.
@@ -130,6 +135,21 @@ async def enrich_person_info_from_apollo(
         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"}
 
+    # Check cache if organization_id is available
+    cache_key_identifier = linkedin_url or email or phone
+    cache_tool_name = "enrich_person_phone_from_apollo" if fetch_valid_phone_number else "enrich_person_info_from_apollo"
+    if organization_id and cache_key_identifier:
+        cache_key = f"{organization_id}:{cache_key_identifier}"
+        try:
+            cached_response = retrieve_output(cache_tool_name, cache_key)
+            if cached_response is not None and cached_response.get('error') is None:
+                logger.info(f"Cache hit for Apollo person enrichment, org_id={organization_id}, identifier={cache_key_identifier}")
+                return cached_response
+            else:
+                logger.info(f"Cache miss for Apollo person enrichment, org_id={organization_id}, identifier={cache_key_identifier}")
+        except Exception:
+            logger.warning(f"Failed to retrieve cached Apollo person data for org_id={organization_id}, proceeding with API call.")
+
     headers = {"Content-Type": "application/json"}
     if is_oauth:
         headers["Authorization"] = f"Bearer {token}"
@@ -160,6 +180,13 @@ async def enrich_person_info_from_apollo(
                 logger.debug(f"Received response status: {response.status}")
                 if response.status == 200:
                     result = await response.json()
+                    # Cache on success if organization_id is available
+                    if organization_id and cache_key_identifier:
+                        cache_key = f"{organization_id}:{cache_key_identifier}"
+                        try:
+                            cache_output(cache_tool_name, cache_key, result, ttl=APOLLO_CACHE_TTL)
+                        except Exception:
+                            logger.warning("Failed to cache Apollo person data.")
                     logger.info("Successfully retrieved person info from Apollo.")
                     return result
                 elif response.status == 429:
@@ -272,12 +299,14 @@ async def lookup_person_in_apollo_by_name(
 async def enrich_organization_info_from_apollo(
     organization_domain: Optional[str] = None,
     tool_config: Optional[List[Dict]] = None,
+    organization_id: Optional[str] = None,
 ) -> Dict[str, Any]:
     """
     Fetch an organization's details from Apollo using the organization domain.
     
     Parameters:
     - **organization_domain** (*str*, optional): Domain of the organization.
+    - **organization_id** (*str*, optional): Organization ID used as prefix for cache keys to scope caching per tenant.
 
     Returns:
     - **dict**: JSON response containing organization information.
@@ -290,6 +319,19 @@ async def enrich_organization_info_from_apollo(
         logger.warning("No organization domain provided.")
         return {'error': "organization domain must be provided"}
 
+    # Check cache if organization_id is available
+    if organization_id and organization_domain:
+        cache_key = f"{organization_id}:{organization_domain}"
+        try:
+            cached_response = retrieve_output("enrich_organization_info_from_apollo", cache_key)
+            if cached_response is not None and cached_response.get('error') is None:
+                logger.info(f"Cache hit for Apollo org enrichment, org_id={organization_id}, domain={organization_domain}")
+                return cached_response
+            else:
+                logger.info(f"Cache miss for Apollo org enrichment, org_id={organization_id}, domain={organization_domain}")
+        except Exception:
+            logger.warning(f"Failed to retrieve cached Apollo org data for org_id={organization_id}, proceeding with API call.")
+
     headers = {
         "Content-Type": "application/json",
         "Cache-Control": "no-cache",
@@ -309,6 +351,13 @@ async def enrich_organization_info_from_apollo(
                 logger.debug(f"Received response status: {response.status}")
                 if response.status == 200:
                     result = await response.json()
+                    # Cache on success if organization_id is available
+                    if organization_id and organization_domain:
+                        cache_key = f"{organization_id}:{organization_domain}"
+                        try:
+                            cache_output("enrich_organization_info_from_apollo", cache_key, result, ttl=APOLLO_CACHE_TTL)
+                        except Exception:
+                            logger.warning("Failed to cache Apollo org data.")
                     logger.info("Successfully retrieved organization info from Apollo.")
                     return result
                 elif response.status == 429:
@@ -1117,6 +1166,10 @@ async def enrich_user_info_with_apollo(
     email = input_user_properties.get("email", "")
     user_data_from_apollo = None
 
+    # Extract organization_id for tenant-scoped caching
+    org_id_raw = input_user_properties.get("organization_id", "")
+    organization_id = str(org_id_raw) if org_id_raw else None
+
     logger.debug(f"Properties => LinkedIn URL: {linkedin_url}, Email: {email}")
 
     # If LinkedIn url or email is present, attempt direct enrichment
@@ -1125,7 +1178,8 @@ async def enrich_user_info_with_apollo(
             user_data_from_apollo = await enrich_person_info_from_apollo(
                 linkedin_url=linkedin_url,
                 email=email,
-                tool_config=tool_config
+                tool_config=tool_config,
+                organization_id=organization_id,
             )
         except Exception:
             logger.exception("Exception occurred while enriching person info from Apollo by LinkedIn or email.")
@@ -1185,7 +1239,8 @@ async def enrich_user_info_with_apollo(
                         try:
                             user_data_from_apollo = await enrich_person_info_from_apollo(
                                 linkedin_url=linkedin_url,
-                                tool_config=tool_config
+                                tool_config=tool_config,
+                                organization_id=organization_id,
                             )
                         except Exception:
                             logger.exception("Exception occurred during second stage Apollo enrichment.")
@@ -1894,6 +1949,7 @@ async def search_organization_by_linkedin_or_domain(
     linkedin_url: Optional[str] = None,
     domain: Optional[str] = None,
     tool_config: Optional[List[Dict]] = None,
+    organization_id: Optional[str] = None,
 ) -> Dict[str, Any]:
     """
     Search for an organization in Apollo using LinkedIn URL or domain and return
@@ -1933,6 +1989,21 @@ async def search_organization_by_linkedin_or_domain(
         logger.warning("No linkedin_url or domain provided. At least one is required.")
         return {'error': "At least one of linkedin_url or domain must be provided"}
     
+    # --- Cache lookup ---
+    cache_tool_name = "search_organization_by_linkedin_or_domain"
+    cache_identifier = (linkedin_url or domain or "").strip().rstrip("/").lower()
+    cache_key = f"{organization_id}:{cache_identifier}" if organization_id else None
+    if cache_key:
+        try:
+            cached = retrieve_output(cache_tool_name, cache_key)
+            if cached is not None and cached.get('error') is None:
+                logger.info("Cache hit for search_organization_by_linkedin_or_domain org_id=%s identifier=%s", organization_id, cache_identifier)
+                return cached
+            else:
+                logger.info("Cache miss for search_organization_by_linkedin_or_domain org_id=%s identifier=%s", organization_id, cache_identifier)
+        except Exception as e:
+            logger.warning("Cache retrieval error for search_organization_by_linkedin_or_domain: %s", e)
+
     token, is_oauth = get_apollo_access_token(tool_config)
     
     headers = {
@@ -2126,6 +2197,14 @@ async def search_organization_by_linkedin_or_domain(
                                f"(domain: {standardized_org.get('domain')}, "
                                f"linkedin: {standardized_org.get('organization_linkedin_url')}, "
                                f"confidence: {match_confidence})")
+
+                    # --- Cache the result ---
+                    if cache_key:
+                        try:
+                            cache_output(cache_tool_name, cache_key, standardized_org, APOLLO_CACHE_TTL)
+                        except Exception as e:
+                            logger.warning("Cache write error for search_organization_by_linkedin_or_domain: %s", e)
+
                     return standardized_org
                     
                 elif response.status == 429:

{dhisana-0.0.1.dev301 → dhisana-0.0.1.dev302}/src/dhisana/utils/check_linkedin_url_validity.py

@@ -68,9 +68,12 @@ async def validate_linkedin_url_with_apollo(
     linkedin_url = lead_properties.get("user_linkedin_url", "")
     match_result = LeadLinkedInMatch()
 
+    org_id_raw = lead_properties.get("organization_id", "")
+    apollo_org_id = str(org_id_raw) if org_id_raw else None
     linkedin_data = await enrich_person_info_from_apollo(
         linkedin_url=linkedin_url, 
-        tool_config=tool_config
+        tool_config=tool_config,
+        organization_id=apollo_org_id,
     )
     # If no data is returned from Apollo, return defaults
     if not linkedin_data:

{dhisana-0.0.1.dev301 → dhisana-0.0.1.dev302}/src/dhisana/utils/enrich_lead_information.py

@@ -361,9 +361,12 @@ async def enrich_lead_information(
         and not cloned_properties.get("user_linkedin_url")
     ):
         try:
+            org_id_raw = cloned_properties.get("organization_id", "")
+            apollo_org_id = str(org_id_raw) if org_id_raw else None
             apollo_result = await enrich_person_info_from_apollo(
                 email=cloned_properties["email"],
                 tool_config=tool_config,
+                organization_id=apollo_org_id,
             )
             if apollo_result and not apollo_result.get("error"):
                 person_data = apollo_result.get("person", {})
@@ -583,9 +586,12 @@ async def enrich_user_info(
         # 1a) If email is present, first try Apollo lookup by email for more robust matching
         if email:
             logger.debug("Attempting Apollo lookup by email: %s", email)
+            org_id_raw = input_properties.get("organization_id", "")
+            apollo_org_id = str(org_id_raw) if org_id_raw else None
             apollo_result = await enrich_person_info_from_apollo(
                 email=email,
                 tool_config=tool_config,
+                organization_id=apollo_org_id,
             )
             if apollo_result and not apollo_result.get("error"):
                 person_data = apollo_result.get("person", {})
@@ -899,6 +905,7 @@ async def enrich_organization_info_from_company_url(
     extra: Optional[bool] = None,
     use_cache: Optional[str] = "if-present",
     fallback_to_cache: Optional[str] = "on-error",
+    organization_id: Optional[str] = None,
 ) -> Dict[str, Any]:
     """
     Given an organization LinkedIn URL, attempt to enrich its data (e.g. name, website)
@@ -917,6 +924,7 @@ async def enrich_organization_info_from_company_url(
         apollo_result = await search_organization_by_linkedin_or_domain(
             linkedin_url=organization_linkedin_url,
             tool_config=tool_config,
+            organization_id=organization_id,
         )
         if apollo_result and not apollo_result.get("error"):
             logger.debug(f"Apollo returned company data: {apollo_result.get('organization_name')}")

{dhisana-0.0.1.dev301 → dhisana-0.0.1.dev302}/src/dhisana/utils/serpapi_search_tools.py

@@ -828,6 +828,7 @@ async def get_resolved_linkedin_links(url: str) -> List[str]:
 async def get_company_website_from_linkedin_url(
     linkedin_url: str,
     tool_config: Optional[List[Dict]] = None,
+    organization_id: Optional[str] = None,
 ) -> str:
     """
     Attempt to extract a company's website from its LinkedIn URL.
@@ -859,6 +860,7 @@ async def get_company_website_from_linkedin_url(
                 org_info = await search_organization_by_linkedin_or_domain(
                     linkedin_url=linkedin_url,
                     tool_config=tool_config,
+                    organization_id=organization_id,
                 )
                 # Prefer 'website', then build one from 'domain'
                 website = (org_info.get("website") or "").strip()

{dhisana-0.0.1.dev301 → dhisana-0.0.1.dev302}/src/dhisana.egg-info/PKG-INFO

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