sunholo 0.69.12__py3-none-any.whl → 0.69.15__py3-none-any.whl

sunholo/discovery_engine/discovery_engine_client.py

@@ -3,9 +3,12 @@ try:
     from google.cloud import discoveryengine_v1alpha as discoveryengine
     from google.api_core.retry import Retry, if_exception_type
     from google.api_core.exceptions import ResourceExhausted
+    from google.cloud.discoveryengine_v1alpha import SearchResponse, Chunk
 except ImportError:
     ClientOptions = None
     discoveryengine = None
+    Chunk = None
+    SearchResponse = None
 
 from ..logging import log
 from typing import Optional
@@ -214,50 +217,39 @@ class DiscoveryEngineClient:
         
         log.info("Discovery engine response object")
         return search_response
-
-    def process_chunks(self, response):
+    
+    def chunk_format(self, chunk: Chunk):
+        return (
+                    f"# {chunk.id}\n"
+                    f"{chunk.content}\n"
+                    f"## metadata\n"
+                    f"Document URI: {chunk.document_metadata.uri}\n"
+                    f"Document Title: {chunk.document_metadata.title}\n"
+                )        
+
+    def process_chunks(self, response: SearchResponse):
         all_chunks = []
 
-        if 'results' not in response:
+        # Check if the response contains results
+        if not hasattr(response, 'results') or not response.results:
             raise ValueError(f'No results found in response: {response=}')
         
-        for result in response['results']:
-            chunk = result['chunk']
-            chunk_metadata = chunk['chunkMetadata']
+        # Iterate through each result in the response
+        for result in response.results:
+            chunk = result.chunk
+            chunk_metadata = chunk.ChunkMetadata
 
-            if 'previousChunks' in chunk_metadata:
+            if hasattr(chunk_metadata, 'previous_chunks'):
                 # Process previous chunks
-                for prev_chunk in chunk['chunkMetadata']['previousChunks']:
-                    prev_chunk_string = (
-                        f"# {prev_chunk['id']}\n"
-                        f"{prev_chunk['content']}\n"
-                        f"## metadata\n"
-                        f"Document URI: {prev_chunk['documentMetadata']['uri']}\n"
-                        f"Document Title: {prev_chunk['documentMetadata']['title']}\n"
-                    )
-                    all_chunks.append(prev_chunk_string)
-
-            # Process fetched chunk
-            fetched_chunk_string = (
-                f"# {chunk['id']}\n"
-                f"{chunk['content']}\n"
-                f"## metadata\n"
-                f"Document URI: {chunk['documentMetadata']['uri']}\n"
-                f"Document Title: {chunk['documentMetadata']['title']}\n"
-            )
-            all_chunks.append(fetched_chunk_string)
+                for prev_chunk in chunk_metadata.previous_chunks:
+                    all_chunks.append(self.chunk_format(prev_chunk))
+
+            all_chunks.append(self.chunk_format(chunk))
 
             # Process next chunks
-            if 'nextChunks' in chunk_metadata:
-                for next_chunk in chunk_metadata['nextChunks']:
-                    next_chunk_string = (
-                        f"# {next_chunk['id']}\n"
-                        f"{next_chunk['content']}\n"
-                        f"## metadata\n"
-                        f"Document URI: {next_chunk['documentMetadata']['uri']}\n"
-                        f"Document Title: {next_chunk['documentMetadata']['title']}\n"
-                    )
-                    all_chunks.append(next_chunk_string)
+            if hasattr(chunk_metadata, 'next_chunks'):
+                for next_chunk in chunk_metadata.next_chunks:
+                    all_chunks.append(self.chunk_format(next_chunk))
 
         # Combine all chunks into one long string
         result_string = "\n".join(all_chunks)

{sunholo-0.69.12.dist-info → sunholo-0.69.15.dist-info}/METADATA

@@ -1,9 +1,9 @@
 Metadata-Version: 2.1
 Name: sunholo
-Version: 0.69.12
+Version: 0.69.15
 Summary: Large Language Model DevOps - a package to help deploy LLMs to the Cloud.
 Home-page: https://github.com/sunholo-data/sunholo-py
-Download-URL: https://github.com/sunholo-data/sunholo-py/archive/refs/tags/v0.69.12.tar.gz
+Download-URL: https://github.com/sunholo-data/sunholo-py/archive/refs/tags/v0.69.15.tar.gz
 Author: Holosun ApS
 Author-email: multivac@sunholo.com
 License: Apache License, Version 2.0

{sunholo-0.69.12.dist-info → sunholo-0.69.15.dist-info}/RECORD

@@ -63,7 +63,7 @@ sunholo/database/sql/sb/setup.sql,sha256=CvoFvZQev2uWjmFa3aj3m3iuPFzAAJZ0S7Qi3L3
 sunholo/discovery_engine/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 sunholo/discovery_engine/chunker_handler.py,sha256=puNnV6vKnjNqk28FLnsIPMNsC-1Y6s20PK7ioi8qwzc,4491
 sunholo/discovery_engine/create_new.py,sha256=7oZG78T6lW0EspRzlo7-qRyXFSuFxDn2dfSAVEaqlqY,978
-sunholo/discovery_engine/discovery_engine_client.py,sha256=WFi0h-JfZd0eKtW6uzm6zfffkGMP2iKBHZU1Tw1uiCw,14944
+sunholo/discovery_engine/discovery_engine_client.py,sha256=aiEfn0511pIaS4lj6GwVA6LOiBn_PPphmMZGfjLfj5o,14486
 sunholo/embedder/__init__.py,sha256=sI4N_CqgEVcrMDxXgxKp1FsfsB4FpjoXgPGkl4N_u4I,44
 sunholo/embedder/embed_chunk.py,sha256=P744zUQJgqrjILunzaqtTerB9AwoXFU6tXBtz4rjWgQ,6673
 sunholo/gcs/__init__.py,sha256=DtVw_AZwQn-IguR5BJuIi2XJeF_FQXizhJikzRNrXiE,50
@@ -111,9 +111,9 @@ sunholo/vertex/__init__.py,sha256=JvHcGFuv6R_nAhY2AdoqqhMpJ5ugeWPZ_svGhWrObBk,13
 sunholo/vertex/init.py,sha256=JDMUaBRdednzbKF-5p33qqLit2LMsvgvWW-NRz0AqO0,1801
 sunholo/vertex/memory_tools.py,sha256=8F1iTWnqEK9mX4W5RzCVKIjydIcNp6OFxjn_dtQ3GXo,5379
 sunholo/vertex/safety.py,sha256=3meAX0HyGZYrH7rXPUAHxtI_3w_zoy_RX7Shtkoa660,1275
-sunholo-0.69.12.dist-info/LICENSE.txt,sha256=SdE3QjnD3GEmqqg9EX3TM9f7WmtOzqS1KJve8rhbYmU,11345
-sunholo-0.69.12.dist-info/METADATA,sha256=w1SqSvez7MqPL3PlMn4PIrhlFDru7p8XLU_DPiE8_AI,6242
-sunholo-0.69.12.dist-info/WHEEL,sha256=mguMlWGMX-VHnMpKOjjQidIo1ssRlCFu4a4mBpz1s2M,91
-sunholo-0.69.12.dist-info/entry_points.txt,sha256=bZuN5AIHingMPt4Ro1b_T-FnQvZ3teBes-3OyO0asl4,49
-sunholo-0.69.12.dist-info/top_level.txt,sha256=wt5tadn5--5JrZsjJz2LceoUvcrIvxjHJe-RxuudxAk,8
-sunholo-0.69.12.dist-info/RECORD,,
+sunholo-0.69.15.dist-info/LICENSE.txt,sha256=SdE3QjnD3GEmqqg9EX3TM9f7WmtOzqS1KJve8rhbYmU,11345
+sunholo-0.69.15.dist-info/METADATA,sha256=E4C9L4WSLKaLcmofPRBBUeaDTpOc--yO8iNqsuLNv8g,6242
+sunholo-0.69.15.dist-info/WHEEL,sha256=mguMlWGMX-VHnMpKOjjQidIo1ssRlCFu4a4mBpz1s2M,91
+sunholo-0.69.15.dist-info/entry_points.txt,sha256=bZuN5AIHingMPt4Ro1b_T-FnQvZ3teBes-3OyO0asl4,49
+sunholo-0.69.15.dist-info/top_level.txt,sha256=wt5tadn5--5JrZsjJz2LceoUvcrIvxjHJe-RxuudxAk,8
+sunholo-0.69.15.dist-info/RECORD,,