sunholo 0.92.6__py3-none-any.whl → 0.93.0__py3-none-any.whl

sunholo/components/llm.py

@@ -87,18 +87,25 @@ def llm_str_to_llm(llm_str, model=None, vector_name=None, config=None):
     elif llm_str == 'genai':
         from langchain_google_genai import ChatGoogleGenerativeAI
         if model is None:
-            model = "gemini-pro"
+            model = "gemini-1.5-pro"
             log.info(f"No 'model' value in config file - selecting default {model}")
         
         return ChatGoogleGenerativeAI(model=model)
 
     elif llm_str == 'vertex':
         # Setup for Vertex LLM
-        from langchain_google_vertexai import VertexAI
+        
         if model is None:
-            model = 'text-unicorn'
+            model = 'gemini-1.5-pro'
             log.info(f"No 'model' value in config file - selecting default {model}")
+        if model.startswith('claude'):
+            from langchain_google_vertexai.model_garden import ChatAnthropicVertex
+            gcp_config = config.vacConfig("gcp_config")
+            return ChatAnthropicVertex(model_name=model, 
+                                    project=gcp_config.get('project_id'), 
+                                    location=gcp_config.get('location'))
             
+        from langchain_google_vertexai import VertexAI
         return VertexAI(model_name = model, temperature=0, max_output_tokens=1024)
 
     elif llm_str == 'model_garden':
@@ -116,13 +123,16 @@ def llm_str_to_llm(llm_str, model=None, vector_name=None, config=None):
         if model is None:
             model = 'claude-3-5-sonnet-20240620'
             log.info(f"No 'model' value in config file - selecting default {model}")
+
         return ChatAnthropic(model_name = model, temperature=0)
+    
     elif llm_str == 'anthropic-vertex':
         from langchain_google_vertexai.model_garden import ChatAnthropicVertex
         if model is None:
             model = "claude-3-5-sonnet@20240620"
             log.info(f"No 'model' value in config file - selecting default {model}")
         gcp_config = config.vacConfig("gcp_config")
+
         return ChatAnthropicVertex(model_name=model, 
                                    project=gcp_config.get('project_id'), 
                                    location=gcp_config.get('location'))
@@ -171,7 +181,13 @@ def get_llm_chat(vector_name:str=None, model=None, config:ConfigManager=None):
         if model is None:
             model = 'gemini-1.0-pro'
             log.info(f"No 'model' value in config file - selecting default {model}")
-            
+        if model.startswith('claude'):
+            from langchain_google_vertexai.model_garden import ChatAnthropicVertex
+            gcp_config = config.vacConfig("gcp_config")
+            return ChatAnthropicVertex(model_name=model, 
+                                    project=gcp_config.get('project_id'), 
+                                    location=gcp_config.get('location'))
+        
         return ChatVertexAI(model_name = model, temperature=0, max_output_tokens=1024)
     
     elif llm_str == 'gemini':
@@ -189,6 +205,7 @@ def get_llm_chat(vector_name:str=None, model=None, config:ConfigManager=None):
             log.info(f"No 'model' value in config file - selecting default {model}")
 
         return ChatAnthropic(model_name = model, temperature=0)
+    
     elif llm_str == 'azure':
         from langchain_openai import AzureChatOpenAI
         azure_config = config.vacConfig("azure")

sunholo/database/alloydb_client.py

@@ -197,6 +197,7 @@ class AlloyDBClient:
         return await self.vectorstore.asimilarity_search(query, filter=source_filter_cmd, k=k)
 
     def execute_sql(self, sql_statement):
+        log.info(f"Executing sync SQL statement: {sql_statement}")
         if self.engine_type == "pg8000":
             return self._execute_sql_pg8000(sql_statement)
         elif self.engine_type == "langchain":
@@ -228,6 +229,7 @@ class AlloyDBClient:
         return result
     
     async def execute_sql_async(self, sql_statement):
+        log.info(f"Executing async SQL statement: {sql_statement}")
         if self.engine_type == "pg8000":
             result = await self._execute_sql_async_pg8000(sql_statement)
         elif self.engine_type == "langchain":
@@ -273,13 +275,30 @@ class AlloyDBClient:
             raise ValueError("The 'source' parameter must be a single string, not a list of strings or other iterable.")
 
         table_name = f"{vector_name}_docstore"
-        doc_id = generate_uuid_from_object_id(source)
+        #doc_id = generate_uuid_from_object_id(source)
+
+        query = f"""
+            SELECT page_content, source, langchain_metadata, images_gsurls, doc_id::text as doc_id
+            FROM "{table_name}"
+            WHERE source = '{source}'
+            LIMIT 500;
+        """
+
+        return query
+
+    def _get_document_via_docid(self, source:str, vector_name:str, doc_id: str):
+        if not isinstance(source, str):
+            raise ValueError("The 'source' parameter must be a single string, not a list of strings or other iterable.")
+
+        table_name = f"{vector_name}_docstore"
+        if not doc_id:
+            doc_id = generate_uuid_from_object_id(source)
 
         query = f"""
             SELECT page_content, source, langchain_metadata, images_gsurls, doc_id::text as doc_id
             FROM "{table_name}"
             WHERE doc_id = '{doc_id}'
-            LIMIT 1;
+            LIMIT 50;
         """
 
         return query

{sunholo-0.92.6.dist-info → sunholo-0.93.0.dist-info}/METADATA

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

{sunholo-0.92.6.dist-info → sunholo-0.93.0.dist-info}/RECORD

@@ -54,12 +54,12 @@ sunholo/cli/sun_rich.py,sha256=UpMqeJ0C8i0pkue1AHnnyyX0bFJ9zZeJ7HBR6yhuA8A,54
 sunholo/cli/swagger.py,sha256=absYKAU-7Yd2eiVNUY-g_WLl2zJfeRUNdWQ0oH8M_HM,1564
 sunholo/cli/vertex.py,sha256=8130YCarxHL1UC3aqblNmUwGZTXbkdL4Y_FOnZJsWiI,2056
 sunholo/components/__init__.py,sha256=IDoylb74zFKo6NIS3RQqUl0PDFBGVxM1dfUmO7OJ44U,176
-sunholo/components/llm.py,sha256=5QkYgMoqFeFVl71w0zrLN-aKMieSlMiL2gM4aB-6uk8,12023
+sunholo/components/llm.py,sha256=Y6fx8CzlF-BpPN1kQFllbX7u0wx6zhQVPIjrNLFhE7E,12814
 sunholo/components/retriever.py,sha256=bKIVT7_18Ut3OJd0E0jyiISPnD9qkHWVjcQPT4i1_G8,7720
 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=QYEqMNuqZqDjWsUVk408eC35qmD8Tu87eI6lmYc1YbI,17547
+sunholo/database/alloydb_client.py,sha256=pD3aVT_UWEtcT8Ma1glyj6QEWHRqbNKJNKe3oau_0HA,18304
 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.92.6.dist-info/LICENSE.txt,sha256=SdE3QjnD3GEmqqg9EX3TM9f7WmtOzqS1KJve8rhbYmU,11345
-sunholo-0.92.6.dist-info/METADATA,sha256=qQpD3u4tg37RVQcIZH2Kb0cemizMQQWS-PfHgHE4nYo,7806
-sunholo-0.92.6.dist-info/WHEEL,sha256=cVxcB9AmuTcXqmwrtPhNK88dr7IR_b6qagTj0UvIEbY,91
-sunholo-0.92.6.dist-info/entry_points.txt,sha256=bZuN5AIHingMPt4Ro1b_T-FnQvZ3teBes-3OyO0asl4,49
-sunholo-0.92.6.dist-info/top_level.txt,sha256=wt5tadn5--5JrZsjJz2LceoUvcrIvxjHJe-RxuudxAk,8
-sunholo-0.92.6.dist-info/RECORD,,
+sunholo-0.93.0.dist-info/LICENSE.txt,sha256=SdE3QjnD3GEmqqg9EX3TM9f7WmtOzqS1KJve8rhbYmU,11345
+sunholo-0.93.0.dist-info/METADATA,sha256=jAwnrLLbA9YDitxozR7LjwaU9doMLczDU6yl2b81ovs,7806
+sunholo-0.93.0.dist-info/WHEEL,sha256=cVxcB9AmuTcXqmwrtPhNK88dr7IR_b6qagTj0UvIEbY,91
+sunholo-0.93.0.dist-info/entry_points.txt,sha256=bZuN5AIHingMPt4Ro1b_T-FnQvZ3teBes-3OyO0asl4,49
+sunholo-0.93.0.dist-info/top_level.txt,sha256=wt5tadn5--5JrZsjJz2LceoUvcrIvxjHJe-RxuudxAk,8
+sunholo-0.93.0.dist-info/RECORD,,