sunholo 0.136.2__tar.gz → 0.137.0__tar.gz

{sunholo-0.136.2/src/sunholo.egg-info → sunholo-0.137.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: sunholo
-Version: 0.136.2
+Version: 0.137.0
 Summary: AI DevOps - a package to help deploy GenAI to the Cloud.
 Author-email: Holosun ApS <multivac@sunholo.com>
 License: Apache License, Version 2.0

{sunholo-0.136.2 → sunholo-0.137.0}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "sunholo"
-version = "0.136.2"
+version = "0.137.0"
 description = "AI DevOps - a package to help deploy GenAI to the Cloud."
 readme = "README.md"
 requires-python = ">=3.10"

{sunholo-0.136.2 → sunholo-0.137.0}/src/sunholo/discovery_engine/discovery_engine_client.py

@@ -486,35 +486,53 @@ class DiscoveryEngineClient:
         """Process a search response containing documents into a formatted string."""
         all_documents = []
         result_count = 0
+        
         # Check if the response contains results
         if not response or not hasattr(response, 'results') or not response.results:
             log.info(f'No results found in response: {response=}')
             return []
         
-        should_break=False
-        # Process the pager properly
-        for page in response.pages:
-            if should_break:
-                break
-            if hasattr(page, 'results') and page.results:
-                for result in page.results:
-                    if result_count >= max_limit:
-                        log.info("Breaking results loop as max limit reached")
-                        should_break = True  # Set flag to break outer loop
-                        break
-
-                if hasattr(result, 'document'):
-                    document = result.document
-                    all_documents.append(self.document_format(document))
-                    result_count += 1
-                    
-                    # Check if we've reached max_limit
-                    if max_limit is not None and result_count >= max_limit:
-                        log.info(f"Reached max_limit of {max_limit} results, stopping processing")
-                        should_break = True
-                        break
-                else:
-                    log.warning("No document found in result")
+        # Simpler approach: Just process the direct results from the response
+        # This handles the case where it's just a simple SearchResponse
+        for result in response.results:
+            if hasattr(result, 'document'):
+                document = result.document
+                all_documents.append(self.document_format(document))
+                result_count += 1
+                
+                # Check if we've reached max_limit
+                if max_limit is not None and result_count >= max_limit:
+                    log.info(f"Reached max_limit of {max_limit} results, stopping processing")
+                    break
+            else:
+                log.warning("No document found in result")
+        
+        # If there are pages, check gently without assuming too much about the structure
+        # Only process if we haven't already hit the max_limit
+        if (max_limit is None or result_count < max_limit) and hasattr(response, 'pages'):
+            try:
+                # For each page (after the first which we've already processed)
+                for page in list(response.pages)[1:]:  # Skip first page as we already processed it
+                    if hasattr(page, 'results'):
+                        for result in page.results:
+                            if hasattr(result, 'document'):
+                                document = result.document
+                                all_documents.append(self.document_format(document))
+                                result_count += 1
+                                
+                                # Check if we've reached max_limit
+                                if max_limit is not None and result_count >= max_limit:
+                                    log.info(f"Reached max_limit of {max_limit} results while processing pages")
+                                    break
+                            else:
+                                log.warning("No document found in result during page processing")
+                        
+                        # Break out of the page loop if we've reached max_limit
+                        if max_limit is not None and result_count >= max_limit:
+                            break
+            except Exception as e:
+                # Don't let page iteration issues break the whole function
+                log.warning(f"Error during page iteration, proceeding with results already collected: {e}")
         
         # Combine all documents into one long string
         result_string = "\n\n".join(all_documents)
@@ -531,30 +549,52 @@ class DiscoveryEngineClient:
             log.info(f'No results found in response: {response=}')
             return []
 
-        should_break=False
-        # Process the pager properly
-        async for page in response.pages:
-            if should_break:
-                break
-            if hasattr(page, 'results') and page.results:
-                for result in page.results:
-                    if result_count >= max_limit:
-                        log.info("Breaking results loop as max limit reached")
-                        should_break = True  # Set flag to break outer loop
-                        break
-
-                if hasattr(result, 'document'):
-                    document = result.document
-                    all_documents.append(self.document_format(document))
-                    result_count += 1
-                    
-                    # Check if we've reached max_limit
-                    if max_limit is not None and result_count >= max_limit:
-                        log.info(f"Reached max_limit of {max_limit} results, stopping processing")
-                        should_break = True
-                        break
-                else:
-                    log.warning("No document found in result")
+        # Simpler approach: Just process the direct results from the response
+        # This handles the case where it's just a simple SearchResponse
+        for result in response.results:
+            if hasattr(result, 'document'):
+                document = result.document
+                all_documents.append(self.document_format(document))
+                result_count += 1
+                
+                # Check if we've reached max_limit
+                if max_limit is not None and result_count >= max_limit:
+                    log.info(f"Reached max_limit of {max_limit} results, stopping processing")
+                    break
+            else:
+                log.warning("No document found in result")
+        
+        # If there are pages, check gently without assuming too much about the structure
+        # Only process if we haven't already hit the max_limit
+        if (max_limit is None or result_count < max_limit) and hasattr(response, 'pages'):
+            try:
+                # Since pages is an async iterator, we need special handling
+                first_page = True  # Flag to skip first page (already processed above)
+                async for page in response.pages:
+                    if first_page:
+                        first_page = False
+                        continue  # Skip first page as we already processed it
+                        
+                    if hasattr(page, 'results'):
+                        for result in page.results:
+                            if hasattr(result, 'document'):
+                                document = result.document
+                                all_documents.append(self.document_format(document))
+                                result_count += 1
+                                
+                                # Check if we've reached max_limit
+                                if max_limit is not None and result_count >= max_limit:
+                                    log.info(f"Reached max_limit of {max_limit} results while processing pages")
+                                    break
+                            else:
+                                log.warning("No document found in result during page processing")
+                        
+                        # Break out of the page loop if we've reached max_limit
+                        if max_limit is not None and result_count >= max_limit:
+                            break
+            except Exception as e:
+                # Don't let page iteration issues break the whole function
+                log.warning(f"Error during async page iteration, proceeding with results already collected: {e}")
         
         # Combine all documents into one long string
         result_string = "\n\n".join(all_documents)

{sunholo-0.136.2 → sunholo-0.137.0}/src/sunholo/invoke/async_class.py

@@ -8,11 +8,12 @@ from tenacity import AsyncRetrying, retry_if_exception_type, wait_random_exponen
 log = setup_logging("sunholo_AsyncTaskRunner")
 
 class AsyncTaskRunner:
-    def __init__(self, retry_enabled=False, retry_kwargs=None, timeout=120):
+    def __init__(self, retry_enabled:bool=False, retry_kwargs:dict=None, timeout:int=120, max_concurrency:int=20):
         self.tasks = []
         self.retry_enabled = retry_enabled
         self.retry_kwargs = retry_kwargs or {}
         self.timeout = timeout
+        self.semaphore = asyncio.Semaphore(max_concurrency)
 
     def add_task(self, func: Callable[..., Any], *args: Any, **kwargs: Any):
         """
@@ -136,10 +137,11 @@ class AsyncTaskRunner:
         Returns:
             Any: The result of the task.
         """
-        if asyncio.iscoroutinefunction(func):
-            return await func(*args, **kwargs)
-        else:
-            return await asyncio.to_thread(func, *args, **kwargs)
+        async with self.semaphore:  # Use semaphore to limit concurrent executions
+            if asyncio.iscoroutinefunction(func):
+                return await func(*args, **kwargs)
+            else:
+                return await asyncio.to_thread(func, *args, **kwargs)
 
     async def _send_heartbeat(self, func_name: str, completion_event: asyncio.Event, queue: asyncio.Queue, interval: int = 2):
         """

{sunholo-0.136.2 → sunholo-0.137.0/src/sunholo.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: sunholo
-Version: 0.136.2
+Version: 0.137.0
 Summary: AI DevOps - a package to help deploy GenAI to the Cloud.
 Author-email: Holosun ApS <multivac@sunholo.com>
 License: Apache License, Version 2.0