sunholo 0.61.0__tar.gz → 0.61.5__tar.gz

{sunholo-0.61.0 → sunholo-0.61.5}/PKG-INFO

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

{sunholo-0.61.0 → sunholo-0.61.5}/setup.py

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

{sunholo-0.61.0 → sunholo-0.61.5}/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.61.0 → sunholo-0.61.5}/sunholo/cli/chat_vac.py

@@ -9,6 +9,7 @@ import uuid
 import sys
 import subprocess
 import json
+import requests
 
 from rich import print
 from .sun_rich import console
@@ -143,27 +144,46 @@ def headless_mode(service_url, service_name, user_input, chat_history=None):
 
     return chat_history
 
+def resolve_service_url(args):
+
+    if args.url_override:
+
+        return args.url_override
+
+    if not args.no_proxy:
+        try:
+            service_url = get_service_url(args.vac_name, args.project, args.region)
+        except ValueError as e:
+            console.print(f"[bold red]ERROR: Could not start {args.vac_name} proxy URL: {str(e)}[/bold red]")
+            sys.exit(1)
+    else:
+        console.print(f"Not using a proxy, connecting directly to {service_url}")
+
+        agent_url = load_config_key("agent_url", args.vac_name, "vacConfig")
+        if agent_url:
+            console.print("Found agent_url within vacConfig: {agent_url}")
+        
+        service_url = agent_url or get_cloud_run_service_url(args.project, args.region, args.vac_name)
+    
+    return service_url
 
 def vac_command(args):
+
+    service_url = resolve_service_url(args)
+
     if args.action == 'list':
+
         list_cloud_run_services(args.project, args.region)
+
         return
+    
     elif args.action == 'get-url':
-        service_url = get_cloud_run_service_url(args.project, args.region, args.vac_name)
-        if service_url:
-            console.print(service_url)
-            return
-    elif args.action == 'chat':
 
-        if not args.no_proxy:
-            try:
-                service_url = get_service_url(args.vac_name, args.project, args.region)
-            except ValueError as e:
-                console.print(f"[bold red]ERROR: Could not start {args.vac_name} proxy URL: {str(e)}[/bold red]")
-                sys.exit(1)
-        else:
-            service_url = get_cloud_run_service_url(args.project, args.region, args.vac_name)
-            console.print(f"Not using a proxy, connecting directly to {service_url}")
+        console.print(service_url)
+
+        return
+    
+    elif args.action == 'chat':
     
         agent_name   = load_config_key("agent", args.vac_name, kind="vacConfig")
 
@@ -188,6 +208,24 @@ def vac_command(args):
         
         stop_proxy(agent_name, stop_local=False)
 
+    elif args.action == 'invoke':
+        try:
+            json_data = json.loads(args.data)
+        except json.JSONDecodeError as err:
+            console.print(f"[bold red]ERROR: invalid JSON: {str(err)} [/bold red]")
+            sys.exit(1)
+
+        invoke_vac(service_url, json_data)
+
+def invoke_vac(service_url, data):
+    try:
+        headers = {"Content-Type": "application/json"}
+        response = requests.post(service_url, headers=headers, data=json.dumps(data))
+        response.raise_for_status()
+        print(response.json())
+    except requests.exceptions.RequestException as e:
+        console.print(f"[bold red]ERROR: Failed to invoke VAC: {e}[/bold red]")
+
 
 def list_cloud_run_services(project, region):
     """
@@ -281,6 +319,8 @@ def setup_vac_subparser(subparsers):
         subparsers: The subparsers object from argparse.ArgumentParser().
     """
     vac_parser = subparsers.add_parser('vac', help='Interact with deployed VAC services.')
+    vac_parser.add_argument('--url_override', help='Override the VAC service URL.')
+    vac_parser.add_argument('--no-proxy', action='store_true', help='Do not use the proxy and connect directly to the VAC service.')
     vac_subparsers = vac_parser.add_subparsers(dest='action', help='VAC subcommands')
 
     # Subcommand for listing VAC services
@@ -296,6 +336,10 @@ def setup_vac_subparser(subparsers):
     chat_parser.add_argument('user_input', help='User input for the VAC service when in headless mode.', nargs='?', default=None)
     chat_parser.add_argument('--headless', action='store_true', help='Run in headless mode.')
     chat_parser.add_argument('--chat_history', help='Chat history for headless mode (as JSON string).', default=None)
-    chat_parser.add_argument('--no-proxy', action='store_true', help='Do not use the proxy and connect directly to the VAC service.')
+
+    # Subcommand for invoking a VAC service directly
+    invoke_parser = vac_subparsers.add_parser('invoke', help='Invoke a VAC service directly with custom data.')
+    invoke_parser.add_argument('vac_name', help='Name of the VAC service.')
+    invoke_parser.add_argument('data', help='Data to send to the VAC service (as JSON string).')
 
     vac_parser.set_defaults(func=vac_command)

{sunholo-0.61.0 → sunholo-0.61.5}/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.61.0 → sunholo-0.61.5}/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.61.0 → sunholo-0.61.5}/sunholo.egg-info/PKG-INFO

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

{sunholo-0.61.0 → sunholo-0.61.5}/sunholo.egg-info/SOURCES.txt

@@ -106,6 +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.5/tests/test_config.py

@@ -0,0 +1,11 @@
+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

sunholo-0.61.0/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

sunholo-0.61.0/tests/test_config.py

@@ -1,40 +0,0 @@
-import pytest
-from sunholo.utils import config
-
-# Test for the `load_config` function
-def test_load_config():
-    # Assuming the function is supposed to load a configuration from a file
-    # and return a dictionary with the configuration data
-    expected_config = {"key": "value"}
-    with pytest.raises(FileNotFoundError):
-        config.load_config("non_existent_file")
-    with pytest.mock.patch("builtins.open", pytest.mock.mock_open(read_data="key: value"), create=True):
-        assert config.load_config("mock_file.yaml") == expected_config
-
-# Test for the `load_config_key` function
-def test_load_config_key():
-    # Assuming the function is supposed to load a specific key from the configuration
-    expected_value = "value"
-    with pytest.raises(KeyError):
-        config.load_config_key("non_existent_key", "mock_vector_name")
-    with pytest.mock.patch("sunholo.utils.config.load_all_configs", return_value={"mock_vector_name": {"key": "value"}}):
-        assert config.load_config_key("key", "mock_vector_name") == expected_value
-
-# Test for the `get_module_filepath` function
-def test_get_module_filepath():
-    # Assuming the function is supposed to return the absolute path of a module file
-    expected_path = "/absolute/path/to/module/file"
-    with pytest.mock.patch("os.path.dirname", return_value="/absolute/path/to"):
-        assert config.get_module_filepath("module/file") == expected_path
-
-# Test for the `fetch_config` function
-def test_fetch_config():
-    # Assuming the function is supposed to fetch configuration from a cloud storage bucket
-    expected_update_time = "2022-01-01T00:00:00Z"
-    with pytest.mock.patch("google.cloud.storage.Client") as mock_client:
-        mock_bucket = mock_client.return_value.get_bucket.return_value
-        mock_blob = mock_bucket.get_blob.return_value
-        mock_blob.updated = expected_update_time
-        assert config.fetch_config("bucket_name", "blob_name") == expected_update_time
-        mock_bucket.get_blob.return_value = None
-        assert config.fetch_config("bucket_name", "blob_name") is None