dhisana 0.0.1.dev210__tar.gz → 0.0.1.dev211__tar.gz

{dhisana-0.0.1.dev210 → dhisana-0.0.1.dev211}/PKG-INFO

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

{dhisana-0.0.1.dev210 → dhisana-0.0.1.dev211}/setup.py

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

{dhisana-0.0.1.dev210 → dhisana-0.0.1.dev211}/src/dhisana/utils/google_oauth_tools.py

@@ -24,6 +24,57 @@ from dhisana.utils.assistant_tool_tag import assistant_tool
 from dhisana.utils.cache_output_tools import retrieve_output, cache_output
 from typing import Optional as _Optional  # avoid name clash in wrappers
 
+def _status_phrase(code: int) -> str:
+    mapping = {
+        400: "Bad Request",
+        401: "Unauthorized",
+        403: "Forbidden",
+        404: "Not Found",
+        405: "Method Not Allowed",
+        409: "Conflict",
+        412: "Precondition Failed",
+        415: "Unsupported Media Type",
+        429: "Too Many Requests",
+        500: "Internal Server Error",
+        502: "Bad Gateway",
+        503: "Service Unavailable",
+        504: "Gateway Timeout",
+    }
+    return mapping.get(code, "HTTP Error")
+
+
+def _extract_google_api_message(response: Optional[httpx.Response]) -> str:
+    """Extract a concise message from Google-style error JSON responses."""
+    if not response:
+        return ""
+    try:
+        data = response.json()
+    except Exception:
+        text = getattr(response, "text", None)
+        return text or ""
+
+    msg = None
+    if isinstance(data, dict):
+        err = data.get("error")
+        if isinstance(err, dict):
+            msg = err.get("message") or err.get("status")
+        elif isinstance(err, str):
+            # Some endpoints return string error + error_description
+            msg = data.get("error_description") or err
+        if not msg:
+            msg = data.get("message") or data.get("text")
+    return msg or ""
+
+
+def _rethrow_with_google_message(exc: httpx.HTTPStatusError, context: str) -> None:
+    resp = getattr(exc, "response", None)
+    code = getattr(resp, "status_code", None) or 0
+    phrase = _status_phrase(int(code))
+    api_msg = _extract_google_api_message(resp) or "Google API request failed."
+    raise httpx.HTTPStatusError(
+        f"{code} {phrase} ({context}). {api_msg}", request=exc.request, response=resp
+    )
+
 
 def get_google_access_token(tool_config: Optional[List[Dict]] = None) -> str:
     """
@@ -91,10 +142,13 @@ async def send_email_using_google_oauth_async(
     url = "https://gmail.googleapis.com/gmail/v1/users/me/messages/send"
 
     async with httpx.AsyncClient(timeout=30) as client:
-        resp = await client.post(url, headers=headers, json=payload)
-        resp.raise_for_status()
-        data = resp.json() or {}
-        return data.get("id", "")
+        try:
+            resp = await client.post(url, headers=headers, json=payload)
+            resp.raise_for_status()
+            data = resp.json() or {}
+            return data.get("id", "")
+        except httpx.HTTPStatusError as exc:
+            _rethrow_with_google_message(exc, "Gmail Send OAuth")
 
 
 async def list_emails_in_time_range_google_oauth_async(
@@ -131,41 +185,44 @@ async def list_emails_in_time_range_google_oauth_async(
 
     items: List[MessageItem] = []
     async with httpx.AsyncClient(timeout=30) as client:
-        list_resp = await client.get(base_url, headers=headers, params=params)
-        list_resp.raise_for_status()
-        list_data = list_resp.json() or {}
-        for m in list_data.get("messages", []) or []:
-            mid = m.get("id")
-            tid = m.get("threadId")
-            if not mid:
-                continue
-            get_url = f"{base_url}/{mid}"
-            get_resp = await client.get(get_url, headers=headers)
-            get_resp.raise_for_status()
-            mdata = get_resp.json() or {}
-
-            headers_list = (mdata.get("payload") or {}).get("headers", [])
-            from_header = find_header(headers_list, "From") or ""
-            subject_header = find_header(headers_list, "Subject") or ""
-            date_header = find_header(headers_list, "Date") or ""
-
-            iso_dt = convert_date_to_iso(date_header)
-            s_name, s_email = parse_single_address(from_header)
-            r_name, r_email = find_all_recipients_in_headers(headers_list)
-
-            items.append(
-                MessageItem(
-                    message_id=mdata.get("id", ""),
-                    thread_id=tid or "",
-                    sender_name=s_name,
-                    sender_email=s_email,
-                    receiver_name=r_name,
-                    receiver_email=r_email,
-                    iso_datetime=iso_dt,
-                    subject=subject_header,
-                    body=extract_email_body_in_plain_text(mdata),
+        try:
+            list_resp = await client.get(base_url, headers=headers, params=params)
+            list_resp.raise_for_status()
+            list_data = list_resp.json() or {}
+            for m in list_data.get("messages", []) or []:
+                mid = m.get("id")
+                tid = m.get("threadId")
+                if not mid:
+                    continue
+                get_url = f"{base_url}/{mid}"
+                get_resp = await client.get(get_url, headers=headers)
+                get_resp.raise_for_status()
+                mdata = get_resp.json() or {}
+
+                headers_list = (mdata.get("payload") or {}).get("headers", [])
+                from_header = find_header(headers_list, "From") or ""
+                subject_header = find_header(headers_list, "Subject") or ""
+                date_header = find_header(headers_list, "Date") or ""
+
+                iso_dt = convert_date_to_iso(date_header)
+                s_name, s_email = parse_single_address(from_header)
+                r_name, r_email = find_all_recipients_in_headers(headers_list)
+
+                items.append(
+                    MessageItem(
+                        message_id=mdata.get("id", ""),
+                        thread_id=tid or "",
+                        sender_name=s_name,
+                        sender_email=s_email,
+                        receiver_name=r_name,
+                        receiver_email=r_email,
+                        iso_datetime=iso_dt,
+                        subject=subject_header,
+                        body=extract_email_body_in_plain_text(mdata),
+                    )
                 )
-            )
+        except httpx.HTTPStatusError as exc:
+            _rethrow_with_google_message(exc, "Gmail List OAuth")
 
     return items
 
@@ -189,9 +246,12 @@ async def reply_to_email_google_oauth_async(
     get_url = f"{base}/messages/{reply_email_context.message_id}"
     params = {"format": "full"}
     async with httpx.AsyncClient(timeout=30) as client:
-        get_resp = await client.get(get_url, headers=headers, params=params)
-        get_resp.raise_for_status()
-        original = get_resp.json() or {}
+        try:
+            get_resp = await client.get(get_url, headers=headers, params=params)
+            get_resp.raise_for_status()
+            original = get_resp.json() or {}
+        except httpx.HTTPStatusError as exc:
+            _rethrow_with_google_message(exc, "Gmail Fetch Message OAuth")
 
     headers_list = (original.get("payload") or {}).get("headers", [])
     headers_map = {h.get("name"): h.get("value") for h in headers_list if isinstance(h, dict)}
@@ -223,9 +283,12 @@ async def reply_to_email_google_oauth_async(
     # 3) Send the reply
     send_url = f"{base}/messages/send"
     async with httpx.AsyncClient(timeout=30) as client:
-        send_resp = await client.post(send_url, headers=headers, json=payload)
-        send_resp.raise_for_status()
-        sent = send_resp.json() or {}
+        try:
+            send_resp = await client.post(send_url, headers=headers, json=payload)
+            send_resp.raise_for_status()
+            sent = send_resp.json() or {}
+        except httpx.HTTPStatusError as exc:
+            _rethrow_with_google_message(exc, "Gmail Send Reply OAuth")
 
     # 4) Optional: mark as read
     if str(reply_email_context.mark_as_read).lower() == "true" and thread_id:
@@ -289,13 +352,16 @@ async def get_calendar_events_using_google_oauth_async(
     }
 
     async with httpx.AsyncClient(timeout=30) as client:
-        resp = await client.get(url, headers=headers, params=params)
-        resp.raise_for_status()
-        data = resp.json() or {}
-        events = data.get("items", [])
-        if not events:
-            logging.info("No upcoming events found within the specified range (OAuth).")
-        return events
+        try:
+            resp = await client.get(url, headers=headers, params=params)
+            resp.raise_for_status()
+            data = resp.json() or {}
+            events = data.get("items", [])
+            if not events:
+                logging.info("No upcoming events found within the specified range (OAuth).")
+            return events
+        except httpx.HTTPStatusError as exc:
+            _rethrow_with_google_message(exc, "Calendar OAuth")
 
 
 # ---------------------------------------------------------------------------
@@ -330,26 +396,68 @@ async def read_google_sheet_using_google_oauth(
     token = get_google_access_token(tool_config)
     headers = {"Authorization": f"Bearer {token}"}
 
+    # If the GCP project requires a quota/billing project with OAuth, allow an optional header
+    def _quota_project(cfg: _Optional[List[Dict]]) -> _Optional[str]:
+        try:
+            g_cfg = next((c for c in (cfg or []) if c.get("name") == "google"), None)
+            if not g_cfg:
+                return None
+            cmap = {f["name"]: f.get("value") for f in g_cfg.get("configuration", []) if f}
+            return (
+                cmap.get("quota_project")
+                or cmap.get("quotaProjectId")
+                or cmap.get("project_id")
+                or cmap.get("x_goog_user_project")
+                or cmap.get("google_cloud_project")
+            )
+        except Exception:
+            return None
+
+    qp = _quota_project(tool_config)
+    if qp:
+        headers["X-Goog-User-Project"] = qp
+
     spreadsheet_id = _get_sheet_id_from_url(sheet_url)
 
-    # Default range to first sheet title if not supplied
-    if not range_name:
-        meta_url = f"https://sheets.googleapis.com/v4/spreadsheets/{spreadsheet_id}"
+    async def _oauth_fetch() -> List[List[str]]:
+        nonlocal range_name
+        # Default range to first sheet title if not supplied
+        if not range_name:
+            meta_url = f"https://sheets.googleapis.com/v4/spreadsheets/{spreadsheet_id}"
+            params = {"fields": "sheets(properties(title))"}
+            async with httpx.AsyncClient(timeout=30) as client:
+                meta_resp = await client.get(meta_url, headers=headers, params=params)
+                meta_resp.raise_for_status()
+                meta = meta_resp.json() or {}
+                sheets = meta.get("sheets", [])
+                if not sheets:
+                    return []
+                range_name = (sheets[0].get("properties") or {}).get("title") or "Sheet1"
+
+        values_url = f"https://sheets.googleapis.com/v4/spreadsheets/{spreadsheet_id}/values/{range_name}"
         async with httpx.AsyncClient(timeout=30) as client:
-            meta_resp = await client.get(meta_url, headers=headers)
-            meta_resp.raise_for_status()
-            meta = meta_resp.json() or {}
-            sheets = meta.get("sheets", [])
-            if not sheets:
-                return []
-            range_name = (sheets[0].get("properties") or {}).get("title") or "Sheet1"
-
-    values_url = f"https://sheets.googleapis.com/v4/spreadsheets/{spreadsheet_id}/values/{range_name}"
-    async with httpx.AsyncClient(timeout=30) as client:
-        val_resp = await client.get(values_url, headers=headers)
-        val_resp.raise_for_status()
-        data = val_resp.json() or {}
-        return data.get("values", [])
+            val_resp = await client.get(values_url, headers=headers)
+            val_resp.raise_for_status()
+            data = val_resp.json() or {}
+            return data.get("values", [])
+
+    try:
+        return await _oauth_fetch()
+    except httpx.HTTPStatusError as exc:
+        # If OAuth fails with 403 (likely insufficient scope or access), fail with clear guidance
+        status = getattr(getattr(exc, "response", None), "status_code", None)
+        if status == 403:
+            api_msg = _extract_google_api_message(exc.response) or "Access forbidden by Google API (403)."
+            guidance = (
+                "Google Sheets access denied with OAuth. Ensure the connected Google account can access the spreadsheet "
+                "(share with the account if private) and that the OAuth token includes the Sheets scope "
+                "('https://www.googleapis.com/auth/spreadsheets.readonly' or 'https://www.googleapis.com/auth/spreadsheets')."
+            )
+            raise httpx.HTTPStatusError(
+                f"403 Forbidden (Sheets OAuth). {api_msg} {guidance}", request=exc.request, response=exc.response
+            )
+        # For other statuses, rethrow with Google's message
+        _rethrow_with_google_message(exc, "Sheets OAuth")
 
 
 @assistant_tool
@@ -368,9 +476,12 @@ async def read_google_document_using_google_oauth(
     url = f"https://docs.googleapis.com/v1/documents/{document_id}"
 
     async with httpx.AsyncClient(timeout=30) as client:
-        resp = await client.get(url, headers=headers)
-        resp.raise_for_status()
-        doc = resp.json() or {}
+        try:
+            resp = await client.get(url, headers=headers)
+            resp.raise_for_status()
+            doc = resp.json() or {}
+        except httpx.HTTPStatusError as exc:
+            _rethrow_with_google_message(exc, "Docs OAuth")
 
     content = (doc.get("body") or {}).get("content", [])
     parts: List[str] = []
@@ -387,7 +498,93 @@ async def read_google_document_using_google_oauth(
 
 
 @assistant_tool
-async def search_google_places_using_google_oauth(
+async def search_google_custom_search(
+    query: str,
+    number_of_results: int = 10,
+    offset: int = 0,
+    tool_config: _Optional[List[Dict]] = None,
+    as_oq: _Optional[str] = None,
+) -> List[str]:
+    """
+    Search Google using the Custom Search JSON API with a per-user OAuth token.
+
+    Requires a Programmable Search Engine ID (cx) from the 'google_custom_search' integration
+    or env var 'GOOGLE_SEARCH_CX'. Returns a list of JSON strings with
+    { position, title, link, snippet } items.
+    """
+    # Final query composition
+    full_query = query if not as_oq else f"{query} {as_oq}"
+
+    # Acquire OAuth token and CX id
+    token = get_google_access_token(tool_config)
+
+    cx: Optional[str] = None
+    if tool_config:
+        gcs_cfg = next((c for c in tool_config if c.get("name") == "google_custom_search"), None)
+        if gcs_cfg:
+            cfg_map = {f["name"]: f.get("value") for f in gcs_cfg.get("configuration", []) if f}
+            cx = cfg_map.get("cx")
+    if not cx:
+        import os as _os
+        cx = _os.environ.get("GOOGLE_SEARCH_CX")
+    if not cx:
+        err = (
+            "Google Custom Search CX is not configured. Please add 'google_custom_search' integration with 'cx',"
+            " or set GOOGLE_SEARCH_CX."
+        )
+        logging.error(err)
+        return [json.dumps({"error": err})]
+
+    # Pagination: start=1-based index
+    start_index = max(1, int(offset) + 1)
+
+    url = "https://www.googleapis.com/customsearch/v1"
+    params = {
+        "q": full_query,
+        "num": number_of_results,
+        "start": start_index,
+        "cx": cx,
+    }
+    headers = {"Authorization": f"Bearer {token}"}
+
+    cache_key = f"oauth_cse:{full_query}:{number_of_results}:{offset}:{cx}"
+    cached = retrieve_output("search_google_custom_search_oauth", cache_key)
+    if cached is not None:
+        return cached
+
+    async with httpx.AsyncClient(timeout=30) as client:
+        try:
+            resp = await client.get(url, headers=headers, params=params)
+            if resp.status_code == 429:
+                return [json.dumps({"error": "Rate limit exceeded (429)"})]
+            resp.raise_for_status()
+            data = resp.json() or {}
+
+            items = data.get("items", []) or []
+            norm: List[Dict[str, Any]] = []
+            for i, item in enumerate(items):
+                norm.append({
+                    "position": i + 1,
+                    "title": item.get("title", ""),
+                    "link": item.get("link", ""),
+                    "snippet": item.get("snippet", ""),
+                })
+            out = [json.dumps(o) for o in norm]
+            cache_output("search_google_custom_search_oauth", cache_key, out)
+            return out
+        except httpx.HTTPStatusError as exc:
+            try:
+                err_json = exc.response.json()
+            except Exception:
+                err_json = {"status": exc.response.status_code, "text": exc.response.text}
+            logging.warning(f"CSE OAuth request failed: {err_json}")
+            return [json.dumps({"error": err_json})]
+        except Exception as e:
+            logging.exception("CSE OAuth request failed")
+            return [json.dumps({"error": str(e)})]
+
+@assistant_tool
+async def search_google_places(
     query: str,
     location_bias: dict = None,
     number_of_results: int = 3,

{dhisana-0.0.1.dev210 → dhisana-0.0.1.dev211}/src/dhisana.egg-info/PKG-INFO

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