sunholo 0.67.6__py3-none-any.whl → 0.67.8__py3-none-any.whl

sunholo/agents/route.py

@@ -47,19 +47,24 @@ def route_endpoint(vector_name, method = 'post', override_endpoint=None):
     
     agents_config = load_config_key(agent_type, vector_name, kind="agentConfig")
     
-    log.info(f"endpoints_config: {agents_config}")
+    log.info(f"agents_config: {agents_config}")
     if method not in agents_config:
         raise ValueError(f"Invalid method '{method}' for agent configuration.")
 
     # 'post' or 'get'
     endpoints_config = agents_config[method]
 
+    log.info(f"endpoints_config: {endpoints_config}")
     # Replace placeholders in the config
     endpoints = {}
     for key, value in endpoints_config.items():
         format_args = {'stem': stem}
         if '{vector_name}' in value and vector_name is not None:
             format_args['vector_name'] = vector_name
+        
+        if not isinstance(value, str):
+            log.warning('endpoint value not string? format_args: {format_args} - value: {value} - key: {key}')
+            
         endpoints[key] = value.format(**format_args)
 
     return endpoints

sunholo/components/retriever.py

@@ -46,10 +46,18 @@ def pick_retriever(vector_name, embeddings=None):
             vectorstore = value.get('vectorstore')
             if vectorstore:
                 log.info(f"Found vectorstore {vectorstore}")
-                if embeddings is None:
-                    embeddings = get_embeddings(vector_name)
+                from_metadata_id = value.get('from_metadata_id')
+                if from_metadata_id:
+                    # this entry needs to be fetched via metadata key
+                    log.info(f"Skipped from_metadata_id for {vectorstore}")
+                    continue
+
+                embeddings = embeddings or get_embeddings(vector_name)
                 read_only = value.get('readonly')
-                vectorstore = pick_vectorstore(vectorstore, vector_name=vector_name, embeddings=embeddings, read_only=read_only)
+                vectorstore = pick_vectorstore(vectorstore, 
+                                               vector_name=vector_name, 
+                                               embeddings=embeddings, 
+                                               read_only=read_only)
                 k_override = value.get('k', 3)
                 vs_retriever = vectorstore.as_retriever(search_kwargs=dict(k=k_override))
                 retriever_list.append(vs_retriever)
@@ -71,10 +79,54 @@ def pick_retriever(vector_name, embeddings=None):
         log.info(f"No retrievers were created for {memories}")
         return None
     
+    retriever = process_retrieval(retriever_list, vector_name)
+
+    return retriever
+
+def metadata_retriever(metadata: dict, key: str, vector_name:str, embeddings=None):
+    """
+    Decides which vector_name to retrieve from metadata passed
+    """
+    memories = load_memories(vector_name)
+
+    retriever_list = []
+    for memory in memories:  # Iterate over the list
+        for key, value in memory.items():  # Now iterate over the dictionary
+            log.info(f"Found memory {key}")
+            vectorstore = value.get('vectorstore')
+            if vectorstore:
+                log.info(f"Found vectorstore {vectorstore}")
+                from_metadata_id = value.get('from_metadata_id')
+                if from_metadata_id:
+                    # this entry needs to be fetched via metadata key
+                    log.info(f"Finding id from_metadata_id for {vectorstore}")
+                    if key not in metadata:
+                        raise ValueError(f"Missing {key} in {metadata}")
+                    the_id = metadata[key]
+                    read_only = value.get('readonly')
+                    embeddings = embeddings or get_embeddings(vector_name)
+                    vectorstore = pick_vectorstore(vectorstore, 
+                                                   vector_name=the_id, 
+                                                   embeddings=embeddings, 
+                                                   read_only=read_only)
+                    k_override = value.get('k', 3)
+                    id_retriever = vectorstore.as_retriever(search_kwargs=dict(k=k_override))
+                    retriever_list.append(id_retriever)
+                else:
+                    continue
+
+    if not retriever_list or len(retriever_list) == 0:
+        log.info(f"No retrievers were created for {memories}")
+        return None
+    
+    retriever = process_retrieval(retriever_list, vector_name)
+
+    return retriever
+    
+
+
+def process_retrieval(retriever_list: list, vector_name: str):
     k_override = load_config_key("memory_k", vector_name, kind="vacConfig")
-    if not k_override:
-        k_override = 3
-        
     lotr = MergerRetriever(retrievers=retriever_list)
 
     filter_embeddings = get_embeddings(vector_name)
@@ -83,5 +135,5 @@ def pick_retriever(vector_name, embeddings=None):
     retriever = ContextualCompressionRetriever(
         base_compressor=pipeline, base_retriever=lotr, 
         k=k_override)
-
-    return retriever
+    
+    return retriever

sunholo/components/vectorstore.py

@@ -14,7 +14,7 @@
 import os
 from ..logging import log
 
-def pick_vectorstore(vs_str, vector_name, embeddings, read_only=None):
+def pick_vectorstore(vs_str: str, vector_name: str, embeddings, read_only=None):
     log.debug('Picking vectorstore')
         
     if vs_str == 'supabase':

{sunholo-0.67.6.dist-info → sunholo-0.67.8.dist-info}/METADATA

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

{sunholo-0.67.6.dist-info → sunholo-0.67.8.dist-info}/RECORD

@@ -5,7 +5,7 @@ sunholo/agents/chat_history.py,sha256=bkII7PNEbGCaobu2Rnr2rM9dim3BCK0kM-tiWhoI1t
 sunholo/agents/dispatch_to_qa.py,sha256=nFNdxhkr7rVYuUwVoBCBNYBI2Dke6-_z_ZApBEWb_cU,8291
 sunholo/agents/langserve.py,sha256=FdhQjorAY2bMn2rpuabNT6bU3uqSKWrl8DjpH3L_V7k,4375
 sunholo/agents/pubsub.py,sha256=5hbbhbBGyVWRpt2sAGC5FEheYH1mCCwVUhZEB1S7vGg,1337
-sunholo/agents/route.py,sha256=V1HKXTvaNuYgjmT5_QgIQum4O7O0Mw497m6YiMpEzX0,2383
+sunholo/agents/route.py,sha256=xh8ZJuIs60AhGk-1lw-b9LLuvOIVD2sx8m41BnWMJUI,2606
 sunholo/agents/special_commands.py,sha256=ecD5jrBVXo170sdgPILi0m_m_4nRFEv6qKn5zYEvEK8,6494
 sunholo/agents/swagger.py,sha256=wK90aGOgUojZjfMcjqhhJ_ksJ6ZCsVT1Iy02oU6Q5XM,10786
 sunholo/agents/fastapi/__init__.py,sha256=S_pj4_bTUmDGoq_exaREHlOKThi0zTuGT0VZY0YfODQ,88
@@ -44,8 +44,8 @@ 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=WzSBK3lOKRaYP6od4ed0__yOzEwID3wO8b3eAYhLCnU,3801
-sunholo/components/vectorstore.py,sha256=lB8vx_N6eBA44orNeVo1WRn0Q8GCIjvPPT9AfiPWBWE,5620
+sunholo/components/retriever.py,sha256=8_qA7IZvhWWbTplZK3A6x4DlBsGGAaF_NYX6Fn9QGug,6147
+sunholo/components/vectorstore.py,sha256=BxtMF_wX8Zrexr67P07OTSJPjucTewmcPM5OQwIXHPM,5630
 sunholo/database/__init__.py,sha256=Zz0Shcq-CtStf9rJGIYB_Ybzb8rY_Q9mfSj-nviM490,241
 sunholo/database/alloydb.py,sha256=UeWbk_DAqivquMGibX_tz8v1Jza9qnf4SWThNBG2Dh4,17327
 sunholo/database/database.py,sha256=UDHkceiEvJmS3esQX2LYEjEMrHcogN_JHuJXoVWCH3M,7354
@@ -105,9 +105,9 @@ sunholo/vertex/__init__.py,sha256=JvHcGFuv6R_nAhY2AdoqqhMpJ5ugeWPZ_svGhWrObBk,13
 sunholo/vertex/init.py,sha256=JDMUaBRdednzbKF-5p33qqLit2LMsvgvWW-NRz0AqO0,1801
 sunholo/vertex/memory_tools.py,sha256=8F1iTWnqEK9mX4W5RzCVKIjydIcNp6OFxjn_dtQ3GXo,5379
 sunholo/vertex/safety.py,sha256=3meAX0HyGZYrH7rXPUAHxtI_3w_zoy_RX7Shtkoa660,1275
-sunholo-0.67.6.dist-info/LICENSE.txt,sha256=SdE3QjnD3GEmqqg9EX3TM9f7WmtOzqS1KJve8rhbYmU,11345
-sunholo-0.67.6.dist-info/METADATA,sha256=6PlkAPN3HfKLiK2Q_4rcVrtdqDYWOqVUyR1Rhs6_Jk4,6155
-sunholo-0.67.6.dist-info/WHEEL,sha256=cpQTJ5IWu9CdaPViMhC9YzF8gZuS5-vlfoFihTBC86A,91
-sunholo-0.67.6.dist-info/entry_points.txt,sha256=bZuN5AIHingMPt4Ro1b_T-FnQvZ3teBes-3OyO0asl4,49
-sunholo-0.67.6.dist-info/top_level.txt,sha256=wt5tadn5--5JrZsjJz2LceoUvcrIvxjHJe-RxuudxAk,8
-sunholo-0.67.6.dist-info/RECORD,,
+sunholo-0.67.8.dist-info/LICENSE.txt,sha256=SdE3QjnD3GEmqqg9EX3TM9f7WmtOzqS1KJve8rhbYmU,11345
+sunholo-0.67.8.dist-info/METADATA,sha256=ykhSJT_lwZb0G5IkCAlUPzUcUKOvi8Qhcb0riHi0NYI,6155
+sunholo-0.67.8.dist-info/WHEEL,sha256=mguMlWGMX-VHnMpKOjjQidIo1ssRlCFu4a4mBpz1s2M,91
+sunholo-0.67.8.dist-info/entry_points.txt,sha256=bZuN5AIHingMPt4Ro1b_T-FnQvZ3teBes-3OyO0asl4,49
+sunholo-0.67.8.dist-info/top_level.txt,sha256=wt5tadn5--5JrZsjJz2LceoUvcrIvxjHJe-RxuudxAk,8
+sunholo-0.67.8.dist-info/RECORD,,

{sunholo-0.67.6.dist-info → sunholo-0.67.8.dist-info}/WHEEL

@@ -1,5 +1,5 @@
 Wheel-Version: 1.0
-Generator: setuptools (70.1.0)
+Generator: setuptools (70.1.1)
 Root-Is-Purelib: true
 Tag: py3-none-any