dhisana 0.0.1.dev248__tar.gz → 0.0.1.dev249__tar.gz

{dhisana-0.0.1.dev248 → dhisana-0.0.1.dev249}/PKG-INFO

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

{dhisana-0.0.1.dev248 → dhisana-0.0.1.dev249}/setup.py

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

{dhisana-0.0.1.dev248 → dhisana-0.0.1.dev249}/src/dhisana/utils/apollo_tools.py

@@ -1485,7 +1485,7 @@ async def search_companies_with_apollo_page(
     # -----------------------------------
     else:
         dynamic_payload = {}
-        
+         
         # Only add fields if they have values (Apollo doesn't like empty arrays)
         if query.organization_locations:
             dynamic_payload["organization_locations"] = query.organization_locations
@@ -1505,19 +1505,37 @@ async def search_companies_with_apollo_page(
             dynamic_payload["organization_num_employees_ranges"] = employee_ranges
 
         # Add optional parameters only if they have values
+        def _normalize_string_list(value: Any) -> List[str]:
+            if value is None:
+                return []
+            if isinstance(value, str):
+                return [part.strip() for part in value.split(",") if part.strip()]
+            if isinstance(value, list):
+                normalized: List[str] = []
+                for item in value:
+                    if item is None:
+                        continue
+                    text = str(item).strip()
+                    if not text:
+                        continue
+                    normalized.extend([part.strip() for part in text.split(",") if part.strip()])
+                return normalized
+            text = str(value).strip()
+            return [text] if text else []
+
         if query.q_keywords:
-            # Split comma-separated keywords into an array for company search
-            if isinstance(query.q_keywords, str):
-                keyword_tags = [tag.strip() for tag in query.q_keywords.split(",") if tag.strip()]
-            else:
-                keyword_tags = query.q_keywords
-        
-        if query.q_organization_keyword_tags:
-            dynamic_payload["q_organization_keyword_tags"] = keyword_tags
-        
-        if query.q_not_organization_keyword_tags:
-            dynamic_payload["q_not_organization_keyword_tags"] = query.q_not_organization_keyword_tags
-        
+            keywords = _normalize_string_list(query.q_keywords)
+            if keywords:
+                dynamic_payload["q_keywords"] = " ".join(keywords)
+
+        org_keyword_tags = _normalize_string_list(query.q_organization_keyword_tags)
+        if org_keyword_tags:
+            dynamic_payload["q_organization_keyword_tags"] = org_keyword_tags
+
+        not_org_keyword_tags = _normalize_string_list(query.q_not_organization_keyword_tags)
+        if not_org_keyword_tags:
+            dynamic_payload["q_not_organization_keyword_tags"] = not_org_keyword_tags
+         
         if query.q_organization_domains:
             dynamic_payload["q_organization_domains_list"] = query.q_organization_domains
         if query.revenue_range_min is not None:

{dhisana-0.0.1.dev248 → dhisana-0.0.1.dev249}/src/dhisana.egg-info/PKG-INFO

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

{dhisana-0.0.1.dev248 → dhisana-0.0.1.dev249}/tests/test_apollo_company_search.py

@@ -1,8 +1,6 @@
-import asyncio
-import json
-import pytest
 import unittest
-from unittest.mock import patch, MagicMock, AsyncMock
+from unittest.mock import patch
+
 from src.dhisana.schemas.sales import CompanyQueryFilters
 from src.dhisana.utils.apollo_tools import (
     search_companies_with_apollo_page,
@@ -11,7 +9,7 @@ from src.dhisana.utils.apollo_tools import (
 )
 
 
-class TestApolloCompanySearch(unittest.TestCase):
+class TestApolloCompanySearch(unittest.IsolatedAsyncioTestCase):
     """Test cases for Apollo company search functionality."""
     
     def setUp(self):
@@ -148,13 +146,37 @@ class TestApolloCompanySearch(unittest.TestCase):
         
         # Verify API call was made correctly
         mock_fetch_data.assert_called_once()
-        call_args = mock_fetch_data.call_args
-        payload = call_args[1]["payload"]
+        payload = mock_fetch_data.call_args.args[3]
         self.assertEqual(payload["page"], 1)
         self.assertEqual(payload["per_page"], 25)
         self.assertIn("organization_locations", payload)
         self.assertIn("organization_num_employees_ranges", payload)
 
+    @patch('src.dhisana.utils.apollo_tools.fetch_apollo_data')
+    @patch('src.dhisana.utils.apollo_tools.get_apollo_access_token')
+    async def test_search_companies_with_apollo_page_accepts_keyword_tags_without_q_keywords(
+        self, mock_get_token, mock_fetch_data
+    ):
+        mock_get_token.return_value = ("test_api_key", False)
+        mock_fetch_data.return_value = self.mock_apollo_response
+
+        query = CompanyQueryFilters(
+            q_organization_keyword_tags=["Marketing and Advertising", "Media Production"]
+        )
+
+        await search_companies_with_apollo_page(
+            query=query,
+            page=1,
+            per_page=25,
+            tool_config=self.tool_config,
+        )
+
+        payload = mock_fetch_data.call_args.args[3]
+        self.assertEqual(
+            payload["q_organization_keyword_tags"],
+            ["Marketing and Advertising", "Media Production"],
+        )
+
     def test_company_query_filters_initialization(self):
         """Test that CompanyQueryFilters can be initialized with various parameters."""
         query = CompanyQueryFilters(