sunholo 0.77.1__tar.gz → 0.77.2__tar.gz

{sunholo-0.77.1 → sunholo-0.77.2}/PKG-INFO

@@ -1,9 +1,9 @@
 Metadata-Version: 2.1
 Name: sunholo
-Version: 0.77.1
+Version: 0.77.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.77.1.tar.gz
+Download-URL: https://github.com/sunholo-data/sunholo-py/archive/refs/tags/v0.77.2.tar.gz
 Author: Holosun ApS
 Author-email: multivac@sunholo.com
 License: Apache License, Version 2.0
@@ -54,6 +54,7 @@ Requires-Dist: langchain-openai; extra == "all"
 Requires-Dist: langchain-google-genai; extra == "all"
 Requires-Dist: langchain_google_alloydb_pg; extra == "all"
 Requires-Dist: langchain-anthropic>=0.1.13; extra == "all"
+Requires-Dist: langchain-google-vertexai; extra == "all"
 Requires-Dist: langfuse; extra == "all"
 Requires-Dist: pg8000; extra == "all"
 Requires-Dist: pgvector; extra == "all"
@@ -108,6 +109,7 @@ Requires-Dist: google-cloud-discoveryengine; extra == "gcp"
 Requires-Dist: google-generativeai>=0.7.1; extra == "gcp"
 Requires-Dist: langchain-google-genai>=1.0.5; extra == "gcp"
 Requires-Dist: langchain_google_alloydb_pg>=0.2.2; extra == "gcp"
+Requires-Dist: langchain-google-vertexai; extra == "gcp"
 Requires-Dist: pillow; extra == "gcp"
 Provides-Extra: openai
 Requires-Dist: langchain-openai; extra == "openai"

{sunholo-0.77.1 → sunholo-0.77.2}/setup.py

@@ -1,7 +1,7 @@
 from setuptools import setup, find_packages
 
 # Define your base version
-version = '0.77.1'
+version = '0.77.2'
 
 setup(
     name='sunholo',
@@ -69,6 +69,7 @@ setup(
             "langchain-google-genai",
             "langchain_google_alloydb_pg",
             "langchain-anthropic>=0.1.13",
+            "langchain-google-vertexai",
             "langfuse",
             "pg8000",
             "pgvector",
@@ -129,6 +130,7 @@ setup(
             "google-generativeai>=0.7.1",
             "langchain-google-genai>=1.0.5",
             "langchain_google_alloydb_pg>=0.2.2",
+            "langchain-google-vertexai",
             "pillow",
 
         ],

{sunholo-0.77.1 → sunholo-0.77.2}/sunholo/components/llm.py

@@ -12,7 +12,7 @@
 #   See the License for the specific language governing permissions and
 #   limitations under the License.
 from ..logging import log
-from ..utils.config import load_config_key
+from ..utils import load_config_key, ConfigManager
 
 import os
 
@@ -57,7 +57,14 @@ def pick_streaming(vector_name):
     return False
 
 
-def llm_str_to_llm(llm_str, model=None, vector_name=None):
+def llm_str_to_llm(llm_str, model=None, vector_name=None, config=None):
+
+    if llm_str is None:
+        raise NotImplementedError("llm_str was None")
+    
+    if vector_name:
+        config = ConfigManager(vector_name)
+
     if llm_str == 'openai':
         # Setup for OpenAI LLM
         from langchain_openai import ChatOpenAI
@@ -70,7 +77,7 @@ def llm_str_to_llm(llm_str, model=None, vector_name=None):
 
     elif llm_str == 'vertex':
         # Setup for Vertex LLM
-        from langchain_community.llms import VertexAI
+        from langchain_google_vertexai import VertexAI
         if model is None:
             model = 'text-unicorn'
             log.info(f"No 'model' value in config file - selecting default {model}")
@@ -79,7 +86,7 @@ def llm_str_to_llm(llm_str, model=None, vector_name=None):
 
     elif llm_str == 'model_garden':
         from ..patches.langchain.vertexai import VertexAIModelGarden
-        model_garden_config = load_config_key("gcp_config", vector_name, kind="vacConfig")
+        model_garden_config = config.vacConfig("gcp_config")
         if model_garden_config is None:
             raise ValueError("llm='model_garden' requires a gcp_config entry in config yaml file")
         
@@ -97,16 +104,18 @@ def llm_str_to_llm(llm_str, model=None, vector_name=None):
     if llm_str is None:
         raise NotImplementedError(f'No llm implemented for {llm_str}') 
 
-def get_llm(vector_name, model=None):
-    llm_str = load_config_key("llm", vector_name, kind="vacConfig")
-    #model_lookup_filepath = get_module_filepath("lookup/model_lookup.yaml")
-    #model_lookup, _ = load_config(model_lookup_filepath)
+def get_llm(vector_name=None, model=None, config=None):
+
+    if vector_name:
+        config = ConfigManager(vector_name)
+
+    llm_str = config.vacConfig("llm")
 
     if not model:
-        model = load_config_key("model", vector_name, kind="vacConfig")
+        model = config.vacConfig("model")
 
     log.debug(f"Chose LLM: {llm_str}")
-    return llm_str_to_llm(llm_str, model=model, vector_name=vector_name)
+    return llm_str_to_llm(llm_str, model=model, config=config)
 
 def get_llm_chat(vector_name, model=None):
     llm_str = load_config_key("llm", vector_name, kind="vacConfig")

{sunholo-0.77.1 → sunholo-0.77.2}/sunholo/invoke/invoke_vac_utils.py

@@ -21,7 +21,7 @@ def invoke_vac_qa(vac_input: dict, vac_name: str, chat_history=[], stream=False)
     image_uri = vac_input.get('image_url') or vac_input.get('image_uri')
 
     if not stream:
-        log.info(f'Batch invoke_vac_qa with {vac_input=}')
+        log.warning(f'Batch invoke_vac_qa with {vac_input=}')
         vac_response = send_to_qa(
             vac_input["user_input"],
             vector_name=vac_name,
@@ -40,7 +40,8 @@ def invoke_vac_qa(vac_input: dict, vac_name: str, chat_history=[], stream=False)
             },
             user_id=user_id,
             session_id=session_id, 
-            message_source="sunholo.invoke_vac_qa.invoke")
+            message_source="sunholo.invoke_vac_qa.invoke",
+            stream=False)
         
         # ensures {'answer': answer}
         answer = parse_output(vac_response)

{sunholo-0.77.1 → sunholo-0.77.2}/sunholo/vertex/extensions_call.py

@@ -10,7 +10,7 @@ def dynamic_extension_call(question, config:ConfigManager, project_id:str=None,
 
     extensions = config.vacConfig('extensions')
     if not extensions:
-        log.warning("No extensions founded for vac: {vac}")
+        log.warning(f"No extensions founded for vac: {ConfigManager.vector_name}")
 
         return None
     

{sunholo-0.77.1 → sunholo-0.77.2}/sunholo.egg-info/PKG-INFO

@@ -1,9 +1,9 @@
 Metadata-Version: 2.1
 Name: sunholo
-Version: 0.77.1
+Version: 0.77.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.77.1.tar.gz
+Download-URL: https://github.com/sunholo-data/sunholo-py/archive/refs/tags/v0.77.2.tar.gz
 Author: Holosun ApS
 Author-email: multivac@sunholo.com
 License: Apache License, Version 2.0
@@ -54,6 +54,7 @@ Requires-Dist: langchain-openai; extra == "all"
 Requires-Dist: langchain-google-genai; extra == "all"
 Requires-Dist: langchain_google_alloydb_pg; extra == "all"
 Requires-Dist: langchain-anthropic>=0.1.13; extra == "all"
+Requires-Dist: langchain-google-vertexai; extra == "all"
 Requires-Dist: langfuse; extra == "all"
 Requires-Dist: pg8000; extra == "all"
 Requires-Dist: pgvector; extra == "all"
@@ -108,6 +109,7 @@ Requires-Dist: google-cloud-discoveryengine; extra == "gcp"
 Requires-Dist: google-generativeai>=0.7.1; extra == "gcp"
 Requires-Dist: langchain-google-genai>=1.0.5; extra == "gcp"
 Requires-Dist: langchain_google_alloydb_pg>=0.2.2; extra == "gcp"
+Requires-Dist: langchain-google-vertexai; extra == "gcp"
 Requires-Dist: pillow; extra == "gcp"
 Provides-Extra: openai
 Requires-Dist: langchain-openai; extra == "openai"

{sunholo-0.77.1 → sunholo-0.77.2}/sunholo.egg-info/requires.txt

@@ -35,6 +35,7 @@ langchain-openai
 langchain-google-genai
 langchain_google_alloydb_pg
 langchain-anthropic>=0.1.13
+langchain-google-vertexai
 langfuse
 pg8000
 pgvector
@@ -88,6 +89,7 @@ google-cloud-discoveryengine
 google-generativeai>=0.7.1
 langchain-google-genai>=1.0.5
 langchain_google_alloydb_pg>=0.2.2
+langchain-google-vertexai
 pillow
 
 [http]