sunholo 0.80.1__tar.gz → 0.80.2__tar.gz

{sunholo-0.80.1 → sunholo-0.80.2}/PKG-INFO

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

{sunholo-0.80.1 → sunholo-0.80.2}/setup.py

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

{sunholo-0.80.1 → sunholo-0.80.2}/sunholo/agents/flask/qna_routes.py

@@ -535,6 +535,7 @@ def prep_vac(request, vector_name):
     chat_history = data.pop('chat_history', None)
     vector_name = data.pop('vector_name', vector_name)
 
+    log.info("Turning chat_history into paired tuples")
     paired_messages = extract_chat_history(chat_history)
 
     all_input = {'user_input': user_input, 

{sunholo-0.80.1 → sunholo-0.80.2}/sunholo/components/retriever.py

@@ -57,6 +57,26 @@ def pick_retriever(vector_name:str=None, config:ConfigManager=None, embeddings=N
             vectorstore = value.get('vectorstore')
             if vectorstore:
                 log.info(f"Found vectorstore {vectorstore}")
+
+                if vectorstore == "vertex_ai_search" or vectorstore == "discovery_engine":
+                    # use direct retriever
+                    from langchain.retrievers import GoogleVertexAISearchRetriever
+                    gcp_config = config.vacConfig('gcp_config')
+                    try:
+                        gcp_retriever = GoogleVertexAISearchRetriever(
+                            data_store_id=None if value.get("search_engine_id") else vector_name,
+                            max_documents=value.get('max_documents', 5),
+                            project_id=gcp_config.get('project_id') or get_gcp_project(),
+                            search_engine_id=value.get("search_engine_id"),
+                            location_id=gcp_config.get("location", "global"),
+                            engine_data_type=value.get("engine_data_type",0)
+                        )
+                    except Exception as err:
+                        log.error(f"Could not init GoogleVertexAISearchRetriever - {str(err)}")
+                        continue
+                    
+                    retriever_list.append(gcp_retriever)
+
                 from_metadata_id = value.get('from_metadata_id')
                 if from_metadata_id:
                     # this entry needs to be fetched via metadata key
@@ -66,7 +86,7 @@ def pick_retriever(vector_name:str=None, config:ConfigManager=None, embeddings=N
                 embeddings = embeddings or get_embeddings(config=config)
                 read_only = value.get('read_only')
                 try:
-                    vectorstore = pick_vectorstore(
+                    vectorstore_obj = pick_vectorstore(
                         vectorstore, 
                         config=config,
                         embeddings=embeddings, 
@@ -76,23 +96,12 @@ def pick_retriever(vector_name:str=None, config:ConfigManager=None, embeddings=N
                     continue
                 
                 k_override = value.get('k', 3)
-                if vectorstore:
+                if vectorstore_obj:
                     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']}")
-                gcp_retriever = GoogleCloudEnterpriseSearchRetriever(
-                    project_id=get_gcp_project(),
-                    search_engine_id=value["db_id"],
-                    location_id=value.get("location", "global"),
-                    engine_data_type=1 if value.get("type","unstructured") == "structured" else 0,
-                    query_expansion_condition=2
-                )
-                retriever_list.append(gcp_retriever)
-            
             #TODO: more memory stores here
 
     if not retriever_list or len(retriever_list) == 0:

{sunholo-0.80.1 → sunholo-0.80.2}/sunholo/utils/config_class.py

@@ -86,7 +86,7 @@ class ConfigManager:
                 continue
             if filename.endswith(('.yaml', '.yml', '.json')):
                 config_file = os.path.join(folder, filename)
-                log.info("Checking config file: {config_file}")
+                log.debug(f"Checking config file: {config_file}")
                 if filename in self.config_cache:
                     cached_config, cache_time = self.config_cache[filename]
                     time_to_recache = (current_time - cache_time)
@@ -160,7 +160,6 @@ class ConfigManager:
             if isinstance(value, dict) and key in dict1 and isinstance(dict1[key], dict):
                 dict1[key] = self._merge_dicts(dict1[key], value)
             else:
-                print(f"Merging '{key}' to new '{value[:20]}'")
                 dict1[key] = value
         return dict1
 

{sunholo-0.80.1 → sunholo-0.80.2}/sunholo.egg-info/PKG-INFO

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