sunholo 0.56.6__py3-none-any.whl → 0.57.0__py3-none-any.whl

sunholo/agents/flask/qna_routes.py

@@ -77,9 +77,9 @@ def register_qna_routes(app, stream_interpreter, vac_interpreter):
                         generation.end(output=json.dumps(chunk))
                         span.end(output=json.dumps(chunk))
                         trace.update(output=json.dumps(chunk))
-                    yield f"###JSON_START###{json.dumps(chunk)}###JSON_END###"
   
-                    return
+                    return json.dumps(chunk)
+                
                 else:
                     # Otherwise, we yield the plain text chunks as they come in.
                     if chunk:

sunholo/chunker/splitter.py

@@ -32,12 +32,13 @@ def chunk_doc_to_docs(documents: list, extension: str = ".md", min_size: int = 8
     docstore_doc_id, documents = send_doc_to_docstore(documents, vector_name=vector_name)
 
     doc_summaries = summarise_docs(documents, vector_name=vector_name)
-    for doc in documents:
-        # Assuming each doc has a unique identifier in its metadata under 'objectId'
-        objectId = doc.metadata.get("objectId")
-        if objectId and objectId in doc_summaries:
-            # If the objectId is found in doc_summaries, add the summary location to the document's metadata
-            doc.metadata["summary_location"] = doc_summaries[objectId]
+    if doc_summaries:
+        for doc in documents:
+            # Assuming each doc has a unique identifier in its metadata under 'objectId'
+            objectId = doc.metadata.get("objectId")
+            if objectId and objectId in doc_summaries:
+                # If the objectId is found in doc_summaries, add the summary location to the document's metadata
+                doc.metadata["summary_location"] = doc_summaries[objectId]
 
     # Combine entire documents that are smaller than min_size
     combined_documents_content = ""

sunholo/cli/cli.py

@@ -1,8 +1,8 @@
 import argparse
 try:
-    from google.cloud import build_v1
+    from google.cloud.devtools import cloudbuild_v1
 except ImportError:
-    build_v1 = None
+    cloudbuild_v1 = None
 
 from ..logging import log
 
@@ -16,21 +16,21 @@ def trigger_build(args):
     Example:
         trigger_build(args) where args contains project_id, trigger_id, repo_name, and branch_name.
     """
-    if not build_v1:
+    if not cloudbuild_v1:
         log.warning("Can't deploy - google-cloud-build not installed, enable via `pip install sunholo[gcp]")
 
         return None
 
-    client = build_v1.services.cloud_build.CloudBuildClient()
+    client = cloudbuild_v1.CloudBuildClient()
     # Assuming the build source uses the path to the cloudbuild.yaml if specified.
-    source = build_v1.RepoSource(
+    source = cloudbuild_v1.RepoSource(
         project_id=args.project_id, 
         repo_name=args.repo_name, 
         branch_name=args.branch_name,
         substitutions=args.substitutions,
         dir=args.config_path  # Path to directory containing cloudbuild.yaml
     )
-    request = build_v1.RunBuildTriggerRequest(
+    request = cloudbuild_v1.RunBuildTriggerRequest(
         project_id=args.project_id, 
         trigger_id=args.trigger_id, 
         source=source
@@ -62,7 +62,7 @@ def main(args=None):
 
     Example commands:
     ```bash
-    sunholo deploy --project_id "my-gcp-project" --trigger_id "my-trigger-id" --repo_name "my-repo" --branch_name "dev" --config_path "app/vac/my_vac/"
+    sunholo deploy --vac edmonbrain --config=llm_config.yaml
     ```
     """
     parser = argparse.ArgumentParser(description="sunholo CLI tool for deploying applications using Google Cloud Build.")

sunholo/components/vectorstore.py

@@ -19,7 +19,8 @@ def pick_vectorstore(vs_str, vector_name, embeddings):
         
     if vs_str == 'supabase':
         from supabase import Client, create_client
-        from langchain.vectorstores import SupabaseVectorStore
+        from langchain_community.vectorstores import SupabaseVectorStore
+
         from ..database.database import setup_supabase
 
         log.debug(f"Initiating Supabase store: {vector_name}")

sunholo/langfuse/prompts.py

@@ -1,9 +1,22 @@
 from ..logging import log
 from ..utils import load_config_key
-import yaml
 
 # Load the YAML file
 def load_prompt_from_yaml(key, prefix="sunholo", file_path=None):
+    """
+    Returns a string you can use with Langfuse PromptTemplate.from_template() 
+
+    Will first try to load from the Langfuse prompt library, if unavailable will look in promptConfig type file.
+
+    Langfuse prompts have {{ two braces }}, Langchain prompts have { one brace }.
+
+    Example:
+
+    ```python
+    from sunholo.langfuse.prompts import load_prompt_from_yaml
+    from langchain_core.prompts import PromptTemplate
+    
+    """
     from langfuse import Langfuse
 
     # Initialize Langfuse client
@@ -20,9 +33,6 @@ def load_prompt_from_yaml(key, prefix="sunholo", file_path=None):
         return langfuse_prompt.get_langchain_prompt()
     
     except Exception as err:
-        if not file_path:
-            log.error(f"Could not fine langfuse template {langfuse_template} and no file_path was provided {str(err)}")
-            raise
-        log.warning(f"Could not find langfuse template: {langfuse_template} - {str(err)} - attempting to load from {file_path}")
+        log.warning(f"Could not find langfuse template: {langfuse_template} - {str(err)} - attempting to load from promptConfig")
 
-    return load_config_key(key, vector_name=prefix, filename="config/prompt_config.yaml")
+    return load_config_key(key, vector_name=prefix, kind="promptConfig")

sunholo/qna/parsers.py

@@ -21,18 +21,35 @@ def document_to_dict(document):
     }
 
 def parse_output(bot_output):
+    """
+    Parses VAC output assuming it has an 'answer' and an optional 'source_documents' key
+    
+    """
     if isinstance(bot_output, str):
+
         return {"answer": bot_output}
+    
     if isinstance(bot_output, dict) and 'source_documents' in bot_output:
-        if 'source_documents' in bot_output:
-            bot_output['source_documents'] = [document_to_dict(doc) for doc in bot_output['source_documents']]
-        if bot_output.get("answer", None) is None or bot_output.get("answer") == "":
+        bot_output['source_documents'] = [document_to_dict(doc) for doc in bot_output['source_documents']]
+        if not bot_output.get("answer") or bot_output.get("answer") == "":
+            bot_output['answer'] = "(No text was returned)"
+
+        return bot_output
+    
+    elif isinstance(bot_output, dict) and 'metadata' in bot_output and isinstance(bot_output.get('metadata')) and 'source_documents' in bot_output.get('metadata'):
+        metadata = bot_output.get('metadata')
+        bot_output['source_documents'] = [document_to_dict(doc) for doc in metadata['source_documents']]
+        if not bot_output.get("answer") or bot_output.get("answer") == "":
             bot_output['answer'] = "(No text was returned)"
+
         return bot_output
+    
     elif isinstance(bot_output, dict):
         if not bot_output.get("answer"):
             raise ValueError(f"VAC output was not a string or a dict with the key 'answer' - got: {bot_output}")
         else:
+
             return bot_output
+        
     else:
         log.error(f"Couldn't parse output for:\n {bot_output}")

sunholo/streaming/streaming.py

@@ -39,8 +39,6 @@ def start_streaming_chat(question,
     if not check_kwargs_support(qna_func):
         yield "No **kwargs in qna_func - please add it"
 
-    # Immediately yield to indicate the process has started.
-    yield "Thinking...\n"
     log.info(f"Streaming chat with wait time {wait_time} seconds and timeout {timeout} seconds and kwargs {kwargs}")
     # Initialize the chat
     content_buffer = ContentBuffer()
@@ -82,12 +80,6 @@ def start_streaming_chat(question,
             yield content_to_send
             content_buffer.clear()
             start = time.time() # reset timeout
-        else:
-            if time.time() - first_start < wait_time:
-                # If the initial wait period hasn't passed yet, keep sending "..."
-                yield "..."
-            else:
-                log.info("No content to send")
 
         elapsed_time = time.time() - start
         if elapsed_time > timeout: # If the elapsed time exceeds the timeout
@@ -162,9 +154,10 @@ async def start_streaming_chat_async(question, vector_name, qna_func, chat_histo
     The `start_streaming_chat_async` function is used in a coroutine that prints messages as they are generated.
     """
     
-    yield "Thinking...\n"
     log.info(f"Streaming chat with wait time {wait_time} seconds and timeout {timeout} seconds and kwargs {kwargs}")
-
+    if not check_kwargs_support(qna_func):
+        yield "No **kwargs in qna_func - please add it"
+        
     content_buffer = ContentBuffer()
     chat_callback_handler = BufferStreamingStdOutCallbackHandler(content_buffer=content_buffer, tokens=".!?\n")
 

{sunholo-0.56.6.dist-info → sunholo-0.57.0.dist-info}/METADATA

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

{sunholo-0.56.6.dist-info → sunholo-0.57.0.dist-info}/RECORD

@@ -13,7 +13,7 @@ sunholo/agents/fastapi/base.py,sha256=clk76cHbUAvU0OYJrRfCWX_5f0ACbhDsIzYBhI3wyo
 sunholo/agents/fastapi/qna_routes.py,sha256=DgK4Btu5XriOC1JaRQ4G_nWEjJfnQ0J5pyLanF6eF1g,3857
 sunholo/agents/flask/__init__.py,sha256=uqfHNw2Ru3EJ4dJEcbp86h_lkquBQPMxZbjhV_xe3rs,72
 sunholo/agents/flask/base.py,sha256=RUGWBYWeV60FatYF5sMRrxD-INU97Vodsi6JaB6i93s,763
-sunholo/agents/flask/qna_routes.py,sha256=hjUwW3-HEpE0RE2OxtnFJc_CAuzRexJxFSRXEAnFUVo,8426
+sunholo/agents/flask/qna_routes.py,sha256=k5nP_wXX4GVpuAHlVHuC0xMBnMeUc1uqYrGm7Gv_nFg,8382
 sunholo/archive/__init__.py,sha256=qNHWm5rGPVOlxZBZCpA1wTYPbalizRT7f8X4rs2t290,31
 sunholo/archive/archive.py,sha256=C-UhG5x-XtZ8VheQp92IYJqgD0V3NFQjniqlit94t18,1197
 sunholo/auth/__init__.py,sha256=4owDjSaWYkbTlPK47UHTOC0gCWbZsqn4ZIEw5NWZTlg,28
@@ -29,14 +29,14 @@ sunholo/chunker/loaders.py,sha256=xiToUVgPz2ZzcqpUAq7aNP3PTenb_rBUAFzu0JPycIg,10
 sunholo/chunker/message_data.py,sha256=iDP94dySU3Xct-gWGnB4NNRSh2luQmgJeCfQb7ktt3U,6760
 sunholo/chunker/pdfs.py,sha256=daCZ1xjn1YvxlifIyxskWNpLJLe-Q9D_Jq12MWx3tZo,2473
 sunholo/chunker/publish.py,sha256=PoT8q3XJeFCg10WrLkYhuaaXIrGVkvUD3-R9IfoWoH4,2703
-sunholo/chunker/splitter.py,sha256=CZ33xVWeYdjckd1VTrZnxuLypzzn-yKXQBFZaN7UcjI,6697
+sunholo/chunker/splitter.py,sha256=ug_v-h0wos3b7OkhmedVQs5jtLuDdFDWypvsZVYgxbU,6743
 sunholo/cli/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-sunholo/cli/cli.py,sha256=ljOso32M1u9_PAx_T2vGQtZcCTNRw8TLblinob8btAo,3352
+sunholo/cli/cli.py,sha256=9ov0GgbdM3IDC4QgqLnG4EBSiCm2_8MlRS-6G45sXJg,3279
 sunholo/components/__init__.py,sha256=RJGNEihwvRIiDScKis04RHJv4yZGI1UpXlOmuCptNZI,208
 sunholo/components/llm.py,sha256=T4we3tGmqUj4tPwxQr9M6AXv_BALqZV_dRSvINan-oU,10374
 sunholo/components/prompt.py,sha256=eZSghXkIlRzXiSrzgkG7e5ytUYq6R6LV-qjHU8jStig,6353
 sunholo/components/retriever.py,sha256=TiM-axCeaZ6CZ8rGKGx-io16JKDe8z0pnMccBi1yqHw,3509
-sunholo/components/vectorstore.py,sha256=J5zzW7Acc7A4W6dGnYTYDxST3p6W4OtckXUUwAEeaqE,4941
+sunholo/components/vectorstore.py,sha256=04t_UctPMOYMaQUbLP4bRLQlCFykdAFDcBdwArA9jkg,4952
 sunholo/database/__init__.py,sha256=Zz0Shcq-CtStf9rJGIYB_Ybzb8rY_Q9mfSj-nviM490,241
 sunholo/database/alloydb.py,sha256=18Q4AG_W-Sz8udIj3gWMkGrMWmiEelqgOwJ7VKHElV0,14877
 sunholo/database/database.py,sha256=reZrThKyKvMAQXe2RIiEKmKYmsRvGsn7e05OoXjWVSQ,7395
@@ -57,7 +57,7 @@ sunholo/gcs/download_url.py,sha256=PAwYShV-sRd9sNvuJrEOvfF1V34ovVP0omWbuwDkRrA,4
 sunholo/gcs/metadata.py,sha256=C9sMPsHsq1ETetdQCqB3EBs3Kws8b8QHS9L7ei_v5aw,891
 sunholo/langfuse/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 sunholo/langfuse/callback.py,sha256=G9xcZHpLvyzolU57ycItLaooMCtRuM37QJSWjiwQEd0,1776
-sunholo/langfuse/prompts.py,sha256=ZZ-WIVLyAUVaBzLpE-AVBSC7dpeMs6SFedfH-dnHhZw,966
+sunholo/langfuse/prompts.py,sha256=HO4Zy9usn5tKooBPCKksuw4Lff3c03Ny5wqn4ce_xZM,1217
 sunholo/llamaindex/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 sunholo/llamaindex/generate.py,sha256=l1Picr-hVwkmAUD7XmTCa63qY9ERliFHQXwyX3BqB2Q,686
 sunholo/llamaindex/import_files.py,sha256=QamEVtFXSD6Zk2La0HDgmtVPhFDdXpjzLACO--BAYpg,9378
@@ -71,21 +71,21 @@ sunholo/pubsub/__init__.py,sha256=wgkrtlL3h8uzNpnlWSHdVMOq0l5Q3D7gkxF_Rp1A6Ro,94
 sunholo/pubsub/process_pubsub.py,sha256=64hvqMsxbBrf0WGJsprz_SXf9FpjeszAIsqUSBlJrA8,2780
 sunholo/pubsub/pubsub_manager.py,sha256=M85QPCXYBPzmE8Ha0FYHdzpA-LRX9p3lu6b-UAHAyac,6400
 sunholo/qna/__init__.py,sha256=F8q1uR_HreoSX0IfmKY1qoSwIgXhO2Q8kuDSxh9_-EE,28
-sunholo/qna/parsers.py,sha256=Qn7lYsO2daWN0kDRGop5CkamIPq9wWFPEB1cP6Is7Ng,1585
+sunholo/qna/parsers.py,sha256=mH_SIgN2yXzvcoQZt9ITkdJSw3jgZGuu0p8q_H-kdSM,2140
 sunholo/qna/retry.py,sha256=gFgOf9AxrZMIO9OwOYu1EW7rhNhyfnw_o4XAsNLBOVQ,2021
 sunholo/streaming/__init__.py,sha256=k8dBqhzyS1Oi6NfADtRtWfnPtU1FU2kQz-YxH9yrNeQ,197
 sunholo/streaming/content_buffer.py,sha256=hr2ySHOTK1zw_3u-JrKwoomsAAdda2VcOxjkvJLcUuM,6596
 sunholo/streaming/langserve.py,sha256=6isOvFwZBfmiQY5N41PYPyrdJj9IgJXXHLfTzPvewGw,6299
-sunholo/streaming/streaming.py,sha256=TLLBamDs5ihvA77I30xAXu_J8vMVUmhyeJFJkTN9ess,16723
+sunholo/streaming/streaming.py,sha256=WoSRMnD-3sRxmeyxHz3miTtB6ECpj3Dw4SUCcnP0zB4,16473
 sunholo/summarise/__init__.py,sha256=MZk3dblUMODcPb1crq4v-Z508NrFIpkSWNf9FIO8BcU,38
 sunholo/summarise/summarise.py,sha256=C3HhjepTjUhUC8FLk4jMQIBvq1BcORniwuTFHjPVhVo,3784
 sunholo/utils/__init__.py,sha256=G11nN_6ATjxpuMfG_BvcUr9UU8onPIgkpTK6CjOcbr8,48
 sunholo/utils/config.py,sha256=NW2FFyNNTwCyopOvSzDQ0I0l92LAfJJ7hEzatSuoZho,8689
 sunholo/utils/gcp.py,sha256=B2G1YKjeD7X9dqO86Jrp2vPuFwZ223Xl5Tg09Ndw-oc,5760
 sunholo/utils/parsers.py,sha256=OrHmASqIbI45atVOhiGodgLvnfrzkvVzyHnSvAXD89I,3841
-sunholo-0.56.6.dist-info/LICENSE.txt,sha256=SdE3QjnD3GEmqqg9EX3TM9f7WmtOzqS1KJve8rhbYmU,11345
-sunholo-0.56.6.dist-info/METADATA,sha256=Izjem6siNara4nKFRwQbfpeXK9AsuO74q-p_fbi6-mo,6617
-sunholo-0.56.6.dist-info/WHEEL,sha256=GJ7t_kWBFywbagK5eo9IoUwLW6oyOeTKmQ-9iHFVNxQ,92
-sunholo-0.56.6.dist-info/entry_points.txt,sha256=bZuN5AIHingMPt4Ro1b_T-FnQvZ3teBes-3OyO0asl4,49
-sunholo-0.56.6.dist-info/top_level.txt,sha256=wt5tadn5--5JrZsjJz2LceoUvcrIvxjHJe-RxuudxAk,8
-sunholo-0.56.6.dist-info/RECORD,,
+sunholo-0.57.0.dist-info/LICENSE.txt,sha256=SdE3QjnD3GEmqqg9EX3TM9f7WmtOzqS1KJve8rhbYmU,11345
+sunholo-0.57.0.dist-info/METADATA,sha256=y3WkwDsEQAjtKnCr_X1rnoP4IINqlu4jtyEm0Lz4PCw,6617
+sunholo-0.57.0.dist-info/WHEEL,sha256=GJ7t_kWBFywbagK5eo9IoUwLW6oyOeTKmQ-9iHFVNxQ,92
+sunholo-0.57.0.dist-info/entry_points.txt,sha256=bZuN5AIHingMPt4Ro1b_T-FnQvZ3teBes-3OyO0asl4,49
+sunholo-0.57.0.dist-info/top_level.txt,sha256=wt5tadn5--5JrZsjJz2LceoUvcrIvxjHJe-RxuudxAk,8
+sunholo-0.57.0.dist-info/RECORD,,