sunholo 0.71.5__py3-none-any.whl → 0.71.8__py3-none-any.whl

sunholo/discovery_engine/discovery_engine_client.py

@@ -11,7 +11,7 @@ except ImportError:
     SearchResponse = None
 
 from ..logging import log
-from typing import Optional
+from typing import Optional, List
 
 class DiscoveryEngineClient:
     """
@@ -69,6 +69,7 @@ class DiscoveryEngineClient:
         self.store_client  = discoveryengine.DataStoreServiceClient(client_options=client_options)
         self.doc_client    = discoveryengine.DocumentServiceClient(client_options=client_options)
         self.search_client = discoveryengine.SearchServiceClient(client_options=client_options)
+        self.engine_client = discoveryengine.EngineServiceClient(client_options=client_options)
 
     @classmethod
     def my_retry(cls):
@@ -261,6 +262,59 @@ class DiscoveryEngineClient:
         result_string = "\n".join(all_chunks)
 
         return result_string
+    
+    def create_engine(self,
+        engine_id: str, 
+        data_store_ids: List[str],
+        solution_type=None,
+        search_tier=None,
+        search_add_ons=None,
+    ) -> str:
+
+        # The full resource name of the collection
+        # e.g. projects/{project}/locations/{location}/collections/default_collection
+        parent = self.data_store_path()
+
+        engine = discoveryengine.Engine(
+            display_name=engine_id,
+            # Options: GENERIC, MEDIA, HEALTHCARE_FHIR
+            industry_vertical=discoveryengine.IndustryVertical.GENERIC,
+            # Options: SOLUTION_TYPE_RECOMMENDATION, SOLUTION_TYPE_SEARCH, SOLUTION_TYPE_CHAT, SOLUTION_TYPE_GENERATIVE_CHAT
+            solution_type=solution_type or discoveryengine.SolutionType.SOLUTION_TYPE_SEARCH,
+            # For search apps only
+            search_engine_config=discoveryengine.Engine.SearchEngineConfig(
+                # Options: SEARCH_TIER_STANDARD, SEARCH_TIER_ENTERPRISE
+                search_tier=search_tier or discoveryengine.SearchTier.SEARCH_TIER_ENTERPRISE,
+                # Options: SEARCH_ADD_ON_LLM, SEARCH_ADD_ON_UNSPECIFIED
+                search_add_ons=search_add_ons or [discoveryengine.SearchAddOn.SEARCH_ADD_ON_UNSPECIFIED],
+            ),
+            # For generic recommendation apps only
+            # similar_documents_config=discoveryengine.Engine.SimilarDocumentsEngineConfig,
+            data_store_ids=data_store_ids,
+        )
+
+        request = discoveryengine.CreateEngineRequest(
+            parent=parent,
+            engine=engine,
+            engine_id=engine_id,
+        )
+
+        # Make the request
+        operation = self.engine_client.create_engine(request=request)
+
+        log.info(f"Waiting for create vertex ai search operation to complete: {operation.operation.name}")
+        response = operation.result()
+
+        # Once the operation is complete,
+        # get information from operation metadata
+        metadata = discoveryengine.CreateEngineMetadata(operation.metadata)
+
+        # Handle the response
+        log.info(f"{response=} {metadata=}")
+
+        return operation.operation.name
+
+
 
     def import_documents(self,
         gcs_uri: Optional[str] = None,

sunholo/vertex/__init__.py

@@ -1,3 +1,3 @@
 from .init import init_vertex
-from .memory_tools import get_vertex_memories, print_grounding_response
+from .memory_tools import get_vertex_memories, print_grounding_response, get_google_search_grounding
 from .safety import vertex_safety

sunholo/vertex/memory_tools.py

@@ -106,6 +106,17 @@ def get_vertex_memories(vector_name):
     
     return tools
 
+def get_google_search_grounding(vector_name):
+    # can't have this and llamaindex memories?
+    ground = load_config_key("grounding", vector_name=vector_name, kind="vacConfig")
+    if ground and ground.get("google_search"):
+        gs_tool = Tool.from_google_search_retrieval(grounding.GoogleSearchRetrieval())
+        log.info(f"Got Search Tool: {gs_tool}")
+        return gs_tool
+    
+    log.info(f"No google search config available for {vector_name}")
+    return None
+
 def print_grounding_response(response):
     """Prints Gemini response with grounding citations."""
     grounding_metadata = response.candidates[0].grounding_metadata

{sunholo-0.71.5.dist-info → sunholo-0.71.8.dist-info}/METADATA

@@ -1,9 +1,9 @@
 Metadata-Version: 2.1
 Name: sunholo
-Version: 0.71.5
+Version: 0.71.8
 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.71.5.tar.gz
+Download-URL: https://github.com/sunholo-data/sunholo-py/archive/refs/tags/v0.71.8.tar.gz
 Author: Holosun ApS
 Author-email: multivac@sunholo.com
 License: Apache License, Version 2.0

{sunholo-0.71.5.dist-info → sunholo-0.71.8.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=H1HHDqWMCkchJER1_oU9TOLxqf2PygiMO6CL3uKZP64,4563
 sunholo/discovery_engine/create_new.py,sha256=7oZG78T6lW0EspRzlo7-qRyXFSuFxDn2dfSAVEaqlqY,978
-sunholo/discovery_engine/discovery_engine_client.py,sha256=cUdyXdXvFS_IxNqwJkGdGpXH-k18MQDKuUFn_7E7pKo,14922
+sunholo/discovery_engine/discovery_engine_client.py,sha256=-e3rzmqYcVmb-Q7scq-ae1NF7hQGfJCIU1ym2Cu2u6g,17167
 sunholo/embedder/__init__.py,sha256=sI4N_CqgEVcrMDxXgxKp1FsfsB4FpjoXgPGkl4N_u4I,44
 sunholo/embedder/embed_chunk.py,sha256=d_dIzeNF630Q0Ar-u1hxos60s0tLIImJccAvuo_LTIw,6814
 sunholo/gcs/__init__.py,sha256=DtVw_AZwQn-IguR5BJuIi2XJeF_FQXizhJikzRNrXiE,50
@@ -107,15 +107,15 @@ sunholo/utils/parsers.py,sha256=z98cQ1v2_ScnqHxCtApNeAN2the8MdvS6RpKL6vWyOU,5287
 sunholo/utils/timedelta.py,sha256=BbLabEx7_rbErj_YbNM0MBcaFN76DC4PTe4zD2ucezg,493
 sunholo/utils/user_ids.py,sha256=SQd5_H7FE7vcTZp9AQuQDWBXd4FEEd7TeVMQe1H4Ny8,292
 sunholo/utils/version.py,sha256=P1QAJQdZfT2cMqdTSmXmcxrD2PssMPEGM-WI6083Fck,237
-sunholo/vertex/__init__.py,sha256=JvHcGFuv6R_nAhY2AdoqqhMpJ5ugeWPZ_svGhWrObBk,136
+sunholo/vertex/__init__.py,sha256=dZa4xWYo-KU6br7SHZJPzfB4T6ICGkw_FshDs1tvnCA,165
 sunholo/vertex/extensions.py,sha256=d-Ikt9gHFf-jUMPmyU-xHwYe22QtEyr90Ua1LDKgTws,11026
 sunholo/vertex/extensions_class.py,sha256=0-XMrMvfhMN380ZdGXl11Mt7R9kCu9rB4Vduiflk8QA,9202
 sunholo/vertex/init.py,sha256=RLjQppTUwubWgwf2PoAke-EtcwlVkFPaPMYvUsMw1KQ,2029
-sunholo/vertex/memory_tools.py,sha256=x4Z4Hlpd1VNFu_DfA7xtF0ySF0-IXbkLJJLa6RTpks0,5871
+sunholo/vertex/memory_tools.py,sha256=sipBI7TFttbYzobSWS_1TzWFVTPnJckz3NvLVbTepMc,6345
 sunholo/vertex/safety.py,sha256=3meAX0HyGZYrH7rXPUAHxtI_3w_zoy_RX7Shtkoa660,1275
-sunholo-0.71.5.dist-info/LICENSE.txt,sha256=SdE3QjnD3GEmqqg9EX3TM9f7WmtOzqS1KJve8rhbYmU,11345
-sunholo-0.71.5.dist-info/METADATA,sha256=tcQaaxDVPDG1_y0ku5bN12OEoicVYLSmfaFEYbF-qWM,6613
-sunholo-0.71.5.dist-info/WHEEL,sha256=mguMlWGMX-VHnMpKOjjQidIo1ssRlCFu4a4mBpz1s2M,91
-sunholo-0.71.5.dist-info/entry_points.txt,sha256=bZuN5AIHingMPt4Ro1b_T-FnQvZ3teBes-3OyO0asl4,49
-sunholo-0.71.5.dist-info/top_level.txt,sha256=wt5tadn5--5JrZsjJz2LceoUvcrIvxjHJe-RxuudxAk,8
-sunholo-0.71.5.dist-info/RECORD,,
+sunholo-0.71.8.dist-info/LICENSE.txt,sha256=SdE3QjnD3GEmqqg9EX3TM9f7WmtOzqS1KJve8rhbYmU,11345
+sunholo-0.71.8.dist-info/METADATA,sha256=0E4ymtqS_ZQf_em3l97Y44zLaxZV8GMEi21hLCfM_N4,6613
+sunholo-0.71.8.dist-info/WHEEL,sha256=mguMlWGMX-VHnMpKOjjQidIo1ssRlCFu4a4mBpz1s2M,91
+sunholo-0.71.8.dist-info/entry_points.txt,sha256=bZuN5AIHingMPt4Ro1b_T-FnQvZ3teBes-3OyO0asl4,49
+sunholo-0.71.8.dist-info/top_level.txt,sha256=wt5tadn5--5JrZsjJz2LceoUvcrIvxjHJe-RxuudxAk,8
+sunholo-0.71.8.dist-info/RECORD,,