sunholo 0.60.1__py3-none-any.whl → 0.60.3__py3-none-any.whl

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/agents/dispatch_to_qa.py

@@ -52,7 +52,7 @@ def prep_request_payload(user_input, chat_history, vector_name, stream, **kwargs
     agent = load_config_key("agent", vector_name=vector_name, kind="vacConfig")
     agent_type = load_config_key("agent_type", vector_name=vector_name, kind="vacConfig")
 
-    override_endpoint = kwargs.get("endpoint_url")
+    override_endpoint = kwargs.get("override_endpoint")
     if override_endpoint:
         log.info(f"Overriding endpoint with {override_endpoint}")
 

sunholo/agents/flask/qna_routes.py

@@ -37,6 +37,10 @@ except ImportError as err:
 
 def register_qna_routes(app, stream_interpreter, vac_interpreter):
 
+    @app.route("/")
+    def home():
+        return jsonify("OK")
+
     @app.route('/vac/streaming/<vector_name>', methods=['POST'])
     @observe()
     def stream_qa(vector_name):

sunholo/cli/chat_vac.py

@@ -1,38 +1,46 @@
-from ..agents import send_to_qa_async
-from ..streaming import generate_proxy_stream_async, generate_proxy_stream
-from ..utils.user_ids import generate_uuid_from_gcloud_user
+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 load_proxies, start_proxy
+from .run_proxy import clean_proxy_list, start_proxy
 
 import uuid
 
-def get_service_url(service_name):
-    proxies = load_proxies()
+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(service_name, project, region):
+    proxies = clean_proxy_list()
     if service_name in proxies:
         port = proxies[service_name]['port']
         return 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)
+        return start_proxy(service_name, region, project)
 
-async def stream_chat_session(service_name, chat_history):
+def stream_chat_session(service_name, project, region):
 
-    service_url = get_service_url(service_name)
-    user_id = generate_uuid_from_gcloud_user()
+    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": "user", "content": user_input})
-
-        
+        chat_history.append({"role": "Human", "content": user_input})
 
-        async def stream_response():
-            generate = await generate_proxy_stream_async(
-                send_to_qa_async,
+        def stream_response():
+            generate = generate_proxy_stream(
+                send_to_qa,
                 user_input,
                 vector_name=service_name,
                 chat_history=chat_history,
@@ -56,28 +64,40 @@ async def stream_chat_session(service_name, chat_history):
                 message_source="cli",
                 override_endpoint=service_url
             )
-            async for part in generate():
+            for part in generate():
                 yield part
 
-        print("Assistant: ", end='', flush=True)
-        async for token in stream_response():
-            if isinstance(token, bytes):
-                token = token.decode('utf-8')
-            print(token, end='', flush=True)
+        response_started = False
+        vac_response = ""
 
-        chat_history.append({"role": "assistant", "content": token})
-        print()  # For new line after streaming ends
+        # 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
 
-async def headless_mode(service_name, user_input, chat_history=None):
+                if isinstance(token, bytes):
+                    token = token.decode('utf-8')
+                console.print(token, end='')
+                vac_response += token
+
+        chat_history.append({"role": "AI", "content": vac_response})
+        response_started = False
+        console.print()
+        console.rule()
+
+def headless_mode(service_name, user_input, project, region, chat_history=None):
     chat_history = chat_history or []
-    chat_history.append({"role": "user", "content": user_input})
-    service_url = get_service_url(service_name)
-    user_id = generate_uuid_from_gcloud_user()
+    chat_history.append({"role": "Human", "content": user_input})
+    service_url = get_service_url(project, region)
+    user_id = generate_user_id()
     session_id = str(uuid.uuid4())
 
-    async def stream_response():
-        generate = await generate_proxy_stream_async(
-                send_to_qa_async,
+    def stream_response():
+        generate = generate_proxy_stream(
+                send_to_qa,
                 user_input,
                 vector_name=service_name,
                 chat_history=chat_history,
@@ -101,30 +121,41 @@ async def headless_mode(service_name, user_input, chat_history=None):
                 message_source="cli",
                 override_endpoint=service_url
         )
-        async for part in generate():
+        for part in generate():
             yield part
 
-    print("Assistant: ", end='', flush=True)
-    async for token in stream_response():
+    print(f"VAC {service_name}: ", end='', flush=True)
+    for token in stream_response():
         if isinstance(token, bytes):
             token = token.decode('utf-8')
         print(token, end='', flush=True)
 
-    chat_history.append({"role": "assistant", "content": token})
+    chat_history.append({"role": "AI", "content": token})
     print()  # For new line after streaming ends
 
+    return chat_history
+
 
 def vac_command(args):
     try:
-        service_url = get_service_url(args.service_name)
+        service_url = get_service_url(args.service_name, args.project, args.region)
     except ValueError as e:
-        print(e)
+        console.print(f"[bold red]ERROR: Could not start {args.service_name} proxy URL: {str(e)}[/bold red]")
         return
-
+    
+    display_name = load_config_key("display_name", vector_name=args.service_name,  kind="vacConfig")
+    description = load_config_key("description", vector_name=args.service_name, kind="vacConfig")
+
+    print(
+        Panel(description or "Starting VAC chat session", 
+              title=display_name or args.service_name,
+              subtitle=service_url)
+              )
+    
     if args.headless:
-        headless_mode(service_url, args.user_input, args.chat_history)
+        headless_mode(args.service_name, args.user_input, args.project, args.region, args.chat_history)
     else:
-        stream_chat_session(service_url)
+        stream_chat_session(args.service_name, args.project, args.region)
 
 def setup_vac_subparser(subparsers):
     """
@@ -133,9 +164,9 @@ def setup_vac_subparser(subparsers):
     Args:
         subparsers: The subparsers object from argparse.ArgumentParser().
     """
-    vac_parser = subparsers.add_parser('vac', help='Interact with the VAC service.')
+    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('user_input', help='User input for the VAC service.', nargs='?', default=None)
+    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)
     vac_parser.set_defaults(func=vac_command)

sunholo/cli/cli.py

@@ -1,4 +1,5 @@
 import argparse
+import logging
 
 from .configs import setup_list_configs_subparser
 from .deploy import setup_deploy_subparser
@@ -6,19 +7,44 @@ 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
+
+from rich import print
+from rich.console import Console
+from rich.prompt import Prompt
+from rich.spinner import Spinner
+from rich.panel import Panel
+from rich.text import Text
+console = Console()
+
+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', 
@@ -40,6 +66,13 @@ def main(args=None):
 
     args = parser.parse_args(args)
 
+    if args.debug:
+        log.setLevel(logging.INFO)
+        logging.getLogger().setLevel(logging.INFO)
+    else:
+        log.setLevel(logging.WARNING)
+        logging.getLogger().setLevel(logging.WARNING)
+
     if hasattr(args, 'func'):
         args.func(args)
     else:

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.")
             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
@@ -63,16 +67,35 @@ def check_gcloud():
         print(f"ERROR: An unexpected error occurred: {e}")
         return False
 
+def is_process_running(pid):
+    try:
+        os.kill(pid, 0)
+        return True
+    except OSError:
+        print("WARNING: VAC Proxy lost connection")
+        return False
+
 def load_proxies():
     if os.path.exists(PROXY_TRACKER_FILE):
         with open(PROXY_TRACKER_FILE, 'r') as file:
             return json.load(file)
     return {}
 
+def clean_proxy_list():
+    proxies = load_proxies()
+    updated_proxies = {k: v for k, v in proxies.items() if is_process_running(v["pid"])}
+    if len(proxies) != len(updated_proxies):
+        save_proxies(updated_proxies)
+        
+    return updated_proxies
+
 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.
@@ -83,7 +106,7 @@ def start_proxy(service_name, region, project, port=None):
         project (str): GCP project of the Cloud Run service.
         port (int, optional): Port to run the proxy on. If not provided, auto-assigns the next available port.
     """
-    proxies = load_proxies()
+    proxies = clean_proxy_list()
 
     if service_name in proxies:
         print(f"Proxy for service {service_name} is already running on port {proxies[service_name]['port']}.")
@@ -109,7 +132,7 @@ def start_proxy(service_name, region, project, port=None):
     
     print(f"Proxy for {service_name} setup complete on port {port}")
     list_proxies()
-    
+
     return f"http://127.0.0.1:{port}"
 
 
@@ -120,7 +143,7 @@ def stop_proxy(service_name):
     Args:
         service_name (str): Name of the Cloud Run service.
     """
-    proxies = load_proxies()
+    proxies = clean_proxy_list()
 
     if service_name not in proxies:
         print(f"No proxy found for service: {service_name}")
@@ -139,20 +162,99 @@ 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 = load_proxies()
+    print("Listing Proxies...")
+    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):
     """
@@ -161,13 +263,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_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.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))
 
@@ -178,4 +279,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/cli/sun_rich.py

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

sunholo/components/retriever.py

@@ -48,7 +48,8 @@ def pick_retriever(vector_name, embeddings=None):
                 log.info(f"Found vectorstore {vectorstore}")
                 if embeddings is None:
                     embeddings = get_embeddings(vector_name)
-                vectorstore = pick_vectorstore(vectorstore, vector_name=vector_name, embeddings=embeddings)
+                read_only = value.get('readonly')
+                vectorstore = pick_vectorstore(vectorstore, vector_name=vector_name, embeddings=embeddings, read_only=read_only)
                 k_override = value.get('k', 3)
                 vs_retriever = vectorstore.as_retriever(search_kwargs=dict(k=k_override))
                 retriever_list.append(vs_retriever)

sunholo/components/vectorstore.py

@@ -14,7 +14,7 @@
 import os
 from ..logging import log
 
-def pick_vectorstore(vs_str, vector_name, embeddings):
+def pick_vectorstore(vs_str, vector_name, embeddings, read_only=None):
     log.debug('Picking vectorstore')
         
     if vs_str == 'supabase':
@@ -23,8 +23,9 @@ def pick_vectorstore(vs_str, vector_name, embeddings):
 
         from ..database.database import setup_supabase
 
-        log.debug(f"Initiating Supabase store: {vector_name}")
-        setup_supabase(vector_name)
+        if not read_only:
+            log.debug(f"Initiating Supabase store: {vector_name}")
+            setup_supabase(vector_name)
 
         # init embedding and vector store
         supabase_url = os.getenv('SUPABASE_URL')
@@ -70,10 +71,14 @@ def pick_vectorstore(vs_str, vector_name, embeddings):
     elif vs_str == 'alloydb':
         from langchain_google_alloydb_pg import AlloyDBVectorStore
         from ..database.alloydb import create_alloydb_table, create_alloydb_engine
+        from ..database.database import get_vector_size
 
+        vector_size = get_vector_size(vector_name)
         engine = create_alloydb_engine(vector_name)
 
-        table_name = create_alloydb_table(vector_name, engine)
+        table_name = f"{vector_name}_vectorstore_{vector_size}"
+        if not read_only:
+            table_name = create_alloydb_table(vector_name, engine)
 
         log.info(f"Chose AlloyDB with table name {table_name}")
         vectorstore = AlloyDBVectorStore.create_sync(
@@ -106,21 +111,24 @@ def pick_vectorstore(vs_str, vector_name, embeddings):
         try:
             table = db.open_table(vector_name)
         except FileNotFoundError as err:
-            log.info(f"{err} - Could not open table for {vector_name} - creating new table")
-            init = f"Creating new table for {vector_name}"
-            table = db.create_table(
-                        vector_name,
-                        data=[
-                            {
-                                "vector": embeddings.embed_query(init),
-                                "text": init,
-                                "id": "1",
-                            }
-                        ],
-                        mode="overwrite",
-                    )
-
-        log.info(f"Inititaing LanceDB object for {vector_name} using {LANCEDB_BUCKET}")
+            if not read_only:
+                log.info(f"{err} - Could not open table for {vector_name} - creating new table")
+                init = f"Creating new table for {vector_name}"
+                table = db.create_table(
+                            vector_name,
+                            data=[
+                                {
+                                    "vector": embeddings.embed_query(init),
+                                    "text": init,
+                                    "id": "1",
+                                }
+                            ],
+                            mode="overwrite",
+                        )
+            else:
+                log.info(f"{err} - Could not create table for {vector_name} as read_only=True")
+
+        log.info(f"Initiating LanceDB object for {vector_name} using {LANCEDB_BUCKET}")
         vectorstore = LanceDB(
             connection=table,
             embedding=embeddings,

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/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")
 
@@ -228,11 +225,16 @@ def setup_logging(logger_name=None, log_level=logging.INFO, project_id=None):
             project_id = get_gcp_project()
         # Instantiate the GoogleCloudLogging class
         gc_logger = GoogleCloudLogging(project_id, log_level=log_level, logger_name=logger_name)
+        # Setup logging and return the logger instance
+        return gc_logger.setup_logging()
     else:
-        return logger
+        if not logging.getLogger().hasHandlers():
+            logging.basicConfig(level=logging.INFO, format='%(asctime)s - %(name)s - %(levelname)s - %(message)s')
+        log = logging.getLogger(logger_name)
+
+        return log
     
-    # Setup logging and return the logger instance
-    return gc_logger.setup_logging()
+
 
 
 

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
@@ -191,10 +191,9 @@ def load_config_key(key: str, vector_name: str, kind: str=None):
     assert isinstance(vector_name, str), f"vector_name must be a string, got a {type(vector_name)}"
     
     configs_by_kind = load_all_configs()
-    log.info(f"configs by kind: {configs_by_kind}")
 
     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")
@@ -205,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`")
@@ -224,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
@@ -237,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/utils/user_ids.py

@@ -1,8 +1,4 @@
 import uuid
-from google.auth import default
-
-from ..logging import log
-
 import hashlib
 import platform
 import socket
@@ -10,30 +6,5 @@ import socket
 def generate_user_id():
     data = f"{socket.gethostname()}-{platform.platform()}-{platform.processor()}"
     hashed_id = hashlib.sha256(data.encode('utf-8')).hexdigest()
-    return hashed_id
-
-def generate_uuid_from_gcloud_user():
-    """
-    Generates a UUID using the Google Cloud authorized user's email address, or if not available via os settings.
-
-    Returns:
-        str: The generated UUID as a string.
-    """
-    _, credentials = default()  # Get the default credentials
-
-    if credentials:
-        user_email = credentials.service_account_email  # Get email for service accounts
-        if not user_email:
-            user_email = credentials.id_token['email']  # Get email for user accounts
-
-        if user_email:
-            # Create a UUID using the user's email as a source for randomness
-            user_uuid = uuid.uuid5(uuid.NAMESPACE_DNS, user_email)
-            return str(user_uuid)
-        else:
-            log.warning("Unable to get user email from Google Cloud credentials.")
-            
-    else:
-        log.warning("No Google Cloud credentials found.")
-
-    return str(generate_user_id())  
+    
+    return str(uuid.uuid5(uuid.NAMESPACE_DNS, hashed_id))

{sunholo-0.60.1.dist-info → sunholo-0.60.3.dist-info}/METADATA

@@ -1,9 +1,9 @@
 Metadata-Version: 2.1
 Name: sunholo
-Version: 0.60.1
+Version: 0.60.3
 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.1.tar.gz
+Download-URL: https://github.com/sunholo-data/sunholo-py/archive/refs/tags/v0.60.3.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,12 +56,15 @@ 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: anthropic
 Requires-Dist: langchain-anthropic ; extra == 'anthropic'
+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.1.dist-info → sunholo-0.60.3.dist-info}/RECORD

@@ -1,8 +1,8 @@
-sunholo/__init__.py,sha256=KfqJV0T-2WCIlabNxeX3CvLS-bBGCl9n5aWy091lr2M,841
-sunholo/logging.py,sha256=JSzS_6HY6BIxy8bmVV2TDHXOjyfB1q5nI76OZXAtQDc,11372
+sunholo/__init__.py,sha256=0CdpufyRKWyZe7J7UKigL6j_qOorM-p0OjHIAuf9M38,864
+sunholo/logging.py,sha256=1jzfy4q9h5DNG4MjwtbTiM8keZxymlrZ0gDQEtGLMHY,11400
 sunholo/agents/__init__.py,sha256=CnlbVohPt-Doth9PyROSlN3P8xMV9j9yS19YE-wCS90,341
 sunholo/agents/chat_history.py,sha256=PbwYmw1TwzI8H-cwQIGgHZ6UIr2Qb-JWow0RG3ayLM8,5195
-sunholo/agents/dispatch_to_qa.py,sha256=1PENm1EV4JGwv4TafGkZVf51YwxqSYL_VSuKipgCjhM,8203
+sunholo/agents/dispatch_to_qa.py,sha256=h5qbcPqJ5JGa21T8Z5is7jbn4eG3P4xULLj_X25q3WM,8208
 sunholo/agents/langserve.py,sha256=FdhQjorAY2bMn2rpuabNT6bU3uqSKWrl8DjpH3L_V7k,4375
 sunholo/agents/pubsub.py,sha256=5hbbhbBGyVWRpt2sAGC5FEheYH1mCCwVUhZEB1S7vGg,1337
 sunholo/agents/route.py,sha256=0klBifx-QtMGsjq8HB04s9Bytm0nFXPYaWKeyt-S9S4,2356
@@ -13,7 +13,7 @@ sunholo/agents/fastapi/base.py,sha256=clk76cHbUAvU0OYJrRfCWX_5f0ACbhDsIzYBhI3wyo
 sunholo/agents/fastapi/qna_routes.py,sha256=DgK4Btu5XriOC1JaRQ4G_nWEjJfnQ0J5pyLanF6eF1g,3857
 sunholo/agents/flask/__init__.py,sha256=uqfHNw2Ru3EJ4dJEcbp86h_lkquBQPMxZbjhV_xe3rs,72
 sunholo/agents/flask/base.py,sha256=RUGWBYWeV60FatYF5sMRrxD-INU97Vodsi6JaB6i93s,763
-sunholo/agents/flask/qna_routes.py,sha256=JLjYrVN2mGoWrGUM_o5N93um46gXpQa8LWdxjF2yN4Y,8554
+sunholo/agents/flask/qna_routes.py,sha256=Pr2dxM7GKhXNKv6t7_J578BN6oMETAYFe6ydEm4D90g,8620
 sunholo/archive/__init__.py,sha256=qNHWm5rGPVOlxZBZCpA1wTYPbalizRT7f8X4rs2t290,31
 sunholo/archive/archive.py,sha256=C-UhG5x-XtZ8VheQp92IYJqgD0V3NFQjniqlit94t18,1197
 sunholo/auth/__init__.py,sha256=4owDjSaWYkbTlPK47UHTOC0gCWbZsqn4ZIEw5NWZTlg,28
@@ -32,18 +32,19 @@ sunholo/chunker/pdfs.py,sha256=daCZ1xjn1YvxlifIyxskWNpLJLe-Q9D_Jq12MWx3tZo,2473
 sunholo/chunker/publish.py,sha256=PoT8q3XJeFCg10WrLkYhuaaXIrGVkvUD3-R9IfoWoH4,2703
 sunholo/chunker/splitter.py,sha256=FLkDhkePkg_zGQpFBK13Cznw575D-Rf9pcaCpc1HUxY,6726
 sunholo/cli/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-sunholo/cli/chat_vac.py,sha256=2dhoVfTdtbw-Wz8_PdAnsMvlecY-aqOccOkWyFIwUSY,5136
-sunholo/cli/cli.py,sha256=titcQDSgV6ZBCaMBtwGKV0NpMZREb_-FcD5DxlEWAGY,1570
+sunholo/cli/chat_vac.py,sha256=o17_ErIsR0FtCelSCTRSyleUeqZkbA7M463F7e61KBs,6360
+sunholo/cli/cli.py,sha256=d52lyS0WnEWK8qSDX6-B6KgpNhQC6R9hiENE9s-qSqM,2613
 sunholo/cli/cli_init.py,sha256=JMZ9AX2cPDZ-_mv3adiv2ToFVNyRPtjk9Biszl1kiR0,2358
 sunholo/cli/configs.py,sha256=QUM9DvKOdZmEQRM5uI3Nh887T0YDiSMr7O240zTLqws,4546
 sunholo/cli/deploy.py,sha256=zxdwUsRTRMC8U5vyRv0JiKBLFn84Ug_Tc88-_h9hJSs,1609
 sunholo/cli/merge_texts.py,sha256=U9vdMwKmcPoc6iPOWX5MKSxn49dNGbNzVLw8ui5PhEU,1823
-sunholo/cli/run_proxy.py,sha256=QAhylEmrdJ9P7uEJj116_MhPSxKzfOx3fhCBwx7n18A,6132
+sunholo/cli/run_proxy.py,sha256=2ZFjOPMUNeC2nK2iwLZfE2HQkq9ZDaDen2EabHuNAFs,9606
+sunholo/cli/sun_rich.py,sha256=UpMqeJ0C8i0pkue1AHnnyyX0bFJ9zZeJ7HBR6yhuA8A,54
 sunholo/components/__init__.py,sha256=RJGNEihwvRIiDScKis04RHJv4yZGI1UpXlOmuCptNZI,208
 sunholo/components/llm.py,sha256=T4we3tGmqUj4tPwxQr9M6AXv_BALqZV_dRSvINan-oU,10374
 sunholo/components/prompt.py,sha256=eZSghXkIlRzXiSrzgkG7e5ytUYq6R6LV-qjHU8jStig,6353
-sunholo/components/retriever.py,sha256=AxTg0QLR2E74FPbBrqB-ap8CTRK4gBOJnpqUk1CWSkY,3684
-sunholo/components/vectorstore.py,sha256=RB_Dgc9234G_TE3w3abCfBw1pqm2br2RrLP0UqshkvA,5172
+sunholo/components/retriever.py,sha256=_Lyt9RIgb2PD-rhV6oKAadiUs3ukT5uAYGW197tEskw,3755
+sunholo/components/vectorstore.py,sha256=dzspqOBtuxSjCFxem5_50sqwUUjbZ4oBYERtCwxZR6E,5619
 sunholo/database/__init__.py,sha256=Zz0Shcq-CtStf9rJGIYB_Ybzb8rY_Q9mfSj-nviM490,241
 sunholo/database/alloydb.py,sha256=J4VzrW2ChIYyqtccUBCtoN-vClfn-iipEDJpxN7GJkY,14820
 sunholo/database/database.py,sha256=doY05kG8BZBLL-arh4hq5ef1ouWOtGHqdsDc6M2YHgk,7345
@@ -60,7 +61,7 @@ sunholo/embedder/__init__.py,sha256=sI4N_CqgEVcrMDxXgxKp1FsfsB4FpjoXgPGkl4N_u4I,
 sunholo/embedder/embed_chunk.py,sha256=XV1kdDUWw2QO-am5_Yl7GrYP9V_4i1XRNNFPhqUSnZQ,5851
 sunholo/gcs/__init__.py,sha256=DtVw_AZwQn-IguR5BJuIi2XJeF_FQXizhJikzRNrXiE,50
 sunholo/gcs/add_file.py,sha256=JmJIuz5Z1h7-eJ6s2eE3wc8Y4IAv3Jridq1xfQbD9_E,4711
-sunholo/gcs/download_url.py,sha256=HJlRhjs2WGtWV5jk0fcOGj9QCXVW4NQJV5X9toucyO8,4800
+sunholo/gcs/download_url.py,sha256=8XSEf8byfubqs5CMQeF_tn9wxqwUTq3n9mo5mLNIUTA,4801
 sunholo/gcs/metadata.py,sha256=C9sMPsHsq1ETetdQCqB3EBs3Kws8b8QHS9L7ei_v5aw,891
 sunholo/langfuse/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 sunholo/langfuse/callback.py,sha256=G9xcZHpLvyzolU57ycItLaooMCtRuM37QJSWjiwQEd0,1776
@@ -88,16 +89,16 @@ sunholo/summarise/__init__.py,sha256=MZk3dblUMODcPb1crq4v-Z508NrFIpkSWNf9FIO8BcU
 sunholo/summarise/summarise.py,sha256=C3HhjepTjUhUC8FLk4jMQIBvq1BcORniwuTFHjPVhVo,3784
 sunholo/utils/__init__.py,sha256=G11nN_6ATjxpuMfG_BvcUr9UU8onPIgkpTK6CjOcbr8,48
 sunholo/utils/big_context.py,sha256=gJIP7_ZL-YSLhOMq8jmFTMqH1wq8eB1NK7oKPeZAq2s,5578
-sunholo/utils/config.py,sha256=WIcJstLkQsM8iMCl_GBpgYdrSWIcnnCJ_uOFHIQX1g8,8500
+sunholo/utils/config.py,sha256=3GSDFGbHugB3qlkHadKi3Z1CEr6EZhCOQ3TiNt03nNU,8594
 sunholo/utils/config_schema.py,sha256=Wv-ncitzljOhgbDaq9qnFqH5LCuxNv59dTGDWgd1qdk,4189
 sunholo/utils/gcp.py,sha256=B2G1YKjeD7X9dqO86Jrp2vPuFwZ223Xl5Tg09Ndw-oc,5760
 sunholo/utils/parsers.py,sha256=OrHmASqIbI45atVOhiGodgLvnfrzkvVzyHnSvAXD89I,3841
-sunholo/utils/user_ids.py,sha256=LjO6Gsg7Bk7Jxj3dgo4VyV5_6xYRrnzPF-vb7MfiR4I,1241
+sunholo/utils/user_ids.py,sha256=SQd5_H7FE7vcTZp9AQuQDWBXd4FEEd7TeVMQe1H4Ny8,292
 sunholo/vertex/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 sunholo/vertex/init_vertex.py,sha256=JDMUaBRdednzbKF-5p33qqLit2LMsvgvWW-NRz0AqO0,1801
-sunholo-0.60.1.dist-info/LICENSE.txt,sha256=SdE3QjnD3GEmqqg9EX3TM9f7WmtOzqS1KJve8rhbYmU,11345
-sunholo-0.60.1.dist-info/METADATA,sha256=Ss12ALa6XeCzAyjVSWf9JTxTmwqFVH-GFEyp_Vs7ig4,7903
-sunholo-0.60.1.dist-info/WHEEL,sha256=GJ7t_kWBFywbagK5eo9IoUwLW6oyOeTKmQ-9iHFVNxQ,92
-sunholo-0.60.1.dist-info/entry_points.txt,sha256=bZuN5AIHingMPt4Ro1b_T-FnQvZ3teBes-3OyO0asl4,49
-sunholo-0.60.1.dist-info/top_level.txt,sha256=wt5tadn5--5JrZsjJz2LceoUvcrIvxjHJe-RxuudxAk,8
-sunholo-0.60.1.dist-info/RECORD,,
+sunholo-0.60.3.dist-info/LICENSE.txt,sha256=SdE3QjnD3GEmqqg9EX3TM9f7WmtOzqS1KJve8rhbYmU,11345
+sunholo-0.60.3.dist-info/METADATA,sha256=Zk0NZ77eeA0GocxUY1fVWY7RA7rtma6t531MCjaBiVU,8057
+sunholo-0.60.3.dist-info/WHEEL,sha256=GJ7t_kWBFywbagK5eo9IoUwLW6oyOeTKmQ-9iHFVNxQ,92
+sunholo-0.60.3.dist-info/entry_points.txt,sha256=bZuN5AIHingMPt4Ro1b_T-FnQvZ3teBes-3OyO0asl4,49
+sunholo-0.60.3.dist-info/top_level.txt,sha256=wt5tadn5--5JrZsjJz2LceoUvcrIvxjHJe-RxuudxAk,8
+sunholo-0.60.3.dist-info/RECORD,,