PyPI - sunholo - Versions diffs - 0.71.4__tar.gz → 0.71.6__tar.gz - Mend

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

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

@@ -64,8 +64,11 @@ def pick_retriever(vector_name, embeddings=None):
                     continue
                 k_override = value.get('k', 3)
-                vs_retriever = vectorstore.as_retriever(search_kwargs=dict(k=k_override))
-                retriever_list.append(vs_retriever)
+                if vectorstore:
+                    vs_retriever = vectorstore.as_retriever(search_kwargs=dict(k=k_override))
+                    retriever_list.append(vs_retriever)
+                else:
+                    log.warning(f"No vectorstore found despite being in config: {key=}")
             if value.get('provider') == "GoogleCloudEnterpriseSearchRetriever":
                 log.info(f"Found GoogleCloudEnterpriseSearchRetriever {value['provider']}")

@@ -81,7 +81,7 @@ def do_llamaindex(message_data, metadata, vector_name):
                 corpuses.append(corpus)
     if not corpuses:
-        log.error("Could not find a RAG corpus to import data to")
+        log.warning("Could not find a Vertex Llamaindex RAG corpus to import data to despite being in config")
         return None
     try:

@@ -101,6 +101,10 @@ class GoogleCloudLogging:
             severity (str, optional): The severity level of the log entry. Defaults to "INFO".
         """
+        from .utils.version import sunholo_version
+        log_text = f"[{sunholo_version()}] {log_text}"
         if not logger_name and not self.logger_name:
             raise ValueError("Must provide a logger name e.g. 'run.googleapis.com%2Fstderr'")

@@ -0,0 +1,8 @@
+_cached_version = None
+def sunholo_version():
+    global _cached_version
+    if _cached_version is None:
+        from importlib.metadata import version
+        _cached_version = f"sunholo-{version('sunholo')}"
+    return _cached_version

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

@@ -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.4__tar.gz → 0.71.6__tar.gz