sunholo 0.67.6__tar.gz → 0.67.8__tar.gz

{sunholo-0.67.6 → sunholo-0.67.8}/PKG-INFO

@@ -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 → sunholo-0.67.8}/setup.py

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

{sunholo-0.67.6 → sunholo-0.67.8}/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-0.67.6 → sunholo-0.67.8}/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-0.67.6 → sunholo-0.67.8}/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 → sunholo-0.67.8}/sunholo.egg-info/PKG-INFO

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