sunholo 0.60.5__py3-none-any.whl → 0.60.7__py3-none-any.whl

sunholo/cli/chat_vac.py

@@ -7,6 +7,8 @@ from .run_proxy import clean_proxy_list, start_proxy, stop_proxy
 
 import uuid
 import sys
+import subprocess
+import json
 
 from rich import print
 from .sun_rich import console
@@ -14,6 +16,7 @@ from .sun_rich import console
 from rich.prompt import Prompt
 from rich.panel import Panel
 from rich.text import Text
+from rich.table import Table
 
 
 def get_service_url(vac_name, project, region):
@@ -28,9 +31,8 @@ def get_service_url(vac_name, project, region):
 
     return url
 
-def stream_chat_session(service_name, project, region):
+def stream_chat_session(service_url, service_name):
 
-    service_url = get_service_url(service_name, project, region)
     user_id = generate_user_id()
     chat_history = []
     while True:
@@ -91,10 +93,9 @@ def stream_chat_session(service_name, project, region):
         console.print()
         console.rule()
 
-def headless_mode(service_name, user_input, project, region, chat_history=None):
+def headless_mode(service_url, service_name, user_input, chat_history=None):
     chat_history = chat_history or []
 
-    service_url = get_service_url(service_name, project, region)
     user_id = generate_user_id()
     session_id = str(uuid.uuid4())
 
@@ -144,34 +145,132 @@ def headless_mode(service_name, user_input, project, region, chat_history=None):
 
 
 def vac_command(args):
-    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)
-    
-    agent_name   = load_config_key("agent", args.vac_name, kind="vacConfig")
+    if args.action == 'list':
+        list_cloud_run_services(args.project, args.region)
+        return
+    elif args.action == 'get-url':
+        service_url = get_cloud_run_service_url(args.project, args.region, args.vac_name)
+        if service_url:
+            console.print(service_url)
+            return
+    elif args.action == 'chat':
 
-    if args.headless:
-        headless_mode(args.vac_name, args.user_input, args.project, args.region, args.chat_history)
-        stop_proxy(agent_name)
-    else:
-        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 not args.no_proxy:
+            try:
+                service_url = get_service_url(args.vac_name, args.project, args.region)
+            except ValueError as e:
+                console.print(f"[bold red]ERROR: Could not start {args.vac_name} proxy URL: {str(e)}[/bold red]")
+                sys.exit(1)
+        else:
+            service_url = get_cloud_run_service_url(args.project, args.region, args.vac_name)
+            console.print(f"Not using a proxy, connecting directly to {service_url}")
+    
+        agent_name   = load_config_key("agent", args.vac_name, kind="vacConfig")
 
-        if agent_name == "langserve":
-            subtitle = f"{service_url}/{args.vac_name}/playground/"
+        if args.headless:
+            headless_mode(service_url, args.vac_name, args.user_input, args.chat_history)
         else:
-            subtitle = f"{agent_name} - {service_url}/vac/{args.vac_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)
-                )
+            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)
+            stream_chat_session(service_url, args.vac_name)
+        
         stop_proxy(agent_name)
+
+
+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 get_cloud_run_service_url(project, region, service_name):
+    """
+    Retrieves the URL of a specific Cloud Run service in a given project and region.
+
+    Args:
+        project (str): The GCP project ID.
+        region (str): The region of the Cloud Run service.
+        service_name (str): The name of the Cloud Run service.
+
+    Returns:
+        str: The URL of the Cloud Run service, or an error message if not found.
+    """
+    try:
+        result = subprocess.run(
+            ["gcloud", "run", "services", "describe", service_name, "--project", project, "--region", region, "--format=json"],
+            stdout=subprocess.PIPE, stderr=subprocess.PIPE, timeout=30
+        )
+        if result.returncode != 0:
+            console.print(f"[bold red]ERROR: Unable to get Cloud Run service URL: {result.stderr.decode()}[/bold red]")
+            return None
+
+        service = json.loads(result.stdout.decode())
+        service_url = service['status']['url']
+        return service_url
+    except Exception as e:
+        console.print(f"[bold red]ERROR: An unexpected error occurred: {e}[/bold red]")
+        return None
+
     
 
 def setup_vac_subparser(subparsers):
@@ -182,8 +281,21 @@ 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('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)
+    vac_subparsers = vac_parser.add_subparsers(dest='action', help='VAC subcommands')
+
+    # Subcommand for listing VAC services
+    list_parser = vac_subparsers.add_parser('list', help='List all VAC services.')
+
+    # Subcommand for getting the URL of a specific VAC service
+    get_url_parser = vac_subparsers.add_parser('get-url', help='Get the URL of a specific VAC service.')
+    get_url_parser.add_argument('vac_name', help='Name of the VAC service.')
+
+    # Subcommand for interacting with a VAC service
+    chat_parser = vac_subparsers.add_parser('chat', help='Interact with a VAC service.')
+    chat_parser.add_argument('vac_name', help='Name of the VAC service.')
+    chat_parser.add_argument('user_input', help='User input for the VAC service when in headless mode.', nargs='?', default=None)
+    chat_parser.add_argument('--headless', action='store_true', help='Run in headless mode.')
+    chat_parser.add_argument('--chat_history', help='Chat history for headless mode (as JSON string).', default=None)
+    chat_parser.add_argument('--no_proxy', action='store_true', help='Do not use the proxy and connect directly to the VAC service.')
+
     vac_parser.set_defaults(func=vac_command)

sunholo/cli/run_proxy.py

@@ -109,7 +109,7 @@ def start_proxy(service_name, region, project, port=None):
     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']}.")
+        console.print(f"Proxy for service [bold orange]'{service_name}'[/bold orange] is already running on port {proxies[service_name]['port']}.")
         return
 
     if not port:
@@ -130,7 +130,7 @@ def start_proxy(service_name, region, project, port=None):
     }
     save_proxies(proxies)
     
-    print(f"Proxy for {service_name} setup complete on port {port}")
+    console.print(f"Proxy for [bold orange]'{service_name}'[/bold orange] setup complete on port {port}")
     list_proxies()
 
     return f"http://127.0.0.1:{port}"
@@ -154,11 +154,11 @@ def stop_proxy(service_name):
         os.kill(pid, signal.SIGTERM)
         del proxies[service_name]
         save_proxies(proxies)
-        print(f"Proxy for {service_name} stopped.")
+        console.print(f"Proxy for [bold orange]'{service_name}'[bold orange] stopped.")
     except ProcessLookupError:
-        print(f"No process found with PID: {pid}")
+        console.print(f"No process found with PID: {pid}")
     except Exception as e:
-        print(f"Error stopping proxy for {service_name}: {e}")
+        console.print(f"[bold red]Error stopping proxy for {service_name}: {e}[/bold red]")
     
     list_proxies()
 
@@ -172,69 +172,16 @@ def stop_all_proxies():
         pid = info["pid"]
         try:
             os.kill(pid, signal.SIGTERM)
-            print(f"Proxy for {service_name} stopped.")
+            print(f"Proxy for [bold orange]'{service_name}'[/bold orange] stopped.")
         except ProcessLookupError:
             print(f"No process found with PID: {pid}")
         except Exception as e:
-            print(f"Error stopping proxy for {service_name}: {e}")
+            print(f"Error stopping proxy for [bold orange]'{service_name}'[/bold orange]: {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.
@@ -283,7 +230,5 @@ def setup_proxy_subparser(subparsers):
     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.5.dist-info → sunholo-0.60.7.dist-info}/METADATA

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

{sunholo-0.60.5.dist-info → sunholo-0.60.7.dist-info}/RECORD

@@ -32,13 +32,13 @@ 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=0ta0uXsGJQlUHrSiMY7wbUp9AaljLJA5R8xDIF2isgk,6857
+sunholo/cli/chat_vac.py,sha256=8iSda-K3w0zHLrMkjck919kVgM5vJNrLAbEj0zKVIKw,11361
 sunholo/cli/cli.py,sha256=LWA5OveHx3ocy9KD1XwAwosBFrTUwifArIbltYgpul4,2420
 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=kYi3LnMdi27IqzA-k37WyT8AnFifn5ePP7jNK-8UmhE,9694
+sunholo/cli/run_proxy.py,sha256=53bRzm6IVf5SB07fiwqKpJrGQBTt3xAWi-669w6VYSU,7591
 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
@@ -96,9 +96,9 @@ sunholo/utils/parsers.py,sha256=OrHmASqIbI45atVOhiGodgLvnfrzkvVzyHnSvAXD89I,3841
 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.5.dist-info/LICENSE.txt,sha256=SdE3QjnD3GEmqqg9EX3TM9f7WmtOzqS1KJve8rhbYmU,11345
-sunholo-0.60.5.dist-info/METADATA,sha256=bYtLnWZBwnj6r_Nzbc6TqFANw0lZuv9OCk4eldL_RZQ,8057
-sunholo-0.60.5.dist-info/WHEEL,sha256=GJ7t_kWBFywbagK5eo9IoUwLW6oyOeTKmQ-9iHFVNxQ,92
-sunholo-0.60.5.dist-info/entry_points.txt,sha256=bZuN5AIHingMPt4Ro1b_T-FnQvZ3teBes-3OyO0asl4,49
-sunholo-0.60.5.dist-info/top_level.txt,sha256=wt5tadn5--5JrZsjJz2LceoUvcrIvxjHJe-RxuudxAk,8
-sunholo-0.60.5.dist-info/RECORD,,
+sunholo-0.60.7.dist-info/LICENSE.txt,sha256=SdE3QjnD3GEmqqg9EX3TM9f7WmtOzqS1KJve8rhbYmU,11345
+sunholo-0.60.7.dist-info/METADATA,sha256=UqURElBg2H6zB4MKBSBwTktG2AeeClFUcGVVr_BPSW4,8057
+sunholo-0.60.7.dist-info/WHEEL,sha256=GJ7t_kWBFywbagK5eo9IoUwLW6oyOeTKmQ-9iHFVNxQ,92
+sunholo-0.60.7.dist-info/entry_points.txt,sha256=bZuN5AIHingMPt4Ro1b_T-FnQvZ3teBes-3OyO0asl4,49
+sunholo-0.60.7.dist-info/top_level.txt,sha256=wt5tadn5--5JrZsjJz2LceoUvcrIvxjHJe-RxuudxAk,8
+sunholo-0.60.7.dist-info/RECORD,,