sunholo 0.60.9__tar.gz → 0.61.4__tar.gz

{sunholo-0.60.9 → sunholo-0.61.4}/PKG-INFO

@@ -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 → sunholo-0.61.4}/setup.py

@@ -1,7 +1,7 @@
 from setuptools import setup, find_packages
 
 # Define your base version
-version = '0.60.9'
+version = '0.61.4'
 
 setup(
     name='sunholo',

{sunholo-0.60.9 → sunholo-0.61.4}/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-0.60.9 → sunholo-0.61.4}/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-0.60.9 → sunholo-0.61.4}/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 → sunholo-0.61.4}/sunholo.egg-info/PKG-INFO

@@ -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 → sunholo-0.61.4}/sunholo.egg-info/SOURCES.txt

@@ -18,7 +18,6 @@ sunholo/agents/langserve.py
 sunholo/agents/pubsub.py
 sunholo/agents/route.py
 sunholo/agents/special_commands.py
-sunholo/agents/test_chat_history.py
 sunholo/agents/fastapi/__init__.py
 sunholo/agents/fastapi/base.py
 sunholo/agents/fastapi/qna_routes.py
@@ -107,4 +106,5 @@ sunholo/utils/parsers.py
 sunholo/utils/user_ids.py
 sunholo/vertex/__init__.py
 sunholo/vertex/init_vertex.py
-test/test_dispatch_to_qa.py
+tests/test_chat_history.py
+tests/test_config.py

sunholo-0.61.4/tests/test_chat_history.py

@@ -0,0 +1,50 @@
+import pytest
+from sunholo.agents.chat_history import extract_chat_history, embeds_to_json, create_message_element, is_human, is_bot, is_ai
+
+# Test cases for extract_chat_history function
+@pytest.mark.parametrize("chat_history,expected", [
+    ([], []),
+    ([{"name": "Human", "text": "Hello, AI!"}, {"name": "AI", "text": "Hello, Human! How can I help you today?"}], [("Hello, AI!", "Hello, Human! How can I help you today?")])
+])
+def test_extract_chat_history(chat_history, expected):
+    assert extract_chat_history(chat_history) == expected
+
+# Test cases for embeds_to_json function
+@pytest.mark.parametrize("message,expected", [
+    ({"embeds": []}, ""),
+    ({"embeds": [{"type": "image", "url": "https://example.com/image.png"}]}, '[{"type": "image", "url": "https://example.com/image.png"}]')
+])
+def test_embeds_to_json(message, expected):
+    assert embeds_to_json(message) == expected
+
+# Test cases for create_message_element function
+@pytest.mark.parametrize("message,expected", [
+    ({"text": "Hello, AI!"}, "Hello, AI!"),
+    ({"content": "Hello, AI!"}, "Hello, AI!")
+])
+def test_create_message_element(message, expected):
+    assert create_message_element(message) == expected
+
+# Test cases for is_human function
+@pytest.mark.parametrize("message,expected", [
+    ({"name": "Human"}, True),
+    ({"name": "AI"}, False)
+])
+def test_is_human(message, expected):
+    assert is_human(message) == expected
+
+# Test cases for is_bot function
+@pytest.mark.parametrize("message,expected", [
+    ({"name": "AI"}, True),
+    ({"name": "Human"}, False)
+])
+def test_is_bot(message, expected):
+    assert is_bot(message) == expected
+
+# Test cases for is_ai function
+@pytest.mark.parametrize("message,expected", [
+    ({"name": "AI"}, True),
+    ({"name": "Human"}, False)
+])
+def test_is_ai(message, expected):
+    assert is_ai(message) == expected

sunholo-0.61.4/tests/test_config.py

@@ -0,0 +1,15 @@
+import pytest
+from unittest.mock import patch, mock_open
+from sunholo.utils import config
+
+def test_load_config():
+    expected_config = {"key": "value"}
+    with pytest.raises(FileNotFoundError):
+        config.load_config("non_existent_file")
+    with patch("builtins.open", mock_open(read_data='{"key": "value"}'), create=True):
+        result, _ = config.load_config("mock_file.json")
+        assert result == expected_config
+
+def test_load_config_key():
+    with pytest.raises(KeyError):
+        config.load_config_key("non_existent_key", "mock_vector_name")

sunholo-0.60.9/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'

sunholo-0.60.9/test/test_dispatch_to_qa.py

@@ -1,73 +0,0 @@
-import pytest
-import requests_mock
-from sunholo.agents import dispatch_to_qa
-
-
-def setup():
-    user_input = 'mock_user_input'
-    chat_history = 'mock_chat_history'
-    vector_name = 'mock_vector_name'
-    stream = 'mock_stream'
-    return user_input, chat_history, vector_name, stream
-
-
-def test_prep_request_payload():
-    user_input, chat_history, vector_name, stream = setup()
-    # Call 'prep_request_payload' with the mock data
-    qna_endpoint, qna_data = dispatch_to_qa.prep_request_payload(user_input, chat_history, vector_name, stream)
-    # Check the returned 'qna_endpoint' and 'qna_data'
-    assert qna_endpoint == 'expected_qna_endpoint'
-    assert qna_data == 'expected_qna_data'
-
-
-def test_send_to_qa():
-    user_input, chat_history, vector_name, stream = setup()
-    mock_qna_endpoint = 'http://mock.qna.endpoint'
-    mock_response = {'status': 'success'}
-    with requests_mock.Mocker() as m:
-        m.post(mock_qna_endpoint, json=mock_response)
-        response = dispatch_to_qa.send_to_qa(user_input, chat_history, vector_name, stream)
-        assert response == mock_response
-
-    # Scenario where 'stream' is True and the response is a generator that yields response content chunks
-    mock_response_chunk = 'mock_response_chunk'
-    m.post(mock_qna_endpoint, text=mock_response_chunk)
-    response = dispatch_to_qa.send_to_qa(user_input, chat_history, vector_name, True)
-    assert next(response) == mock_response_chunk
-
-    # Scenario where an HTTP error occurs
-    m.post(mock_qna_endpoint, status_code=500)
-    response = dispatch_to_qa.send_to_qa(user_input, chat_history, vector_name, stream)
-    assert 'Error' in response
-
-    # Scenario where any other error occurs
-    m.post(mock_qna_endpoint, exc=requests_mock.exceptions.ReadTimeout)
-    response = dispatch_to_qa.send_to_qa(user_input, chat_history, vector_name, stream)
-    assert 'Error' in response
-
-
-def test_send_to_qa_async():
-    user_input, chat_history, vector_name, stream = setup()
-    mock_qna_endpoint = 'http://mock.qna.endpoint'
-    mock_response = {'status': 'success'}
-    import aiohttp
-
-    @pytest.mark.asyncio
-    async def test_send_to_qa_async():
-        user_input, chat_history, vector_name, stream = setup()
-        mock_qna_endpoint = 'http://mock.qna.endpoint'
-        mock_response = {'status': 'success'}
-        async with aiohttp.ClientSession() as session:
-            async with session.post(mock_qna_endpoint, json=mock_response) as resp:
-                response = await dispatch_to_qa.send_to_qa_async(user_input, chat_history, vector_name, stream)
-                assert response == mock_response
-
-        # Scenario where an HTTP error occurs
-        async with session.post(mock_qna_endpoint, status=500) as resp:
-            response = await dispatch_to_qa.send_to_qa_async(user_input, chat_history, vector_name, stream)
-            assert 'Error' in response
-
-        # Scenario where any other error occurs
-        async with session.post(mock_qna_endpoint, raise_for_status=False) as resp:
-            response = await dispatch_to_qa.send_to_qa_async(user_input, chat_history, vector_name, stream)
-            assert 'Error' in response