sunholo 0.62.17__tar.gz → 0.63.0__tar.gz

{sunholo-0.62.17/sunholo.egg-info → sunholo-0.63.0}/PKG-INFO

@@ -1,9 +1,9 @@
 Metadata-Version: 2.1
 Name: sunholo
-Version: 0.62.17
+Version: 0.63.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.62.17.tar.gz
+Download-URL: https://github.com/sunholo-data/sunholo-py/archive/refs/tags/v0.63.0.tar.gz
 Author: Holosun ApS
 Author-email: multivac@sunholo.com
 License: Apache License, Version 2.0
@@ -111,54 +111,21 @@ This is the Sunholo Python project, a comprehensive toolkit for working with lan
 
 Please refer to the website for full documentation at https://dev.sunholo.com/
 
-# sunholo-py
-
-(draft release https://pypi.org/project/sunholo/ )
-## Table of Contents
-- [Agents](#agents)
-- [Archive](#archive)
-- [Bots](#bots)
-- [Chunker](#chunker)
-- [Components](#components)
-- [Database](#database)
-- [Embedder](#embedder)
-- [PubSub](#pubsub)
-- [QnA](#qna)
-- [Streaming](#streaming)
-- [Summarise](#summarise)
-- [Utils](#utils)
+## Demos
 
+Using https://github.com/charmbracelet/vhs
 
 ```sh
-pip install sunholo
+vhs record > cassette.tape
 ```
 
-A python library to enable LLMOps within cloud environments
-
-`sunholo` provides utilities to help manage LLM operations on Google Cloud Platform at first, but it is hoped that making it open source will help it support other clouds in the future.  A lot of the functionality is not Google Cloud Platform specific, so still may be helpful.
-
-It is derived from the Edmonbrain project, the original blog post you can read here: https://code.markedmondson.me/running-llms-on-gcp/ and owes a lot to Langchain ( https://github.com/langchain-ai/langchain )
-
-The package includes:
+Then make gif:
 
-* `agents/` - functions for working with agents, including easy flask apps, parsing chat history and dispatching requests to different agent endpoints
-* `archive/` - functions to record all Q&A activity to BigQuery via PubSub
-* `bots/` - functions for special cases regarding frontend bots such as GChat, Web Apps, Discord and Slack
-* `chunker/` - functions to slice up documents for sending into vector stores
-* `components/` - functions to help configure which LLM, prompt, vectorstore or document retriever you will use based on a yaml config file
-* `database/` - database setup functions and SQL to run on those sources such as Supabase
-* `embedder/` - functions to send chunks into embedding vector stores
-* `pubsub/` - use of PubSub for a message queue between components
-* `qna/` - utilities for running agents such as retry strats and parsing of output/input
-* `streaming/` - creation of streaming responses from LLM bots
-* `summarise/` - creation of summaries of large documents
-* `utils/` - reading configuration files, Google Cloud Platform metadata
-
-## Configuration
+```sh
+vhs docs/tapes/config-list.tape
+```
 
-The library uses the config specifications that some examples are given in the `config/` folder.
 
-When using the functions, make sure to have the `config/` folder in the root of where your application is running (usually `$HOME/config`)
 
 ```
    Copyright [2024] [Holosun ApS]

sunholo-0.63.0/README.md

@@ -0,0 +1,37 @@
+## Introduction
+This is the Sunholo Python project, a comprehensive toolkit for working with language models and vector stores on Google Cloud Platform. It provides a wide range of functionalities and utilities to facilitate the development and deployment of language model applications.
+
+Please refer to the website for full documentation at https://dev.sunholo.com/
+
+## Demos
+
+Using https://github.com/charmbracelet/vhs
+
+```sh
+vhs record > cassette.tape
+```
+
+Then make gif:
+
+```sh
+vhs docs/tapes/config-list.tape
+```
+
+
+
+```
+   Copyright [2024] [Holosun ApS]
+
+   Licensed under the Apache License, Version 2.0 (the "License");
+   you may not use this file except in compliance with the License.
+   You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.
+```
+

{sunholo-0.62.17 → sunholo-0.63.0}/setup.py

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

{sunholo-0.62.17 → sunholo-0.63.0}/sunholo/auth/run.py

@@ -53,26 +53,23 @@ def get_header(vector_name) -> Optional[dict]:
     else:
         run_url = "http://127.0.0.1:8080"
 
-    if "http://" in run_url:
-        return None
-    else:
-        # Append ID Token to make authenticated requests to Cloud Run services
-        frame = inspect.currentframe()
-        caller_frame = frame.f_back if frame is not None else None  # One level up in the stack
+    # Append ID Token to make authenticated requests to Cloud Run services
+    frame = inspect.currentframe()
+    caller_frame = frame.f_back if frame is not None else None  # One level up in the stack
+    deets = {
+        'message': 'Authenticating for run_url',
+        'run_url': run_url
+    }
+    if caller_frame:
         deets = {
-            'message': 'Authenticating for run_url',
-            'run_url': run_url
-        }
-        if caller_frame:
-            deets = {
-                    'message': 'Authenticating for run_url',
-                    'file': caller_frame.f_code.co_filename,
-                    'line': str(caller_frame.f_lineno),  
-                    'function': caller_frame.f_code.co_name,
-                    'run_url': run_url
-                }
-        log.info(f"Authenticating for run_url {run_url} from {caller_frame.f_code.co_name}")
-        id_token = get_id_token(run_url)
-        headers = {"Authorization": f"Bearer {id_token}"}
-        #log.info(f"id_token {id_token}")
-        return headers
+                'message': 'Authenticating for run_url',
+                'file': caller_frame.f_code.co_filename,
+                'line': str(caller_frame.f_lineno),  
+                'function': caller_frame.f_code.co_name,
+                'run_url': run_url
+            }
+    log.info(f"Authenticating for run_url {run_url} from {caller_frame.f_code.co_name}")
+    id_token = get_id_token(run_url)
+    headers = {"Authorization": f"Bearer {id_token}"}
+    #log.info(f"id_token {id_token}")
+    return headers

{sunholo-0.62.17 → sunholo-0.63.0}/sunholo/cli/chat_vac.py

@@ -149,46 +149,72 @@ def headless_mode(service_url, service_name, user_input, chat_history=None, stre
     user_id = generate_user_id()
     session_id = str(uuid.uuid4())
 
-    def stream_response():
-        generate = generate_proxy_stream(
-                send_to_qa,
-                user_input,
-                vector_name=service_name,
-                chat_history=chat_history,
-                generate_f_output=lambda x: x,  # Replace with actual processing function
-                stream_wait_time=0.5,
-                stream_timeout=120,
-                message_author=user_id,
-                #TODO: populate these
-                image_url=None,
-                source_filters=None,
-                search_kwargs=None,
-                private_docs=None,
-                whole_document=False,
-                source_filters_and_or=False,
-                # system kwargs
-                configurable={
-                    "vector_name": service_name,
-                },
-                user_id=user_id,
-                session_id=session_id, 
-                message_source="cli",
-                override_endpoint=service_url
-        )
-        for part in generate():
-            yield part
+    if not stream:
+        vac_response = send_to_qa(user_input,
+            vector_name=service_name,
+            chat_history=chat_history,
+            message_author=user_id,
+            #TODO: populate these
+            image_url=None,
+            source_filters=None,
+            search_kwargs=None,
+            private_docs=None,
+            whole_document=False,
+            source_filters_and_or=False,
+            # system kwargs
+            configurable={
+                "vector_name": service_name,
+            },
+            user_id=user_id,
+            session_id=session_id, 
+            message_source="cli",
+            override_endpoint=service_url)
+        
+        # ensures {'answer': answer}
+        answer = parse_output(vac_response)
+        
+        console.print(answer.get('answer'))
+    else:
+        def stream_response():
+            generate = generate_proxy_stream(
+                    send_to_qa,
+                    user_input,
+                    vector_name=service_name,
+                    chat_history=chat_history,
+                    generate_f_output=lambda x: x,  # Replace with actual processing function
+                    stream_wait_time=0.5,
+                    stream_timeout=120,
+                    message_author=user_id,
+                    #TODO: populate these
+                    image_url=None,
+                    source_filters=None,
+                    search_kwargs=None,
+                    private_docs=None,
+                    whole_document=False,
+                    source_filters_and_or=False,
+                    # system kwargs
+                    configurable={
+                        "vector_name": service_name,
+                    },
+                    user_id=user_id,
+                    session_id=session_id, 
+                    message_source="cli",
+                    override_endpoint=service_url
+            )
+            for part in generate():
+                yield part
 
-    vac_response = ""
+        answer = ""
 
-    for token in stream_response():
-        if isinstance(token, bytes):
-            token = token.decode('utf-8')
-        print(token, end='', flush=True)
-        vac_response += token
+        for token in stream_response():
+            if isinstance(token, bytes):
+                token = token.decode('utf-8')
+            print(token, end='', flush=True)
+            answer += token
 
-    if vac_response:
+    if answer:
         chat_history.append({"name": "Human", "content": user_input})
-        chat_history.append({"name": "AI", "content": vac_response})
+        chat_history.append({"name": "AI", "content": answer})
     print()  # For new line after streaming ends
 
     return chat_history
@@ -273,6 +299,7 @@ def vac_command(args):
 def invoke_vac(service_url, data, vector_name=None, metadata=None, is_file=False):
     try:
         if is_file:
+            console.print("Uploading file to chunker...")
             # Handle file upload
             if not isinstance(data, Path) or not data.is_file():
                 raise ValueError("For file uploads, 'data' must be a Path object pointing to a valid file.")
@@ -287,12 +314,20 @@ def invoke_vac(service_url, data, vector_name=None, metadata=None, is_file=False
 
             response = requests.post(service_url, files=files, data=form_data)
         else:
+            console.print("Uploading JSON to chunker...")
             try:
-                json_data = json.loads(data)
+                if isinstance(data, dict):
+                    json_data = data
+                else:
+                    json_data = json.loads(data)
             except json.JSONDecodeError as err:
                 console.print(f"[bold red]ERROR: invalid JSON: {str(err)} [/bold red]")
                 sys.exit(1)
+            except Exception as err:
+                console.print(f"[bold red]ERROR: could not parse JSON: {str(err)} [/bold red]")
+                sys.exit(1)
 
+            log.debug(f"Sending data: {data} or json_data: {json.dumps(json_data)}")
             # Handle JSON data
             headers = {"Content-Type": "application/json"}
             response = requests.post(service_url, headers=headers, data=json.dumps(json_data))

{sunholo-0.62.17 → sunholo-0.63.0}/sunholo/cli/embedder.py

@@ -18,12 +18,15 @@ def create_metadata(vac, metadata):
     # Default metadata if none provided
     default_metadata = {"vector_name": vac, "source": "sunholo-cli", "eventTime": formatted_time}
 
-    # Merge default metadata with provided metadata
-    if metadata:
-        if not isinstance(metadata, dict):
-            metadata = json.loads(metadata)
-    else:
-        metadata = {}    
+    try:
+        # Merge default metadata with provided metadata
+        if metadata:
+            if not isinstance(metadata, dict):
+                metadata = json.loads(metadata)
+        else:
+            metadata = {}    
+    except Exception as err:
+        console.print(f"[bold red]ERROR: metadata not parsed: {err} for {metadata}")
 
     # Update metadata with default values if not present
     metadata.update(default_metadata)
@@ -87,7 +90,7 @@ def embed_command(args):
     chunk_args = Namespace(**chunk_args)
     chunk_url = resolve_service_url(chunk_args, no_config=True)
 
-    with console.status(f"[bold orange]Sending {args.data} to chunk via {chunk_url}[/bold orange]", spinner="star"):
+    with console.status(f"[bold orange]Sending '{args.data}' to chunk via {chunk_url}[/bold orange]", spinner="star"):
         if args.is_file:
 
             metadata = create_metadata(args.vac_name, args.metadata)  
@@ -102,6 +105,7 @@ def embed_command(args):
         
         else:
             json_data = encode_data(args.vac_name, args.data, args.metadata, args.local_chunks)
+            console.print(f"Chunk JSON data: {json_data}")
             chunk_res = invoke_vac(f"{chunk_url}/pubsub_to_store", json_data)
         
         stop_proxy("chunker")
@@ -113,6 +117,11 @@ def embed_command(args):
 
             return
     
+    if not chunk_res:
+        console.rule(f"[bold orange]No chunks were found for processing of {args.data}[/bold orange]")
+
+        return
+    
     console.rule("Processing chunks locally")
 
     if args.embed_override:

{sunholo-0.62.17 → sunholo-0.63.0/sunholo.egg-info}/PKG-INFO

@@ -1,9 +1,9 @@
 Metadata-Version: 2.1
 Name: sunholo
-Version: 0.62.17
+Version: 0.63.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.62.17.tar.gz
+Download-URL: https://github.com/sunholo-data/sunholo-py/archive/refs/tags/v0.63.0.tar.gz
 Author: Holosun ApS
 Author-email: multivac@sunholo.com
 License: Apache License, Version 2.0
@@ -111,54 +111,21 @@ This is the Sunholo Python project, a comprehensive toolkit for working with lan
 
 Please refer to the website for full documentation at https://dev.sunholo.com/
 
-# sunholo-py
-
-(draft release https://pypi.org/project/sunholo/ )
-## Table of Contents
-- [Agents](#agents)
-- [Archive](#archive)
-- [Bots](#bots)
-- [Chunker](#chunker)
-- [Components](#components)
-- [Database](#database)
-- [Embedder](#embedder)
-- [PubSub](#pubsub)
-- [QnA](#qna)
-- [Streaming](#streaming)
-- [Summarise](#summarise)
-- [Utils](#utils)
+## Demos
 
+Using https://github.com/charmbracelet/vhs
 
 ```sh
-pip install sunholo
+vhs record > cassette.tape
 ```
 
-A python library to enable LLMOps within cloud environments
-
-`sunholo` provides utilities to help manage LLM operations on Google Cloud Platform at first, but it is hoped that making it open source will help it support other clouds in the future.  A lot of the functionality is not Google Cloud Platform specific, so still may be helpful.
-
-It is derived from the Edmonbrain project, the original blog post you can read here: https://code.markedmondson.me/running-llms-on-gcp/ and owes a lot to Langchain ( https://github.com/langchain-ai/langchain )
-
-The package includes:
+Then make gif:
 
-* `agents/` - functions for working with agents, including easy flask apps, parsing chat history and dispatching requests to different agent endpoints
-* `archive/` - functions to record all Q&A activity to BigQuery via PubSub
-* `bots/` - functions for special cases regarding frontend bots such as GChat, Web Apps, Discord and Slack
-* `chunker/` - functions to slice up documents for sending into vector stores
-* `components/` - functions to help configure which LLM, prompt, vectorstore or document retriever you will use based on a yaml config file
-* `database/` - database setup functions and SQL to run on those sources such as Supabase
-* `embedder/` - functions to send chunks into embedding vector stores
-* `pubsub/` - use of PubSub for a message queue between components
-* `qna/` - utilities for running agents such as retry strats and parsing of output/input
-* `streaming/` - creation of streaming responses from LLM bots
-* `summarise/` - creation of summaries of large documents
-* `utils/` - reading configuration files, Google Cloud Platform metadata
-
-## Configuration
+```sh
+vhs docs/tapes/config-list.tape
+```
 
-The library uses the config specifications that some examples are given in the `config/` folder.
 
-When using the functions, make sure to have the `config/` folder in the root of where your application is running (usually `$HOME/config`)
 
 ```
    Copyright [2024] [Holosun ApS]

{sunholo-0.62.17 → sunholo-0.63.0}/sunholo.egg-info/SOURCES.txt

@@ -113,5 +113,6 @@ sunholo/vertex/init.py
 sunholo/vertex/memory_tools.py
 sunholo/vertex/safety.py
 tests/test_chat_history.py
+tests/test_chunker.py
 tests/test_config.py
 tests/test_dispatch_to_qa.py

sunholo-0.63.0/tests/test_chunker.py

@@ -0,0 +1,23 @@
+import pytest
+from unittest.mock import patch, MagicMock
+from sunholo.chunker.data_to_embed_pubsub import data_to_embed_pubsub
+
+# Mock external calls within the function
+@patch('sunholo.chunker.data_to_embed_pubsub.process_pubsub_message', return_value=({}, {}, 'test_vector'))
+@patch('sunholo.chunker.data_to_embed_pubsub.process_chunker_data', return_value='processed_data')
+def test_data_to_embed_pubsub(mock_process_chunker_data, mock_process_pubsub_message):
+    # Test the function with various inputs including edge cases
+    assert data_to_embed_pubsub({}) == 'processed_data'
+    assert data_to_embed_pubsub({'key': 'value'}) == 'processed_data'
+    mock_process_pubsub_message.assert_called()
+    mock_process_chunker_data.assert_called()
+
+    # Ensure tests are self-contained and do not require external dependencies
+    mock_process_pubsub_message = MagicMock(return_value=({}, {}, 'test_vector'))
+    mock_process_chunker_data = MagicMock(return_value='processed_data')
+    assert data_to_embed_pubsub({'key': 'value'}) == 'processed_data'
+
+    # Validate the function's output against expected results
+    expected_output = 'processed_data'
+    actual_output = data_to_embed_pubsub({'key': 'value'})
+    assert actual_output == expected_output, f"Expected {expected_output}, got {actual_output}"

{sunholo-0.62.17 → sunholo-0.63.0}/tests/test_dispatch_to_qa.py

@@ -8,13 +8,19 @@ from sunholo.agents.dispatch_to_qa import prep_request_payload
     # Additional test cases to cover all logic paths
     ("", [], "empty_input_vector", False, "http://example.com/invoke", {"user_input": "", "chat_history": [], "vector_name": "empty_input_vector"}),
     ("Valid input", ["Chat history present"], "history_vector", False, "http://example.com/invoke", {"user_input": "Valid input", "chat_history": ["Chat history present"], "vector_name": "history_vector"}),
-    ("Stream request", [], "stream_vector", True, "http://example.com/stream", {"user_input": "Stream request", "chat_history": [], "vector_name": "stream_vector"})
+    ("Stream request", [], "stream_vector", True, "http://example.com/stream", {"user_input": "Stream request", "chat_history": [], "vector_name": "stream_vector"}),
+    # New test cases for prep_request_payload function
+    ("User input with override endpoint", [], "override_vector", False, "http://override.com/invoke", {"user_input": "User input with override endpoint", "chat_history": [], "vector_name": "override_vector"}),
+    ("Stream with chat history and override endpoint", ["Chat history for override"], "override_stream_vector", True, "http://override.com/stream", {"user_input": "Stream with chat history and override endpoint", "chat_history": ["Chat history for override"], "vector_name": "override_stream_vector"})
 ])
 @patch('sunholo.agents.dispatch_to_qa.load_config_key')
 @patch('sunholo.agents.dispatch_to_qa.route_endpoint')
 def test_prep_request_payload(mock_route_endpoint, mock_load_config_key, user_input, chat_history, vector_name, stream, expected_endpoint, expected_payload):
     mock_route_endpoint.return_value = {"invoke": "http://example.com/invoke", "stream": "http://example.com/stream"}
     mock_load_config_key.side_effect = lambda key, vector_name=None, kind=None: "my_vector" if key == "vector_name" else None
+    # Mocking for override endpoint scenario
+    if vector_name.startswith("override"):
+        mock_route_endpoint.return_value = {"invoke": "http://override.com/invoke", "stream": "http://override.com/stream"}
 
     endpoint, payload = prep_request_payload(user_input, chat_history, vector_name, stream)
 

sunholo-0.62.17/README.md

@@ -1,70 +0,0 @@
-## Introduction
-This is the Sunholo Python project, a comprehensive toolkit for working with language models and vector stores on Google Cloud Platform. It provides a wide range of functionalities and utilities to facilitate the development and deployment of language model applications.
-
-Please refer to the website for full documentation at https://dev.sunholo.com/
-
-# sunholo-py
-
-(draft release https://pypi.org/project/sunholo/ )
-## Table of Contents
-- [Agents](#agents)
-- [Archive](#archive)
-- [Bots](#bots)
-- [Chunker](#chunker)
-- [Components](#components)
-- [Database](#database)
-- [Embedder](#embedder)
-- [PubSub](#pubsub)
-- [QnA](#qna)
-- [Streaming](#streaming)
-- [Summarise](#summarise)
-- [Utils](#utils)
-
-
-```sh
-pip install sunholo
-```
-
-A python library to enable LLMOps within cloud environments
-
-`sunholo` provides utilities to help manage LLM operations on Google Cloud Platform at first, but it is hoped that making it open source will help it support other clouds in the future.  A lot of the functionality is not Google Cloud Platform specific, so still may be helpful.
-
-It is derived from the Edmonbrain project, the original blog post you can read here: https://code.markedmondson.me/running-llms-on-gcp/ and owes a lot to Langchain ( https://github.com/langchain-ai/langchain )
-
-The package includes:
-
-* `agents/` - functions for working with agents, including easy flask apps, parsing chat history and dispatching requests to different agent endpoints
-* `archive/` - functions to record all Q&A activity to BigQuery via PubSub
-* `bots/` - functions for special cases regarding frontend bots such as GChat, Web Apps, Discord and Slack
-* `chunker/` - functions to slice up documents for sending into vector stores
-* `components/` - functions to help configure which LLM, prompt, vectorstore or document retriever you will use based on a yaml config file
-* `database/` - database setup functions and SQL to run on those sources such as Supabase
-* `embedder/` - functions to send chunks into embedding vector stores
-* `pubsub/` - use of PubSub for a message queue between components
-* `qna/` - utilities for running agents such as retry strats and parsing of output/input
-* `streaming/` - creation of streaming responses from LLM bots
-* `summarise/` - creation of summaries of large documents
-* `utils/` - reading configuration files, Google Cloud Platform metadata
-
-## Configuration
-
-The library uses the config specifications that some examples are given in the `config/` folder.
-
-When using the functions, make sure to have the `config/` folder in the root of where your application is running (usually `$HOME/config`)
-
-```
-   Copyright [2024] [Holosun ApS]
-
-   Licensed under the Apache License, Version 2.0 (the "License");
-   you may not use this file except in compliance with the License.
-   You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-```
-