sunholo 0.66.0__py3-none-any.whl → 0.66.2__py3-none-any.whl

sunholo/agents/swagger.py

@@ -195,7 +195,8 @@ def generate_swagger(vac_config, agent_config):
                     'operationId': operation_id,
                     'x-google-backend': {
                         'address': endpoint_address,
-                        'protocol': 'h2'
+                        'protocol': 'h2',
+                        'deadline':  180000  # Timeout of 3 minutes (1,800,00 milliseconds)
                     },
                     'security': security,
                     'responses': copy.deepcopy(agent_config_paths.get('response', {}).get(endpoint_key, {
@@ -252,7 +253,7 @@ def generate_swagger(vac_config, agent_config):
                     swagger_template['paths'][endpoint_path] = {}
                 
                 operation_id = f"{method}_{agent_type}_{endpoint_key}_{vector_name}"
-                
+
                 security = [{'ApiKeyAuth': []}] if do_auth else [{'None': []}]
 
                 swagger_template['paths'][endpoint_path][method] = {
@@ -260,7 +261,8 @@ def generate_swagger(vac_config, agent_config):
                     'operationId': operation_id,
                     'x-google-backend': {
                         'address': endpoint_address,
-                        'protocol': 'h2'
+                        'protocol': 'h2',
+                        'deadline': 180000  # Timeout of 3 minutes (1,800,00 milliseconds)
                     },
                     'security': security,
                     'responses': copy.deepcopy(default_agent_config.get('response', {}).get(endpoint_key, {

sunholo/llamaindex/import_files.py

@@ -7,6 +7,7 @@ from ..logging import log
 from ..utils.config import load_config_key
 from ..vertex import init_vertex
 from .get_files import fetch_corpus
+from ..components import load_memories
     
 
 def do_llamaindex(message_data, metadata, vector_name):
@@ -45,30 +46,60 @@ def do_llamaindex(message_data, metadata, vector_name):
         raise ValueError(f"Need config.{vector_name}.gcp_config to configure llamaindex on VertexAI")
 
     init_vertex(gcp_config)
-    corpus = fetch_corpus(gcp_config)
-    #display_name = load_config_key("display_name", vector_name=vector_name, filename="config/llm_config.yaml")
-    #description = load_config_key("description", vector_name=vector_name, filename="config/llm_config.yaml")
 
+    global_project_id = gcp_config.get('project_id')
+    global_location = gcp_config.get('location')
+    global_rag_id = gcp_config.get('rag_id')
+    #global_data_store_id = gcp_config.get('data_store_id')
+
+    memories = load_memories(vector_name)
+    tools = []
+
+    if not memories:
+        return tools
+    
+    corpuses = None
+    for memory in memories:
+        for key, value in memory.items():  # Now iterate over the dictionary
+            log.info(f"Found memory {key}")
+            vectorstore = value.get('vectorstore')
+            if vectorstore == "llamaindex":
+                log.info(f"Found vectorstore {vectorstore}")
+                rag_id = value.get('rag_id')
+                project_id = gcp_config.get('project_id')
+                location = gcp_config.get('location')
+                corpus = fetch_corpus(
+                    project_id=project_id or global_project_id,
+                    location=location or global_location,
+                    rag_id=rag_id or global_rag_id
+                )
+                corpuses.append(corpus)
+    if not corpuses:
+        log.error("Could not find a RAG corpus to import data to")
+        return None
+    
     try:
         corpura = rag.list_corpora()
-        log.info(f"Corpora: {corpura} - {type(corpura)}")
+        log.info(f"All Corpora: {corpura} - {type(corpura)}")
     except Exception as err:
         log.warning(f"Could not list any corpora - {str(err)}")
 
-    log.info(f"Found llamaindex corpus: {corpus}")
+    log.info(f"Found llamaindex corpus: {corpuses}")
 
     # native support for cloud storage and drive links
     chunker_config = load_config_key("chunker", vector_name=vector_name, kind="vacConfig")
 
+    
     if message_data.startswith("gs://") or message_data.startswith("https://drive.google.com"):
         log.info(f"rag.import_files for {message_data}")
-        response = rag.import_files(
-            corpus_name=corpus.name,
-            paths=[message_data],
-            chunk_size=chunker_config.get("chunk_size"),  # Optional
-            chunk_overlap=chunker_config.get("overlap"),  # Optional
-        )
-        log.info(f"Imported file to corpus: {response} with metadata: {metadata}")
+        for corp in corpuses:
+            response = rag.import_files(
+                corpus_name=corp.name,
+                paths=[message_data],
+                chunk_size=chunker_config.get("chunk_size"),  # Optional
+                chunk_overlap=chunker_config.get("overlap"),  # Optional
+            )
+            log.info(f"Imported file to corpus: {response} with metadata: {metadata}")
 
         metadata["source"] = message_data
         return metadata

{sunholo-0.66.0.dist-info → sunholo-0.66.2.dist-info}/METADATA

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

{sunholo-0.66.0.dist-info → sunholo-0.66.2.dist-info}/RECORD

@@ -7,7 +7,7 @@ sunholo/agents/langserve.py,sha256=FdhQjorAY2bMn2rpuabNT6bU3uqSKWrl8DjpH3L_V7k,4
 sunholo/agents/pubsub.py,sha256=5hbbhbBGyVWRpt2sAGC5FEheYH1mCCwVUhZEB1S7vGg,1337
 sunholo/agents/route.py,sha256=V1HKXTvaNuYgjmT5_QgIQum4O7O0Mw497m6YiMpEzX0,2383
 sunholo/agents/special_commands.py,sha256=ecD5jrBVXo170sdgPILi0m_m_4nRFEv6qKn5zYEvEK8,6494
-sunholo/agents/swagger.py,sha256=tm25kFGYs48Yx0aFGOVdgclhuABLbRvJ0flbFr8_k-k,11371
+sunholo/agents/swagger.py,sha256=muFMQ1-9MtVlvSyUrLKjmULe4inC_QMb0Iofa14QnXw,11540
 sunholo/agents/fastapi/__init__.py,sha256=S_pj4_bTUmDGoq_exaREHlOKThi0zTuGT0VZY0YfODQ,88
 sunholo/agents/fastapi/base.py,sha256=clk76cHbUAvU0OYJrRfCWX_5f0ACbhDsIzYBhI3wyoE,2514
 sunholo/agents/fastapi/qna_routes.py,sha256=DgK4Btu5XriOC1JaRQ4G_nWEjJfnQ0J5pyLanF6eF1g,3857
@@ -70,7 +70,7 @@ sunholo/langfuse/prompts.py,sha256=HO4Zy9usn5tKooBPCKksuw4Lff3c03Ny5wqn4ce_xZM,1
 sunholo/llamaindex/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 sunholo/llamaindex/generate.py,sha256=l1Picr-hVwkmAUD7XmTCa63qY9ERliFHQXwyX3BqB2Q,686
 sunholo/llamaindex/get_files.py,sha256=6rhXCDqQ_lrIapISQ_OYQDjiSATXvS_9m3qq53-oIl0,781
-sunholo/llamaindex/import_files.py,sha256=eGRVYoMzeEjxtg4sQw5NLPIBWjlYDu7r63DPRarLGpQ,5349
+sunholo/llamaindex/import_files.py,sha256=i4YvrDOg-eq1Ep0SgmgpoUjC2y2D7kNLb31U-UipPcE,6373
 sunholo/lookup/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 sunholo/lookup/model_lookup.yaml,sha256=O7o-jP53MLA06C8pI-ILwERShO-xf6z_258wtpZBv6A,739
 sunholo/patches/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
@@ -104,9 +104,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.66.0.dist-info/LICENSE.txt,sha256=SdE3QjnD3GEmqqg9EX3TM9f7WmtOzqS1KJve8rhbYmU,11345
-sunholo-0.66.0.dist-info/METADATA,sha256=8PjQhPq2svsacMHzi-wkLvWch5Gtrhjz16i7YjNPGyk,5998
-sunholo-0.66.0.dist-info/WHEEL,sha256=cpQTJ5IWu9CdaPViMhC9YzF8gZuS5-vlfoFihTBC86A,91
-sunholo-0.66.0.dist-info/entry_points.txt,sha256=bZuN5AIHingMPt4Ro1b_T-FnQvZ3teBes-3OyO0asl4,49
-sunholo-0.66.0.dist-info/top_level.txt,sha256=wt5tadn5--5JrZsjJz2LceoUvcrIvxjHJe-RxuudxAk,8
-sunholo-0.66.0.dist-info/RECORD,,
+sunholo-0.66.2.dist-info/LICENSE.txt,sha256=SdE3QjnD3GEmqqg9EX3TM9f7WmtOzqS1KJve8rhbYmU,11345
+sunholo-0.66.2.dist-info/METADATA,sha256=oIbyKC0s3PKDXd2fQlmaEWuNiXQkRJlJ54VBpWn-G9k,5998
+sunholo-0.66.2.dist-info/WHEEL,sha256=cpQTJ5IWu9CdaPViMhC9YzF8gZuS5-vlfoFihTBC86A,91
+sunholo-0.66.2.dist-info/entry_points.txt,sha256=bZuN5AIHingMPt4Ro1b_T-FnQvZ3teBes-3OyO0asl4,49
+sunholo-0.66.2.dist-info/top_level.txt,sha256=wt5tadn5--5JrZsjJz2LceoUvcrIvxjHJe-RxuudxAk,8
+sunholo-0.66.2.dist-info/RECORD,,