dhisana 0.0.1.dev215__py3-none-any.whl → 0.0.1.dev216__py3-none-any.whl

dhisana/utils/serperdev_search.py

@@ -1,3 +1,4 @@
+import asyncio
 import json
 import os
 from typing import Any, Dict, List, Optional
@@ -129,7 +130,8 @@ async def search_google_serper(
     all_results: List[Dict[str, Any]] = []
 
     # We'll collect results from "organic", converting each to a SerpAPI-like format.
-    async with aiohttp.ClientSession() as session:
+    timeout = aiohttp.ClientTimeout(total=30, connect=10)
+    async with aiohttp.ClientSession(timeout=timeout) as session:
         while len(all_results) < number_of_results:
             payload = {
                 "q": full_query,
@@ -142,20 +144,57 @@ async def search_google_serper(
             }
 
             logger.debug(f"Requesting Serper.dev page {page} for query '{full_query}'.")
-            try:
-                async with session.post(url, headers=headers, json=payload) as response:
-                    if response.status != 200:
-                        try:
-                            error_content = await response.json()
-                        except Exception:
-                            error_content = await response.text()
-                        logger.warning(f"Non-200 response from Serper.dev: {error_content}")
-                        return [json.dumps({"error": error_content})]
-
-                    result_json = await response.json()
-            except Exception as e:
-                logger.exception("Exception during Serper.dev request.")
-                return [json.dumps({"error": str(e)})]
+            for attempt in range(3):
+                try:
+                    async with session.post(url, headers=headers, json=payload) as response:
+                        if response.status != 200:
+                            try:
+                                error_content = await response.json()
+                            except Exception:
+                                error_content = await response.text()
+                            logger.warning(
+                                "Non-200 response from Serper.dev: %s (status=%s)",
+                                error_content,
+                                response.status,
+                            )
+                            return [json.dumps({"error": error_content})]
+
+                        result_json = await response.json()
+                        break
+                except asyncio.TimeoutError:
+                    logger.warning(
+                        "Timeout contacting Serper.dev (attempt %s/3) for query '%s'",
+                        attempt + 1,
+                        full_query,
+                    )
+                except aiohttp.ClientError as exc:
+                    logger.warning(
+                        "Client error contacting Serper.dev (attempt %s/3): %s",
+                        attempt + 1,
+                        exc,
+                    )
+                    if attempt == 2:
+                        logger.exception("Exception during Serper.dev request.")
+                        return [json.dumps({"error": str(exc)})]
+                except Exception as e:
+                    logger.exception("Unexpected exception during Serper.dev request.")
+                    return [json.dumps({"error": str(e)})]
+                else:
+                    # Successful request, exit retry loop
+                    break
+                await asyncio.sleep(2 ** attempt)
+            else:
+                logger.error(
+                    "Failed to retrieve data from Serper.dev after multiple attempts for query '%s'",
+                    full_query,
+                )
+                return [
+                    json.dumps(
+                        {
+                            "error": "Serper.dev request timed out after multiple attempts.",
+                        }
+                    )
+                ]
 
             organic_results = result_json.get("organic", [])
             if not organic_results:

{dhisana-0.0.1.dev215.dist-info → dhisana-0.0.1.dev216.dist-info}/METADATA

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

{dhisana-0.0.1.dev215.dist-info → dhisana-0.0.1.dev216.dist-info}/RECORD

@@ -76,7 +76,7 @@ dhisana/utils/serpapi_local_business_search.py,sha256=vinmuXLaQ_0BpEdwnONZ2vLTq5
 dhisana/utils/serpapi_search_tools.py,sha256=MglMPN9wHkGAHb7YAQXvEDsWK3RGS-zu3wUIvZAYxfo,31738
 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=Uv38XN5CKPeD8gipRKjz4PGwB7189MDeRvzKSxgp2nU,7687
+dhisana/utils/serperdev_search.py,sha256=_iBKIfHMq4gFv5StYz58eArriygoi1zW6VnLlux8vto,9363
 dhisana/utils/smtp_email_tools.py,sha256=kx0VSa0JQyVLD020oARCHhOBZJxDwMIri1Z7jPN0nP4,15843
 dhisana/utils/test_connect.py,sha256=-BL0BfHsKuD9JMAfKzyWyLolcZomYlKQWYdkQC8TOn8,53970
 dhisana/utils/trasform_json.py,sha256=s48DoyzVVCI4dTvSUwF5X-exX6VH6nPWrjbUENkYuNE,6979
@@ -92,8 +92,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=kwW8jWqSBNcRmoyaxlTuZCMOpGJpTbJQgHI7gSjwdzM,3399
-dhisana-0.0.1.dev215.dist-info/METADATA,sha256=Uwhryk3Uevk_vG5Mv3QFkB-mQ7qSLgKLJkbNgpOO0u0,1190
-dhisana-0.0.1.dev215.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-dhisana-0.0.1.dev215.dist-info/entry_points.txt,sha256=jujxteZmNI9EkEaK-pOCoWuBujU8TCevdkfl9ZcKHek,49
-dhisana-0.0.1.dev215.dist-info/top_level.txt,sha256=NETTHt6YifG_P7XtRHbQiXZlgSFk9Qh9aR-ng1XTf4s,8
-dhisana-0.0.1.dev215.dist-info/RECORD,,
+dhisana-0.0.1.dev216.dist-info/METADATA,sha256=9AsIIMKtc-BrvNBrKu0lBLRSkcWPjBBcJxpOXa3twkc,1190
+dhisana-0.0.1.dev216.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+dhisana-0.0.1.dev216.dist-info/entry_points.txt,sha256=jujxteZmNI9EkEaK-pOCoWuBujU8TCevdkfl9ZcKHek,49
+dhisana-0.0.1.dev216.dist-info/top_level.txt,sha256=NETTHt6YifG_P7XtRHbQiXZlgSFk9Qh9aR-ng1XTf4s,8
+dhisana-0.0.1.dev216.dist-info/RECORD,,