sunholo 0.60.9__py3-none-any.whl → 0.61.4__py3-none-any.whl

sunholo/agents/chat_history.py

@@ -74,7 +74,7 @@ def embeds_to_json(message: dict):
     # Output: '[{"type": "image", "url": "https://example.com/image.png"}]'
     ```
     """
-    if len(message['embeds'] > 0):
+    if 'embeds' in message and len(message['embeds']) > 0:
         return json.dumps(message.get("embeds"))
     else:
         return ""

sunholo/components/vectorstore.py

@@ -45,7 +45,7 @@ def pick_vectorstore(vs_str, vector_name, embeddings, read_only=None):
         return vectorstore
     
     elif vs_str == 'cloudsql' or vs_str == 'postgres':
-        from langchain.vectorstores.pgvector import PGVector
+        from langchain_community.vectorstores import PGVector
 
         log.debug("Inititaing CloudSQL/Postgres pgvector")
         #setup_cloudsql(vector_name) 

sunholo/utils/config.py

@@ -75,7 +75,7 @@ def load_all_configs():
             if filename in config_cache:
                 cached_config, cache_time = config_cache[filename]
                 if (current_time - cache_time) < timedelta(minutes=5):
-                    log.info(f"Returning cached config for {filename}")
+                    log.debug(f"Returning cached config for {filename}")
                     config = cached_config
                 else:
                     config = reload_config_file(config_file, filename)
@@ -167,7 +167,7 @@ def load_config(filename: str=None) -> tuple[dict, str]:
     
     return config, filename
 
-def load_config_key(key: str, vector_name: str, kind: str=None):
+def load_config_key(key: str, vector_name: str, kind: str):
     """
     Load a specific key from a configuration file.
 
@@ -192,27 +192,16 @@ def load_config_key(key: str, vector_name: str, kind: str=None):
     
     configs_by_kind = load_all_configs()
 
-    if kind:
-        log.debug(f"Got kind: {kind} - applying to configs")
+    log.debug(f"Got kind: {kind} - applying to configs")
     
     if not configs_by_kind:
         log.warning("Did not load configs via folder")
              
-    if kind and configs_by_kind.get(kind):
-        config = configs_by_kind[kind]
-        filename = kind
-    else:
-        config, filename = load_config(filename)
+    config = configs_by_kind[kind]
 
-    log.debug(f"Fetching '{key}' for '{vector_name}'")
     apiVersion = config.get('apiVersion')
-    kind = config.get('kind')
-    vac = config.get('vac')
 
-    if not apiVersion or not kind:
-        raise ValueError("Deprecated config file, move to config with `apiVersion` and `kind` set")
-
-    log.debug(f"Loaded config file {kind}/{apiVersion}")
+    log.debug(f"Fetching '{key}' for '{vector_name}' from '{kind}/{apiVersion}'")
     
     if kind == 'vacConfig':
         if vector_name == 'global':
@@ -226,7 +215,7 @@ def load_config_key(key: str, vector_name: str, kind: str=None):
             raise ValueError("Deprecated config file, move to config with `vac:` at top level for `vector_name`")
         vac_config = vac.get(vector_name)
         if not vac_config:
-            raise ValueError(f"No config array was found for {vector_name} in {filename}")
+            raise ValueError(f"No config array was found for {vector_name} in {kind}")
         
         log.debug(f'vac_config: {vac_config} for {vector_name} - fetching "{key}"')
         key_value = vac_config.get(key)

{sunholo-0.60.9.dist-info → sunholo-0.61.4.dist-info}/METADATA

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

{sunholo-0.60.9.dist-info → sunholo-0.61.4.dist-info}/RECORD

@@ -1,13 +1,12 @@
 sunholo/__init__.py,sha256=0CdpufyRKWyZe7J7UKigL6j_qOorM-p0OjHIAuf9M38,864
 sunholo/logging.py,sha256=1jzfy4q9h5DNG4MjwtbTiM8keZxymlrZ0gDQEtGLMHY,11400
 sunholo/agents/__init__.py,sha256=CnlbVohPt-Doth9PyROSlN3P8xMV9j9yS19YE-wCS90,341
-sunholo/agents/chat_history.py,sha256=PbwYmw1TwzI8H-cwQIGgHZ6UIr2Qb-JWow0RG3ayLM8,5195
+sunholo/agents/chat_history.py,sha256=bkII7PNEbGCaobu2Rnr2rM9dim3BCK0kM-tiWhoI1tw,5219
 sunholo/agents/dispatch_to_qa.py,sha256=h5qbcPqJ5JGa21T8Z5is7jbn4eG3P4xULLj_X25q3WM,8208
 sunholo/agents/langserve.py,sha256=FdhQjorAY2bMn2rpuabNT6bU3uqSKWrl8DjpH3L_V7k,4375
 sunholo/agents/pubsub.py,sha256=5hbbhbBGyVWRpt2sAGC5FEheYH1mCCwVUhZEB1S7vGg,1337
 sunholo/agents/route.py,sha256=0klBifx-QtMGsjq8HB04s9Bytm0nFXPYaWKeyt-S9S4,2356
 sunholo/agents/special_commands.py,sha256=PI4ADgFQvPDCeCpOeWIrD4bD432NYFeVcBBnkqTBWi8,6457
-sunholo/agents/test_chat_history.py,sha256=vPbPu0xREEs4J4X_zJKBY1f19Vy5yV05_CKfUUQqfFg,3923
 sunholo/agents/fastapi/__init__.py,sha256=S_pj4_bTUmDGoq_exaREHlOKThi0zTuGT0VZY0YfODQ,88
 sunholo/agents/fastapi/base.py,sha256=clk76cHbUAvU0OYJrRfCWX_5f0ACbhDsIzYBhI3wyoE,2514
 sunholo/agents/fastapi/qna_routes.py,sha256=DgK4Btu5XriOC1JaRQ4G_nWEjJfnQ0J5pyLanF6eF1g,3857
@@ -44,7 +43,7 @@ sunholo/components/__init__.py,sha256=RJGNEihwvRIiDScKis04RHJv4yZGI1UpXlOmuCptNZ
 sunholo/components/llm.py,sha256=T4we3tGmqUj4tPwxQr9M6AXv_BALqZV_dRSvINan-oU,10374
 sunholo/components/prompt.py,sha256=eZSghXkIlRzXiSrzgkG7e5ytUYq6R6LV-qjHU8jStig,6353
 sunholo/components/retriever.py,sha256=_Lyt9RIgb2PD-rhV6oKAadiUs3ukT5uAYGW197tEskw,3755
-sunholo/components/vectorstore.py,sha256=dzspqOBtuxSjCFxem5_50sqwUUjbZ4oBYERtCwxZR6E,5619
+sunholo/components/vectorstore.py,sha256=lB8vx_N6eBA44orNeVo1WRn0Q8GCIjvPPT9AfiPWBWE,5620
 sunholo/database/__init__.py,sha256=Zz0Shcq-CtStf9rJGIYB_Ybzb8rY_Q9mfSj-nviM490,241
 sunholo/database/alloydb.py,sha256=0zRLyeC9nACzj3v36ET9NqLeuzdwBJ2bE09CzgVTTFM,17098
 sunholo/database/database.py,sha256=doY05kG8BZBLL-arh4hq5ef1ouWOtGHqdsDc6M2YHgk,7345
@@ -89,16 +88,16 @@ sunholo/summarise/__init__.py,sha256=MZk3dblUMODcPb1crq4v-Z508NrFIpkSWNf9FIO8BcU
 sunholo/summarise/summarise.py,sha256=C3HhjepTjUhUC8FLk4jMQIBvq1BcORniwuTFHjPVhVo,3784
 sunholo/utils/__init__.py,sha256=G11nN_6ATjxpuMfG_BvcUr9UU8onPIgkpTK6CjOcbr8,48
 sunholo/utils/big_context.py,sha256=gJIP7_ZL-YSLhOMq8jmFTMqH1wq8eB1NK7oKPeZAq2s,5578
-sunholo/utils/config.py,sha256=3GSDFGbHugB3qlkHadKi3Z1CEr6EZhCOQ3TiNt03nNU,8594
+sunholo/utils/config.py,sha256=M755G2VGVsfRvGBv2hM18KzFiSf5lJ6wj3ncDBCvWtg,8215
 sunholo/utils/config_schema.py,sha256=Wv-ncitzljOhgbDaq9qnFqH5LCuxNv59dTGDWgd1qdk,4189
 sunholo/utils/gcp.py,sha256=B2G1YKjeD7X9dqO86Jrp2vPuFwZ223Xl5Tg09Ndw-oc,5760
 sunholo/utils/parsers.py,sha256=OrHmASqIbI45atVOhiGodgLvnfrzkvVzyHnSvAXD89I,3841
 sunholo/utils/user_ids.py,sha256=SQd5_H7FE7vcTZp9AQuQDWBXd4FEEd7TeVMQe1H4Ny8,292
 sunholo/vertex/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 sunholo/vertex/init_vertex.py,sha256=JDMUaBRdednzbKF-5p33qqLit2LMsvgvWW-NRz0AqO0,1801
-sunholo-0.60.9.dist-info/LICENSE.txt,sha256=SdE3QjnD3GEmqqg9EX3TM9f7WmtOzqS1KJve8rhbYmU,11345
-sunholo-0.60.9.dist-info/METADATA,sha256=HRCIwV9y1sAi8Ft3p73fUff0wkaxHQ7V9CSN-1jwSzE,8057
-sunholo-0.60.9.dist-info/WHEEL,sha256=GJ7t_kWBFywbagK5eo9IoUwLW6oyOeTKmQ-9iHFVNxQ,92
-sunholo-0.60.9.dist-info/entry_points.txt,sha256=bZuN5AIHingMPt4Ro1b_T-FnQvZ3teBes-3OyO0asl4,49
-sunholo-0.60.9.dist-info/top_level.txt,sha256=wt5tadn5--5JrZsjJz2LceoUvcrIvxjHJe-RxuudxAk,8
-sunholo-0.60.9.dist-info/RECORD,,
+sunholo-0.61.4.dist-info/LICENSE.txt,sha256=SdE3QjnD3GEmqqg9EX3TM9f7WmtOzqS1KJve8rhbYmU,11345
+sunholo-0.61.4.dist-info/METADATA,sha256=fNJFynKc9QQ-n26UaiizHapEY9hWrt-imjk3WBxlJqs,8057
+sunholo-0.61.4.dist-info/WHEEL,sha256=GJ7t_kWBFywbagK5eo9IoUwLW6oyOeTKmQ-9iHFVNxQ,92
+sunholo-0.61.4.dist-info/entry_points.txt,sha256=bZuN5AIHingMPt4Ro1b_T-FnQvZ3teBes-3OyO0asl4,49
+sunholo-0.61.4.dist-info/top_level.txt,sha256=wt5tadn5--5JrZsjJz2LceoUvcrIvxjHJe-RxuudxAk,8
+sunholo-0.61.4.dist-info/RECORD,,

sunholo/agents/test_chat_history.py

@@ -1,119 +0,0 @@
-import pytest
-from .chat_history import *
-
-
-def test_extract_chat_history_null_input():
-    assert extract_chat_history(None) == [], 'Expected empty list for null input'
-
-
-def test_extract_chat_history_no_chat():
-    assert extract_chat_history([]) == [], 'Expected empty list for no chat history'
-
-
-def test_extract_chat_history_with_chat():
-    chat_history = [('User', 'Hello'), ('Bot', 'Hi'), ('User', 'How are you?'), ('Bot', 'I am fine.')]
-    expected_output = [('User', 'Hello'), ('Bot', 'Hi'), ('User', 'How are you?'), ('Bot', 'I am fine.')]
-    assert extract_chat_history(chat_history) == expected_output, 'Expected list of paired messages for chat history'
-
-
-# Test cases for embeds_to_json function
-
-def test_embeds_to_json_no_embeds():
-    message = 'Hello, world!'
-    assert embeds_to_json(message) == '', 'Expected empty string for message with no embeds'
-
-
-def test_embeds_to_json_one_embed():
-    message = 'Hello, world! [embed]'
-    expected_output = '{"embeds": ["embed"]}'
-    assert embeds_to_json(message) == expected_output, 'Expected JSON string with one embed for message with one embed'
-
-
-def test_embeds_to_json_multiple_embeds():
-    message = 'Hello, world! [embed1] [embed2]'
-    expected_output = '{"embeds": ["embed1", "embed2"]}'
-    assert embeds_to_json(message) == expected_output, 'Expected JSON string with multiple embeds for message with multiple embeds'
-
-
-# Test cases for create_message_element function
-
-def test_create_message_element_text():
-    message = {'text': 'Hello, world!'}
-    assert create_message_element(message) == 'Hello, world!', 'Expected text element for message with text'
-
-
-def test_create_message_element_content():
-    message = {'content': 'Hello, world!'}
-    assert create_message_element(message) == 'Hello, world!', 'Expected content element for message with content'
-
-
-def test_create_message_element_no_text_or_content():
-    message = {}
-    with pytest.raises(KeyError):
-        create_message_element(message)
-
-
-# Test cases for is_human function
-
-def test_is_human_name_human():
-    message = {'name': 'Human'}
-    assert is_human(message) == True, 'Expected True for message with name Human'
-
-
-def test_is_human_sender_type_human():
-    message = {'sender': {'type': 'HUMAN'}}
-    assert is_human(message) == True, 'Expected True for message with sender type HUMAN'
-
-
-def test_is_human_user_no_bot_id():
-    message = {'user': 'User1', 'bot_id': None}
-    assert is_human(message) == True, 'Expected True for message with user field and no bot_id field'
-
-
-def test_is_human_not_human():
-    message = {'name': 'Bot'}
-    assert is_human(message) == False, 'Expected False for message not from a human'
-
-
-# Test cases for is_bot function
-
-def test_is_bot_name_bot():
-    message = {'name': 'Bot'}
-    assert is_bot(message) == True, 'Expected True for message with name Bot'
-
-
-def test_is_bot_sender_type_bot():
-    message = {'sender': {'type': 'BOT'}}
-    assert is_bot(message) == True, 'Expected True for message with sender type BOT'
-
-
-def test_is_bot_with_bot_id():
-    message = {'bot_id': 'bot1'}
-    assert is_bot(message) == True, 'Expected True for message with bot_id field'
-
-
-def test_is_bot_not_bot():
-    message = {'name': 'Human'}
-    assert is_bot(message) == False, 'Expected False for message not from a bot'
-
-
-# Test cases for is_ai function
-
-def test_is_ai_name_ai():
-    message = {'name': 'AI'}
-    assert is_ai(message) == True, 'Expected True for message with name AI'
-
-
-def test_is_ai_sender_type_bot():
-    message = {'sender': {'type': 'BOT'}}
-    assert is_ai(message) == True, 'Expected True for message with sender type BOT'
-
-
-def test_is_ai_with_bot_id():
-    message = {'bot_id': 'bot1'}
-    assert is_ai(message) == True, 'Expected True for message with bot_id field'
-
-
-def test_is_ai_not_ai():
-    message = {'name': 'Human'}
-    assert is_ai(message) == False, 'Expected False for message not from an AI'