sunholo 0.80.0__py3-none-any.whl → 0.80.2__py3-none-any.whl

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/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/utils/config_class.py

@@ -86,6 +86,7 @@ class ConfigManager:
                 continue
             if filename.endswith(('.yaml', '.yml', '.json')):
                 config_file = os.path.join(folder, filename)
+                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)
@@ -159,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}'")
                 dict1[key] = value
         return dict1
 

{sunholo-0.80.0.dist-info → sunholo-0.80.2.dist-info}/METADATA

@@ -1,9 +1,9 @@
 Metadata-Version: 2.1
 Name: sunholo
-Version: 0.80.0
+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.0.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.0.dist-info → sunholo-0.80.2.dist-info}/RECORD

@@ -13,7 +13,7 @@ sunholo/agents/fastapi/base.py,sha256=W-cyF8ZDUH40rc-c-Apw3-_8IIi2e4Y9qRtnoVnsc1
 sunholo/agents/fastapi/qna_routes.py,sha256=lKHkXPmwltu9EH3RMwmD153-J6pE7kWQ4BhBlV3to-s,3864
 sunholo/agents/flask/__init__.py,sha256=uqfHNw2Ru3EJ4dJEcbp86h_lkquBQPMxZbjhV_xe3rs,72
 sunholo/agents/flask/base.py,sha256=FgSaCODyoTtlstJtsqlLPScdgRUtv9_plxftdzHdVFo,809
-sunholo/agents/flask/qna_routes.py,sha256=Gk0cTnnwaYoziPBx7_1pVgmiOWkH-WyO2kc-f3mxczc,22001
+sunholo/agents/flask/qna_routes.py,sha256=pSXAipANqoE4wgDv4YD2_Sd7GvpGmFcj4Quslf4FKTM,22057
 sunholo/agents/flask/vac_routes.py,sha256=JHBrz9URmRzxoNAiqEeI-5qWyKfVSZ1Ix__1t19p6HI,19527
 sunholo/archive/__init__.py,sha256=qNHWm5rGPVOlxZBZCpA1wTYPbalizRT7f8X4rs2t290,31
 sunholo/archive/archive.py,sha256=PxVfDtO2_2ZEEbnhXSCbXLdeoHoQVImo4y3Jr2XkCFY,1204
@@ -55,7 +55,7 @@ sunholo/cli/swagger.py,sha256=absYKAU-7Yd2eiVNUY-g_WLl2zJfeRUNdWQ0oH8M_HM,1564
 sunholo/cli/vertex.py,sha256=8130YCarxHL1UC3aqblNmUwGZTXbkdL4Y_FOnZJsWiI,2056
 sunholo/components/__init__.py,sha256=IDoylb74zFKo6NIS3RQqUl0PDFBGVxM1dfUmO7OJ44U,176
 sunholo/components/llm.py,sha256=5wRVf7lIb7q1vRADNcdQp26L9l4vGHFIvjtUDurZN_s,11488
-sunholo/components/retriever.py,sha256=ECTXmKiFYT7B9oFaXSEbmQ9m2OZOOpqzcPccFi9KDpc,6861
+sunholo/components/retriever.py,sha256=G89Gfctsxr_Y2igFTUtPVcluUoZ6L7UXA5yO0207sV8,7377
 sunholo/components/vectorstore.py,sha256=xKk7micTRwZckaI7U6PxvFz_ZSjCH48xPTDYiDcv2tc,5913
 sunholo/database/__init__.py,sha256=Zz0Shcq-CtStf9rJGIYB_Ybzb8rY_Q9mfSj-nviM490,241
 sunholo/database/alloydb.py,sha256=c1PEmK9fJCxYaVmKv4emvOoXrajV7KqaVK5mqpeksvM,11527
@@ -117,7 +117,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=k2wKuvEQlbqfUzujGcrDH_ZuPEhtYrlksJr-sBy-elg,9022
+sunholo/utils/config_class.py,sha256=AbjTTgelMiaTPpTSBlbl6CC5wggcVE8ZFr4LJQ4t8Mg,9029
 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
@@ -133,9 +133,9 @@ sunholo/vertex/init.py,sha256=1OQwcPBKZYBTDPdyU7IM4X4OmiXLdsNV30C-fee2scQ,2875
 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.80.0.dist-info/LICENSE.txt,sha256=SdE3QjnD3GEmqqg9EX3TM9f7WmtOzqS1KJve8rhbYmU,11345
-sunholo-0.80.0.dist-info/METADATA,sha256=dL9qKmYHLd8M7rmztP84WKfSQ_aoVfLmwA6pU0E3jM0,7348
-sunholo-0.80.0.dist-info/WHEEL,sha256=R0nc6qTxuoLk7ShA2_Y-UWkN8ZdfDBG2B6Eqpz2WXbs,91
-sunholo-0.80.0.dist-info/entry_points.txt,sha256=bZuN5AIHingMPt4Ro1b_T-FnQvZ3teBes-3OyO0asl4,49
-sunholo-0.80.0.dist-info/top_level.txt,sha256=wt5tadn5--5JrZsjJz2LceoUvcrIvxjHJe-RxuudxAk,8
-sunholo-0.80.0.dist-info/RECORD,,
+sunholo-0.80.2.dist-info/LICENSE.txt,sha256=SdE3QjnD3GEmqqg9EX3TM9f7WmtOzqS1KJve8rhbYmU,11345
+sunholo-0.80.2.dist-info/METADATA,sha256=uNKoHN6qsuLMg_784oOLPV1AJamXOqOifURetX-YDdo,7348
+sunholo-0.80.2.dist-info/WHEEL,sha256=R0nc6qTxuoLk7ShA2_Y-UWkN8ZdfDBG2B6Eqpz2WXbs,91
+sunholo-0.80.2.dist-info/entry_points.txt,sha256=bZuN5AIHingMPt4Ro1b_T-FnQvZ3teBes-3OyO0asl4,49
+sunholo-0.80.2.dist-info/top_level.txt,sha256=wt5tadn5--5JrZsjJz2LceoUvcrIvxjHJe-RxuudxAk,8
+sunholo-0.80.2.dist-info/RECORD,,