sunholo 0.79.2__py3-none-any.whl → 0.79.4__py3-none-any.whl

sunholo/chunker/doc_handling.py

@@ -1,4 +1,4 @@
-from ..utils import load_config_key
+from ..utils import load_config_key, ConfigManager
 from ..custom_logging import log
 from ..database.alloydb import add_document_if_not_exists
 from ..database.uuid import generate_uuid_from_object_id
@@ -109,8 +109,10 @@ def summarise_docs(docs, vector_name, summary_threshold_default=10000, model_lim
 
     if not docs:
         return None
+    
+    config = ConfigManager(vector_name)
 
-    chunker_config = load_config_key("chunker", vector_name=vector_name, kind="vacConfig")
+    chunker_config = config.vacConfig("chunker")
     summarise_chunking_config = chunker_config.get("summarise") if chunker_config else None
     
     if not summarise_chunking_config:
@@ -122,7 +124,7 @@ def summarise_docs(docs, vector_name, summary_threshold_default=10000, model_lim
     summary_threshold = summarise_chunking_config.get("threshold") if summarise_chunking_config.get("threshold") else summary_threshold_default
     model_limit = summarise_chunking_config.get("model_limit") if summarise_chunking_config.get("model_limit") else model_limit_default
 
-    summary_llm = llm_str_to_llm(summary_llm_str, model=model)
+    summary_llm = llm_str_to_llm(summary_llm_str, model=model, config=config)
 
     doc_summaries = {}
     for doc in docs:

sunholo/utils/config_class.py

@@ -6,7 +6,7 @@ from collections import defaultdict
 from .timedelta import format_timedelta
 
 class ConfigManager:
-    def __init__(self, vector_name: str):
+    def __init__(self, vector_name: str, validate:bool=True):
         """
         Initialize the ConfigManager with a vector name.
         Requires a local config/ folder holding your configuration files or the env var VAC_CONFIG_FOLDER to be set.
@@ -15,6 +15,7 @@ class ConfigManager:
 
         Args:
             vector_name (str): The name of the vector in the configuration files.
+            validate (bool): Whether to validate the configurations
         
         Example:
         ```python
@@ -38,7 +39,7 @@ class ConfigManager:
         self.configs_by_kind = self.load_all_configs()
 
         test_agent = self.vacConfig("agent")
-        if not test_agent and self.vector_name != "global":
+        if not test_agent and self.vector_name != "global" and validate:
             print(f"WARNING: No vacConfig.agent found for {self.vector_name} - are you in right folder? {local_config_folder=} {self.config_folder=}")
 
     def load_all_configs(self):

sunholo/vertex/extensions_call.py

@@ -10,7 +10,7 @@ def dynamic_extension_call(question, config:ConfigManager, project_id:str=None,
 
     extensions = config.vacConfig('extensions')
     if not extensions:
-        log.warning(f"No extensions founded for vac: {ConfigManager.vector_name}")
+        log.warning(f"No extensions founded for vac: {config.vector_name}")
 
         return None
     

sunholo/vertex/memory_tools.py

@@ -12,7 +12,7 @@ from ..discovery_engine.discovery_engine_client import DiscoveryEngineClient
 from ..utils.gcp_project import get_gcp_project
 from ..utils import ConfigManager
 
-def get_vertex_memories(vector_name:str=None, config:ConfigManager=None):
+def get_vertex_memories(config:ConfigManager):
     """
     Retrieves a LlamaIndex corpus from Vertex AI based on the provided Google Cloud configuration.
     
@@ -40,10 +40,6 @@ def get_vertex_memories(vector_name:str=None, config:ConfigManager=None):
         print("Error fetching corpus:", str(e))
     ```
     """
-    if config is None:
-        if vector_name is None:
-            raise ValueError("config or vector_name are required")
-        config = ConfigManager(vector_name)
 
     gcp_config = config.vacConfig("gcp_config")
 
@@ -52,7 +48,7 @@ def get_vertex_memories(vector_name:str=None, config:ConfigManager=None):
     
     global_location = gcp_config.get('location')
 
-    memories = load_memories(vector_name)
+    memories = load_memories(config=config)
     tools = []
 
     if not memories:
@@ -70,15 +66,19 @@ def get_vertex_memories(vector_name:str=None, config:ConfigManager=None):
 
                 if rag_id:
                     log.info("Using rag_id for using vectorstore: llamaindex")
-                    corpus = fetch_corpus(
-                            project_id=project_id or get_gcp_project(),
-                            location=location or global_location,
-                            rag_id=rag_id
-                        )
+                    try:
+                        corpus = fetch_corpus(
+                                project_id=project_id or get_gcp_project(),
+                                location=location or global_location,
+                                rag_id=rag_id
+                            )
+                    except Exception as err:
+                        log.error(f"Skipping - No rag found for {rag_id=} - {str(err)}")
+                        continue
                 else:
-                    log.info(f"Using display_name {vector_name} to derive rag_id")
+                    log.info(f"Using display_name {config.vector_name} to derive rag_id")
                     manager = LlamaIndexVertexCorpusManager(project_id=project_id, location=location)
-                    corpus = manager.find_corpus_from_list(vector_name)
+                    corpus = manager.find_corpus_from_list(config.vector_name)
 
                 try:
                     corpus_tool = Tool.from_retrieval(

{sunholo-0.79.2.dist-info → sunholo-0.79.4.dist-info}/METADATA

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

{sunholo-0.79.2.dist-info → sunholo-0.79.4.dist-info}/RECORD

@@ -31,7 +31,7 @@ sunholo/bots/github_webhook.py,sha256=5pQPRLM_wxxcILVaIzUDV8Kt7Arcm2dL1r1kMMHA52
 sunholo/bots/webapp.py,sha256=EIMxdAJ_xtufwJmvnn7N_Fb_1hZ9DjhJ0Kf_hp02vEU,1926
 sunholo/chunker/__init__.py,sha256=A5canS0XPgisHu0OZ7sVdILgEHGzgH9kpkDi4oBwLZk,135
 sunholo/chunker/azure.py,sha256=MVF9_-QdKUoJqlpEJ49pv2sdjMDxEiMNxzmO7w5nWDQ,3270
-sunholo/chunker/doc_handling.py,sha256=7NdRWIlyAdsd_xZTKrXiviRI3Jl3pQgomemLNrtdxfw,8701
+sunholo/chunker/doc_handling.py,sha256=UAf9BmUMpKCKRlAMl1qNZK6xDNYWk1z3ARoftWoa_54,8734
 sunholo/chunker/encode_metadata.py,sha256=hxxd9KU35Xi0Z_EL8kt_oD66pKfBLhEjBImC16ew-Eo,1919
 sunholo/chunker/images.py,sha256=id2PBu6XyGEOtgafq2v0c9_O6kxaC_pYFMnbsIitkSg,1868
 sunholo/chunker/loaders.py,sha256=CCB0IGigNAWT__2ImVin_j83W3eGS2Qe5I6U18YQzoM,10275
@@ -116,7 +116,7 @@ sunholo/utils/__init__.py,sha256=Hv02T5L2zYWvCso5hzzwm8FQogwBq0OgtUbN_7Quzqc,89
 sunholo/utils/api_key.py,sha256=Ct4bIAQZxzPEw14hP586LpVxBAVi_W9Serpy0BK-7KI,244
 sunholo/utils/big_context.py,sha256=gJIP7_ZL-YSLhOMq8jmFTMqH1wq8eB1NK7oKPeZAq2s,5578
 sunholo/utils/config.py,sha256=aG29MXcL5qzQMtCMqcdy-2ysDCYf9Zn_ZLk5NNOQNSE,8982
-sunholo/utils/config_class.py,sha256=BewBxf59vSKJs4jcYvuLi6PW9M6so8w3qz9HfNFIu0M,8862
+sunholo/utils/config_class.py,sha256=DEY2w7ks5fXmtJ4SwqELhUF4NJFVOuRwxeVFZJlYPf0,8963
 sunholo/utils/config_schema.py,sha256=Wv-ncitzljOhgbDaq9qnFqH5LCuxNv59dTGDWgd1qdk,4189
 sunholo/utils/gcp.py,sha256=uueODEpA-P6O15-t0hmcGC9dONLO_hLfzSsSoQnkUss,4854
 sunholo/utils/gcp_project.py,sha256=0ozs6tzI4qEvEeXb8MxLnCdEVoWKxlM6OH05htj7_tc,1325
@@ -125,16 +125,16 @@ sunholo/utils/timedelta.py,sha256=BbLabEx7_rbErj_YbNM0MBcaFN76DC4PTe4zD2ucezg,49
 sunholo/utils/user_ids.py,sha256=SQd5_H7FE7vcTZp9AQuQDWBXd4FEEd7TeVMQe1H4Ny8,292
 sunholo/utils/version.py,sha256=P1QAJQdZfT2cMqdTSmXmcxrD2PssMPEGM-WI6083Fck,237
 sunholo/vertex/__init__.py,sha256=tMd7ysJ1uwBjfFSn8JL0uS3-s6h_X4GAUBz8AArZEF0,339
-sunholo/vertex/extensions_call.py,sha256=VIVBYpJPMaDzGWxuBU5RF9GfAbrvrskGWH4eXpJbzIc,13823
+sunholo/vertex/extensions_call.py,sha256=QeQbL3aAHlc4_-SynOzooZ_3xkQWAlcgNmFBSwLNtN8,13816
 sunholo/vertex/extensions_class.py,sha256=2QGW28lNjoMEnaoVb3QcqEDwphclIsZthnpLUi5_Ivo,21033
 sunholo/vertex/genai_functions.py,sha256=2z6grM9H0Z79Yzx88l8mE1wXck3bRa0TWvnqZZ9ifDc,2051
 sunholo/vertex/init.py,sha256=1OQwcPBKZYBTDPdyU7IM4X4OmiXLdsNV30C-fee2scQ,2875
-sunholo/vertex/memory_tools.py,sha256=7nDQXjrF9IpCPKbX3Focn4A2PdKb7JhfZDLv4le5kWc,7498
+sunholo/vertex/memory_tools.py,sha256=pgSahVDh7GPEulu3nl-w0jb5lTClb4TCnVxPnMokNZY,7533
 sunholo/vertex/safety.py,sha256=S9PgQT1O_BQAkcqauWncRJaydiP8Q_Jzmu9gxYfy1VA,2482
 sunholo/vertex/type_dict_to_json.py,sha256=uTzL4o9tJRao4u-gJOFcACgWGkBOtqACmb6ihvCErL8,4694
-sunholo-0.79.2.dist-info/LICENSE.txt,sha256=SdE3QjnD3GEmqqg9EX3TM9f7WmtOzqS1KJve8rhbYmU,11345
-sunholo-0.79.2.dist-info/METADATA,sha256=qtezkTfwv1CJNsCg-T2vPY1zsZMixC7t-teHOjFwPI0,7348
-sunholo-0.79.2.dist-info/WHEEL,sha256=R0nc6qTxuoLk7ShA2_Y-UWkN8ZdfDBG2B6Eqpz2WXbs,91
-sunholo-0.79.2.dist-info/entry_points.txt,sha256=bZuN5AIHingMPt4Ro1b_T-FnQvZ3teBes-3OyO0asl4,49
-sunholo-0.79.2.dist-info/top_level.txt,sha256=wt5tadn5--5JrZsjJz2LceoUvcrIvxjHJe-RxuudxAk,8
-sunholo-0.79.2.dist-info/RECORD,,
+sunholo-0.79.4.dist-info/LICENSE.txt,sha256=SdE3QjnD3GEmqqg9EX3TM9f7WmtOzqS1KJve8rhbYmU,11345
+sunholo-0.79.4.dist-info/METADATA,sha256=-mV_Y5Er002Y0OS4lEz913p-XMfqTuifDtkRMlExgA4,7348
+sunholo-0.79.4.dist-info/WHEEL,sha256=R0nc6qTxuoLk7ShA2_Y-UWkN8ZdfDBG2B6Eqpz2WXbs,91
+sunholo-0.79.4.dist-info/entry_points.txt,sha256=bZuN5AIHingMPt4Ro1b_T-FnQvZ3teBes-3OyO0asl4,49
+sunholo-0.79.4.dist-info/top_level.txt,sha256=wt5tadn5--5JrZsjJz2LceoUvcrIvxjHJe-RxuudxAk,8
+sunholo-0.79.4.dist-info/RECORD,,