sunholo 0.119.11__py3-none-any.whl → 0.119.13__py3-none-any.whl

sunholo/discovery_engine/chunker_handler.py

@@ -152,6 +152,10 @@ def discovery_engine_chunker_check(message_data,
 
         return llama
     
+    # If not processing and only memory, do not process further
+    if not process and total_memories == 1:
+        return metadata
+    
     elif llama:
         log.info("Discovery Engine found but not the only memory, continuing with other processes.")
 

sunholo/discovery_engine/discovery_engine_client.py

@@ -726,6 +726,67 @@ class DiscoveryEngineClient:
         log.info("Discovery engine response object")
         return search_response
 
+    async def async_search_with_filters(self, query, filter_str=None,
+                            num_previous_chunks=3, num_next_chunks=3, 
+                            page_size=10, parse_chunks_to_string=True, 
+                            serving_config="default_serving_config",
+                            data_store_ids: Optional[List[str]] = None):
+        """
+        Searches with a generic filter string asynchronously.
+
+        Args:
+            query (str): The search query.
+            filter_str (str, optional): The filter string to apply (e.g., "source LIKE 'my_source' AND eventTime > TIMESTAMP('2024-01-01')").
+            #... other parameters from get_chunks
+
+        Returns:
+            discoveryengine.SearchResponse or str: The search response object or string of chunks.
+        """
+
+        serving_config_path = self.async_search_client.serving_config_path(
+            self.project_id,
+            self.location,
+            self.data_store_id,
+            serving_config
+        )
+
+        search_request = discoveryengine.SearchRequest(
+            serving_config=serving_config_path,
+            query=query,
+            page_size=page_size, 
+            content_search_spec=discoveryengine.SearchRequest.ContentSearchSpec(
+                search_result_mode="CHUNKS", 
+                chunk_spec=discoveryengine.SearchRequest.ContentSearchSpec.ChunkSpec(
+                    num_previous_chunks=num_previous_chunks,
+                    num_next_chunks=num_next_chunks,
+                ),
+            ),
+            filter=filter_str # name:'ANY("king kong")'
+        )
+
+        if data_store_ids:
+            search_request.data_store_specs = [
+                discoveryengine.SearchRequest.DataStoreSpec(
+                    data_store=self._search_data_store_path(data_store_id, serving_config=serving_config)
+                )
+                for data_store_id in data_store_ids
+            ]
+
+        log.info(f"Discovery engine request with filter: {search_request=}")
+        try:
+            search_response = await self.async_search_client.search(search_request)
+        except Exception as e:
+            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]}")
+            return big_string
+        
+        log.info("Discovery engine response object")
+        return search_response
+
     def search_by_objectId_and_or_date(self, query, objectId=None, date=None, **kwargs):
         """
         Searches and filters by objectId (exact match) and/or date.
@@ -751,3 +812,29 @@ class DiscoveryEngineClient:
         else:
             # No filters, perform regular search
             return self.search_with_filters(query, **kwargs)
+
+    async def async_search_by_objectId_and_or_date(self, query, objectId=None, date=None, **kwargs):
+        """
+        Searches and filters by objectId (exact match) and/or date asynchronously.
+
+        Args:
+            query (str): The search query.
+            objectId (str, optional): The exact objectId to filter by.
+            date (str, optional): The literal_iso_8601_datetime_format date to filter by e.g. 2025-02-24T12:25:30.123Z
+            **kwargs: Additional keyword arguments to pass to `async_search_with_filters`.
+
+        Returns:
+            list: A list of search results.
+        """
+        filter_clauses = []
+        if objectId:
+            filter_clauses.append(f'objectId: ANY("{objectId}")')
+        if date:
+            filter_clauses.append(f'eventTime >= "{date}"')
+
+        if filter_clauses:
+            filter_str = " AND ".join(filter_clauses)  # Combine with AND
+            return await self.async_search_with_filters(query, filter_str, **kwargs)
+        else:
+            # No filters, perform regular search
+            return await self.async_search_with_filters(query, **kwargs)

sunholo/discovery_engine/get_ai_search_chunks.py

@@ -116,7 +116,7 @@ async def async_get_all_chunks(question:str, config:ConfigManager, filter_str=No
 async def async_get_chunks(question, vector_name, num_chunks, filter_str, project_id=None):
     de = DiscoveryEngineClient(vector_name, project_id=project_id)
     try:
-        return await de.search_with_filters(query=question, 
+        return await de.async_search_with_filters(query=question, 
                                             filter_str=filter_str,
                                             num_previous_chunks=num_chunks, 
                                             num_next_chunks=num_chunks)

{sunholo-0.119.11.dist-info → sunholo-0.119.13.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.2
 Name: sunholo
-Version: 0.119.11
+Version: 0.119.13
 Summary: Large Language Model DevOps - a package to help deploy LLMs to the Cloud.
 Author-email: Holosun ApS <multivac@sunholo.com>
 License: Apache License, Version 2.0

{sunholo-0.119.11.dist-info → sunholo-0.119.13.dist-info}/RECORD

@@ -72,11 +72,11 @@ sunholo/database/sql/sb/delete_source_row.sql,sha256=r6fEuUKdbiLHCDGKSbKINDCpJjs
 sunholo/database/sql/sb/return_sources.sql,sha256=89KAnxfK8n_qGK9jy1OQT8f9n4uYUtYL5cCxbC2mj_c,255
 sunholo/database/sql/sb/setup.sql,sha256=CvoFvZQev2uWjmFa3aj3m3iuPFzAAJZ0S7Qi3L3-zZI,89
 sunholo/discovery_engine/__init__.py,sha256=hLgqRDJ22Aov9o2QjAEfsVgnL3kMdM-g5p8RJ9OyKdQ,130
-sunholo/discovery_engine/chunker_handler.py,sha256=CYsyZLz_VZ0S_TcVlYmPxYz3JiAiPtw3tbcjvE3IFYA,6023
+sunholo/discovery_engine/chunker_handler.py,sha256=2775W5wHzdkYXqkRMlwh8MRbas20wcMnnnNngo0ljms,6160
 sunholo/discovery_engine/cli.py,sha256=KGVle5rkLL49oF9TQhrGI--8017IvvLOEoYur545Qb0,12790
 sunholo/discovery_engine/create_new.py,sha256=WUi4_xh_dFaGX3xA9jkNKZhaR6LCELjMPeRb0hyj4FU,1226
-sunholo/discovery_engine/discovery_engine_client.py,sha256=0h3h_Vy8vCcvfSBhGl8qSgVzDakOmsaPPFqHIGh3mv8,33053
-sunholo/discovery_engine/get_ai_search_chunks.py,sha256=IDb9cm4X5XqQbUytZVQrBsm_oiSQxe3KjBAxaSZ3JyQ,5548
+sunholo/discovery_engine/discovery_engine_client.py,sha256=w3ZwAcP9t8cGgwEQZsf4_b1HPnnIzgetTiaEvG4tMwI,36741
+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
 sunholo/embedder/embed_metadata.py,sha256=2ziUIdVwnbCUU8gOwQWEvkrRcyp-7IeyZfSsWNkMquA,866
@@ -166,9 +166,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.119.11.dist-info/LICENSE.txt,sha256=SdE3QjnD3GEmqqg9EX3TM9f7WmtOzqS1KJve8rhbYmU,11345
-sunholo-0.119.11.dist-info/METADATA,sha256=gj6We8d7T27etGlhriYOvyJmNLF-bX0hbHui6sc_zmo,9715
-sunholo-0.119.11.dist-info/WHEEL,sha256=nn6H5-ilmfVryoAQl3ZQ2l8SH5imPWFpm1A5FgEuFV4,91
-sunholo-0.119.11.dist-info/entry_points.txt,sha256=bZuN5AIHingMPt4Ro1b_T-FnQvZ3teBes-3OyO0asl4,49
-sunholo-0.119.11.dist-info/top_level.txt,sha256=wt5tadn5--5JrZsjJz2LceoUvcrIvxjHJe-RxuudxAk,8
-sunholo-0.119.11.dist-info/RECORD,,
+sunholo-0.119.13.dist-info/LICENSE.txt,sha256=SdE3QjnD3GEmqqg9EX3TM9f7WmtOzqS1KJve8rhbYmU,11345
+sunholo-0.119.13.dist-info/METADATA,sha256=m5LFMkpjiaKq1GOIq6HYsOt66fe0gcrSUW80_FlmbRk,9715
+sunholo-0.119.13.dist-info/WHEEL,sha256=nn6H5-ilmfVryoAQl3ZQ2l8SH5imPWFpm1A5FgEuFV4,91
+sunholo-0.119.13.dist-info/entry_points.txt,sha256=bZuN5AIHingMPt4Ro1b_T-FnQvZ3teBes-3OyO0asl4,49
+sunholo-0.119.13.dist-info/top_level.txt,sha256=wt5tadn5--5JrZsjJz2LceoUvcrIvxjHJe-RxuudxAk,8
+sunholo-0.119.13.dist-info/RECORD,,