sunholo 0.91.0__py3-none-any.whl → 0.91.2__py3-none-any.whl

sunholo/database/alloydb_client.py

@@ -63,7 +63,7 @@ class AlloyDBClient:
             if not alloydb_config:
                 raise ValueError("Must specify vac.alloydb_config")
             self.config = alloydb_config
-            self.vector_name = self.config.vector_name
+            self.vector_name = self.config.get("vac")
             project_id = alloydb_config["project_id"]
             region = alloydb_config["region"]
             cluster_name = alloydb_config["cluster"]
@@ -141,13 +141,16 @@ class AlloyDBClient:
 
         return engine
     
-    def _get_embedder(self, vector_name):
-        return get_embeddings(vector_name)
+    def _get_embedder(self):
+        return get_embeddings(self.vector_name)
     
-    def get_vectorstore(self):
+    def get_vectorstore(self, vector_name:str=None):
         if self.engine_type != "langchain":
             raise ValueError("Not available using pg8000 engine")
         
+        if vector_name:
+            self.vector_name = vector_name
+
         if self.vector_name is None:
             raise ValueError("No vectorname found - init with ConfigManager?")
         
@@ -158,14 +161,16 @@ class AlloyDBClient:
         self.vectorstore = AlloyDBVectorStore.create_sync(
                 engine=self.engine,
                 table_name=table_name,
-                embedding_service=self._get_embedder(self.vector_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):
+    def _similarity_search(self, query, source_filter:str="", free_filter:str=None, vector_name:str=None):
+
+        self.get_vectorstore(vector_name) 
 
         if free_filter is None:
             source_filter_cmd = f"source %LIKE% {source_filter}" if source_filter else None
@@ -176,14 +181,21 @@ class AlloyDBClient:
 
         return query, source_filter_cmd
 
-    def similarity_search(self, query, source_filter:str="", free_filter:str=None, k:int=5):
+    def similarity_search(self, query:str, source_filter:str="", free_filter:str=None, k:int=5, vector_name:str=None):
 
-        query, source_filter_cmd = self._similarity_search(query, source_filter, free_filter)     
+        query, source_filter_cmd = self._similarity_search(query, 
+                                                           source_filter=source_filter, 
+                                                           free_filter=free_filter, 
+                                                           vector_name=vector_name)    
 
         return self.vectorstore.similarity_search(query, filter=source_filter_cmd, k=k)
 
-    async def asimilarity_search(self, query, source_filter:str="", free_filter:str=None, k:int=5):
-        query, source_filter_cmd = self._similarity_search(query, source_filter, free_filter)     
+    async def asimilarity_search(self, query:str, source_filter:str="", free_filter:str=None, k:int=5, vector_name:str=None):
+
+        query, source_filter_cmd = self._similarity_search(query, 
+                                                           source_filter=source_filter, 
+                                                           free_filter=free_filter, 
+                                                           vector_name=vector_name)     
 
         return await self.vectorstore.asimilarity_search(query, filter=source_filter_cmd, k=k)
 

{sunholo-0.91.0.dist-info → sunholo-0.91.2.dist-info}/METADATA

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

{sunholo-0.91.0.dist-info → sunholo-0.91.2.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=gMTV1rno3pZfPQy-I3YBE_MiXQePcu8Mcki_Kmq3Hj0,17019
+sunholo/database/alloydb_client.py,sha256=remimbHWWzmDMfycpI5jCgb9T0vYbs1q0OqDKIgePZw,17664
 sunholo/database/database.py,sha256=VqhZdkXUNdvWn8sUcUV3YNby1JDVf7IykPVXWBtxo9U,7361
 sunholo/database/lancedb.py,sha256=DyfZntiFKBlVPaFooNN1Z6Pl-LAs4nxWKKuq8GBqN58,715
 sunholo/database/static_dbs.py,sha256=8cvcMwUK6c32AS2e_WguKXWMkFf5iN3g9WHzsh0C07Q,442
@@ -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.91.0.dist-info/LICENSE.txt,sha256=SdE3QjnD3GEmqqg9EX3TM9f7WmtOzqS1KJve8rhbYmU,11345
-sunholo-0.91.0.dist-info/METADATA,sha256=88KfGdcucBZTtc-oEMicxB6actR75TcMt0ktdqvbJ_4,7806
-sunholo-0.91.0.dist-info/WHEEL,sha256=cVxcB9AmuTcXqmwrtPhNK88dr7IR_b6qagTj0UvIEbY,91
-sunholo-0.91.0.dist-info/entry_points.txt,sha256=bZuN5AIHingMPt4Ro1b_T-FnQvZ3teBes-3OyO0asl4,49
-sunholo-0.91.0.dist-info/top_level.txt,sha256=wt5tadn5--5JrZsjJz2LceoUvcrIvxjHJe-RxuudxAk,8
-sunholo-0.91.0.dist-info/RECORD,,
+sunholo-0.91.2.dist-info/LICENSE.txt,sha256=SdE3QjnD3GEmqqg9EX3TM9f7WmtOzqS1KJve8rhbYmU,11345
+sunholo-0.91.2.dist-info/METADATA,sha256=POJto1kGkfk5Bp3a_jzmO-0iUKwHAHfv1yrsVo0hsU8,7806
+sunholo-0.91.2.dist-info/WHEEL,sha256=cVxcB9AmuTcXqmwrtPhNK88dr7IR_b6qagTj0UvIEbY,91
+sunholo-0.91.2.dist-info/entry_points.txt,sha256=bZuN5AIHingMPt4Ro1b_T-FnQvZ3teBes-3OyO0asl4,49
+sunholo-0.91.2.dist-info/top_level.txt,sha256=wt5tadn5--5JrZsjJz2LceoUvcrIvxjHJe-RxuudxAk,8
+sunholo-0.91.2.dist-info/RECORD,,