From da8f8a8d1c2148b52e5b01ba035df32e6f317fc8 Mon Sep 17 00:00:00 2001 From: Mark Date: Mon, 25 Mar 2024 18:03:24 +0100 Subject: [PATCH] doc handling config --- setup.py | 2 +- sunholo/chunker/doc_handling.py | 37 ++++++++++++++++++--------------- 2 files changed, 21 insertions(+), 18 deletions(-) diff --git a/setup.py b/setup.py index 4c0310c8..c0d2709c 100644 --- a/setup.py +++ b/setup.py @@ -1,7 +1,7 @@ from setuptools import setup, find_packages # Define your base version -version = '0.32.5' +version = '0.32.6' setup( name='sunholo', diff --git a/sunholo/chunker/doc_handling.py b/sunholo/chunker/doc_handling.py index 1ce0e8c1..d30e9811 100644 --- a/sunholo/chunker/doc_handling.py +++ b/sunholo/chunker/doc_handling.py @@ -22,24 +22,27 @@ def send_doc_to_docstore(docs, vector_name): log.info(f"Docstore config: {docstore_config}") for docstore in docstore_config: - if docstore.get('type') == 'alloydb': - # upload to alloydb - alloydb_config = load_config_key("alloydb_config", vector_name=vector_name, filename="config/llm_config.yaml") - if alloydb_config: - engine = create_alloydb_engine(alloydb_config, vector_name) - table_name = create_alloydb_table(table_name=vector_name, engine=engine, type = "docstore", alloydb_config=alloydb_config) - saver = AlloyDBDocumentSaver.create_sync( - engine=engine, - table_name=table_name, - metadata_columns=["source"] - ) - saver.add_documents(docs) - log.info(f"Saved docs to alloydb docstore: {table_name}") + for key, value in docstore.items(): + log.info(f"Found memory {key}") + type = value.get('type') + if type == 'alloydb': + # upload to alloydb + alloydb_config = load_config_key("alloydb_config", vector_name=vector_name, filename="config/llm_config.yaml") + if alloydb_config: + engine = create_alloydb_engine(alloydb_config, vector_name) + table_name = create_alloydb_table(table_name=vector_name, engine=engine, type = "docstore", alloydb_config=alloydb_config) + saver = AlloyDBDocumentSaver.create_sync( + engine=engine, + table_name=table_name, + metadata_columns=["source"] + ) + saver.add_documents(docs) + log.info(f"Saved docs to alloydb docstore: {table_name}") + else: + log.error("docstore.type==alloydb but no config.alloydb_config specified") + #elif docstore.get('type') == 'cloudstorage': else: - log.error("docstore.type==alloydb but no config.alloydb_config specified") - #elif docstore.get('type') == 'cloudstorage': - else: - log.info(f"No docstore type found for {vector_name}: {docstore}") + log.info(f"No docstore type found for {vector_name}: {docstore}") def summarise_docs(docs, vector_name, summary_threshold_default=10000, model_limit_default=100000):