sunholo 0.78.4__py3-none-any.whl → 0.78.5__py3-none-any.whl

sunholo/components/llm.py

@@ -16,15 +16,22 @@ from ..utils import load_config_key, ConfigManager
 
 import os
 
-def pick_llm(vector_name):
+def pick_llm(vector_name:str=None, config:ConfigManager=None):
+
+    if config is None:
+        if vector_name is None:
+            raise ValueError("config and vector_name was None")
+        config = ConfigManager(vector_name)
+
     log.debug('Picking llm')
     
-    llm_str = load_config_key("llm", vector_name, kind="vacConfig")
+    llm_str = config.vacConfig("llm")
     
     if llm_str == 'openai':
-        llm_chat = get_llm_chat(vector_name)
-        llm = get_llm_chat(vector_name, model="gpt-3.5-turbo-16k") # TODO: fix it needs llm_chat and not llm
-        embeddings = get_embeddings(vector_name)
+        llm_chat = get_llm_chat(config=config)
+        llm = get_llm_chat(model="gpt-3.5-turbo-16k", config=config) # TODO: fix it needs llm_chat and not llm
+        embeddings = get_embeddings(config=config)
+
         log.debug("Chose OpenAI")
     elif llm_str == 'vertex':
         llm = get_llm_chat(vector_name) # TODO: fix it needs llm_chat and not llm
@@ -62,7 +69,9 @@ 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:
+    if config is None:
+        if vector_name is None:
+            raise ValueError("vector_name and config was None")
         config = ConfigManager(vector_name)
 
     if llm_str == 'openai':
@@ -125,10 +134,16 @@ def get_llm(vector_name=None, model=None, config=None):
     log.debug(f"Chose LLM: {llm_str}")
     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")
+def get_llm_chat(vector_name:str=None, model=None, config:ConfigManager=None):
+
+    if config is None:
+        if vector_name is None:
+            raise ValueError("config and vector_name was None")
+        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}")
     # Configure LLMs based on llm_str
@@ -167,7 +182,7 @@ def get_llm_chat(vector_name, model=None):
         return ChatAnthropic(model_name = model, temperature=0)
     elif llm_str == 'azure':
         from langchain_openai import AzureChatOpenAI
-        azure_config = load_config_key("azure", vector_name, kind="vacConfig")
+        azure_config = config.vacConfig("azure")
         if not azure_config:
             raise ValueError("Need to configure azure.config if llm='azure'")
 
@@ -209,22 +224,37 @@ def get_llm_chat(vector_name, model=None):
     if llm_str is None:
         raise NotImplementedError(f'No llm implemented for {llm_str}')
 
-def get_embeddings(vector_name):
+def get_embeddings(vector_name=None, config:ConfigManager=None):
+
+    if not config:
+        if not vector_name:
+            raise ValueError(f"config and vector_name was None: {vector_name}")
+        config = ConfigManager(vector_name)
+    
 
     llm_str = None
-    embed_dict = load_config_key("embedder", vector_name, kind="vacConfig")
+    embed_dict = config.vacConfig("embedder")
 
     if embed_dict:
         llm_str = embed_dict.get('llm')
 
     if llm_str is None:
-        llm_str = load_config_key("llm", vector_name, kind="vacConfig")
+        llm_str = config.vacConfig("llm")
+    
+    if llm_str is None:
+        raise ValueError(f"llm_str was None: {llm_str}")
 
-    return pick_embedding(llm_str, vector_name=vector_name)
+    return pick_embedding(llm_str, config=config)
 
 
 #TODO: specify model
-def pick_embedding(llm_str: str, vector_name: str=None):
+def pick_embedding(llm_str: str, vector_name: str=None, config: ConfigManager=None):
+
+    if not config:
+        if not vector_name:
+            raise ValueError(f"config and vector_name was None {vector_name}")
+        config = ConfigManager(vector_name)
+
     # get embedding directly from llm_str
     # Configure embeddings based on llm_str
     if llm_str == 'openai':
@@ -244,7 +274,7 @@ def pick_embedding(llm_str: str, vector_name: str=None):
     elif llm_str == 'azure':
         from langchain_openai import AzureOpenAIEmbeddings
         
-        azure_config = load_config_key("azure", vector_name, kind="vacConfig")
+        azure_config = config.vacConfig("azure")
         if not azure_config:
             raise ValueError("Need to configure azure.config if llm='azure'")
 

sunholo/components/retriever.py

@@ -26,8 +26,14 @@ from langchain.retrievers import ContextualCompressionRetriever
 
 
 
-def load_memories(vector_name):
-    memories = ConfigManager(vector_name).vacConfig("memory")
+def load_memories(vector_name:str=None, config:ConfigManager=None):
+    if config is None:
+        if vector_name is None:
+            raise ValueError("vector_name and config were none")
+        config = ConfigManager(vector_name)
+
+    memories = config.vacConfig("memory")
+    
     log.info(f"Found memory settings for {vector_name}: {memories}")
     if not memories or len(memories) == 0:
         log.info(f"No memory settings found for {vector_name}")

sunholo/embedder/embed_chunk.py

@@ -22,6 +22,7 @@ from langchain.schema import Document
 from ..components import get_embeddings, pick_vectorstore, load_memories, pick_embedding
 from ..logging import log
 from ..database.uuid import generate_uuid_from_object_id
+from ..utils import ConfigManager
 
 def embed_pubsub_chunk(data: dict):
     """Triggered from a message on a Cloud Pub/Sub topic "embed_chunk" topic
@@ -63,6 +64,9 @@ def embed_pubsub_chunk(data: dict):
         log.error(msg)
         return msg
     
+    config = ConfigManager(vector_name)
+    log.info(f"{config=}")
+    
     log.info(f"Embedding: {vector_name} page_content: {page_content[:30]}...[{len(page_content)}] - {metadata}")
 
     if 'eventTime' not in metadata:
@@ -102,9 +106,9 @@ def embed_pubsub_chunk(data: dict):
     doc = Document(page_content=page_content, metadata=metadata)
 
     # init embedding and vector store
-    embeddings = get_embeddings(vector_name)
+    embeddings = get_embeddings(config=config)
 
-    memories = load_memories(vector_name)
+    memories = load_memories(config=config)
     vectorstore_list = []
     for memory in memories:  # Iterate over the list
         for key, value in memory.items(): 
@@ -114,7 +118,7 @@ def embed_pubsub_chunk(data: dict):
                 # check if vectorstore specific embedding is available
                 embed_llm = value.get('llm')
                 if embed_llm:
-                    embeddings = pick_embedding(embed_llm)
+                    embeddings = pick_embedding(embed_llm, config=config)
                 # check if read only
                 read_only = value.get('read_only')
                 if read_only:

{sunholo-0.78.4.dist-info → sunholo-0.78.5.dist-info}/METADATA

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

{sunholo-0.78.4.dist-info → sunholo-0.78.5.dist-info}/RECORD

@@ -54,8 +54,8 @@ 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=QTTpqUhfj7u9Ty9-E-XL8dpg4fp19z64FdRC1zbTHVo,10698
-sunholo/components/retriever.py,sha256=BFUw_6turT3CQJZWv_uXylmH5fHdb0gKfKJrQ_j6MGY,6533
+sunholo/components/llm.py,sha256=XhSFuvthK35LDirX-zUbeLrLU8ccLSGxdJOOQovBGEM,11481
+sunholo/components/retriever.py,sha256=F-wgZMpGJ8mGxJMAHA7HNgDwEhnvq1Pd6EGnTuBFlY8,6719
 sunholo/components/vectorstore.py,sha256=zUJ90L1S4IyxLB0JUWopeuwVjcsSqdhj1QreEfsJhsE,5548
 sunholo/database/__init__.py,sha256=Zz0Shcq-CtStf9rJGIYB_Ybzb8rY_Q9mfSj-nviM490,241
 sunholo/database/alloydb.py,sha256=d9W0pbZB0jTVIGF5OVaQ6kXHo-X3-6e9NpWNmV5e9UY,10464
@@ -75,7 +75,7 @@ sunholo/discovery_engine/chunker_handler.py,sha256=fDqvXeXr58s6TB75MMIGKKEg42T21
 sunholo/discovery_engine/create_new.py,sha256=7oZG78T6lW0EspRzlo7-qRyXFSuFxDn2dfSAVEaqlqY,978
 sunholo/discovery_engine/discovery_engine_client.py,sha256=YYsFeaW41l8jmWCruQnYxJGKEYBZ7dduTBDhdxI63hQ,17719
 sunholo/embedder/__init__.py,sha256=sI4N_CqgEVcrMDxXgxKp1FsfsB4FpjoXgPGkl4N_u4I,44
-sunholo/embedder/embed_chunk.py,sha256=8BJ90tR0_JbCcsVCzrtPdZn6sVys0OhXSxLszlve_ko,6819
+sunholo/embedder/embed_chunk.py,sha256=FFr5pDvFCsWNS5JnTjuf1aCpg4Qlut83wqndneavnj8,6944
 sunholo/gcs/__init__.py,sha256=SZvbsMFDko40sIRHTHppA37IijvJTae54vrhooEF5-4,90
 sunholo/gcs/add_file.py,sha256=m-iQeYAmdXxy2EJ1uMmM3gx-eKbTcNpfsAyRd4sL_hA,7120
 sunholo/gcs/download_folder.py,sha256=mfntDA3Gl-7quMK9_eSTWvUOY1330jF--1cb62C0K1E,1607
@@ -132,9 +132,9 @@ 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.78.4.dist-info/LICENSE.txt,sha256=SdE3QjnD3GEmqqg9EX3TM9f7WmtOzqS1KJve8rhbYmU,11345
-sunholo-0.78.4.dist-info/METADATA,sha256=Ic8NbVh3Y5f0OZxVu18aB9QaI5PcIamIG3DDPzH6_6o,7348
-sunholo-0.78.4.dist-info/WHEEL,sha256=Z4pYXqR_rTB7OWNDYFOm1qRk0RX6GFP2o8LgvP453Hk,91
-sunholo-0.78.4.dist-info/entry_points.txt,sha256=bZuN5AIHingMPt4Ro1b_T-FnQvZ3teBes-3OyO0asl4,49
-sunholo-0.78.4.dist-info/top_level.txt,sha256=wt5tadn5--5JrZsjJz2LceoUvcrIvxjHJe-RxuudxAk,8
-sunholo-0.78.4.dist-info/RECORD,,
+sunholo-0.78.5.dist-info/LICENSE.txt,sha256=SdE3QjnD3GEmqqg9EX3TM9f7WmtOzqS1KJve8rhbYmU,11345
+sunholo-0.78.5.dist-info/METADATA,sha256=seWt-IjHlh20kmVCIeYAftXTj7OPKwqVvdOZhZ4J7KM,7348
+sunholo-0.78.5.dist-info/WHEEL,sha256=Z4pYXqR_rTB7OWNDYFOm1qRk0RX6GFP2o8LgvP453Hk,91
+sunholo-0.78.5.dist-info/entry_points.txt,sha256=bZuN5AIHingMPt4Ro1b_T-FnQvZ3teBes-3OyO0asl4,49
+sunholo-0.78.5.dist-info/top_level.txt,sha256=wt5tadn5--5JrZsjJz2LceoUvcrIvxjHJe-RxuudxAk,8
+sunholo-0.78.5.dist-info/RECORD,,