sunholo 0.90.6__py3-none-any.whl → 0.91.1__py3-none-any.whl

sunholo/database/alloydb_client.py

@@ -3,7 +3,7 @@ try:
     import pg8000
     import sqlalchemy
     from sqlalchemy.exc import DatabaseError, ProgrammingError
-    from langchain_google_alloydb_pg import AlloyDBEngine
+    from langchain_google_alloydb_pg import AlloyDBEngine, AlloyDBVectorStore
 except ImportError:
     AlloyDBEngine = None
     pass
@@ -12,6 +12,7 @@ from .database import get_vector_size
 from .uuid import generate_uuid_from_object_id
 from ..custom_logging import log
 from ..utils import ConfigManager
+from ..components import get_embeddings
 
 class AlloyDBClient:
     """
@@ -62,6 +63,7 @@ class AlloyDBClient:
             if not alloydb_config:
                 raise ValueError("Must specify vac.alloydb_config")
             self.config = alloydb_config
+            self.vector_name = self.config.get("vac")
             project_id = alloydb_config["project_id"]
             region = alloydb_config["region"]
             cluster_name = alloydb_config["cluster"]
@@ -87,6 +89,11 @@ class AlloyDBClient:
             log.info("Build with Langchain engine - will use default service account for auth")
             self.engine = self._create_engine()
             self.engine_type = "langchain"
+        
+        if self.engine_type == "langchain":
+            self.vectorstore = self.get_vectorstore()
+        else:        
+            self.vectorstore = None
 
     def _build_instance_uri(self, project_id, region, cluster_name, instance_name):
         return f"projects/{project_id}/locations/{region}/clusters/{cluster_name}/instances/{instance_name}"
@@ -134,6 +141,52 @@ class AlloyDBClient:
 
         return engine
     
+    def _get_embedder(self):
+        return get_embeddings(self.vector_name)
+    
+    def get_vectorstore(self):
+        if self.engine_type != "langchain":
+            raise ValueError("Not available using pg8000 engine")
+        
+        if self.vector_name is None:
+            raise ValueError("No vectorname found - init with ConfigManager?")
+        
+        vector_size = get_vector_size(self.vector_name)
+        table_name = f"{self.vector_name}_vectorstore_{vector_size}"
+
+        log.info(f"Initialised AlloyDBClient with AlloyDBVectorStore: {table_name}")
+        self.vectorstore = AlloyDBVectorStore.create_sync(
+                engine=self.engine,
+                table_name=table_name,
+                embedding_service=self._get_embedder(),
+                metadata_columns=["source", "docstore_doc_id"]
+                #metadata_columns=["source", "eventTime"]
+            )
+        
+        return self.vectorstore
+    
+    def _similarity_search(self, query, source_filter:str="", free_filter:str=None):
+
+        if free_filter is None:
+            source_filter_cmd = f"source %LIKE% {source_filter}" if source_filter else None
+        else:
+            source_filter_cmd = free_filter
+
+        log.info(f"Similarity search for {query} and {source_filter_cmd}")       
+
+        return query, source_filter_cmd
+
+    def similarity_search(self, query:str, source_filter:str="", free_filter:str=None, k:int=5):
+
+        query, source_filter_cmd = self._similarity_search(query, source_filter, free_filter)     
+
+        return self.vectorstore.similarity_search(query, filter=source_filter_cmd, k=k)
+
+    async def asimilarity_search(self, query:str, source_filter:str="", free_filter:str=None, k:int=5):
+        query, source_filter_cmd = self._similarity_search(query, source_filter, free_filter)     
+
+        return await self.vectorstore.asimilarity_search(query, filter=source_filter_cmd, k=k)
+
     def execute_sql(self, sql_statement):
         if self.engine_type == "pg8000":
             return self._execute_sql_pg8000(sql_statement)

sunholo/llamaindex/llamaindex_class.py

@@ -178,6 +178,8 @@ class LlamaIndexVertexCorpusManager:
     
     def query_corpus(self, query:str, corpus_disply_name:str):
         corpus = self.find_corpus_from_list(corpus_disply_name)
+
+        log.info(f"Querying {corpus.name=} with {query=}")
         
         response:RetrieveContextsResponse = rag.retrieval_query(
             rag_resources=[

{sunholo-0.90.6.dist-info → sunholo-0.91.1.dist-info}/METADATA

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

{sunholo-0.90.6.dist-info → sunholo-0.91.1.dist-info}/RECORD

@@ -59,7 +59,7 @@ sunholo/components/retriever.py,sha256=bKIVT7_18Ut3OJd0E0jyiISPnD9qkHWVjcQPT4i1_
 sunholo/components/vectorstore.py,sha256=xKk7micTRwZckaI7U6PxvFz_ZSjCH48xPTDYiDcv2tc,5913
 sunholo/database/__init__.py,sha256=bpB5Nk21kwqYj-qdVnvNgXjLsbflnH4g-San7OHMqR4,283
 sunholo/database/alloydb.py,sha256=YH8wNPS8gN-TDZEXQcVHxwd1NScHRfAxma3gK4R6KCk,11740
-sunholo/database/alloydb_client.py,sha256=H2BfucbMOm1nT6Pq6MS1Yw4ZIG02KKKTeOijX8B6DaU,14804
+sunholo/database/alloydb_client.py,sha256=urXmesN-41FrjmYIy1ybp7zUdw7Y4UnVUhWDacBELAU,17002
 sunholo/database/database.py,sha256=VqhZdkXUNdvWn8sUcUV3YNby1JDVf7IykPVXWBtxo9U,7361
 sunholo/database/lancedb.py,sha256=DyfZntiFKBlVPaFooNN1Z6Pl-LAs4nxWKKuq8GBqN58,715
 sunholo/database/static_dbs.py,sha256=8cvcMwUK6c32AS2e_WguKXWMkFf5iN3g9WHzsh0C07Q,442
@@ -99,7 +99,7 @@ sunholo/langfuse/prompts.py,sha256=27BsVfihM6-h1jscbkGSO4HsATl-d4ZN6tcNCVztWoY,1
 sunholo/llamaindex/__init__.py,sha256=DlY_cHWCsVEV1C5WBgDdHRgOMlJc8pDoCRukUJ8PT9w,88
 sunholo/llamaindex/get_files.py,sha256=6rhXCDqQ_lrIapISQ_OYQDjiSATXvS_9m3qq53-oIl0,781
 sunholo/llamaindex/import_files.py,sha256=Bnic5wz8c61af9Kwq8KSrNBbc4imYnzMtBCb2jzSImI,6224
-sunholo/llamaindex/llamaindex_class.py,sha256=wtMS97YMsfA2IWLTd5mzr73DV4_fi5I5GVD7AC4wVm0,17375
+sunholo/llamaindex/llamaindex_class.py,sha256=PnpPoc7LpP7xvKIXYu-UvI4ehj67pGhE1EIWEQyimhQ,17435
 sunholo/llamaindex/user_history.py,sha256=ZtkecWuF9ORduyGB8kF8gP66bm9DdvCI-ZiK6Kt-cSE,2265
 sunholo/lookup/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 sunholo/lookup/model_lookup.yaml,sha256=O7o-jP53MLA06C8pI-ILwERShO-xf6z_258wtpZBv6A,739
@@ -144,9 +144,9 @@ sunholo/vertex/init.py,sha256=1OQwcPBKZYBTDPdyU7IM4X4OmiXLdsNV30C-fee2scQ,2875
 sunholo/vertex/memory_tools.py,sha256=q_phxgGX2TG2j2MXNULF2xGzQnQPENwjPN9nZ_A9Gh0,7526
 sunholo/vertex/safety.py,sha256=S9PgQT1O_BQAkcqauWncRJaydiP8Q_Jzmu9gxYfy1VA,2482
 sunholo/vertex/type_dict_to_json.py,sha256=uTzL4o9tJRao4u-gJOFcACgWGkBOtqACmb6ihvCErL8,4694
-sunholo-0.90.6.dist-info/LICENSE.txt,sha256=SdE3QjnD3GEmqqg9EX3TM9f7WmtOzqS1KJve8rhbYmU,11345
-sunholo-0.90.6.dist-info/METADATA,sha256=oeL4J2tqfAvbatVNoApFgnG2_1A2mN3lpeoVZmLFhdE,7806
-sunholo-0.90.6.dist-info/WHEEL,sha256=cVxcB9AmuTcXqmwrtPhNK88dr7IR_b6qagTj0UvIEbY,91
-sunholo-0.90.6.dist-info/entry_points.txt,sha256=bZuN5AIHingMPt4Ro1b_T-FnQvZ3teBes-3OyO0asl4,49
-sunholo-0.90.6.dist-info/top_level.txt,sha256=wt5tadn5--5JrZsjJz2LceoUvcrIvxjHJe-RxuudxAk,8
-sunholo-0.90.6.dist-info/RECORD,,
+sunholo-0.91.1.dist-info/LICENSE.txt,sha256=SdE3QjnD3GEmqqg9EX3TM9f7WmtOzqS1KJve8rhbYmU,11345
+sunholo-0.91.1.dist-info/METADATA,sha256=VV2CVfBHDRqyFrsgGDzyd-xfFC8gOGn9LTZvuDwjO0Y,7806
+sunholo-0.91.1.dist-info/WHEEL,sha256=cVxcB9AmuTcXqmwrtPhNK88dr7IR_b6qagTj0UvIEbY,91
+sunholo-0.91.1.dist-info/entry_points.txt,sha256=bZuN5AIHingMPt4Ro1b_T-FnQvZ3teBes-3OyO0asl4,49
+sunholo-0.91.1.dist-info/top_level.txt,sha256=wt5tadn5--5JrZsjJz2LceoUvcrIvxjHJe-RxuudxAk,8
+sunholo-0.91.1.dist-info/RECORD,,