dhisana 0.0.1.dev256__tar.gz → 0.0.1.dev258__tar.gz

{dhisana-0.0.1.dev256 → dhisana-0.0.1.dev258}/PKG-INFO

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

{dhisana-0.0.1.dev256 → dhisana-0.0.1.dev258}/setup.py

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

{dhisana-0.0.1.dev256 → dhisana-0.0.1.dev258}/src/dhisana/utils/enrich_lead_information.py

@@ -753,8 +753,8 @@ async def get_organization_linkedin_url(lead: Dict[str, Any], tools: Optional[Li
 
     linkedin_url = await find_organization_linkedin_url_with_google_search(
         name,
-        company_location="US",
-        company_domain=lead.get("primary_domain_of_organization"),
+        company_location="USA",
+        company_domain=lead.get("primary_domain_of_organization", ""),
         use_strict_check=True,
         tool_config=tools,
     )

{dhisana-0.0.1.dev256 → dhisana-0.0.1.dev258}/src/dhisana/utils/google_workspace_tools.py

@@ -33,7 +33,7 @@ from dhisana.schemas.common import (SendEmailContext, QueryEmailContext, ReplyEm
 #                               HELPER FUNCTIONS
 ################################################################################
 
-def get_google_workspace_token(tool_config: Optional[List[Dict]] = None) -> str:
+def get_google_workspace_token(tool_config: Optional[List[Dict]] = None) -> Any:
     """
     Retrieves the GOOGLE_SERVICE_KEY (base64-encoded JSON) from the provided tool configuration or environment.
 
@@ -43,7 +43,7 @@ def get_google_workspace_token(tool_config: Optional[List[Dict]] = None) -> str:
                             where "configuration" is a list of dictionaries containing "name" and "value" keys.
 
     Returns:
-        str: The base64-encoded JSON string for the service account credentials.
+        Any: The service account payload (JSON string, base64 string, or dict) for credentials.
 
     Raises:
         ValueError: If the Google Workspace integration has not been configured.
@@ -75,6 +75,29 @@ def get_google_workspace_token(tool_config: Optional[List[Dict]] = None) -> str:
     return GOOGLE_SERVICE_KEY
 
 
+def _normalize_service_account_info(service_account_json: Any) -> Dict[str, Any]:
+    """
+    Normalize a service account payload into a dict for Credentials.from_service_account_info.
+    Accepts dict, JSON string, or base64-encoded JSON string.
+    """
+    if isinstance(service_account_json, dict):
+        return service_account_json
+    if isinstance(service_account_json, (bytes, bytearray)):
+        service_account_json = service_account_json.decode("utf-8")
+    if not isinstance(service_account_json, str):
+        raise TypeError(
+            "Google Workspace service account payload must be a dict, str, bytes, or bytearray."
+        )
+    try:
+        return json.loads(service_account_json)
+    except json.JSONDecodeError:
+        try:
+            decoded = base64.b64decode(service_account_json).decode("utf-8")
+        except (ValueError, UnicodeDecodeError) as exc:
+            raise ValueError("Invalid Google Workspace service account payload.") from exc
+        return json.loads(decoded)
+
+
 
 def get_google_credentials(
     sender_email: str, 
@@ -97,7 +120,7 @@ def get_google_credentials(
         raise ValueError("sender_email is required to impersonate via service account.")
 
     service_account_json = get_google_workspace_token(tool_config)
-    service_account_info = json.loads(service_account_json)
+    service_account_info = _normalize_service_account_info(service_account_json)
 
     # Create Credentials object and impersonate the sender_email
     credentials = service_account.Credentials.from_service_account_info(

{dhisana-0.0.1.dev256 → dhisana-0.0.1.dev258}/src/dhisana/utils/serpapi_search_tools.py

@@ -709,8 +709,8 @@ def extract_company_page(url: str) -> str:
 @assistant_tool
 async def find_organization_linkedin_url_with_google_search(
     company_name: str,
-    company_location: Optional[str] = None,
-    company_domain: Optional[str] = None,
+    company_location: str = "",
+    company_domain: str = "",
     use_strict_check: bool = True,
     tool_config: Optional[List[Dict]] = None,
 ) -> str:

{dhisana-0.0.1.dev256 → dhisana-0.0.1.dev258}/src/dhisana.egg-info/PKG-INFO

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