sunholo 0.71.5__tar.gz → 0.71.8__tar.gz

{sunholo-0.71.5 → sunholo-0.71.8}/PKG-INFO

@@ -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 → sunholo-0.71.8}/setup.py

@@ -1,7 +1,7 @@
 from setuptools import setup, find_packages
 
 # Define your base version
-version = '0.71.5'
+version = '0.71.8'
 
 setup(
     name='sunholo',

{sunholo-0.71.5 → sunholo-0.71.8}/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-0.71.5 → sunholo-0.71.8}/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-0.71.5 → sunholo-0.71.8}/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 → sunholo-0.71.8}/sunholo.egg-info/PKG-INFO

@@ -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