dhisana 0.0.1.dev256__py3-none-any.whl → 0.0.1.dev257__py3-none-any.whl

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

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: dhisana
-Version: 0.0.1.dev256
+Version: 0.0.1.dev257
 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.dist-info → dhisana-0.0.1.dev257.dist-info}/RECORD

@@ -48,7 +48,7 @@ dhisana/utils/generate_linkedin_response_message.py,sha256=-jg-u5Ipf4-cn9q0yjEHs
 dhisana/utils/generate_structured_output_internal.py,sha256=DmZ5QzW-79Jo3JL5nDCZQ-Fjl8Nz7FHK6S0rZxXbKyg,20705
 dhisana/utils/google_custom_search.py,sha256=5rQ4uAF-hjFpd9ooJkd6CjRvSmhZHhqM0jfHItsbpzk,10071
 dhisana/utils/google_oauth_tools.py,sha256=ReG5lCpXL3_e_s0yn6ai4U7B4-feOWHJVtbv_c0g0rE,28525
-dhisana/utils/google_workspace_tools.py,sha256=zTKMyqRj1kAVCBrUPZXjkxANamKFhbvp1er0ftHD3S4,49175
+dhisana/utils/google_workspace_tools.py,sha256=fuV0UcvAqF9drLzj7-p6D5zh7d5jMXl1jNJTICk4XOo,50224
 dhisana/utils/hubspot_clearbit.py,sha256=keNX1F_RnDl9AOPxYEOTMdukV_A9g8v9j1fZyT4tuP4,3440
 dhisana/utils/hubspot_crm_tools.py,sha256=lbXFCeq690_TDLjDG8Gm5E-2f1P5EuDqNf5j8PYpMm8,99298
 dhisana/utils/instantly_tools.py,sha256=hhqjDPyLE6o0dzzuvryszbK3ipnoGU2eBm6NlsUGJjY,4771
@@ -76,7 +76,7 @@ dhisana/utils/serpapi_additional_tools.py,sha256=Xb1tc_oK-IjI9ZrEruYhFg8UJMLHQDa
 dhisana/utils/serpapi_google_jobs.py,sha256=HUJFZEW8UvYqsW0sWlEDXgI_IUomh5fTkzRJzEgsDGc,4509
 dhisana/utils/serpapi_google_search.py,sha256=B3sVq2OXdrYmPbH7cjQN4RFoek96qgKzXIayKXn0HLU,7318
 dhisana/utils/serpapi_local_business_search.py,sha256=vinmuXLaQ_0BpEdwnONZ2vLTq5xnRh6ICmPbnpckSN4,5775
-dhisana/utils/serpapi_search_tools.py,sha256=xiiYi6Rd6Mqn94mjSKEs5nNZk1l2-PW_hTL4grvxUpI,31722
+dhisana/utils/serpapi_search_tools.py,sha256=Wsvy6JDYWBGhIomWcjZiYcWe7ALTO7CORsNG8whyyQg,31698
 dhisana/utils/serperdev_google_jobs.py,sha256=m5_2f_5y79FOFZz1A_go6m0hIUfbbAoZ0YTjUMO2BSI,4508
 dhisana/utils/serperdev_local_business.py,sha256=JoZfTg58Hojv61cyuwA2lcnPdLT1lawnWaBNrUYWnuQ,6447
 dhisana/utils/serperdev_search.py,sha256=_iBKIfHMq4gFv5StYz58eArriygoi1zW6VnLlux8vto,9363
@@ -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.dev256.dist-info/METADATA,sha256=HagswDBVW-DaxEac9yaFUTjSBvGCMD2lNetMk-Iqe-s,1190
-dhisana-0.0.1.dev256.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-dhisana-0.0.1.dev256.dist-info/entry_points.txt,sha256=jujxteZmNI9EkEaK-pOCoWuBujU8TCevdkfl9ZcKHek,49
-dhisana-0.0.1.dev256.dist-info/top_level.txt,sha256=NETTHt6YifG_P7XtRHbQiXZlgSFk9Qh9aR-ng1XTf4s,8
-dhisana-0.0.1.dev256.dist-info/RECORD,,
+dhisana-0.0.1.dev257.dist-info/METADATA,sha256=7R2CrO9xKlOsUiKt0px0PABQv_WjlLPLTOEGDdHcP3Q,1190
+dhisana-0.0.1.dev257.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+dhisana-0.0.1.dev257.dist-info/entry_points.txt,sha256=jujxteZmNI9EkEaK-pOCoWuBujU8TCevdkfl9ZcKHek,49
+dhisana-0.0.1.dev257.dist-info/top_level.txt,sha256=NETTHt6YifG_P7XtRHbQiXZlgSFk9Qh9aR-ng1XTf4s,8
+dhisana-0.0.1.dev257.dist-info/RECORD,,