sunholo 0.136.0__py3-none-any.whl → 0.136.2__py3-none-any.whl

sunholo/discovery_engine/discovery_engine_client.py

@@ -487,23 +487,34 @@ class DiscoveryEngineClient:
         all_documents = []
         result_count = 0
         # Check if the response contains results
-        if not hasattr(response, 'results') or not response.results:
+        if not response or not hasattr(response, 'results') or not response.results:
             log.info(f'No results found in response: {response=}')
             return []
         
-        # Iterate through each result in the page
-        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")
+        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")
         
         # Combine all documents into one long string
         result_string = "\n\n".join(all_documents)
@@ -516,23 +527,34 @@ class DiscoveryEngineClient:
         result_count = 0
 
         # Check if the response contains results
-        if not hasattr(response, 'results') or not response.results:
+        if not response or not hasattr(response, 'results') or not response.results:
             log.info(f'No results found in response: {response=}')
             return []
-        
-        # Iterate through each result in the page
-        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")
+
+        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")
         
         # Combine all documents into one long string
         result_string = "\n\n".join(all_documents)
@@ -862,33 +884,6 @@ class DiscoveryEngineClient:
         except Exception as e:
             log.info(f"No results {search_request.data_store_specs=}: {str(e)}")
             return None
-
-        # Apply max_limit if needed
-        if content_search_spec_type=="documents" and max_limit is not None:
-            # For raw response objects (when parse_chunks_to_string=False)
-            if not parse_chunks_to_string:
-                # We need to limit the pager results before returning
-                limited_response = search_response
-                # Store the original pages iterator method
-                original_pages = limited_response.pages
-                
-                # Override the pages property with a custom iterator that respects max_limit
-                def limited_pages_iterator():
-                    results_count = 0
-                    for page in original_pages:
-                        yield page
-                        
-                        # Count results in this page
-                        if hasattr(page, 'results'):
-                            results_count += len(page.results)
-                        
-                        # Stop if we've reached max_limit
-                        if results_count >= max_limit:
-                            break
-                
-                # Replace the pages property with our custom iterator
-                limited_response.pages = limited_pages_iterator()
-                return limited_response
         
         if parse_chunks_to_string:
             if content_search_spec_type=="chunks":
@@ -973,33 +968,6 @@ class DiscoveryEngineClient:
         except Exception as e:
             log.info(f"No results {search_request.data_store_specs=}: {str(e)}")
             return None
-        
-        # Apply max_limit if needed
-        if content_search_spec_type=="documents" and max_limit is not None:
-            # For raw response objects (when parse_chunks_to_string=False)
-            if not parse_chunks_to_string:
-                # We need to limit the pager results before returning
-                limited_response = search_response
-                # Store the original pages iterator method
-                original_pages = limited_response.pages
-                
-                # Override the pages property with a custom iterator that respects max_limit
-                async def limited_pages_iterator():
-                    results_count = 0
-                    async for page in original_pages:
-                        yield page
-                        
-                        # Count results in this page
-                        if hasattr(page, 'results'):
-                            results_count += len(page.results)
-                        
-                        # Stop if we've reached max_limit
-                        if results_count >= max_limit:
-                            break
-                
-                # Replace the pages property with our custom iterator
-                limited_response.pages = limited_pages_iterator()
-                return limited_response
             
         if parse_chunks_to_string:
             if content_search_spec_type=="chunks":

{sunholo-0.136.0.dist-info → sunholo-0.136.2.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: sunholo
-Version: 0.136.0
+Version: 0.136.2
 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.0.dist-info → sunholo-0.136.2.dist-info}/RECORD

@@ -75,7 +75,7 @@ sunholo/discovery_engine/__init__.py,sha256=hLgqRDJ22Aov9o2QjAEfsVgnL3kMdM-g5p8R
 sunholo/discovery_engine/chunker_handler.py,sha256=wkvXl4rFtYfN6AZUKdW9_QD49Whf77BukDbO82UwlAg,7480
 sunholo/discovery_engine/cli.py,sha256=tsKqNSDCEsDTz5-wuNwjttb3Xt35D97-KyyEiaqolMQ,35628
 sunholo/discovery_engine/create_new.py,sha256=WUi4_xh_dFaGX3xA9jkNKZhaR6LCELjMPeRb0hyj4FU,1226
-sunholo/discovery_engine/discovery_engine_client.py,sha256=xOcOj7D49bh7aKvDM1KujrFxu8dhgbFugSJv-fUPjt0,62444
+sunholo/discovery_engine/discovery_engine_client.py,sha256=f-KjBzS5ILMDWLBF-ozRynKCjxGi7Mm3rRNnynlhWtY,60822
 sunholo/discovery_engine/get_ai_search_chunks.py,sha256=I6Dt1CznqEvE7XIZ2PkLqopmjpO96iVEWJJqL5cJjOU,5554
 sunholo/embedder/__init__.py,sha256=sI4N_CqgEVcrMDxXgxKp1FsfsB4FpjoXgPGkl4N_u4I,44
 sunholo/embedder/embed_chunk.py,sha256=did2pKkWM2o0KkRcb0H9l2x_WjCq6OyuHDxGbITFKPM,6530
@@ -168,9 +168,9 @@ sunholo/vertex/init.py,sha256=1OQwcPBKZYBTDPdyU7IM4X4OmiXLdsNV30C-fee2scQ,2875
 sunholo/vertex/memory_tools.py,sha256=tBZxqVZ4InTmdBvLlOYwoSEWu4-kGquc-gxDwZCC4FA,7667
 sunholo/vertex/safety.py,sha256=S9PgQT1O_BQAkcqauWncRJaydiP8Q_Jzmu9gxYfy1VA,2482
 sunholo/vertex/type_dict_to_json.py,sha256=uTzL4o9tJRao4u-gJOFcACgWGkBOtqACmb6ihvCErL8,4694
-sunholo-0.136.0.dist-info/licenses/LICENSE.txt,sha256=SdE3QjnD3GEmqqg9EX3TM9f7WmtOzqS1KJve8rhbYmU,11345
-sunholo-0.136.0.dist-info/METADATA,sha256=VeoffpbDPqtye_pewu_LASUZo-79qT6Rpb4UjrG1TQ8,10067
-sunholo-0.136.0.dist-info/WHEEL,sha256=ooBFpIzZCPdw3uqIQsOo4qqbA4ZRPxHnOH7peeONza0,91
-sunholo-0.136.0.dist-info/entry_points.txt,sha256=bZuN5AIHingMPt4Ro1b_T-FnQvZ3teBes-3OyO0asl4,49
-sunholo-0.136.0.dist-info/top_level.txt,sha256=wt5tadn5--5JrZsjJz2LceoUvcrIvxjHJe-RxuudxAk,8
-sunholo-0.136.0.dist-info/RECORD,,
+sunholo-0.136.2.dist-info/licenses/LICENSE.txt,sha256=SdE3QjnD3GEmqqg9EX3TM9f7WmtOzqS1KJve8rhbYmU,11345
+sunholo-0.136.2.dist-info/METADATA,sha256=3RZ3YKpfmyWWwg2yUp8ayE4a2ECu47f9Kp35IV1MjyM,10067
+sunholo-0.136.2.dist-info/WHEEL,sha256=ooBFpIzZCPdw3uqIQsOo4qqbA4ZRPxHnOH7peeONza0,91
+sunholo-0.136.2.dist-info/entry_points.txt,sha256=bZuN5AIHingMPt4Ro1b_T-FnQvZ3teBes-3OyO0asl4,49
+sunholo-0.136.2.dist-info/top_level.txt,sha256=wt5tadn5--5JrZsjJz2LceoUvcrIvxjHJe-RxuudxAk,8
+sunholo-0.136.2.dist-info/RECORD,,