sunholo 0.92.5__tar.gz → 0.93.0__tar.gz

{sunholo-0.92.5 → sunholo-0.93.0}/PKG-INFO

@@ -1,9 +1,9 @@
 Metadata-Version: 2.1
 Name: sunholo
-Version: 0.92.5
+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.5.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.5 → sunholo-0.93.0}/setup.py

@@ -1,6 +1,6 @@
 from setuptools import setup, find_packages
 
-version = '0.92.5'
+version = '0.93.0'
 
 setup(
     name='sunholo',

{sunholo-0.92.5 → sunholo-0.93.0}/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-0.92.5 → sunholo-0.93.0}/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.5 → sunholo-0.93.0}/sunholo/genai/process_funcs_cls.py

@@ -255,7 +255,9 @@ class GenAIFunctionProcessor:
                         if not isinstance(fn_exec, genai.protos.FunctionDeclaration):
                             # Execute the function with the provided parameters
                             result = fn_exec(**params_obj)
-                            log.info(f"Got result from {function_name}: {result}")
+                            log.info(f"Got result from {function_name}: {result} of type: {type(result)}")
+                            if not isinstance(result, str):
+                                log.warning(f"Tool functions should return strings: {function_name} returned type: {type(result)}")
                         else:
                             fn_result = type(fn).to_dict(fn)
                             result = fn_result.get("result")
@@ -448,7 +450,7 @@ class GenAIFunctionProcessor:
                         callback.on_llm_new_token(token=token)
 
                     try:
-                            # Convert MapComposite to a standard Python dictionary
+                        # 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)
@@ -471,7 +473,7 @@ class GenAIFunctionProcessor:
                             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"
                     else:
-                        token = f"--- {fn_log} result: \n"
+                        token = f"--- {fn}() result --- \n"
                         if fn_result_json:
                             if fn_result_json.get('stdout'):
                                 text = fn_result_json.get('stdout').encode('utf-8').decode('unicode_escape')

{sunholo-0.92.5 → sunholo-0.93.0}/sunholo.egg-info/PKG-INFO

@@ -1,9 +1,9 @@
 Metadata-Version: 2.1
 Name: sunholo
-Version: 0.92.5
+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.5.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