sunholo 0.77.1__py3-none-any.whl → 0.77.2__py3-none-any.whl

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/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/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.dist-info → sunholo-0.77.2.dist-info}/METADATA

@@ -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'
@@ -102,6 +103,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: http
 Requires-Dist: fastapi ; extra == 'http'

{sunholo-0.77.1.dist-info → sunholo-0.77.2.dist-info}/RECORD

@@ -51,7 +51,7 @@ 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=T4we3tGmqUj4tPwxQr9M6AXv_BALqZV_dRSvINan-oU,10374
+sunholo/components/llm.py,sha256=WPzZQ-S4D6S5ULH2dK6ps1Qy9Jp6qMXt3dGd9iNBUNY,10394
 sunholo/components/retriever.py,sha256=BFUw_6turT3CQJZWv_uXylmH5fHdb0gKfKJrQ_j6MGY,6533
 sunholo/components/vectorstore.py,sha256=zUJ90L1S4IyxLB0JUWopeuwVjcsSqdhj1QreEfsJhsE,5548
 sunholo/database/__init__.py,sha256=Zz0Shcq-CtStf9rJGIYB_Ybzb8rY_Q9mfSj-nviM490,241
@@ -79,7 +79,7 @@ sunholo/gcs/download_folder.py,sha256=mfntDA3Gl-7quMK9_eSTWvUOY1330jF--1cb62C0K1
 sunholo/gcs/download_url.py,sha256=iCIPESi2viQ-TcCINpbJXxUt7XJFFpF0KiVgSA6zFis,5228
 sunholo/gcs/metadata.py,sha256=C9sMPsHsq1ETetdQCqB3EBs3Kws8b8QHS9L7ei_v5aw,891
 sunholo/invoke/__init__.py,sha256=Dxivd9cU92X4v2JAZet4f7L2RJ5l_30rt9t2NiD-iLA,55
-sunholo/invoke/invoke_vac_utils.py,sha256=0JkCZDBEkRImzuB-nf70dF75t0WKtgA9G4TdaQJUB08,5240
+sunholo/invoke/invoke_vac_utils.py,sha256=MLqmHVIqde7c5Qf1DvZYO5JITbjV7oWWIblaD8a_RSM,5269
 sunholo/langfuse/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 sunholo/langfuse/callback.py,sha256=CTaos8sYcrga949BG6lIZ4I62DiiQSHxwz5re9XjDWQ,1677
 sunholo/langfuse/prompts.py,sha256=EkbzSw9Jr05ULMsRDoGOp-frbtCZpnvdYSJEYNpzfX8,1293
@@ -121,16 +121,16 @@ sunholo/utils/timedelta.py,sha256=BbLabEx7_rbErj_YbNM0MBcaFN76DC4PTe4zD2ucezg,49
 sunholo/utils/user_ids.py,sha256=SQd5_H7FE7vcTZp9AQuQDWBXd4FEEd7TeVMQe1H4Ny8,292
 sunholo/utils/version.py,sha256=P1QAJQdZfT2cMqdTSmXmcxrD2PssMPEGM-WI6083Fck,237
 sunholo/vertex/__init__.py,sha256=tMd7ysJ1uwBjfFSn8JL0uS3-s6h_X4GAUBz8AArZEF0,339
-sunholo/vertex/extensions_call.py,sha256=W20AMcPdyJYQvkTdIEo0VTMiuvreRNoTsVd7vcMJfCE,13793
+sunholo/vertex/extensions_call.py,sha256=eUPVoWtsEnQqUYYY28sGgJcRh1GLz31-ylxmyzzzUV8,13816
 sunholo/vertex/extensions_class.py,sha256=a1EEP3SHyHCVeA_tcYkud_oG1hw6liBsFsJpEaqs4MA,21026
 sunholo/vertex/genai_functions.py,sha256=EODgy8_5KlKuhNY4h63F3vbEcpp5qcleabKm6maVvGk,2044
 sunholo/vertex/init.py,sha256=uyg76EqS39jWJ2gxMqXOLWP6MQ2hc81wFdwgG86ZoCM,2868
 sunholo/vertex/memory_tools.py,sha256=pomHrDKqvY8MZxfUqoEwhdlpCvSGP6KmFJMVKOimXjs,6842
 sunholo/vertex/safety.py,sha256=S9PgQT1O_BQAkcqauWncRJaydiP8Q_Jzmu9gxYfy1VA,2482
 sunholo/vertex/type_dict_to_json.py,sha256=uTzL4o9tJRao4u-gJOFcACgWGkBOtqACmb6ihvCErL8,4694
-sunholo-0.77.1.dist-info/LICENSE.txt,sha256=SdE3QjnD3GEmqqg9EX3TM9f7WmtOzqS1KJve8rhbYmU,11345
-sunholo-0.77.1.dist-info/METADATA,sha256=KvkeVR7-RfMUBwj0WH_c40XSYpjaO1lwbc1Vp76AD-k,7136
-sunholo-0.77.1.dist-info/WHEEL,sha256=Z4pYXqR_rTB7OWNDYFOm1qRk0RX6GFP2o8LgvP453Hk,91
-sunholo-0.77.1.dist-info/entry_points.txt,sha256=bZuN5AIHingMPt4Ro1b_T-FnQvZ3teBes-3OyO0asl4,49
-sunholo-0.77.1.dist-info/top_level.txt,sha256=wt5tadn5--5JrZsjJz2LceoUvcrIvxjHJe-RxuudxAk,8
-sunholo-0.77.1.dist-info/RECORD,,
+sunholo-0.77.2.dist-info/LICENSE.txt,sha256=SdE3QjnD3GEmqqg9EX3TM9f7WmtOzqS1KJve8rhbYmU,11345
+sunholo-0.77.2.dist-info/METADATA,sha256=xS_n1x1FYlsji1Wg46phwsE938jCS0c2OdFn3w9QN48,7252
+sunholo-0.77.2.dist-info/WHEEL,sha256=Z4pYXqR_rTB7OWNDYFOm1qRk0RX6GFP2o8LgvP453Hk,91
+sunholo-0.77.2.dist-info/entry_points.txt,sha256=bZuN5AIHingMPt4Ro1b_T-FnQvZ3teBes-3OyO0asl4,49
+sunholo-0.77.2.dist-info/top_level.txt,sha256=wt5tadn5--5JrZsjJz2LceoUvcrIvxjHJe-RxuudxAk,8
+sunholo-0.77.2.dist-info/RECORD,,