sunholo 0.61.4__tar.gz → 0.61.6__tar.gz

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

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

{sunholo-0.61.4 → sunholo-0.61.6}/setup.py

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

{sunholo-0.61.4 → sunholo-0.61.6}/sunholo/chunker/data_to_embed_pubsub.py

@@ -25,6 +25,10 @@ def data_to_embed_pubsub(data: dict):
 
     message_data, metadata, vector_name = process_pubsub_message(data)
 
+    return process_chunker_data(message_data, metadata, vector_name)
+
+def process_chunker_data(message_data, metadata, vector_name):
+
     if metadata:
         metadata["vector_name"] = vector_name
 

{sunholo-0.61.4 → sunholo-0.61.6}/sunholo/chunker/message_data.py

@@ -186,7 +186,7 @@ def handle_json_content_message(message_data: str, metadata: dict, vector_name:
 
     if the_content is None:
         log.info("No content found")
-        return {"metadata": "No content found"}
+        return {"metadata": "No content found in 'page_content' JSON field"}
     
     docs = [Document(page_content=the_content, metadata=metadata)]
 

{sunholo-0.61.4 → sunholo-0.61.6}/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
@@ -19,14 +20,19 @@ from rich.text import Text
 from rich.table import Table
 
 
-def get_service_url(vac_name, project, region):
-    agent_name = load_config_key("agent", vac_name, kind="vacConfig")
+def get_service_url(vac_name, project, region, no_config=False):
+
+    if no_config:
+        agent_name = vac_name
+    else:
+        agent_name = load_config_key("agent", vac_name, kind="vacConfig")
+
     proxies = clean_proxy_list()
     if agent_name in proxies:
         port = proxies[agent_name]['port']
         url = f"http://127.0.0.1:{port}"
     else:
-        print(f"No proxy found running for service: {agent_name} required for {vac_name} - attempting to connect")
+        console.print(f"No proxy found running for service: [bold orange]'{agent_name}[/bold orange] required for [bold orange]{vac_name}[/bold orange] - attempting to connect")
         url = start_proxy(agent_name, region, project)
 
     return url
@@ -143,28 +149,47 @@ def headless_mode(service_url, service_name, user_input, chat_history=None):
 
     return chat_history
 
+def resolve_service_url(args, no_config=False):
+    """
+    no_config: some VACs do not have an entry in the config file e.g. chunker, embedder etc.
+    """
+    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, no_config=no_config)
+        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):
+
     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':
+        service_url = resolve_service_url(args)
+        console.print(service_url)
 
-        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}")
+        return
     
+    elif args.action == 'chat':
+        service_url = resolve_service_url(args)
         agent_name   = load_config_key("agent", args.vac_name, kind="vacConfig")
 
         if args.headless:
@@ -188,6 +213,30 @@ def vac_command(args):
         
         stop_proxy(agent_name, stop_local=False)
 
+    elif args.action == 'invoke':
+        service_url = resolve_service_url(args, no_config=True)
+        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()
+
+        the_data = response.json()
+        console.print(the_data)
+
+        return the_data
+    
+    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 +330,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 +347,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.4 → sunholo-0.61.6}/sunholo/cli/cli.py

@@ -7,6 +7,8 @@ from .cli_init import setup_init_subparser
 from .merge_texts import setup_merge_text_subparser
 from .run_proxy import setup_proxy_subparser
 from .chat_vac import setup_vac_subparser
+from .embedder import setup_embedder_subparser
+
 from ..utils.config import load_config_key
 
 from ..logging import log
@@ -64,6 +66,8 @@ def main(args=None):
     setup_proxy_subparser(subparsers)
     # vac command
     setup_vac_subparser(subparsers)
+    # embed command
+    setup_embedder_subparser(subparsers)
 
     args = parser.parse_args(args)
 

sunholo-0.61.6/sunholo/cli/embedder.py

@@ -0,0 +1,148 @@
+import json
+import uuid
+import base64
+from datetime import datetime, timezone
+from argparse import Namespace
+
+from .sun_rich import console
+from rich.progress import Progress
+
+from .chat_vac import resolve_service_url, invoke_vac
+
+def encode_data(vac, content, metadata=None, local_chunks=False):
+    # Current time in UTC
+    now_utc = datetime.now(timezone.utc)
+    formatted_time = now_utc.strftime("%Y-%m-%dT%H:%M:%SZ")
+
+    # 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 = {}
+
+    # Update metadata with default values if not present
+    metadata.update(default_metadata)
+
+    # Encode the content (URL)
+    if isinstance(content, str):
+        message_data = base64.b64encode(content.encode('utf-8')).decode('utf-8')
+    else:
+        raise ValueError(f"Unsupported content type: {type(content)}")
+
+    # Construct the message dictionary
+    messageId = str(uuid.uuid4())
+    message = {
+        "message": {
+            "data": message_data,
+            "messageId": messageId,
+            "publishTime": formatted_time,
+            "attributes": {
+                "namespace": vac,
+                "return_chunks": str(local_chunks).lower()
+            },
+        }
+    }
+
+    # Merge metadata with attributes
+    message["message"]["attributes"].update(metadata)
+
+    #console.print()
+    #console.print(f"Sending message: {messageId} with metadata:")
+    #console.print(f"{message['message']['attributes']}")
+
+    return message
+
+def embed_command(args):
+    chunk_args = vars(args).copy()
+    embed_args = vars(args).copy()
+
+    console.rule("Sending data for chunking")
+
+    if args.chunk_override:
+        chunk_args["url_override"] = args.chunk_override
+    else:
+        chunk_args["vac_name"] = "chunker"
+        chunk_args["url_override"] = ""
+    chunk_args = Namespace(**chunk_args)
+    chunk_url = resolve_service_url(chunk_args, no_config=True)
+
+    json_data = encode_data(args.vac_name, args.data, args.metadata, args.local_chunks)
+
+    with console.status(f"[bold orange]Sending {args.data} to chunk via {chunk_url}[/bold orange]", spinner="star"):
+        chunk_res = invoke_vac(f"{chunk_url}/pubsub_to_store", json_data)
+
+    if not args.local_chunks:
+        console.rule(f"Chunks sent for processing in cloud: {chunk_res}")
+
+        return
+    
+    console.rule("Processing chunks locally")
+
+    if args.embed_override:
+        embed_args["url_override"] = args.embed_override
+    else:
+        embed_args["vac_name"] = "embedder"
+        embed_args["url_override"] = ""
+    embed_args = Namespace(**embed_args)
+    embed_url = resolve_service_url(embed_args, no_config=True)
+    
+    if not chunk_res:
+        console.print(f"[bold red]ERROR: Did not get any chunks from {chunk_url} for {json_data}")
+
+        return
+
+    chunks = chunk_res.get('chunks')
+    if not chunks:
+        console.print(f"[bold red]ERROR: No chunks found within json data: {str(chunk_res)} [/bold red]")
+
+        return
+    
+    embeds = []
+    with Progress() as progress:
+        task = progress.add_task(f"Embedding [{len(chunks)}] chunks via {embed_url}", total=len(chunks))
+        for chunk in chunks:
+            progress.console.print(f"Working on chunk {chunk['metadata']}")
+
+            # do this async?
+            content = chunk.get("page_content")
+            now_utc = datetime.now(timezone.utc)
+            formatted_time = now_utc.strftime("%Y-%m-%dT%H:%M:%SZ")
+            chunk["metadata"]["eventTime"]  = formatted_time
+            if not content:
+                progress.console.print("[bold red]No content chunk found, skipping.[/bold red]")
+                progress.advance(task)
+                continue
+            progress.console.print(f"Sending chunk length {len(content)} to embedder")
+            processed_chunk = encode_data(vac = args.vac_name, 
+                                          content = json.dumps(chunk))
+            
+            embed_res = invoke_vac(f"{embed_url}/embed_chunk", processed_chunk)
+            embeds.append(embed_res)
+            progress.advance(task)
+
+    console.rule("Embedding pipeline finished")
+    
+    return embed_res
+
+
+def setup_embedder_subparser(subparsers):
+    """
+    Sets up an argparse subparser for the 'embed' command.
+
+    Args:
+        subparsers: The subparsers object from argparse.ArgumentParser().
+    """
+    embed_parser = subparsers.add_parser('embed', help='Send data for embedding to a VAC vector store')
+    embed_parser.add_argument('--embed-override', help='Override the embed VAC service URL.')
+    embed_parser.add_argument('--chunk-override', help='Override the chunk VAC service URL.')
+    embed_parser.add_argument('--no-proxy', action='store_true', help='Do not use the proxy and connect directly to the VAC service.')
+    embed_parser.add_argument('-m', '--metadata', default=None, help='Metadata to send with the embedding (as JSON string).')
+    embed_parser.add_argument('--local-chunks',  action='store_true', help='Whether to process chunks to embed locally, or via the cloud.')
+    embed_parser.add_argument('vac_name', help='VAC service to embed the data for')
+    embed_parser.add_argument('data', help='String content to send for embedding')
+
+    embed_parser.set_defaults(func=embed_command)

{sunholo-0.61.4 → sunholo-0.61.6}/sunholo.egg-info/PKG-INFO

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

{sunholo-0.61.4 → sunholo-0.61.6}/sunholo.egg-info/SOURCES.txt

@@ -47,6 +47,7 @@ sunholo/cli/cli.py
 sunholo/cli/cli_init.py
 sunholo/cli/configs.py
 sunholo/cli/deploy.py
+sunholo/cli/embedder.py
 sunholo/cli/merge_texts.py
 sunholo/cli/run_proxy.py
 sunholo/cli/sun_rich.py

{sunholo-0.61.4 → sunholo-0.61.6}/tests/test_config.py

@@ -9,7 +9,3 @@ def test_load_config():
     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")