dhisana 0.0.1.dev307__tar.gz → 0.0.1.dev309__tar.gz

{dhisana-0.0.1.dev307 → dhisana-0.0.1.dev309}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: dhisana
-Version: 0.0.1.dev307
+Version: 0.0.1.dev309
 Summary: A Python SDK for Dhisana AI Platform
 Home-page: https://github.com/dhisana-ai/dhisana-python-sdk
 Author: Admin
@@ -16,6 +16,7 @@ Requires-Dist: click>=7.0
 Requires-Dist: fastapi
 Requires-Dist: google-api-python-client
 Requires-Dist: google-auth
+Requires-Dist: google-genai>=1.0.0
 Requires-Dist: openai
 Requires-Dist: playwright
 Requires-Dist: requests

{dhisana-0.0.1.dev307 → dhisana-0.0.1.dev309}/setup.py

@@ -2,7 +2,7 @@ from setuptools import setup, find_packages
 
 setup(
     name='dhisana',  
-    version='0.0.1-dev307',
+    version='0.0.1-dev309',
     description='A Python SDK for Dhisana AI Platform',
     author='Admin',
     author_email='contact@dhisana.ai',
@@ -16,6 +16,7 @@ setup(
         'fastapi',
         'google-api-python-client',
         'google-auth',
+        'google-genai>=1.0.0',
         'openai',
         'playwright',
         'requests',

{dhisana-0.0.1.dev307 → dhisana-0.0.1.dev309}/src/dhisana/utils/apollo_tools.py

@@ -201,9 +201,15 @@ async def enrich_person_info_from_apollo(
                         headers=response.headers
                     )
                 else:
-                    result = await response.json()
-                    logger.warning(f"enrich_person_info_from_apollo error: {result}")
+                    body = await response.text()
+                    try:
+                        result = json.loads(body)
+                    except (json.JSONDecodeError, ValueError):
+                        result = body or f"HTTP {response.status}"
+                    logger.warning(f"enrich_person_info_from_apollo error (status={response.status}): {str(result)[:500]}")
                     return {'error': result}
+        except aiohttp.ClientResponseError:
+            raise
         except Exception as e:
             logger.exception("Exception occurred while fetching person info from Apollo.")
             return {'error': str(e)}
@@ -281,9 +287,15 @@ async def lookup_person_in_apollo_by_name(
                         headers=response.headers
                     )
                 else:
-                    result = await response.json()
-                    logger.warning(f"lookup_person_in_apollo_by_name error: {result}")
+                    body = await response.text()
+                    try:
+                        result = json.loads(body)
+                    except (json.JSONDecodeError, ValueError):
+                        result = body or f"HTTP {response.status}"
+                    logger.warning(f"lookup_person_in_apollo_by_name error (status={response.status}): {str(result)[:500]}")
                     return {'error': result}
+        except aiohttp.ClientResponseError:
+            raise
         except Exception as e:
             logger.exception("Exception occurred while looking up person by name.")
             return {'error': str(e)}
@@ -371,9 +383,15 @@ async def enrich_organization_info_from_apollo(
                         headers=response.headers
                     )
                 else:
-                    result = await response.json()
-                    logger.warning(f"Error from Apollo while enriching org info: {result}")
+                    body = await response.text()
+                    try:
+                        result = json.loads(body)
+                    except (json.JSONDecodeError, ValueError):
+                        result = body or f"HTTP {response.status}"
+                    logger.warning(f"Error from Apollo while enriching org info (status={response.status}): {str(result)[:500]}")
                     return {'error': result}
+        except aiohttp.ClientResponseError:
+            raise
         except Exception as e:
             logger.exception("Exception occurred while fetching organization info from Apollo.")
             return {'error': str(e)}
@@ -1132,9 +1150,15 @@ async def get_organization_details_from_apollo(
                         headers=response.headers
                     )
                 else:
-                    result = await response.json()
-                    logger.warning(f"get_organization_details_from_apollo error: {result}")
+                    body = await response.text()
+                    try:
+                        result = json.loads(body)
+                    except (json.JSONDecodeError, ValueError):
+                        result = body or f"HTTP {response.status}"
+                    logger.warning(f"get_organization_details_from_apollo error (status={response.status}): {str(result)[:500]}")
                     return {'error': result}
+        except aiohttp.ClientResponseError:
+            raise
         except Exception as e:
             logger.exception("Exception occurred while fetching organization details from Apollo.")
             return {'error': str(e)}
@@ -2219,8 +2243,12 @@ async def search_organization_by_linkedin_or_domain(
                         headers=response.headers
                     )
                 else:
-                    result = await response.json()
-                    logger.warning(f"search_organization_by_linkedin_or_domain error: {result}")
+                    body = await response.text()
+                    try:
+                        result = json.loads(body)
+                    except (json.JSONDecodeError, ValueError):
+                        result = body or f"HTTP {response.status}"
+                    logger.warning(f"search_organization_by_linkedin_or_domain error (status={response.status}): {str(result)[:500]}")
                     return {'error': result}
                     
         except aiohttp.ClientResponseError:

{dhisana-0.0.1.dev307 → dhisana-0.0.1.dev309}/src/dhisana/utils/test_connect.py

@@ -3,7 +3,7 @@ import logging
 import asyncio
 import os
 from datetime import datetime, timedelta, timezone
-from typing import Awaitable, Callable, Dict, List, Any, Optional
+from typing import Awaitable, Callable, Dict, List, Any, Optional, Union
 import requests
 
 try:
@@ -2105,6 +2105,135 @@ async def test_dataverse(
         return {"success": False, "status_code": 0, "error_message": str(exc)}
 
 
+async def test_gemini(
+    api_key: Union[str, Dict[str, Any]] = "",
+    use_vertex_ai: bool = False,
+    project: str = "",
+    location: str = "us-central1",
+) -> Dict[str, Any]:
+    """Verify Gemini connectivity by listing available models.
+
+    Args:
+        api_key: A Gemini API key, a service-account JSON string, or an
+            already-parsed service-account ``dict``.  When a service-account
+            JSON is detected, Vertex AI mode is enabled automatically.
+        use_vertex_ai: Explicitly enable Vertex AI mode.
+        project: GCP project ID (required for Vertex AI).
+        location: GCP region for Vertex AI (default ``us-central1``).
+    """
+    try:
+        from google import genai
+    except ImportError:
+        return {
+            "success": False,
+            "status_code": 0,
+            "error_message": "google-genai package is not installed. Install with: pip install google-genai",
+        }
+
+    try:
+        # Normalise api_key: it may arrive as a dict (already-parsed
+        # service-account JSON from Pydantic config deserialization).
+        if isinstance(api_key, dict):
+            if api_key.get("type") == "service_account":
+                sa_info = api_key
+            else:
+                return {
+                    "success": False,
+                    "status_code": 0,
+                    "error_message": "api_key is a dict but not a valid service account JSON (missing \"type\": \"service_account\").",
+                }
+            api_key = ""  # not a plain API key string
+        else:
+            # Try to parse service account JSON from the api_key field
+            sa_info = None
+            if api_key and api_key.strip().startswith("{"):
+                try:
+                    parsed = json.loads(api_key)
+                    if isinstance(parsed, dict) and parsed.get("type") == "service_account":
+                        sa_info = parsed
+                except (json.JSONDecodeError, TypeError):
+                    pass
+
+        # Validate required fields in service-account JSON
+        if sa_info:
+            missing_sa_fields = [
+                f for f in ("private_key", "client_email")
+                if not sa_info.get(f)
+            ]
+            if missing_sa_fields:
+                return {
+                    "success": False,
+                    "status_code": 0,
+                    "error_message": f"Service account JSON is missing required fields: {', '.join(missing_sa_fields)}",
+                }
+
+        # Auto-detect: service account JSON → force Vertex AI
+        if sa_info and not use_vertex_ai:
+            use_vertex_ai = True
+            if not project:
+                project = sa_info.get("project_id", "")
+
+        if use_vertex_ai and project:
+            if sa_info:
+                from google.oauth2 import service_account as sa_module
+                credentials = sa_module.Credentials.from_service_account_info(
+                    sa_info,
+                    scopes=["https://www.googleapis.com/auth/cloud-platform"],
+                )
+                client = genai.Client(
+                    vertexai=True,
+                    project=project,
+                    location=location,
+                    credentials=credentials,
+                )
+            else:
+                client = genai.Client(
+                    vertexai=True,
+                    project=project,
+                    location=location,
+                )
+        elif api_key and not sa_info:
+            client = genai.Client(api_key=api_key)
+        elif sa_info:
+            return {
+                "success": False,
+                "status_code": 0,
+                "error_message": "API key contains a service account JSON but no GCP project could be determined. "
+                                 "Set the 'GCP Project ID' field or ensure the JSON includes 'project_id'.",
+            }
+        else:
+            return {
+                "success": False,
+                "status_code": 0,
+                "error_message": "No API key or Vertex AI project configured.",
+            }
+
+        # Use models.list to verify credentials without depending on a
+        # specific model being available in the configured location.
+        found_any = False
+        models_iter = await client.aio.models.list(config={"page_size": 1})
+        async for _ in models_iter:
+            found_any = True
+            break
+        if not found_any:
+            return {
+                "success": False,
+                "status_code": 0,
+                "error_message": "Authentication succeeded but no models are accessible. "
+                                 "Check your GCP project permissions or API key.",
+            }
+        # Any successful API response proves connectivity, regardless of
+        # whether the model returned text (safety filters may suppress it).
+        return {"success": True, "status_code": 200, "error_message": None}
+    except Exception as exc:
+        err_msg = str(exc)
+        # Avoid leaking credentials in error messages
+        if isinstance(api_key, str) and api_key and api_key in err_msg:
+            err_msg = err_msg.replace(api_key, "<REDACTED>")
+        logger.error(f"Gemini connectivity test failed: {err_msg}")
+        return {"success": False, "status_code": 0, "error_message": err_msg}
+
+
 ###############################################################################
 #                         MAIN CONNECTIVITY FUNCTION
 ###############################################################################
@@ -2163,6 +2292,7 @@ async def test_connectivity(tool_config: List[Dict[str, Any]]) -> Dict[str, Dict
         "sendgrid":         test_sendgrid,
         "samgov":          test_samgov,
         "scraperapi":       test_scraperapi,
+        "gemini":           test_gemini,
     }
 
     results: Dict[str, Dict[str, Any]] = {}
@@ -2499,6 +2629,42 @@ async def test_connectivity(tool_config: List[Dict[str, Any]]) -> Dict[str, Dict
                 )
             continue
 
+        # ------------------------------------------------------------------ #
+        # Special-case: Gemini (api_key or Vertex AI)
+        # ------------------------------------------------------------------ #
+        if tool_name == "gemini":
+            _MISSING = object()
+
+            def _gem_first(*names, default=None):
+                for n in names:
+                    val = next((c["value"] for c in config_entries if c["name"] == n), _MISSING)
+                    if val is not _MISSING and val:
+                        return val
+                return default
+
+            gem_api_key = _gem_first("api_key", "apiKey", "apikey", default="")
+            use_vertex = str(
+                _gem_first("use_vertex_ai", "vertexai", default="false")
+            ).lower() in ("true", "1", "yes")
+            gem_project = _gem_first("project", "gcp_project", default="")
+            gem_location = _gem_first("location", "gcp_location", default="us-central1")
+
+            if not gem_api_key and not (use_vertex and gem_project):
+                results[tool_name] = {
+                    "success": False,
+                    "status_code": 0,
+                    "error_message": "Provide either an API key or enable Vertex AI with a GCP project ID.",
+                }
+            else:
+                logger.info("Testing connectivity for Gemini…")
+                results[tool_name] = await test_gemini(
+                    api_key=gem_api_key,
+                    use_vertex_ai=use_vertex,
+                    project=gem_project,
+                    location=gem_location,
+                )
+            continue
+
         # ------------------------------------------------------------------ #
         # All other tools – expect an apiKey by default
         # ------------------------------------------------------------------ #

{dhisana-0.0.1.dev307 → dhisana-0.0.1.dev309}/src/dhisana.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: dhisana
-Version: 0.0.1.dev307
+Version: 0.0.1.dev309
 Summary: A Python SDK for Dhisana AI Platform
 Home-page: https://github.com/dhisana-ai/dhisana-python-sdk
 Author: Admin
@@ -16,6 +16,7 @@ Requires-Dist: click>=7.0
 Requires-Dist: fastapi
 Requires-Dist: google-api-python-client
 Requires-Dist: google-auth
+Requires-Dist: google-genai>=1.0.0
 Requires-Dist: openai
 Requires-Dist: playwright
 Requires-Dist: requests

{dhisana-0.0.1.dev307 → dhisana-0.0.1.dev309}/src/dhisana.egg-info/SOURCES.txt

@@ -107,6 +107,7 @@ src/dhisana/workflow/task.py
 src/dhisana/workflow/test.py
 tests/test_agent_tools.py
 tests/test_apollo_company_search.py
+tests/test_apollo_json_error_handling.py
 tests/test_apollo_lead_search.py
 tests/test_connectivity.py
 tests/test_email_body_utils.py

{dhisana-0.0.1.dev307 → dhisana-0.0.1.dev309}/src/dhisana.egg-info/requires.txt

@@ -3,6 +3,7 @@ click>=7.0
 fastapi
 google-api-python-client
 google-auth
+google-genai>=1.0.0
 openai
 playwright
 requests

dhisana-0.0.1.dev309/tests/test_apollo_json_error_handling.py

@@ -0,0 +1,137 @@
+"""Tests for Apollo lookup/enrich – non-JSON response handling.
+
+Reproduces DHISANA-STAGE-14H: JSONDecodeError when Apollo returns an empty
+or non-JSON body on error status codes.
+"""
+
+import json
+
+import pytest
+from unittest.mock import AsyncMock, MagicMock, patch
+
+
+def _mock_aiohttp_session(method, response_status, response_body):
+    """Build a mock aiohttp.ClientSession whose *method* returns *response_body*."""
+    mock_response = MagicMock()
+    mock_response.status = response_status
+    mock_response.text = AsyncMock(return_value=response_body)
+    mock_response.request_info = MagicMock()
+    mock_response.history = ()
+    mock_response.headers = {}
+
+    mock_cm = MagicMock()
+    mock_cm.__aenter__ = AsyncMock(return_value=mock_response)
+    mock_cm.__aexit__ = AsyncMock(return_value=None)
+
+    mock_session = MagicMock()
+    setattr(mock_session, method, MagicMock(return_value=mock_cm))
+
+    mock_session_cm = MagicMock()
+    mock_session_cm.__aenter__ = AsyncMock(return_value=mock_session)
+    mock_session_cm.__aexit__ = AsyncMock(return_value=None)
+
+    return mock_session_cm
+
+
+# ---------------------------------------------------------------------------
+# lookup_person_in_apollo_by_name
+# ---------------------------------------------------------------------------
+
+class TestLookupPersonByName:
+
+    @pytest.mark.asyncio
+    @patch("src.dhisana.utils.apollo_tools.get_apollo_access_token", return_value=("fake-key", False))
+    async def test_empty_body_error_status(self, _mock_token):
+        """Non-200 with empty body should return error dict, not raise."""
+        from src.dhisana.utils.apollo_tools import lookup_person_in_apollo_by_name
+
+        with patch("aiohttp.ClientSession", return_value=_mock_aiohttp_session("post", 502, "")):
+            result = await lookup_person_in_apollo_by_name("Jane Doe")
+
+        assert "error" in result
+        assert "JSONDecodeError" not in str(result["error"])
+
+    @pytest.mark.asyncio
+    @patch("src.dhisana.utils.apollo_tools.get_apollo_access_token", return_value=("fake-key", False))
+    async def test_html_body_error_status(self, _mock_token):
+        """Non-200 with HTML body should return the HTML text as error."""
+        from src.dhisana.utils.apollo_tools import lookup_person_in_apollo_by_name
+
+        html = "<html><body>Service Unavailable</body></html>"
+        with patch("aiohttp.ClientSession", return_value=_mock_aiohttp_session("post", 503, html)):
+            result = await lookup_person_in_apollo_by_name("Jane Doe")
+
+        assert "error" in result
+        assert "Service Unavailable" in str(result["error"])
+
+    @pytest.mark.asyncio
+    @patch("src.dhisana.utils.apollo_tools.get_apollo_access_token", return_value=("fake-key", False))
+    async def test_json_error_body(self, _mock_token):
+        """Non-200 with valid JSON body should return parsed JSON as error."""
+        from src.dhisana.utils.apollo_tools import lookup_person_in_apollo_by_name
+
+        body = json.dumps({"message": "Unauthorized"})
+        with patch("aiohttp.ClientSession", return_value=_mock_aiohttp_session("post", 401, body)):
+            result = await lookup_person_in_apollo_by_name("Jane Doe")
+
+        assert result["error"] == {"message": "Unauthorized"}
+
+    @pytest.mark.asyncio
+    @patch("src.dhisana.utils.apollo_tools.get_apollo_access_token", return_value=("fake-key", False))
+    async def test_success(self, _mock_token):
+        """200 response returns parsed JSON body."""
+        from src.dhisana.utils.apollo_tools import lookup_person_in_apollo_by_name
+
+        body = json.dumps({"people": [{"name": "Jane Doe"}]})
+        with patch("aiohttp.ClientSession", return_value=_mock_aiohttp_session("post", 200, body)):
+            result = await lookup_person_in_apollo_by_name("Jane Doe")
+
+        assert result == {"people": [{"name": "Jane Doe"}]}
+
+    @pytest.mark.asyncio
+    async def test_empty_name(self):
+        """Empty full_name should return error without making API call."""
+        from src.dhisana.utils.apollo_tools import lookup_person_in_apollo_by_name
+
+        result = await lookup_person_in_apollo_by_name("")
+        assert "error" in result
+
+
+# ---------------------------------------------------------------------------
+# enrich_person_info_from_apollo
+# ---------------------------------------------------------------------------
+
+class TestEnrichPersonInfo:
+
+    @pytest.mark.asyncio
+    @patch("src.dhisana.utils.apollo_tools.get_apollo_access_token", return_value=("fake-key", False))
+    async def test_empty_body_error_status(self, _mock_token):
+        from src.dhisana.utils.apollo_tools import enrich_person_info_from_apollo
+
+        with patch("aiohttp.ClientSession", return_value=_mock_aiohttp_session("post", 500, "")):
+            result = await enrich_person_info_from_apollo(
+                email="test@example.com",
+            )
+
+        assert "error" in result
+        assert "JSONDecodeError" not in str(result["error"])
+
+
+# ---------------------------------------------------------------------------
+# enrich_organization_info_from_apollo
+# ---------------------------------------------------------------------------
+
+class TestEnrichOrgInfo:
+
+    @pytest.mark.asyncio
+    @patch("src.dhisana.utils.apollo_tools.get_apollo_access_token", return_value=("fake-key", False))
+    async def test_empty_body_error_status(self, _mock_token):
+        from src.dhisana.utils.apollo_tools import enrich_organization_info_from_apollo
+
+        with patch("aiohttp.ClientSession", return_value=_mock_aiohttp_session("get", 502, "")):
+            result = await enrich_organization_info_from_apollo(
+                organization_domain="example.com",
+            )
+
+        assert "error" in result
+        assert "JSONDecodeError" not in str(result["error"])