sunholo 0.61.5__tar.gz → 0.61.7__tar.gz

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

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

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

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

{sunholo-0.61.5 → sunholo-0.61.7}/sunholo/agents/flask/base.py

@@ -16,5 +16,6 @@ def create_app(name):
     # Initialize Flask app
     app = Flask(name)
     app.config['TRAP_HTTP_EXCEPTIONS'] = True
+    app.config['PROPAGATE_EXCEPTIONS'] = True
    
     return app

{sunholo-0.61.5 → sunholo-0.61.7}/sunholo/agents/flask/qna_routes.py

@@ -27,13 +27,12 @@ from ...utils.config import load_config
 try:
     from flask import request, jsonify, Response
 except ImportError:
-    print("No flask installed for agents.flask.register_qna_routes, install via `pip install sunholo[http]`")
+    pass
 
 try:
     from langfuse.decorators import langfuse_context, observe
-except ImportError as err:
-    print(f"No langfuse installed for agents.flask.register_qna_routes, install via `pip install sunholo[http]` - {str(err)}")
-    
+except ImportError:
+    pass    
 
 def register_qna_routes(app, stream_interpreter, vac_interpreter):
 

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

@@ -20,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
@@ -144,33 +149,32 @@ def headless_mode(service_url, service_name, user_input, chat_history=None):
 
     return chat_history
 
-def resolve_service_url(args):
-
+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)
-        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}")
-
+    if args.no_proxy:
         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)
+        console.print(f"No proxy, connecting directly to {service_url}")
+    else:
+        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)
     
     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)
@@ -178,13 +182,13 @@ def vac_command(args):
         return
     
     elif args.action == 'get-url':
-
+        service_url = resolve_service_url(args)
         console.print(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:
@@ -209,6 +213,7 @@ 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:
@@ -222,7 +227,12 @@ def invoke_vac(service_url, data):
         headers = {"Content-Type": "application/json"}
         response = requests.post(service_url, headers=headers, data=json.dumps(data))
         response.raise_for_status()
-        print(response.json())
+
+        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]")
 

{sunholo-0.61.5 → sunholo-0.61.7}/sunholo/cli/cli.py

@@ -7,12 +7,15 @@ 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
 
 from .sun_rich import console
 import sys
+from rich.panel import Panel
 
 
 def load_default_gcp_config():
@@ -29,6 +32,12 @@ def load_default_gcp_config():
 
 def main(args=None):
 
+    console.print(
+        Panel("Welcome to Sunholo Command Line Interface, your assistant to deploy GenAI Virtual Agent Computers (VACs) to Multivac or your own Cloud.", 
+            title="Sunholo GenAIOps Assistant CLI",
+            subtitle="Documentation at https://dev.sunholo.com/")
+            )
+    console.rule()
 
     """
     Entry point for the sunholo console script. This function parses command line arguments
@@ -64,6 +73,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.7/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.5 → sunholo-0.61.7}/sunholo/cli/run_proxy.py

@@ -1,6 +1,5 @@
 import subprocess
 import os
-import sys
 import signal
 import json
 
@@ -11,19 +10,6 @@ from rich import print
 PROXY_TRACKER_FILE = '.vac_proxy_tracker.json'
 DEFAULT_PORT = 8080
 
-def create_hyperlink(url, text):
-    """
-    Creates a hyperlink for the console.
-
-    Args:
-        url (str): The URL for the hyperlink.
-        text (str): The text to display for the hyperlink.
-
-    Returns:
-        str: The formatted hyperlink.
-    """
-    return f"\033]8;;{url}\033\\{text}\033]8;;\033\\"
-
 
 def get_next_available_port(proxies, default_port):
     """
@@ -94,9 +80,6 @@ def save_proxies(proxies):
     with open(PROXY_TRACKER_FILE, 'w') as file:
         json.dump(proxies, file, indent=4)
 
-
-
-
 def start_proxy(service_name, region, project, port=None, local=False, app_type=None, app_folder=None, log_file=None):
     """
     Starts the gcloud proxy to the Cloud Run service and stores the PID.
@@ -116,8 +99,6 @@ def start_proxy(service_name, region, project, port=None, local=False, app_type=
     if not port:
         port = get_next_available_port(proxies, DEFAULT_PORT)
     
-
-
     if local:
         start_local(service_name, port, app_type, app_folder, log_file)
     else:
@@ -160,6 +141,9 @@ def stop_proxy(service_name, stop_local=True):
     """
     proxies = clean_proxy_list()
 
+    # ps aux | grep gcloud
+    # kill PID
+
     if service_name not in proxies:
         print(f"No proxy found for service: {service_name}")
         return
@@ -248,7 +232,7 @@ def start_local(service_name, port, app_type, app_folder, log_file):
         return
 
     if app_type == 'flask':
-        command = [sys.executable, 'app.py']
+        command = ["gunicorn", "--bind", f"0.0.0.0:{port}", "--workers", "4", "app:app"]
     elif app_type == 'fastapi':
         command = ["uvicorn", "app:app", f"--port={port}"]
     else:
@@ -304,11 +288,11 @@ def setup_proxy_subparser(subparsers):
                                                             args.app_folder,
                                                             args.log_file))
     
-    stop_parser = proxy_subparsers.add_parser('stop', help='Stop the proxy to the Cloud Run service.')
+    stop_parser = proxy_subparsers.add_parser('stop', help='Stop the proxy to the Cloud Run service. Backup: `kill -9 PID`')
     stop_parser.add_argument('service_name', help='Name of the Cloud Run service.')
     stop_parser.set_defaults(func=lambda args: stop_proxy(args.service_name))
 
-    list_parser = proxy_subparsers.add_parser('list', help='List all running proxies.')
+    list_parser = proxy_subparsers.add_parser('list', help='List all running proxies. Examine port via `lsof-i :PORT`')
     list_parser.set_defaults(func=lambda args: list_proxies())
 
     stop_all_parser = proxy_subparsers.add_parser('stop-all', help='Stop all running proxies.')

{sunholo-0.61.5 → sunholo-0.61.7}/sunholo/database/alloydb.py

@@ -8,7 +8,7 @@ try:
     from langchain_google_alloydb_pg import AlloyDBEngine, Column, AlloyDBLoader, AlloyDBDocumentSaver
     from google.cloud.alloydb.connector import IPTypes
 except ImportError:
-    print("No database.alloydb functions - install via `pip install sunholo[database,gcp]`")
+    pass
 
 from .database import get_vector_size
 from ..logging import log

{sunholo-0.61.5 → sunholo-0.61.7}/sunholo.egg-info/PKG-INFO

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

{sunholo-0.61.5 → sunholo-0.61.7}/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