sunholo 0.134.3__py3-none-any.whl → 0.134.4__py3-none-any.whl

sunholo/discovery_engine/discovery_engine_client.py

@@ -309,8 +309,11 @@ class DiscoveryEngineClient:
         
         # Iterate through each result in the response
         for result in response.results:
-            chunk = result.chunk
-            chunk_metadata = chunk.ChunkMetadata
+            if hasattr(result, 'chunk'):      
+                chunk = result.chunk
+                chunk_metadata = chunk.ChunkMetadata
+            else:
+                log.warning("No chunk found in result")
 
             if hasattr(chunk_metadata, 'previous_chunks'):
                 # Process previous chunks
@@ -339,8 +342,11 @@ class DiscoveryEngineClient:
         
         # Iterate through each result in the response
         for result in response.results:
-            chunk = result.chunk
-            chunk_metadata = chunk.ChunkMetadata
+            if hasattr(result, 'chunk'):      
+                chunk = result.chunk
+                chunk_metadata = chunk.ChunkMetadata
+            else:
+                log.warning("No chunk found in result")
 
             if hasattr(chunk_metadata, 'previous_chunks'):
                 # Process previous chunks
@@ -431,6 +437,83 @@ class DiscoveryEngineClient:
             data_store_ids=data_store_ids,
             content_search_spec_type="documents"
         )
+
+    def document_format(self, document):
+        """Format a document for string output."""
+        # Extract useful fields from the document
+        document_id = document.id
+        document_name = document.name
+        
+        # Get content if available
+        content = ""
+        if hasattr(document, 'content') and document.content:
+            if hasattr(document.content, 'uri') and document.content.uri:
+                content = f"Content URI: {document.content.uri}\n"
+            if hasattr(document.content, 'mime_type') and document.content.mime_type:
+                content += f"Content Type: {document.content.mime_type}\n"
+        
+        # Get structured data if available
+        struct_data = ""
+        if hasattr(document, 'struct_data') and document.struct_data:
+            struct_data = f"Structured Data: {dict(document.struct_data)}\n"
+        
+        # Get derived structured data if available
+        derived_data = ""
+        if hasattr(document, 'derived_struct_data') and document.derived_struct_data:
+            derived_data = f"Derived Data: {dict(document.derived_struct_data)}\n"
+        
+        # Return formatted document string
+        return (
+            f"# Document: {document_id}\n"
+            f"Resource Name: {document_name}\n"
+            f"{content}"
+            f"{struct_data}"
+            f"{derived_data}"
+        )
+
+    def process_documents(self, response):
+        """Process a search response containing documents into a formatted string."""
+        all_documents = []
+
+        # Check if the response contains results
+        if not hasattr(response, 'results') or not response.results:
+            log.info(f'No results found in response: {response=}')
+            return []
+        
+        # Iterate through each result in the response
+        for result in response.results:
+            if hasattr(result, 'document'):
+                document = result.document
+                all_documents.append(self.document_format(document))
+            else:
+                log.warning("No document found in result")
+        
+        # Combine all documents into one long string
+        result_string = "\n\n".join(all_documents)
+        
+        return result_string
+
+    async def async_process_documents(self, response):
+        """Process a search response containing documents into a formatted string asynchronously."""
+        all_documents = []
+
+        # Check if the response contains results
+        if not hasattr(response, 'results') or not response.results:
+            log.info(f'No results found in response: {response=}')
+            return []
+        
+        # Iterate through each result in the response
+        for result in response.results:
+            if hasattr(result, 'document'):
+                document = result.document
+                all_documents.append(self.document_format(document))
+            else:
+                log.warning("No document found in result")
+        
+        # Combine all documents into one long string
+        result_string = "\n\n".join(all_documents)
+        
+        return result_string
     
     def create_engine(self,
         engine_id: str, 
@@ -753,9 +836,14 @@ class DiscoveryEngineClient:
             log.info(f"No results {search_request.data_store_specs=}: {str(e)}")
             return None
         
-        if parse_chunks_to_string:
-            big_string = self.process_chunks(search_response)
-            log.info(f"Discovery engine chunks string sample: {big_string[:100]}")
+        if content_search_spec_type=="chunks":
+            if parse_chunks_to_string:
+                big_string = self.process_chunks(search_response)
+                log.info(f"Discovery engine chunks string sample: {big_string[:100]}")
+                return big_string
+        elif content_search_spec_type=="documents":
+            big_string = self.process_documents(search_response)
+            log.info(f"Discovery engine documents string sample: {big_string[:100]}")
             return big_string
         
         log.info("Discovery engine response object")
@@ -824,9 +912,14 @@ class DiscoveryEngineClient:
             log.info(f"No results {search_request.data_store_specs=}: {str(e)}")
             return None
         
-        if parse_chunks_to_string:
-            big_string = await self.async_process_chunks(search_response)
-            log.info(f"Discovery engine chunks string sample: {big_string[:100]}")
+        if content_search_spec_type=="chunks":
+            if parse_chunks_to_string:
+                big_string = self.process_chunks(search_response)
+                log.info(f"Discovery engine chunks string sample: {big_string[:100]}")
+                return big_string
+        elif content_search_spec_type=="documents":
+            big_string = self.process_documents(search_response)
+            log.info(f"Discovery engine documents string sample: {big_string[:100]}")
             return big_string
         
         log.info("Discovery engine response object")

{sunholo-0.134.3.dist-info → sunholo-0.134.4.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: sunholo
-Version: 0.134.3
+Version: 0.134.4
 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.134.3.dist-info → sunholo-0.134.4.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=bUhCPoKrkMtdeTBHLyCZf9syVwHn5kE0yXpqDBIzmTc,34120
 sunholo/discovery_engine/create_new.py,sha256=WUi4_xh_dFaGX3xA9jkNKZhaR6LCELjMPeRb0hyj4FU,1226
-sunholo/discovery_engine/discovery_engine_client.py,sha256=D_OiMiMDScwC426xzgbMpAPNV9Q8xaz4y_waDeRPhVQ,54496
+sunholo/discovery_engine/discovery_engine_client.py,sha256=Ak3VpadtgpPWfIEot87EiNh4vbDUg9gQVa-1UDnoGMA,58442
 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.134.3.dist-info/licenses/LICENSE.txt,sha256=SdE3QjnD3GEmqqg9EX3TM9f7WmtOzqS1KJve8rhbYmU,11345
-sunholo-0.134.3.dist-info/METADATA,sha256=XicSY1z4sd8PfmmNYnZyKvKYEDOMauxj-uf7WCOs328,10067
-sunholo-0.134.3.dist-info/WHEEL,sha256=pxyMxgL8-pra_rKaQ4drOZAegBVuX-G_4nRHjjgWbmo,91
-sunholo-0.134.3.dist-info/entry_points.txt,sha256=bZuN5AIHingMPt4Ro1b_T-FnQvZ3teBes-3OyO0asl4,49
-sunholo-0.134.3.dist-info/top_level.txt,sha256=wt5tadn5--5JrZsjJz2LceoUvcrIvxjHJe-RxuudxAk,8
-sunholo-0.134.3.dist-info/RECORD,,
+sunholo-0.134.4.dist-info/licenses/LICENSE.txt,sha256=SdE3QjnD3GEmqqg9EX3TM9f7WmtOzqS1KJve8rhbYmU,11345
+sunholo-0.134.4.dist-info/METADATA,sha256=g2a99cYiyPfDeVa55srGe2k_5_MHsJhzwBll43hQ56M,10067
+sunholo-0.134.4.dist-info/WHEEL,sha256=pxyMxgL8-pra_rKaQ4drOZAegBVuX-G_4nRHjjgWbmo,91
+sunholo-0.134.4.dist-info/entry_points.txt,sha256=bZuN5AIHingMPt4Ro1b_T-FnQvZ3teBes-3OyO0asl4,49
+sunholo-0.134.4.dist-info/top_level.txt,sha256=wt5tadn5--5JrZsjJz2LceoUvcrIvxjHJe-RxuudxAk,8
+sunholo-0.134.4.dist-info/RECORD,,