sunholo 0.69.16__tar.gz → 0.69.17__tar.gz

{sunholo-0.69.16 → sunholo-0.69.17}/PKG-INFO

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

{sunholo-0.69.16 → sunholo-0.69.17}/setup.py

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

{sunholo-0.69.16 → sunholo-0.69.17}/sunholo/discovery_engine/discovery_engine_client.py

@@ -80,6 +80,13 @@ class DiscoveryEngineClient:
             predicate=if_exception_type(ResourceExhausted)  # Retry if a ResourceExhausted error occurs
         )
     
+    def data_store_path(self, collection: str = "default_collection"):
+        return self.store_client.collection_path(
+            project=self.project_id,
+            location=self.location,
+            collection=collection,
+        )
+
     def create_data_store(
         self, chunk_size: int = 500,
         collection: str = "default_collection"
@@ -121,15 +128,9 @@ class DiscoveryEngineClient:
             document_processing_config=doc_config
         )
 
-        parent = self.store_client.collection_path(
-            project=self.project_id,
-            location=self.location,
-            collection=collection,
-        )
-
         # https://cloud.google.com/python/docs/reference/discoveryengine/0.11.4/google.cloud.discoveryengine_v1alpha.types.CreateDataStoreRequest
         request = discoveryengine.CreateDataStoreRequest(
-            parent=parent,
+            parent=self.data_store_path(collection),
             data_store_id=self.data_store_id,
             data_store=data_store,
             # Optional: For Advanced Site Search Only

{sunholo-0.69.16 → sunholo-0.69.17}/sunholo/vertex/init.py

@@ -1,6 +1,7 @@
 from ..logging import log
+from ..utils.gcp_project import get_gcp_project
 
-def init_vertex(gcp_config):
+def init_vertex(gcp_config=None, location="eu"):
     """
     Initializes the Vertex AI environment using the provided Google Cloud Platform configuration.
 
@@ -12,6 +13,7 @@ def init_vertex(gcp_config):
         gcp_config (dict): A dictionary containing the Google Cloud Platform configuration with keys:
             - 'project_id': The Google Cloud project ID to configure for Vertex AI.
             - 'location': The Google Cloud region to configure for Vertex AI.
+            If default None it will derive it from the environment
 
     Raises:
         KeyError: If the necessary keys ('project_id' or 'location') are missing in the gcp_config dictionary.
@@ -37,7 +39,11 @@ def init_vertex(gcp_config):
 
         return None
     
-    # Initialize Vertex AI API once per session
-    project_id = gcp_config.get('project_id')
-    location = gcp_config.get('location')
+    if gcp_config:
+        # Initialize Vertex AI API once per session
+        project_id = gcp_config.get('project_id')
+        location = gcp_config.get('location') or location
+    else:
+        project_id = get_gcp_project()
+
     vertexai.init(project=project_id, location=location)

{sunholo-0.69.16 → sunholo-0.69.17}/sunholo/vertex/memory_tools.py

@@ -8,6 +8,8 @@ from ..logging import log
 from ..utils.config import load_config_key
 from ..components import load_memories
 from ..llamaindex.get_files import fetch_corpus
+from ..discovery_engine.discovery_engine_client import DiscoveryEngineClient
+from ..utils.gcp_project import get_gcp_project
 
 def get_vertex_memories(vector_name):
     """
@@ -42,10 +44,7 @@ def get_vertex_memories(vector_name):
     if not rag:
         raise ValueError("Need to install vertexai module via `pip install sunholo[gcp]`")
     
-    global_project_id = gcp_config.get('project_id')
     global_location = gcp_config.get('location')
-    global_rag_id = gcp_config.get('rag_id')
-    global_data_store_id = gcp_config.get('data_store_id')
 
     memories = load_memories(vector_name)
     tools = []
@@ -60,12 +59,16 @@ def get_vertex_memories(vector_name):
             if vectorstore == "llamaindex":
                 log.info(f"Found vectorstore {vectorstore}")
                 rag_id = value.get('rag_id')
+                if rag_id is None:
+                    raise ValueError("Must specify rag_id if using vectorstore: llamaindex")
+                
                 project_id = gcp_config.get('project_id')
                 location = gcp_config.get('location')
+
                 corpus = fetch_corpus(
-                    project_id=project_id or global_project_id,
+                    project_id=project_id or get_gcp_project(),
                     location=location or global_location,
-                    rag_id=rag_id or global_rag_id
+                    rag_id=rag_id
                 )
                 corpus_tool = Tool.from_retrieval(
                     retrieval=rag.Retrieval(
@@ -76,13 +79,12 @@ def get_vertex_memories(vector_name):
                     )
                 )
                 tools.append(corpus_tool)
-            elif vectorstore == "vertexai_agent_builder":
+            elif vectorstore == "discovery_engine" or vectorstore == "vertex_ai_search":
+
+                de = DiscoveryEngineClient(vector_name, project_id=get_gcp_project())
                 log.info(f"Found vectorstore {vectorstore}")
-                data_store_id = value.get('data_store_id') or global_data_store_id
-                project_id = gcp_config.get('project_id') or global_project_id
-                location = gcp_config.get('location') or global_location
-                data_store_path=f"projects/{project_id}/locations/{location}/collections/default_collection/dataStores/{data_store_id}"
 
+                data_store_path = de.data_store_path()
                 corpus_tool = Tool.from_retrieval(
                     grounding.Retrieval(grounding.VertexAISearch(datastore=data_store_path))
                 )

{sunholo-0.69.16 → sunholo-0.69.17}/sunholo.egg-info/PKG-INFO

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