sunholo 0.99.1__py3-none-any.whl → 0.99.3__py3-none-any.whl

sunholo/database/alloydb_client.py

@@ -87,7 +87,7 @@ class AlloyDBClient:
         self.password = password
         self.inst_url = ""
         if user:
-            log.info("User specified {user} - using pg8000 engine")
+            log.info(f"User specified {user} - using pg8000 engine")
             self.inst_url = self._build_instance_uri(project_id, region, cluster_name, instance_name)
             self.engine = self._create_engine_from_pg8000(user, password, self.database)
             self.engine_type = "pg8000"
@@ -204,23 +204,18 @@ class AlloyDBClient:
 
         return await self.vectorstore.asimilarity_search(query, filter=source_filter_cmd, k=k)
     
-    def create_index(self, vectorstore=None, vectorsize:int=None):
+    def create_index(self, vectorstore=None):
         from langchain_google_alloydb_pg.indexes import IVFFlatIndex
 
-        vector_size = vectorsize or get_vector_size(self.vector_name)
-        table_name = f"{self.vector_name}_vectorstore_{vector_size}"
-
-        vsize = f'''ALTER TABLE
-        "public"."{table_name}"
-        ALTER COLUMN "embedding" TYPE vector({vector_size});
-        '''
-        self.execute_sql(vsize)
-
         index = IVFFlatIndex()
         vs = vectorstore or self.vectorstore
 
         return vs.apply_vector_index(index)
+    
+    def refresh_index(self, vectorstore=None):
+        vs = vectorstore or self.vectorstore
 
+        return vs.reindex()
 
     def execute_sql(self, sql_statement):
         log.info(f"Executing sync SQL statement: {sql_statement}")
@@ -482,7 +477,7 @@ class AlloyDBClient:
         CREATE TABLE IF NOT EXISTS "{vectorstore_id}" (
         langchain_id UUID NOT NULL,
         content TEXT NOT NULL,
-        embedding vector NOT NULL,
+        embedding vector({vector_size}) NOT NULL,
         source TEXT,
         langchain_metadata JSONB,
         docstore_doc_id UUID,

sunholo/genai/process_funcs_cls.py

@@ -450,10 +450,18 @@ class GenAIFunctionProcessor:
                         callback.on_llm_new_token(token=token)
 
                     try:
+                        log.info(f"{fn_log} created a result={type(fn_result)=}")
                         # Convert MapComposite to a standard Python dictionary
                         if isinstance(fn_result, proto.marshal.collections.maps.MapComposite):
                             fn_result = dict(fn_result)
-                        fn_result_json = json.loads(fn_result)
+                            if isinstance(fn_result, str):
+                                fn_result_json = json.loads(fn_result)
+                            else:
+                                fn_result_json = fn_result
+                        elif isinstance(fn_result, dict):
+                            fn_result_json = fn_result
+                        else:
+                            log.warning(f"Unrecognised result: {type(fn_result)}")
                         if not isinstance(fn_result_json, dict):
                             log.warning(f"{fn_result} was loaded but is not a dictionary")
                             fn_result_json = None
@@ -461,17 +469,17 @@ class GenAIFunctionProcessor:
                         log.warning(f"{fn_result} was not JSON decoded")
                         fn_result_json = None
                     except Exception as err:
-                        log.warning(f"{fn_result} was not json decoded due to unknown exception: {str(err)}")
+                        log.warning(f"{fn_result} was not json decoded due to unknown exception: {str(err)} {traceback.format_exc()}")
                         fn_result_json = None
 
                     if fn == "decide_to_go_on":
-                        log.info(f"{fn_result_json} {fn_result=} {type(fn_result)}")
-                        go_on_args = fn_result_json
+                        log.info(f"{fn_result=} {type(fn_result)}")
+                        go_on_args = fn_result
                         if go_on_args:
                             token = f"\n{'STOPPING' if not go_on_args.get('go_on') else 'CONTINUE'}: {go_on_args.get('chat_summary')}\n"
                         else:
                             log.warning(f"{fn_result_json} did not work for decide_to_go_on")
-                            token = f"Error calling decide_to_go_on with {fn_result_json}\n"
+                            token = f"Error calling decide_to_go_on with {fn_result}\n"
                     else:
                         token = f"--- {fn_log} result --- \n"
                         if fn_result_json:
@@ -546,4 +554,5 @@ class GenAIFunctionProcessor:
         Returns:
             boolean: True to carry on, False to continue
         """
-        return json.dumps({"go_on": go_on, "chat_summary": chat_summary})
+        return {"go_on": go_on, "chat_summary": chat_summary}
+    

{sunholo-0.99.1.dist-info → sunholo-0.99.3.dist-info}/METADATA

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

{sunholo-0.99.1.dist-info → sunholo-0.99.3.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=2lzD7oV-jq1xI5157xZ5uByTKi0-Kk7us0fH3WSY7Ck,19176
+sunholo/database/alloydb_client.py,sha256=UQpmILNeInuqMrMgf-AeIB7_I44AgJuR_WSrBafDC_k,18986
 sunholo/database/database.py,sha256=VqhZdkXUNdvWn8sUcUV3YNby1JDVf7IykPVXWBtxo9U,7361
 sunholo/database/lancedb.py,sha256=DyfZntiFKBlVPaFooNN1Z6Pl-LAs4nxWKKuq8GBqN58,715
 sunholo/database/static_dbs.py,sha256=8cvcMwUK6c32AS2e_WguKXWMkFf5iN3g9WHzsh0C07Q,442
@@ -86,7 +86,7 @@ sunholo/gcs/download_url.py,sha256=q1NiJSvEhdNrmU5ZJ-sBCMC_J5CxzrajY8LRgdPOV_M,6
 sunholo/gcs/metadata.py,sha256=oQLcXi4brsZ74aegWyC1JZmhlaEV270HS5_UWtAYYWE,898
 sunholo/genai/__init__.py,sha256=dBl6IA3-Fx6-Vx81r0XqxHlUq6WeW1iDX188dpChu8s,115
 sunholo/genai/init.py,sha256=yG8E67TduFCTQPELo83OJuWfjwTnGZsyACospahyEaY,687
-sunholo/genai/process_funcs_cls.py,sha256=sFM5WxzZW02H9FC80ZZ_fcTv2OBRwuueeR7JoWPuM78,24362
+sunholo/genai/process_funcs_cls.py,sha256=CJCYA5fHAjYaF2uu-H9HzCPEhvGLlRITU2AHZcPz20k,24821
 sunholo/genai/safety.py,sha256=mkFDO_BeEgiKjQd9o2I4UxB6XI7a9U-oOFjZ8LGRUC4,1238
 sunholo/invoke/__init__.py,sha256=o1RhwBGOtVK0MIdD55fAIMCkJsxTksi8GD5uoqVKI-8,184
 sunholo/invoke/async_class.py,sha256=uvCP8ekUCfTRWk7xwofTzRqFykMAwrRZ4Ce_YUR6PVs,2820
@@ -144,9 +144,9 @@ sunholo/vertex/init.py,sha256=1OQwcPBKZYBTDPdyU7IM4X4OmiXLdsNV30C-fee2scQ,2875
 sunholo/vertex/memory_tools.py,sha256=tBZxqVZ4InTmdBvLlOYwoSEWu4-kGquc-gxDwZCC4FA,7667
 sunholo/vertex/safety.py,sha256=S9PgQT1O_BQAkcqauWncRJaydiP8Q_Jzmu9gxYfy1VA,2482
 sunholo/vertex/type_dict_to_json.py,sha256=uTzL4o9tJRao4u-gJOFcACgWGkBOtqACmb6ihvCErL8,4694
-sunholo-0.99.1.dist-info/LICENSE.txt,sha256=SdE3QjnD3GEmqqg9EX3TM9f7WmtOzqS1KJve8rhbYmU,11345
-sunholo-0.99.1.dist-info/METADATA,sha256=APy3Yi0OiehX4Nix3bfmhrQE7HC9O9JeBaoPC7yxZkM,8310
-sunholo-0.99.1.dist-info/WHEEL,sha256=GV9aMThwP_4oNCtvEC2ec3qUYutgWeAzklro_0m4WJQ,91
-sunholo-0.99.1.dist-info/entry_points.txt,sha256=bZuN5AIHingMPt4Ro1b_T-FnQvZ3teBes-3OyO0asl4,49
-sunholo-0.99.1.dist-info/top_level.txt,sha256=wt5tadn5--5JrZsjJz2LceoUvcrIvxjHJe-RxuudxAk,8
-sunholo-0.99.1.dist-info/RECORD,,
+sunholo-0.99.3.dist-info/LICENSE.txt,sha256=SdE3QjnD3GEmqqg9EX3TM9f7WmtOzqS1KJve8rhbYmU,11345
+sunholo-0.99.3.dist-info/METADATA,sha256=ZbYM2dfChl6nLGkN5OB5SbYiS7CSEyLoKkdTJKteFss,8310
+sunholo-0.99.3.dist-info/WHEEL,sha256=GV9aMThwP_4oNCtvEC2ec3qUYutgWeAzklro_0m4WJQ,91
+sunholo-0.99.3.dist-info/entry_points.txt,sha256=bZuN5AIHingMPt4Ro1b_T-FnQvZ3teBes-3OyO0asl4,49
+sunholo-0.99.3.dist-info/top_level.txt,sha256=wt5tadn5--5JrZsjJz2LceoUvcrIvxjHJe-RxuudxAk,8
+sunholo-0.99.3.dist-info/RECORD,,