sunholo 0.71.4__py3-none-any.whl → 0.71.6__py3-none-any.whl

sunholo/components/retriever.py

@@ -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']}")

sunholo/llamaindex/import_files.py

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

sunholo/logging.py

@@ -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'")
         

sunholo/utils/version.py

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

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.4.dist-info → sunholo-0.71.6.dist-info}/METADATA

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

{sunholo-0.71.4.dist-info → sunholo-0.71.6.dist-info}/RECORD

@@ -1,5 +1,5 @@
 sunholo/__init__.py,sha256=0CdpufyRKWyZe7J7UKigL6j_qOorM-p0OjHIAuf9M38,864
-sunholo/logging.py,sha256=UUBl0_oBrW21O5cNAT5lYZ2OmAnVJ92PnAwtA_2Sz_g,12117
+sunholo/logging.py,sha256=YfIN1oP3dOEkkYkyRBU8BGS3uJFGwUDsFCl8mIVbwvE,12225
 sunholo/agents/__init__.py,sha256=Hb4NXy2rN-83Z0-UDRwX-LXv2R29lcbSFPf8G6q4fZg,380
 sunholo/agents/chat_history.py,sha256=8iX1bgvRW6fdp6r_DQR_caPHYrZ_9QJJgPxCiSDf3q8,5380
 sunholo/agents/dispatch_to_qa.py,sha256=nFNdxhkr7rVYuUwVoBCBNYBI2Dke6-_z_ZApBEWb_cU,8291
@@ -45,7 +45,7 @@ sunholo/cli/sun_rich.py,sha256=UpMqeJ0C8i0pkue1AHnnyyX0bFJ9zZeJ7HBR6yhuA8A,54
 sunholo/cli/swagger.py,sha256=absYKAU-7Yd2eiVNUY-g_WLl2zJfeRUNdWQ0oH8M_HM,1564
 sunholo/components/__init__.py,sha256=IDoylb74zFKo6NIS3RQqUl0PDFBGVxM1dfUmO7OJ44U,176
 sunholo/components/llm.py,sha256=T4we3tGmqUj4tPwxQr9M6AXv_BALqZV_dRSvINan-oU,10374
-sunholo/components/retriever.py,sha256=jltG91N5r2P9RWKPW8A8tU3ilghciBczxapauW83Ir8,6377
+sunholo/components/retriever.py,sha256=szXyQ-cgFOw6uokl7ajQt9AGXC0N2nLB900TVtjNRa4,6528
 sunholo/components/vectorstore.py,sha256=zUJ90L1S4IyxLB0JUWopeuwVjcsSqdhj1QreEfsJhsE,5548
 sunholo/database/__init__.py,sha256=Zz0Shcq-CtStf9rJGIYB_Ybzb8rY_Q9mfSj-nviM490,241
 sunholo/database/alloydb.py,sha256=d9W0pbZB0jTVIGF5OVaQ6kXHo-X3-6e9NpWNmV5e9UY,10464
@@ -76,7 +76,7 @@ sunholo/langfuse/prompts.py,sha256=HO4Zy9usn5tKooBPCKksuw4Lff3c03Ny5wqn4ce_xZM,1
 sunholo/llamaindex/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 sunholo/llamaindex/generate.py,sha256=l1Picr-hVwkmAUD7XmTCa63qY9ERliFHQXwyX3BqB2Q,686
 sunholo/llamaindex/get_files.py,sha256=6rhXCDqQ_lrIapISQ_OYQDjiSATXvS_9m3qq53-oIl0,781
-sunholo/llamaindex/import_files.py,sha256=_v1yIFksUQvqLgdH19bWFfIkG4R3srYRg6EwduAPxms,5844
+sunholo/llamaindex/import_files.py,sha256=DmBS4tTSZW39FhKGff0qjMTP07VO7xl-LaQuxQYoc8M,5888
 sunholo/lookup/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 sunholo/lookup/model_lookup.yaml,sha256=O7o-jP53MLA06C8pI-ILwERShO-xf6z_258wtpZBv6A,739
 sunholo/patches/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
@@ -106,16 +106,16 @@ sunholo/utils/gcp_project.py,sha256=0ozs6tzI4qEvEeXb8MxLnCdEVoWKxlM6OH05htj7_tc,
 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=jjU_4anXBikJxPg0Wur0X-B7-ec1tC7jToykAnAG9Dg,108
-sunholo/vertex/__init__.py,sha256=JvHcGFuv6R_nAhY2AdoqqhMpJ5ugeWPZ_svGhWrObBk,136
+sunholo/utils/version.py,sha256=P1QAJQdZfT2cMqdTSmXmcxrD2PssMPEGM-WI6083Fck,237
+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.4.dist-info/LICENSE.txt,sha256=SdE3QjnD3GEmqqg9EX3TM9f7WmtOzqS1KJve8rhbYmU,11345
-sunholo-0.71.4.dist-info/METADATA,sha256=VBbB2GrEwZczEWC0--p2AOwLFU4naCvztxA5j5rTre8,6613
-sunholo-0.71.4.dist-info/WHEEL,sha256=mguMlWGMX-VHnMpKOjjQidIo1ssRlCFu4a4mBpz1s2M,91
-sunholo-0.71.4.dist-info/entry_points.txt,sha256=bZuN5AIHingMPt4Ro1b_T-FnQvZ3teBes-3OyO0asl4,49
-sunholo-0.71.4.dist-info/top_level.txt,sha256=wt5tadn5--5JrZsjJz2LceoUvcrIvxjHJe-RxuudxAk,8
-sunholo-0.71.4.dist-info/RECORD,,
+sunholo-0.71.6.dist-info/LICENSE.txt,sha256=SdE3QjnD3GEmqqg9EX3TM9f7WmtOzqS1KJve8rhbYmU,11345
+sunholo-0.71.6.dist-info/METADATA,sha256=mF32bponOP0fNr7dvWPiIWOAlTf1-csaIxTIy_oSBDA,6613
+sunholo-0.71.6.dist-info/WHEEL,sha256=mguMlWGMX-VHnMpKOjjQidIo1ssRlCFu4a4mBpz1s2M,91
+sunholo-0.71.6.dist-info/entry_points.txt,sha256=bZuN5AIHingMPt4Ro1b_T-FnQvZ3teBes-3OyO0asl4,49
+sunholo-0.71.6.dist-info/top_level.txt,sha256=wt5tadn5--5JrZsjJz2LceoUvcrIvxjHJe-RxuudxAk,8
+sunholo-0.71.6.dist-info/RECORD,,