sunholo 0.61.9__tar.gz → 0.61.11__tar.gz

{sunholo-0.61.9 → sunholo-0.61.11}/PKG-INFO

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

{sunholo-0.61.9 → sunholo-0.61.11}/setup.py

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

{sunholo-0.61.9 → sunholo-0.61.11}/sunholo/cli/chat_vac.py

@@ -10,6 +10,7 @@ import sys
 import subprocess
 import json
 import requests
+from pathlib import Path
 
 from rich import print
 from .sun_rich import console
@@ -214,18 +215,36 @@ def vac_command(args):
 
     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)
+        invoke_vac(service_url, args.data, is_file=args.is_file)
 
-def invoke_vac(service_url, data):
+def invoke_vac(service_url, data, vector_name=None, metadata=None, is_file=False):
     try:
-        headers = {"Content-Type": "application/json"}
-        response = requests.post(service_url, headers=headers, data=json.dumps(data))
+        if is_file:
+            # 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.")
+            
+            files = {
+                'file': (data.name, open(data, 'rb')),
+            }
+            form_data = {
+                'vector_name': vector_name,
+                'metadata': json.dumps(metadata) if metadata else '',
+            }
+
+            response = requests.post(service_url, files=files, data=form_data)
+        else:
+            try:
+                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)
+
+            # Handle JSON data
+            headers = {"Content-Type": "application/json"}
+            response = requests.post(service_url, headers=headers, data=json.dumps(json_data))
+
         response.raise_for_status()
 
         the_data = response.json()
@@ -235,6 +254,8 @@ def invoke_vac(service_url, data):
     
     except requests.exceptions.RequestException as e:
         console.print(f"[bold red]ERROR: Failed to invoke VAC: {e}[/bold red]")
+    except Exception as e:
+        console.print(f"[bold red]ERROR: An unexpected error occurred: {e}[/bold red]")
 
 
 def list_cloud_run_services(project, region):
@@ -351,5 +372,6 @@ def setup_vac_subparser(subparsers):
     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).')
+    invoke_parser.add_argument('--is-file', action='store_true', help='Indicate if the data argument is a file path')
 
     vac_parser.set_defaults(func=vac_command)

{sunholo-0.61.9 → sunholo-0.61.11}/sunholo/cli/cli.py

@@ -30,14 +30,23 @@ def load_default_gcp_config():
     else:
         return '', 'europe-west1'
 
+class CustomHelpAction(argparse.Action):
+    def __init__(self, option_strings, dest, nargs=0, **kwargs):
+        super().__init__(option_strings, dest, nargs=nargs, **kwargs)
+
+    def __call__(self, parser, namespace, values, option_string=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()
+        parser.print_help()
+        parser.exit()
+
 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
@@ -50,7 +59,8 @@ def main(args=None):
     """
     default_project, default_region = load_default_gcp_config()
 
-    parser = argparse.ArgumentParser(description="sunholo CLI tool for deploying GenAI VACs")
+    parser = argparse.ArgumentParser(description="sunholo CLI tool for deploying GenAI VACs", add_help=False)
+    parser.add_argument('-h', '--help', action=CustomHelpAction, help='Show this help message and exit')
     parser.add_argument('--debug', action='store_true', help='Enable debug output')
     parser.add_argument('--project', default=default_project, help='GCP project to list Cloud Run services from.')
     parser.add_argument('--region', default=default_region, help='Region to list Cloud Run services from.')

{sunholo-0.61.9 → sunholo-0.61.11}/sunholo/cli/embedder.py

@@ -3,14 +3,14 @@ import uuid
 import base64
 from datetime import datetime, timezone
 from argparse import Namespace
+from pathlib import Path
 
 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
+def create_metadata(vac, metadata):
     now_utc = datetime.now(timezone.utc)
     formatted_time = now_utc.strftime("%Y-%m-%dT%H:%M:%SZ")
 
@@ -22,17 +22,26 @@ def encode_data(vac, content, metadata=None, local_chunks=False):
         if not isinstance(metadata, dict):
             metadata = json.loads(metadata)
     else:
-        metadata = {}
+        metadata = {}    
 
     # Update metadata with default values if not present
     metadata.update(default_metadata)
 
+    return metadata
+
+def encode_data(vac, content, metadata=None, local_chunks=False):
+
+    metadata = create_metadata(vac, 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)}")
 
+    now_utc = datetime.now(timezone.utc)
+    formatted_time = now_utc.strftime("%Y-%m-%dT%H:%M:%SZ")
+
     # Construct the message dictionary
     messageId = str(uuid.uuid4())
     message = {
@@ -62,6 +71,13 @@ def embed_command(args):
 
     console.rule("Sending data for chunking")
 
+    # Check if the data argument is a file path
+    if args.is_file:
+        file_path = Path(args.data)
+        if not file_path.is_file():
+            print(f"ERROR: The specified file does not exist: {file_path}")
+            return
+
     if args.chunk_override:
         chunk_args["url_override"] = args.chunk_override
     else:
@@ -70,15 +86,31 @@ def embed_command(args):
     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
+        if args.is_file:
+
+            metadata = create_metadata(args.vac_name, args.metadata)  
+            if args.local_chunks:
+                metadata["return_chunks"] = True
+
+            chunk_res = invoke_vac(f"{chunk_url}/direct_file_to_embed",
+                                   data=file_path,
+                                   vector_name=args.vac_name,
+                                   metadata=metadata,
+                                   is_file=True)
+        
+        else:
+            json_data = encode_data(args.vac_name, args.data, args.metadata, args.local_chunks)
+            chunk_res = invoke_vac(f"{chunk_url}/pubsub_to_store", json_data)
+        
+        if args.only_chunk:
+
+            return chunk_res
+
+        if not args.local_chunks:
+            console.rule(f"Chunks sent for processing in cloud: {chunk_res}")
+
+            return
     
     console.rule("Processing chunks locally")
 
@@ -91,7 +123,7 @@ def embed_command(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}")
+        console.print(f"[bold red]ERROR: Did not get any chunks from {chunk_url} for {args.data}")
 
         return
 
@@ -144,5 +176,7 @@ def setup_embedder_subparser(subparsers):
     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.add_argument('--is-file', action='store_true', help='Indicate if the data argument is a file path')
+    embed_parser.add_argument('--only-chunk', action='store_true', help='Whether to only parse the document and return the chunks locally, with no embedding')
 
     embed_parser.set_defaults(func=embed_command)

{sunholo-0.61.9 → sunholo-0.61.11}/sunholo/utils/config.py

@@ -215,7 +215,9 @@ def load_config_key(key: str, vector_name: str, kind: str):
             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 {kind}")
+            log.warning(f"No config array was found for {vector_name} in {kind}")
+            
+            return None
         
         log.debug(f'vac_config: {vac_config} for {vector_name} - fetching "{key}"')
         key_value = vac_config.get(key)

{sunholo-0.61.9 → sunholo-0.61.11}/sunholo.egg-info/PKG-INFO

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