sunholo 0.60.2__tar.gz → 0.60.4__tar.gz

{sunholo-0.60.2 → sunholo-0.60.4}/PKG-INFO

@@ -1,9 +1,9 @@
 Metadata-Version: 2.1
 Name: sunholo
-Version: 0.60.2
+Version: 0.60.4
 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.60.2.tar.gz
+Download-URL: https://github.com/sunholo-data/sunholo-py/archive/refs/tags/v0.60.4.tar.gz
 Author: Holosun ApS
 Author-email: multivac@sunholo.com
 License: Apache License, Version 2.0
@@ -18,13 +18,13 @@ Classifier: Programming Language :: Python :: 3.11
 Classifier: Programming Language :: Python :: 3.12
 Description-Content-Type: text/markdown
 License-File: LICENSE.txt
-Requires-Dist: jsonschema
+Requires-Dist: google-auth
 Requires-Dist: langchain
 Requires-Dist: langchain_experimental
 Requires-Dist: langchain-community
-Requires-Dist: google-auth
 Provides-Extra: all
 Requires-Dist: asyncpg; extra == "all"
+Requires-Dist: fastapi; extra == "all"
 Requires-Dist: flask; extra == "all"
 Requires-Dist: google-auth; extra == "all"
 Requires-Dist: google-auth-httplib2; extra == "all"
@@ -42,6 +42,7 @@ Requires-Dist: google-generativeai; extra == "all"
 Requires-Dist: gunicorn; extra == "all"
 Requires-Dist: httpcore; extra == "all"
 Requires-Dist: httpx; extra == "all"
+Requires-Dist: jsonschema; extra == "all"
 Requires-Dist: lancedb; extra == "all"
 Requires-Dist: langchain; extra == "all"
 Requires-Dist: langchain_experimental; extra == "all"
@@ -55,10 +56,13 @@ Requires-Dist: pg8000; extra == "all"
 Requires-Dist: pgvector; extra == "all"
 Requires-Dist: psycopg2-binary; extra == "all"
 Requires-Dist: pypdf; extra == "all"
-Requires-Dist: fastapi; extra == "all"
+Requires-Dist: python-socketio; extra == "all"
+Requires-Dist: rich; extra == "all"
 Requires-Dist: supabase; extra == "all"
 Requires-Dist: tiktoken; extra == "all"
-Requires-Dist: python-socketio; extra == "all"
+Provides-Extra: cli
+Requires-Dist: jsonschema; extra == "cli"
+Requires-Dist: rich; extra == "cli"
 Provides-Extra: database
 Requires-Dist: asyncpg; extra == "database"
 Requires-Dist: supabase; extra == "database"

{sunholo-0.60.2 → sunholo-0.60.4}/setup.py

@@ -1,7 +1,7 @@
 from setuptools import setup, find_packages
 
 # Define your base version
-version = '0.60.2'
+version = '0.60.4'
 
 setup(
     name='sunholo',
@@ -28,17 +28,17 @@ setup(
     },
     install_requires=[
         # Base dependencies
-        "jsonschema",
+        "google-auth", # to check if on gcp
         "langchain",
         "langchain_experimental",
         "langchain-community",
-        "google-auth" # to check if on gcp
         # Add the minimal dependencies that your package requires here
     ],
     extras_require={
         # Define optional dependencies with feature names
         'all': [
             "asyncpg",
+            "fastapi",
             "flask",
             "google-auth",
             "google-auth-httplib2",
@@ -56,6 +56,7 @@ setup(
             "gunicorn",
             "httpcore",
             "httpx",
+            "jsonschema",
             "lancedb",
             "langchain",
             "langchain_experimental",
@@ -69,10 +70,15 @@ setup(
             "pgvector",
             "psycopg2-binary",
             "pypdf",
-            "fastapi",
+            "python-socketio",
+            "rich",
             "supabase",
             "tiktoken",
-            "python-socketio"
+
+        ],
+        'cli': [
+            "jsonschema",
+            "rich"
         ],
         'database': [
             "asyncpg",

{sunholo-0.60.2 → sunholo-0.60.4}/sunholo/__init__.py

@@ -19,6 +19,7 @@ from . import utils
 from . import vertex
 import logging
 
+
 __all__ = ['agents', 
            'archive', 
            'auth',
@@ -37,5 +38,7 @@ __all__ = ['agents',
            'qna', 
            'streaming', 
            'utils', 
+           'vertex',
            'logging']
 
+

{sunholo-0.60.2 → sunholo-0.60.4}/sunholo/cli/chat_vac.py

@@ -1,34 +1,44 @@
 from ..agents import send_to_qa
 from ..streaming import generate_proxy_stream
 from ..utils.user_ids import generate_user_id
+from ..utils.config import load_config_key
 
-from .run_proxy import clean_proxy_list, start_proxy
+from .run_proxy import clean_proxy_list, start_proxy, stop_proxy
 
 import uuid
 
-def get_service_url(service_name):
+from rich import print
+from .sun_rich import console
+
+from rich.prompt import Prompt
+from rich.panel import Panel
+from rich.text import Text
+
+
+def get_service_url(vac_name, project, region):
+    agent_name = load_config_key("agent", vac_name, kind="vacConfig")
     proxies = clean_proxy_list()
-    if service_name in proxies:
-        port = proxies[service_name]['port']
-        return f"http://127.0.0.1:{port}"
+    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: {service_name} - attempting to connect")
-        return start_proxy(service_name)
+        print(f"No proxy found running for service: {agent_name} required for {vac_name} - attempting to connect")
+        url = start_proxy(agent_name, region, project)
 
-def stream_chat_session(service_name):
+    return url
 
-    service_url = get_service_url(service_name)
+def stream_chat_session(service_name, project, region):
+
+    service_url = get_service_url(service_name, project, region)
     user_id = generate_user_id()
     chat_history = []
     while True:
         session_id = str(uuid.uuid4())
-        user_input = input("You: ")
+        user_input = Prompt.ask("[bold cyan]You[/bold cyan]")
         if user_input.lower() in ["exit", "quit"]:
-            print("Exiting chat session.")
+            console.print("[bold red]Exiting chat session.[/bold red]")
             break
 
-        chat_history.append({"role": "Human", "content": user_input})
-
         def stream_response():
             generate = generate_proxy_stream(
                 send_to_qa,
@@ -60,24 +70,30 @@ def stream_chat_session(service_name):
 
         response_started = False
         vac_response = ""
-        for token in stream_response():
-            if not response_started:
-                print(f"VAC {service_name}: ", end='', flush=True)
-                response_started = True
-
-            if isinstance(token, bytes):
-                token = token.decode('utf-8')
-            print(token, end='', flush=True)
-            vac_response += token
 
-        chat_history.append({"role": "AI", "content": vac_response})
+        # point or star?
+        with console.status("[bold orange]Thinking...[/bold orange]", spinner="star") as status:
+            for token in stream_response():
+                if not response_started:
+                    status.stop()
+                    console.print(f"[bold yellow]{service_name}:[/bold yellow] ", end='')
+                    response_started = True
+
+                if isinstance(token, bytes):
+                    token = token.decode('utf-8')
+                console.print(token, end='')
+                vac_response += token
+
+        chat_history.append({"name": "Human", "content": user_input})
+        chat_history.append({"name": "AI", "content": vac_response})
         response_started = False
-        print()  # For new line after streaming ends
+        console.print()
+        console.rule()
 
-def headless_mode(service_name, user_input, chat_history=None):
+def headless_mode(service_name, user_input, project, region, chat_history=None):
     chat_history = chat_history or []
-    chat_history.append({"role": "Human", "content": user_input})
-    service_url = get_service_url(service_name)
+
+    service_url = get_service_url(service_name, project, region)
     user_id = generate_user_id()
     session_id = str(uuid.uuid4())
 
@@ -110,13 +126,17 @@ def headless_mode(service_name, user_input, chat_history=None):
         for part in generate():
             yield part
 
-    print(f"VAC {service_name}: ", end='', flush=True)
+    vac_response = ""
+
     for token in stream_response():
         if isinstance(token, bytes):
             token = token.decode('utf-8')
         print(token, end='', flush=True)
+        vac_response += token
 
-    chat_history.append({"role": "AI", "content": token})
+    if vac_response:
+        chat_history.append({"name": "Human", "content": user_input})
+        chat_history.append({"name": "AI", "content": vac_response})
     print()  # For new line after streaming ends
 
     return chat_history
@@ -124,15 +144,34 @@ def headless_mode(service_name, user_input, chat_history=None):
 
 def vac_command(args):
     try:
-        service_url = get_service_url(args.service_name)
+        service_url = get_service_url(args.vac_name, args.project, args.region)
     except ValueError as e:
-        print(f"ERROR: Could not start {args.service_name} proxy URL: {str(e)}")
+        console.print(f"[bold red]ERROR: Could not start {args.vac_name} proxy URL: {str(e)}[/bold red]")
         return
-    print(f"== Starting VAC chat session with {args.service_name} via proxy URL: {service_url}")
+    
+    agent_name   = load_config_key("agent", args.vac_name, kind="vacConfig")
+
     if args.headless:
-        headless_mode(args.service_name, args.user_input, args.chat_history)
+        headless_mode(args.vac_name, args.user_input, args.project, args.region, args.chat_history)
+        stop_proxy(agent_name)
     else:
-        stream_chat_session(args.service_name)
+        display_name = load_config_key("display_name", vector_name=args.vac_name,  kind="vacConfig")
+        description  = load_config_key("description", vector_name=args.vac_name, kind="vacConfig")
+
+        if agent_name == "langserve":
+            subtitle = f"{service_url}/{args.vac_name}/playground/"
+        else:
+            subtitle = f"{agent_name} - {service_url}/vac/{args.vac_name}"
+
+        print(
+            Panel(description or "Starting VAC chat session", 
+                title=display_name or args.vac_name,
+                subtitle=subtitle)
+                )
+
+        stream_chat_session(args.vac_name, args.project, args.region)
+        stop_proxy(agent_name)
+    
 
 def setup_vac_subparser(subparsers):
     """
@@ -142,7 +181,7 @@ 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('service_name', help='Name of the VAC service.')
+    vac_parser.add_argument('vac_name', help='Name of the VAC service.')
     vac_parser.add_argument('user_input', help='User input for the VAC service when in headless mode.', nargs='?', default=None)
     vac_parser.add_argument('--headless', action='store_true', help='Run in headless mode.')
     vac_parser.add_argument('--chat_history', help='Chat history for headless mode (as JSON string).', default=None)

{sunholo-0.60.2 → sunholo-0.60.4}/sunholo/cli/cli.py

@@ -7,22 +7,38 @@ 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 ..utils.config import load_config_key
 
 from ..logging import log
 
+
+
+def load_default_gcp_config():
+    gcp_config = load_config_key('gcp_config', 'global', kind="vacConfig")
+    if gcp_config:
+        return gcp_config.get('project_id', ''), gcp_config.get('location', 'europe-west1')
+    else:
+        return '', 'europe-west1'
+
 def main(args=None):
+
+
     """
     Entry point for the sunholo console script. This function parses command line arguments
     and invokes the appropriate functionality based on the user input.
 
-    Example commands:
+    Get started:
     ```bash
-    sunholo deploy --config_path . --gcs_bucket your-gcs-bucket --lancedb_bucket your-lancedb-bucket
+    sunholo --help
     ```
     """
+    default_project, default_region = load_default_gcp_config()
+
     parser = argparse.ArgumentParser(description="sunholo CLI tool for deploying GenAI VACs")
     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.')
+    
     subparsers = parser.add_subparsers(title='commands', 
                                        description='Valid commands', 
                                        help='Commands', 
@@ -45,8 +61,8 @@ def main(args=None):
     args = parser.parse_args(args)
 
     if args.debug:
-        log.setLevel(logging.INFO)
-        logging.getLogger().setLevel(logging.INFO)
+        log.setLevel(logging.DEBUG)
+        logging.getLogger().setLevel(logging.DEBUG)
     else:
         log.setLevel(logging.WARNING)
         logging.getLogger().setLevel(logging.WARNING)

{sunholo-0.60.2 → sunholo-0.60.4}/sunholo/cli/run_proxy.py

@@ -3,6 +3,10 @@ import os
 import signal
 import json
 
+from .sun_rich import console
+from rich.table import Table
+from rich import print
+
 PROXY_TRACKER_FILE = '.vac_proxy_tracker.json'
 DEFAULT_PORT = 8080
 
@@ -46,13 +50,13 @@ def check_gcloud():
     """
     try:
         # Check if gcloud is installed
-        result = subprocess.run(["gcloud", "--version"], stdout=subprocess.PIPE, stderr=subprocess.PIPE)
+        result = subprocess.run(["gcloud", "--version"], stdout=subprocess.PIPE, stderr=subprocess.PIPE, timeout=30)
         if result.returncode != 0:
-            print("ERROR: gcloud is not installed or not found in PATH.")
+            print("[bold red]ERROR: gcloud is not installed or not found in PATH.[/bold red]")
             return False
 
         # Check if gcloud is authenticated
-        result = subprocess.run(["gcloud", "auth", "list"], stdout=subprocess.PIPE, stderr=subprocess.PIPE)
+        result = subprocess.run(["gcloud", "auth", "list"], stdout=subprocess.PIPE, stderr=subprocess.PIPE, timeout=30)
         if result.returncode != 0 or "ACTIVE" not in result.stdout.decode():
             print("ERROR: gcloud is not authenticated. Please run 'gcloud auth login'.")
             return False
@@ -89,6 +93,9 @@ 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):
     """
     Starts the gcloud proxy to the Cloud Run service and stores the PID.
@@ -155,20 +162,100 @@ def stop_proxy(service_name):
     
     list_proxies()
 
+def stop_all_proxies():
+    """
+    Stops all running gcloud proxies.
+    """
+    proxies = clean_proxy_list()
+
+    for service_name, info in proxies.items():
+        pid = info["pid"]
+        try:
+            os.kill(pid, signal.SIGTERM)
+            print(f"Proxy for {service_name} stopped.")
+        except ProcessLookupError:
+            print(f"No process found with PID: {pid}")
+        except Exception as e:
+            print(f"Error stopping proxy for {service_name}: {e}")
+    
+    save_proxies({})
+
+    list_proxies()
+
+def list_cloud_run_services(project, region):
+    """
+    Lists all Cloud Run services the user has access to in a specific project and region.
+
+    Args:
+        project (str): The GCP project ID.
+        region (str): The region of the Cloud Run services.
+    """
+
+        # point or star?
+    with console.status("[bold orange]Listing Cloud Run Services[/bold orange]", spinner="star") as status:
+        try:
+            result = subprocess.run(
+                ["gcloud", "run", "services", "list", "--project", project, "--region", region, "--format=json"],
+                stdout=subprocess.PIPE, stderr=subprocess.PIPE, timeout=30
+            )
+            if result.returncode != 0:
+                status.stop()
+                console.print(f"[bold red]ERROR: Unable to list Cloud Run services: {result.stderr.decode()}[/bold red]")
+                return
+
+            services = json.loads(result.stdout.decode())
+            if not services:
+                status.stop()
+                console.print("[bold red]No Cloud Run services found.[/bold red]")
+                return
+
+            proxies = clean_proxy_list()
+            status.stop()
+
+            table = Table(title="VAC Cloud Run Services")
+            table.add_column("Service Name")
+            table.add_column("Region")
+            table.add_column("URL")
+            table.add_column("Proxied")
+            table.add_column("Port")
+            
+            for service in services:
+                service_name = service['metadata']['name']
+                service_url = service['status']['url']
+                if service_name in proxies:
+                    proxied = "Yes"
+                    proxy_port = proxies[service_name]['port']
+                else:
+                    proxied = "No"
+                    proxy_port = "-"
+                table.add_row(service_name, region, service_url, proxied, str(proxy_port))
+
+            console.print(table)
+        except Exception as e:
+            status.stop()
+            console.print(f"[bold red]ERROR: An unexpected error occurred: {e}[/bold red]")
+
 def list_proxies():
     """
     Lists all running proxies.
     """
-    proxies = clean_proxy_list()
+    with console.status("[bold orange]Listing Proxies[/bold orange]", spinner="star"):
+        proxies = clean_proxy_list()
+
     if not proxies:
         print("No proxies currently running.")
     else:
-        print("=== VAC Proxies Running ===")
+        table = Table(title="VAC Proxies")
+        table.add_column("VAC")
+        table.add_column("Port")
+        table.add_column("PID")
+        table.add_column("URL")
+        
         for service_name, info in proxies.items():
             url = f"http://127.0.0.1:{info['port']}"
-            hyperlink = create_hyperlink(url, url)
-            print(f"- VAC: {service_name} Port: {info['port']} PID: {info['pid']} URL: {hyperlink}")
-
+            table.add_row(service_name, str(info['port']), str(info['pid']), url)
+        
+        console.print(table)
 
 def setup_proxy_subparser(subparsers):
     """
@@ -177,13 +264,12 @@ def setup_proxy_subparser(subparsers):
     Args:
         subparsers: The subparsers object from argparse.ArgumentParser().
     """
-    proxy_parser = subparsers.add_parser('proxy', help='Set up or stop a proxy to the Cloud Run service.')
+    
+    proxy_parser = subparsers.add_parser('proxy', help='Set up or stop a proxy to the VAC Cloud Run services')
     proxy_subparsers = proxy_parser.add_subparsers(dest='proxy_command', required=True)
 
-    start_parser = proxy_subparsers.add_parser('start', help='Start the proxy to the Cloud Run service.')
+    start_parser = proxy_subparsers.add_parser('start', help='Start the proxy to the VAC Cloud Run service')
     start_parser.add_argument('service_name', help='Name of the Cloud Run service.')
-    start_parser.add_argument('--region', default='europe-west1', help='Region of the Cloud Run service.')
-    start_parser.add_argument('--project', default='multivac-internal-dev', help='GCP project of the Cloud Run service.')
     start_parser.add_argument('--port', type=int, help='Port to run the proxy on. Auto-assigns if not provided.')
     start_parser.set_defaults(func=lambda args: start_proxy(args.service_name, args.region, args.project, args.port))
 
@@ -194,4 +280,10 @@ def setup_proxy_subparser(subparsers):
     list_parser = proxy_subparsers.add_parser('list', help='List all running proxies.')
     list_parser.set_defaults(func=lambda args: list_proxies())
 
+    stop_all_parser = proxy_subparsers.add_parser('stop-all', help='Stop all running proxies.')
+    stop_all_parser.set_defaults(func=lambda args: stop_all_proxies())
+
+    list_services_parser = proxy_subparsers.add_parser('list-vacs', help='List all Cloud Run VAC services.')
+    list_services_parser.set_defaults(func=lambda args: list_cloud_run_services(args.project, args.region))
+
 

sunholo-0.60.4/sunholo/cli/sun_rich.py

@@ -0,0 +1,3 @@
+from rich.console import Console
+
+console = Console()

{sunholo-0.60.2 → sunholo-0.60.4}/sunholo/database/alloydb.py

@@ -171,6 +171,56 @@ class AlloyDBClient:
 
         return self.execute_sql(query)
 
+    def create_database(self, database_name):
+        self.execute_sql(f'CREATE DATABASE "{database_name}"')
+
+    def fetch_owners(self):
+        owners = self.execute_sql('SELECT table_schema, table_name, privilege_type FROM information_schema.table_privileges')
+        for row in owners:
+            print(f"Schema: {row[0]}, Table: {row[1]}, Privilege: {row[2]}")
+        return owners
+
+    def create_schema(self, schema_name="public"):
+        self.execute_sql(f'CREATE SCHEMA IF NOT EXISTS {schema_name};')
+
+    def grant_permissions(self, schema_name, users):
+        for user in users:
+            self.execute_sql(f'GRANT SELECT, INSERT, UPDATE, DELETE ON ALL TABLES IN SCHEMA {schema_name} TO "{user}";')
+            self.execute_sql(f'GRANT USAGE, CREATE ON SCHEMA {schema_name} TO "{user}";')
+            self.execute_sql(f'ALTER DEFAULT PRIVILEGES IN SCHEMA {schema_name} GRANT SELECT, INSERT, UPDATE, DELETE ON TABLES TO "{user}";')
+            self.execute_sql(f'GRANT USAGE ON SCHEMA information_schema TO "{user}";')
+            self.execute_sql(f'GRANT SELECT ON information_schema.columns TO "{user}";')
+
+    def create_docstore_tables(self, vector_names, users):
+        for vector_name in vector_names:
+            table_name = f"{vector_name}_docstore"
+            sql = f'''
+            CREATE TABLE IF NOT EXISTS "{table_name}" 
+            (page_content TEXT, doc_id UUID, source TEXT, images_gsurls JSONB, chunk_metadata JSONB, langchain_metadata JSONB)
+            '''
+            self.execute_sql(sql)
+
+            for user in users:
+                self.execute_sql(f'GRANT SELECT, INSERT, UPDATE, DELETE ON TABLE "{table_name}" TO "{user}";')
+
+            vectorstore_id = f"{vector_name}_vectorstore_1536"
+            sql = f'''
+            CREATE TABLE IF NOT EXISTS "{vectorstore_id}" (
+            langchain_id UUID NOT NULL,
+            content TEXT NOT NULL,
+            embedding vector NOT NULL,
+            source TEXT,
+            langchain_metadata JSONB,
+            docstore_doc_id UUID,
+            eventTime TIMESTAMPTZ
+            );
+            '''
+            self.execute_sql(sql)
+
+            for user in users:
+                self.execute_sql(f'GRANT SELECT, INSERT, UPDATE, DELETE ON TABLE {vectorstore_id} TO "{user}";')
+
+
 alloydb_table_cache = {}  # Our cache, initially empty  # noqa: F841
 def create_alloydb_table(vector_name, engine, type = "vectorstore", alloydb_config=None, username=None):
     global alloydb_table_cache

{sunholo-0.60.2 → sunholo-0.60.4}/sunholo/gcs/download_url.py

@@ -29,7 +29,7 @@ if is_running_on_gcp():
 
 def refresh_credentials():
     if not is_running_on_gcp():
-        log.info("Not running on Google Cloud so no credentials available for GCS.")
+        log.debug("Not running on Google Cloud so no credentials available for GCS.")
         return False
     if not gcs_credentials.token or gcs_credentials.expired or not gcs_credentials.valid:
         try:

{sunholo-0.60.2 → sunholo-0.60.4}/sunholo/logging.py

@@ -217,9 +217,6 @@ def setup_logging(logger_name=None, log_level=logging.INFO, project_id=None):
     if logger_name is None:
         logger_name = "sunholo"
 
-    if Client and os.environ.get('GOOGLE_CLOUD_LOGGING') != "1":
-        print("GOOGLE_CLOUD_LOGGING != 1 but authentication with Google Cloud Logging enabled - missing env var setting?")
-
     if not Client and os.environ.get('GOOGLE_CLOUD_LOGGING') == "1":
         print("Found GOOGLE_CLOUD_LOGGING=1 but no GCP Client available, install via `pip install sunholo[gcp]` and/or authenticate")
 

{sunholo-0.60.2 → sunholo-0.60.4}/sunholo/streaming/langserve.py

@@ -157,8 +157,8 @@ def parse_json_data(json_data: dict):
     """
     try:
         if isinstance(json_data, dict):
-            content = json_data.get('content')
-            if content:
+            content = json_data.get('content', None)
+            if content is not None: # content can be '' empty string
                 #log.debug(f'Yield content: {content}')
                 yield content
             else:

{sunholo-0.60.2 → sunholo-0.60.4}/sunholo/utils/config.py

@@ -59,12 +59,12 @@ def load_all_configs():
     config_folder = os.getenv("_CONFIG_FOLDER", os.getcwd())
     config_folder = os.path.join(config_folder, "config")
 
-    log.info(f"Loading all configs from folder: {config_folder}")
+    log.debug(f"Loading all configs from folder: {config_folder}")
     current_time = datetime.now()
 
     configs_by_kind = defaultdict(dict)
     for filename in os.listdir(config_folder):
-        log.info(f"config file: {filename}")
+        log.debug(f"config file: {filename}")
         if filename in ["cloudbuild.yaml", "cloud_run_urls.json"]:
             # skip these
             continue
@@ -193,7 +193,7 @@ def load_config_key(key: str, vector_name: str, kind: str=None):
     configs_by_kind = load_all_configs()
 
     if kind:
-        log.info(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")
@@ -204,18 +204,23 @@ def load_config_key(key: str, vector_name: str, kind: str=None):
     else:
         config, filename = load_config(filename)
 
-    log.info(f"Fetching {key} for {vector_name}")
+    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:
-        log.warning("Deprecated config file, move to config with `apiVersion` and `kind` set")
-        vac_config = config.get(vector_name)
-    else:
-        log.info(f"Loaded config file {kind}/{apiVersion}")
+        raise ValueError("Deprecated config file, move to config with `apiVersion` and `kind` set")
+
+    log.debug(f"Loaded config file {kind}/{apiVersion}")
     
     if kind == 'vacConfig':
+        if vector_name == 'global':
+            key_value = config.get(key)
+            log.debug(f'vac_config global value for {key}: {key_value}')
+
+            return key_value
+        
         vac = config.get('vac')
         if not vac:
             raise ValueError("Deprecated config file, move to config with `vac:` at top level for `vector_name`")
@@ -223,7 +228,7 @@ def load_config_key(key: str, vector_name: str, kind: str=None):
         if not vac_config:
             raise ValueError(f"No config array was found for {vector_name} in {filename}")
         
-        log.info(f'vac_config: {vac_config} for {vector_name} - fetching "{key}"')
+        log.debug(f'vac_config: {vac_config} for {vector_name} - fetching "{key}"')
         key_value = vac_config.get(key)
         
         return key_value
@@ -236,7 +241,7 @@ def load_config_key(key: str, vector_name: str, kind: str=None):
         if not prompt_for_vector_name:
             raise ValueError(f"Could not find prompt for vector_name {vector_name}")
         
-        log.info(f'prompts: {prompt_for_vector_name} for {vector_name} - fetching "{key}"')
+        log.debug(f'prompts: {prompt_for_vector_name} for {vector_name} - fetching "{key}"')
         key_value = prompt_for_vector_name.get(key)
         
         return key_value

{sunholo-0.60.2 → sunholo-0.60.4}/sunholo.egg-info/PKG-INFO

@@ -1,9 +1,9 @@
 Metadata-Version: 2.1
 Name: sunholo
-Version: 0.60.2
+Version: 0.60.4
 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.60.2.tar.gz
+Download-URL: https://github.com/sunholo-data/sunholo-py/archive/refs/tags/v0.60.4.tar.gz
 Author: Holosun ApS
 Author-email: multivac@sunholo.com
 License: Apache License, Version 2.0
@@ -18,13 +18,13 @@ Classifier: Programming Language :: Python :: 3.11
 Classifier: Programming Language :: Python :: 3.12
 Description-Content-Type: text/markdown
 License-File: LICENSE.txt
-Requires-Dist: jsonschema
+Requires-Dist: google-auth
 Requires-Dist: langchain
 Requires-Dist: langchain_experimental
 Requires-Dist: langchain-community
-Requires-Dist: google-auth
 Provides-Extra: all
 Requires-Dist: asyncpg; extra == "all"
+Requires-Dist: fastapi; extra == "all"
 Requires-Dist: flask; extra == "all"
 Requires-Dist: google-auth; extra == "all"
 Requires-Dist: google-auth-httplib2; extra == "all"
@@ -42,6 +42,7 @@ Requires-Dist: google-generativeai; extra == "all"
 Requires-Dist: gunicorn; extra == "all"
 Requires-Dist: httpcore; extra == "all"
 Requires-Dist: httpx; extra == "all"
+Requires-Dist: jsonschema; extra == "all"
 Requires-Dist: lancedb; extra == "all"
 Requires-Dist: langchain; extra == "all"
 Requires-Dist: langchain_experimental; extra == "all"
@@ -55,10 +56,13 @@ Requires-Dist: pg8000; extra == "all"
 Requires-Dist: pgvector; extra == "all"
 Requires-Dist: psycopg2-binary; extra == "all"
 Requires-Dist: pypdf; extra == "all"
-Requires-Dist: fastapi; extra == "all"
+Requires-Dist: python-socketio; extra == "all"
+Requires-Dist: rich; extra == "all"
 Requires-Dist: supabase; extra == "all"
 Requires-Dist: tiktoken; extra == "all"
-Requires-Dist: python-socketio; extra == "all"
+Provides-Extra: cli
+Requires-Dist: jsonschema; extra == "cli"
+Requires-Dist: rich; extra == "cli"
 Provides-Extra: database
 Requires-Dist: asyncpg; extra == "database"
 Requires-Dist: supabase; extra == "database"

{sunholo-0.60.2 → sunholo-0.60.4}/sunholo.egg-info/SOURCES.txt

@@ -50,6 +50,7 @@ sunholo/cli/configs.py
 sunholo/cli/deploy.py
 sunholo/cli/merge_texts.py
 sunholo/cli/run_proxy.py
+sunholo/cli/sun_rich.py
 sunholo/components/__init__.py
 sunholo/components/llm.py
 sunholo/components/prompt.py

{sunholo-0.60.2 → sunholo-0.60.4}/sunholo.egg-info/requires.txt

@@ -1,11 +1,11 @@
-jsonschema
+google-auth
 langchain
 langchain_experimental
 langchain-community
-google-auth
 
 [all]
 asyncpg
+fastapi
 flask
 google-auth
 google-auth-httplib2
@@ -23,6 +23,7 @@ google-generativeai
 gunicorn
 httpcore
 httpx
+jsonschema
 lancedb
 langchain
 langchain_experimental
@@ -36,14 +37,18 @@ pg8000
 pgvector
 psycopg2-binary
 pypdf
-fastapi
+python-socketio
+rich
 supabase
 tiktoken
-python-socketio
 
 [anthropic]
 langchain-anthropic
 
+[cli]
+jsonschema
+rich
+
 [database]
 asyncpg
 supabase