dhisana 0.0.1.dev182__tar.gz → 0.0.1.dev183__tar.gz

{dhisana-0.0.1.dev182 → dhisana-0.0.1.dev183}/PKG-INFO

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

{dhisana-0.0.1.dev182 → dhisana-0.0.1.dev183}/setup.py

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

{dhisana-0.0.1.dev182 → dhisana-0.0.1.dev183}/src/dhisana/utils/serpapi_google_search.py

@@ -1,15 +1,10 @@
 import json
 import os
-import re
-from typing import Any, Dict, List, Optional
-from urllib.parse import urlparse
+from typing import Dict, List, Optional
 import aiohttp
-from bs4 import BeautifulSoup
-import urllib
 
 from dhisana.utils.assistant_tool_tag import assistant_tool
 from dhisana.utils.cache_output_tools import cache_output, retrieve_output
-from dhisana.utils.web_download_parse_tools import fetch_html_content
 
 import logging
 logging.basicConfig(level=logging.INFO)
@@ -91,8 +86,8 @@ async def search_google_serpai(
     SERPAPI_KEY = get_serp_api_access_token(tool_config)
     base_url    = "https://serpapi.com/search"
 
-    page_size     = 100
-    start_index   = offset * 100
+    page_size     = number_of_results
+    start_index   = 0 if offset == 0 else offset + 1  # SerpAPI Pagination Mechanism: Uses the start parameter to specify the first result (zero-indexed)
     all_items: list[dict] = []
     seen_links:   set[str] = set()     # dedupe across blocks/pages
 

{dhisana-0.0.1.dev182 → dhisana-0.0.1.dev183}/src/dhisana/utils/serperdev_search.py

@@ -1,21 +1,15 @@
 import json
 import os
-import re
 from typing import Any, Dict, List, Optional
 import aiohttp
-from bs4 import BeautifulSoup
 
 import logging
 logging.basicConfig(level=logging.INFO)
 logger = logging.getLogger(__name__)
 
-from urllib.parse import urlparse
-import urllib
 
 # If you have these utils in your project, import them; otherwise, remove them or replace them.
-from dhisana.utils.assistant_tool_tag import assistant_tool
 from dhisana.utils.cache_output_tools import cache_output, retrieve_output
-from dhisana.utils.web_download_parse_tools import fetch_html_content
 
 
 def get_serper_dev_api_access_token(tool_config: Optional[List[Dict]] = None) -> str:
@@ -119,8 +113,18 @@ async def search_google_serper(
         "Content-Type": "application/json"
     }
 
-    # Serper.dev uses 'page' to paginate. We'll treat 'offset' as "start from page offset+1".
-    page = offset + 1
+    # Serper.dev uses 'page' to paginate. We need to calculate the page number based on offset.
+    # Serper.dev uses 1-based indexing for pages, so we need to adjust accordingly
+    # e.g., if offset is 0, we want page 1; if offset is 10, we want page 2, etc.
+    # Assuming number_of_results is the number of results per page.
+    # If offset is 0, we want the first page,
+    # if offset is 10 and number_of_results is 10, we want the second page, etc.
+    # This means we can calculate the page as follows:
+    # page = (offset // number_of_results) + 1
+    # If offset is 0, page will be 1; if offset is 10 and number_of_results is 10, page will be 2.
+    # This is consistent with how Serper.dev handles pagination.
+    if number_of_results <= 0:
+    page = 1 if offset == 0 else (offset // number_of_results) + 1
     all_results: List[Dict[str, Any]] = []
 
     # We'll collect results from "organic", converting each to a SerpAPI-like format.
@@ -132,7 +136,7 @@ async def search_google_serper(
                 "hl": "en",        # language
                 "autocorrect": True,
                 "page": page,
-                "num": 100,
+                "num": number_of_results,
                 "type": "search"   # or 'news', 'images', etc., if needed
             }
 

{dhisana-0.0.1.dev182 → dhisana-0.0.1.dev183}/src/dhisana.egg-info/PKG-INFO

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