sunholo 0.55.15__py3-none-any.whl → 0.56.1__py3-none-any.whl

sunholo/agents/flask/qna_routes.py

@@ -23,13 +23,6 @@ from ...streaming import start_streaming_chat
 from ...archive import archive_qa
 from ...logging import log
 from ...utils.config import load_config
-
-try:
-    from langfuse import Langfuse
-    langfuse = Langfuse()
-except ImportError as err:
-    print(f"No langfuse installed for agents.flask.register_qna_routes, install via `pip install sunholo[http]` - {str(err)}")
-    langfuse = None
  
 try:
     from flask import request, jsonify, Response
@@ -103,9 +96,6 @@ def register_qna_routes(app, stream_interpreter, vac_interpreter):
             generation.end(output=response)
             span.end(output=response)
             trace.update(output=response)
-        
-        if langfuse:
-            langfuse.flush()  
 
         return response
 
@@ -153,9 +143,6 @@ def register_qna_routes(app, stream_interpreter, vac_interpreter):
         if trace:
             span.end(output=jsonify(bot_output))
             trace.update(output=jsonify(bot_output)) 
-       
-        if langfuse:
-            langfuse.flush()
 
         return jsonify(bot_output)
 

sunholo/cli/cli.py

@@ -0,0 +1,12 @@
+# sunholo/cli/cli.py
+import argparse
+
+def main():
+    parser = argparse.ArgumentParser(description="sunholo CLI tool.")
+    parser.add_argument('--echo', help='Echo the string you use here')
+    args = parser.parse_args()
+    if args.echo:
+        print(args.echo)
+
+if __name__ == "__main__":
+    main()

sunholo/components/llm.py

@@ -19,7 +19,7 @@ import os
 def pick_llm(vector_name):
     log.debug('Picking llm')
     
-    llm_str = load_config_key("llm", vector_name, filename = "config/llm_config.yaml")
+    llm_str = load_config_key("llm", vector_name, kind="vacConfig")
     
     if llm_str == 'openai':
         llm_chat = get_llm_chat(vector_name)
@@ -49,7 +49,7 @@ def pick_llm(vector_name):
 
 def pick_streaming(vector_name):
     
-    llm_str = load_config_key("llm", vector_name, filename = "config/llm_config.yaml")
+    llm_str = load_config_key("llm", vector_name, kind="vacConfig")
     
     if llm_str == 'openai' or llm_str == 'gemini' or llm_str == 'vertex':
         return True
@@ -57,7 +57,7 @@ def pick_streaming(vector_name):
     return False
 
 
-def llm_str_to_llm(llm_str, model=None, vector_name=None, config_file="config/llm_config.yaml"):
+def llm_str_to_llm(llm_str, model=None, vector_name=None):
     if llm_str == 'openai':
         # Setup for OpenAI LLM
         from langchain_openai import ChatOpenAI
@@ -79,7 +79,7 @@ def llm_str_to_llm(llm_str, model=None, vector_name=None, config_file="config/ll
 
     elif llm_str == 'model_garden':
         from ..patches.langchain.vertexai import VertexAIModelGarden
-        model_garden_config = load_config_key("gcp_config", vector_name, filename = config_file)
+        model_garden_config = load_config_key("gcp_config", vector_name, kind="vacConfig")
         if model_garden_config is None:
             raise ValueError("llm='model_garden' requires a gcp_config entry in config yaml file")
         
@@ -97,21 +97,21 @@ def llm_str_to_llm(llm_str, model=None, vector_name=None, config_file="config/ll
     if llm_str is None:
         raise NotImplementedError(f'No llm implemented for {llm_str}') 
 
-def get_llm(vector_name, model=None, config_file="config/llm_config.yaml"):
-    llm_str = load_config_key("llm", vector_name, filename=config_file)
+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)
 
     if not model:
-        model = load_config_key("model", vector_name, filename=config_file)
+        model = load_config_key("model", vector_name, kind="vacConfig")
 
     log.debug(f"Chose LLM: {llm_str}")
-    return llm_str_to_llm(llm_str, model=model, vector_name=vector_name, config_file=config_file)
+    return llm_str_to_llm(llm_str, model=model, vector_name=vector_name, kind="vacConfig")
 
 def get_llm_chat(vector_name, model=None, config_file="config/llm_config.yaml"):
-    llm_str = load_config_key("llm", vector_name, filename=config_file)
+    llm_str = load_config_key("llm", vector_name, kind="vacConfig")
     if not model:
-        model = load_config_key("model", vector_name, filename=config_file)
+        model = load_config_key("model", vector_name, kind="vacConfig")
 
     log.debug(f"Chose LLM: {llm_str}")
     # Configure LLMs based on llm_str
@@ -150,7 +150,7 @@ def get_llm_chat(vector_name, model=None, config_file="config/llm_config.yaml"):
         return ChatAnthropic(model_name = model, temperature=0)
     elif llm_str == 'azure':
         from langchain_openai import AzureChatOpenAI
-        azure_config = load_config_key("azure", vector_name, filename="config/llm_config.yaml")
+        azure_config = load_config_key("azure", vector_name, kind="vacConfig")
         if not azure_config:
             raise ValueError("Need to configure azure.config if llm='azure'")
 
@@ -195,13 +195,13 @@ def get_llm_chat(vector_name, model=None, config_file="config/llm_config.yaml"):
 def get_embeddings(vector_name):
 
     llm_str = None
-    embed_dict = load_config_key("embedder", vector_name, filename="config/llm_config.yaml")
+    embed_dict = load_config_key("embedder", vector_name, kind="vacConfig")
 
     if embed_dict:
         llm_str = embed_dict.get('llm')
 
     if llm_str is None:
-        llm_str = load_config_key("llm", vector_name, filename="config/llm_config.yaml")
+        llm_str = load_config_key("llm", vector_name, kind="vacConfig")
 
     return pick_embedding(llm_str, vector_name=vector_name)
 
@@ -227,7 +227,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, filename="config/llm_config.yaml")
+        azure_config = load_config_key("azure", vector_name, kind="vacConfig")
         if not azure_config:
             raise ValueError("Need to configure azure.config if llm='azure'")
 

sunholo/logging.py

@@ -220,11 +220,16 @@ def setup_logging(logger_name=None, log_level=logging.INFO, project_id=None):
     if logger_name is None:
         logger_name = "sunholo"
 
-    if Client:
+    if Client and os.environ.get('GOOGLE_CLOUD_LOGGING') != "1":
+        print("GOOGLE_CLOUD_LOGGING != 1 but authentication with Google Cloud Logging enabled - missing env var setting?")
+
+    if not Client and os.environ.get('GOOGLE_CLOUD_LOGGING') == "1":
+        print("Found GOOGLE_CLOUD_LOGGING=1 but no GCP Client available, install via `pip install sunholo[gcp]` and/or authenticate")
+
+    if Client and os.environ.get('GOOGLE_CLOUD_LOGGING') == "1":
         # Instantiate the GoogleCloudLogging class
         gc_logger = GoogleCloudLogging(project_id, log_level=log_level, logger_name=logger_name)
     else:
-        print("Could not find GoogleCloudLogging Client, install via `pip install sunholo[gcp]`")
         return logger
     
     # Setup logging and return the logger instance

sunholo/utils/config.py

@@ -16,6 +16,7 @@ import os
 import json
 import yaml
 from datetime import datetime, timedelta
+from collections import defaultdict
 
 try:
     from google.cloud import storage
@@ -95,6 +96,58 @@ def get_module_filepath(filepath: str):
 
 # Global cache
 config_cache = {}
+def load_all_configs():
+    """
+    Load all configuration files from the specified directory into a dictionary.
+    Files are expected to be either YAML or JSON and must contain a 'kind' key at the root.
+    Caching is used to avoid reloading files within a 5-minute window.
+    """
+    from ..logging import log
+
+    config_folder = os.getenv("_CONFIG_FOLDER", os.getcwd())
+    log.debug(f"Loading all configs from folder: {config_folder}")
+    current_time = datetime.now()
+
+    configs_by_kind = defaultdict(dict)
+    for filename in os.listdir(config_folder):
+        if filename.endswith(('.yaml', '.yml', '.json')):
+            config_file = os.path.join(config_folder, filename)
+            
+            # Check cache first
+            if filename in config_cache:
+                cached_config, cache_time = config_cache[filename]
+                if (current_time - cache_time) < timedelta(minutes=5):
+                    log.debug(f"Returning cached config for {filename}")
+                    config = cached_config
+                else:
+                    config = reload_config_file(config_file, filename)
+            else:
+                config = reload_config_file(config_file, filename)
+
+            kind = config.get('kind')
+            if kind:
+                configs_by_kind[kind] = config
+            else:
+                log.warning(f"No 'kind' found in {filename}")
+
+    return configs_by_kind
+
+def reload_config_file(config_file, filename):
+    """
+    Helper function to load a config file and update the cache.
+    """
+    from ..logging import log
+    with open(config_file, 'r') as file:
+        if filename.endswith('.json'):
+            config = json.load(file)
+        else:
+            config = yaml.safe_load(file)
+    
+    config_cache[filename] = (config, datetime.now())
+    log.debug(f"Loaded and cached {filename}")
+    return config
+
+
 
 def load_config(filename: str=None) -> tuple[dict, str]:
     """
@@ -156,14 +209,15 @@ def load_config(filename: str=None) -> tuple[dict, str]:
     
     return config, filename
 
-def load_config_key(key: str, vector_name: str, filename: str=None):
+def load_config_key(key: str, vector_name: str, filename: str=None, kind: str=None):
     """
     Load a specific key from a configuration file.
 
     Args:
         key (str): The key to fetch from the configuration.
         vector_name (str): The name of the vector in the configuration file.
-        filename (str, optional): The configuration file name. Defaults to the `_CONFIG_FILE` environment variable.
+        filename (str, optional): The configuration file name. Defaults to the `_CONFIG_FILE` environment variable. Deprecated - use 'kind' instead
+        kind: (str, optional): Specify the type of configuration to retrieve e.g. 'vacConfig' which will pick from files within `_CONFIG_FOLDER`
 
     Returns:
         str: The value associated with the specified key.
@@ -179,7 +233,13 @@ def load_config_key(key: str, vector_name: str, filename: str=None):
     assert isinstance(key, str), f"key must be a string got a {type(key)}"
     assert isinstance(vector_name, str), f"vector_name must be a string, got a {type(vector_name)}"
     
-    config, filename = load_config(filename)
+    configs_by_kind = load_all_configs()
+    if kind and configs_by_kind.get(kind):
+        config = configs_by_kind[kind]
+        filename = kind
+    else:
+        config, filename = load_config(filename)
+
     log.info(f"Fetching {key} for {vector_name}")
     apiVersion = config.get('apiVersion')
     kind = config.get('kind')

{sunholo-0.55.15.dist-info → sunholo-0.56.1.dist-info}/METADATA

@@ -1,9 +1,9 @@
 Metadata-Version: 2.1
 Name: sunholo
-Version: 0.55.15
+Version: 0.56.1
 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.55.15.tar.gz
+Download-URL: https://github.com/sunholo-data/sunholo-py/archive/refs/tags/v0.56.1.tar.gz
 Author: Holosun ApS
 Author-email: multivac@sunholo.com
 License: Apache License, Version 2.0
@@ -30,6 +30,7 @@ Requires-Dist: google-cloud-alloydb-connector[pg8000] ; extra == 'all'
 Requires-Dist: google-cloud-logging ; extra == 'all'
 Requires-Dist: google-cloud-storage ; extra == 'all'
 Requires-Dist: google-cloud-pubsub ; extra == 'all'
+Requires-Dist: gunicorn ; extra == 'all'
 Requires-Dist: httpcore ; extra == 'all'
 Requires-Dist: httpx ; extra == 'all'
 Requires-Dist: lancedb ; extra == 'all'
@@ -61,11 +62,12 @@ Requires-Dist: langchain-google-alloydb-pg ; extra == 'gcp'
 Requires-Dist: google-api-python-client ; extra == 'gcp'
 Requires-Dist: google-cloud-alloydb-connector[pg8000] ; extra == 'gcp'
 Provides-Extra: http
-Requires-Dist: langfuse ; extra == 'http'
 Requires-Dist: fastapi ; extra == 'http'
 Requires-Dist: flask ; extra == 'http'
+Requires-Dist: gunicorn ; extra == 'http'
 Requires-Dist: httpcore ; extra == 'http'
 Requires-Dist: httpx ; extra == 'http'
+Requires-Dist: langfuse ; extra == 'http'
 Requires-Dist: python-socketio ; extra == 'http'
 Provides-Extra: openai
 Requires-Dist: langchain-openai ; extra == 'openai'

{sunholo-0.55.15.dist-info → sunholo-0.56.1.dist-info}/RECORD

@@ -1,5 +1,5 @@
 sunholo/__init__.py,sha256=hEN0kOEikUGBot_YIMra1nnPNmcwmO_kwvPOmLW8-_8,692
-sunholo/logging.py,sha256=z0aI0u1Bk_be3c6EDCGf0hn4JZKymYqIySbfCKOqpkQ,10881
+sunholo/logging.py,sha256=wvaT33baueD2VV5oP84duhwKKpH4os_3LtqZVWaGPIw,11226
 sunholo/agents/__init__.py,sha256=CnlbVohPt-Doth9PyROSlN3P8xMV9j9yS19YE-wCS90,341
 sunholo/agents/chat_history.py,sha256=PbwYmw1TwzI8H-cwQIGgHZ6UIr2Qb-JWow0RG3ayLM8,5195
 sunholo/agents/dispatch_to_qa.py,sha256=kWrO-CJel5kJAyyCShShpACUuZpqDOP7DN8vo_7ciao,8056
@@ -13,7 +13,7 @@ sunholo/agents/fastapi/base.py,sha256=clk76cHbUAvU0OYJrRfCWX_5f0ACbhDsIzYBhI3wyo
 sunholo/agents/fastapi/qna_routes.py,sha256=Xl05L8DjUozGMK7kKPqz7Twr4W56BnLQu_uprsTv_q0,4075
 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=A_L9w966Pb_MZSh17gcu5HxmzJdiclKaKTZ0ARaSRjg,8785
+sunholo/agents/flask/qna_routes.py,sha256=hjUwW3-HEpE0RE2OxtnFJc_CAuzRexJxFSRXEAnFUVo,8426
 sunholo/archive/__init__.py,sha256=qNHWm5rGPVOlxZBZCpA1wTYPbalizRT7f8X4rs2t290,31
 sunholo/archive/archive.py,sha256=C-UhG5x-XtZ8VheQp92IYJqgD0V3NFQjniqlit94t18,1197
 sunholo/auth/__init__.py,sha256=4owDjSaWYkbTlPK47UHTOC0gCWbZsqn4ZIEw5NWZTlg,28
@@ -30,8 +30,10 @@ sunholo/chunker/message_data.py,sha256=iDP94dySU3Xct-gWGnB4NNRSh2luQmgJeCfQb7ktt
 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/cli/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
+sunholo/cli/cli.py,sha256=i6L729GLkxcYNGFtujYxrkoILUxMvNiHmv_-Zlo7nAY,304
 sunholo/components/__init__.py,sha256=RJGNEihwvRIiDScKis04RHJv4yZGI1UpXlOmuCptNZI,208
-sunholo/components/llm.py,sha256=CMviwqnEOyCSdrVlBgXFUKF5EPyEK9oqFA7uThPK-O0,10641
+sunholo/components/llm.py,sha256=clZktcwEOwZwHE0Bl8hDRt5aDhOOEgCi1STcW0PBxc8,10430
 sunholo/components/prompt.py,sha256=eZSghXkIlRzXiSrzgkG7e5ytUYq6R6LV-qjHU8jStig,6353
 sunholo/components/retriever.py,sha256=TiM-axCeaZ6CZ8rGKGx-io16JKDe8z0pnMccBi1yqHw,3509
 sunholo/components/vectorstore.py,sha256=J5zzW7Acc7A4W6dGnYTYDxST3p6W4OtckXUUwAEeaqE,4941
@@ -78,11 +80,12 @@ sunholo/streaming/streaming.py,sha256=0Bgl_FYmd2GJuy_4khDx5y_nfPqDp7Yu8ZkQ9POVhG
 sunholo/summarise/__init__.py,sha256=MZk3dblUMODcPb1crq4v-Z508NrFIpkSWNf9FIO8BcU,38
 sunholo/summarise/summarise.py,sha256=C3HhjepTjUhUC8FLk4jMQIBvq1BcORniwuTFHjPVhVo,3784
 sunholo/utils/__init__.py,sha256=MxuxoJ-oOie_skGnB4mOagVYjzvfmX9Gz9N5heI8azM,62
-sunholo/utils/config.py,sha256=KYuhwmhYS7qOpt2ZcpAWnlHPJ9rBDX1SgP8gnjkAW6E,7321
+sunholo/utils/config.py,sha256=qkcK1T2AvobmkTp8D-SNXLBxe86TKCuquA_5TkrVfk8,9589
 sunholo/utils/gcp.py,sha256=B2G1YKjeD7X9dqO86Jrp2vPuFwZ223Xl5Tg09Ndw-oc,5760
 sunholo/utils/parsers.py,sha256=E-M7s3_rPviT5zCqQHzhb1DwYmz5a1J472ZVazx10M8,3400
-sunholo-0.55.15.dist-info/LICENSE.txt,sha256=SdE3QjnD3GEmqqg9EX3TM9f7WmtOzqS1KJve8rhbYmU,11345
-sunholo-0.55.15.dist-info/METADATA,sha256=rCF_1oWdOx8Zvn9HZA3E5JZKZXBSvM05F1tX8Q1jheA,6434
-sunholo-0.55.15.dist-info/WHEEL,sha256=GJ7t_kWBFywbagK5eo9IoUwLW6oyOeTKmQ-9iHFVNxQ,92
-sunholo-0.55.15.dist-info/top_level.txt,sha256=wt5tadn5--5JrZsjJz2LceoUvcrIvxjHJe-RxuudxAk,8
-sunholo-0.55.15.dist-info/RECORD,,
+sunholo-0.56.1.dist-info/LICENSE.txt,sha256=SdE3QjnD3GEmqqg9EX3TM9f7WmtOzqS1KJve8rhbYmU,11345
+sunholo-0.56.1.dist-info/METADATA,sha256=2uvcoErVkLNHebBWGCkxsR20evWPXStpQwxOdiIHCt4,6515
+sunholo-0.56.1.dist-info/WHEEL,sha256=GJ7t_kWBFywbagK5eo9IoUwLW6oyOeTKmQ-9iHFVNxQ,92
+sunholo-0.56.1.dist-info/entry_points.txt,sha256=bZuN5AIHingMPt4Ro1b_T-FnQvZ3teBes-3OyO0asl4,49
+sunholo-0.56.1.dist-info/top_level.txt,sha256=wt5tadn5--5JrZsjJz2LceoUvcrIvxjHJe-RxuudxAk,8
+sunholo-0.56.1.dist-info/RECORD,,

sunholo-0.56.1.dist-info/entry_points.txt

@@ -0,0 +1,2 @@
+[console_scripts]
+sunholo = sunholo.cli.cli:main