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

sunholo/cli/chat_vac.py

@@ -3,7 +3,7 @@ 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
 
@@ -15,14 +15,17 @@ from rich.panel import Panel
 from rich.text import Text
 
 
-def get_service_url(service_name, project, region):
+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, region, project)
+        print(f"No proxy found running for service: {agent_name} required for {vac_name} - attempting to connect")
+        url = start_proxy(agent_name, region, project)
+
+    return url
 
 def stream_chat_session(service_name, project, region):
 
@@ -36,8 +39,6 @@ def stream_chat_session(service_name, project, region):
             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,
@@ -83,15 +84,16 @@ def stream_chat_session(service_name, project, region):
                 console.print(token, end='')
                 vac_response += token
 
-        chat_history.append({"role": "AI", "content": vac_response})
+        chat_history.append({"name": "Human", "content": user_input})
+        chat_history.append({"name": "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": "Human", "content": user_input})
-    service_url = get_service_url(project, region)
+
+    service_url = get_service_url(service_name, project, region)
     user_id = generate_user_id()
     session_id = str(uuid.uuid4())
 
@@ -124,13 +126,17 @@ def headless_mode(service_name, user_input, project, region, 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
@@ -138,24 +144,34 @@ def headless_mode(service_name, user_input, project, region, chat_history=None):
 
 def vac_command(args):
     try:
-        service_url = get_service_url(args.service_name, args.project, args.region)
+        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.service_name} proxy URL: {str(e)}[/bold red]")
+        console.print(f"[bold red]ERROR: Could not start {args.vac_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)
-              )
-    
+    agent_name   = load_config_key("agent", args.vac_name, kind="vacConfig")
+
     if args.headless:
-        headless_mode(args.service_name, args.user_input, args.project, args.region, 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, args.project, args.region)
+        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):
     """
@@ -165,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/cli/cli.py

@@ -11,13 +11,7 @@ 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")
@@ -67,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/cli/run_proxy.py

@@ -52,7 +52,7 @@ def check_gcloud():
         # Check if gcloud is installed
         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
@@ -239,8 +239,9 @@ def list_proxies():
     """
     Lists all running proxies.
     """
-    print("Listing 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:
@@ -264,10 +265,10 @@ def setup_proxy_subparser(subparsers):
         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('--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))

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/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.3.dist-info → sunholo-0.60.4.dist-info}/METADATA

@@ -1,9 +1,9 @@
 Metadata-Version: 2.1
 Name: sunholo
-Version: 0.60.3
+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.3.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

{sunholo-0.60.3.dist-info → sunholo-0.60.4.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=o17_ErIsR0FtCelSCTRSyleUeqZkbA7M463F7e61KBs,6360
-sunholo/cli/cli.py,sha256=d52lyS0WnEWK8qSDX6-B6KgpNhQC6R9hiENE9s-qSqM,2613
+sunholo/cli/chat_vac.py,sha256=038AkvGDEK5cBWqQTRrTQYCsa1FDWzZGHaHOyrS2lFE,6841
+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=2ZFjOPMUNeC2nK2iwLZfE2HQkq9ZDaDen2EabHuNAFs,9606
+sunholo/cli/run_proxy.py,sha256=kYi3LnMdi27IqzA-k37WyT8AnFifn5ePP7jNK-8UmhE,9694
 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
@@ -46,7 +46,7 @@ sunholo/components/prompt.py,sha256=eZSghXkIlRzXiSrzgkG7e5ytUYq6R6LV-qjHU8jStig,
 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/alloydb.py,sha256=0zRLyeC9nACzj3v36ET9NqLeuzdwBJ2bE09CzgVTTFM,17098
 sunholo/database/database.py,sha256=doY05kG8BZBLL-arh4hq5ef1ouWOtGHqdsDc6M2YHgk,7345
 sunholo/database/lancedb.py,sha256=WSrbY5mgyeXx6i7UBiz4YQ_i5UIYVYFo-vPGO72bQKY,707
 sunholo/database/static_dbs.py,sha256=aOyU3AJ-Dzz3qSNjbuN2293cfYw5PhkcQuQxdwPMJ4w,435
@@ -83,7 +83,7 @@ sunholo/qna/parsers.py,sha256=mH_SIgN2yXzvcoQZt9ITkdJSw3jgZGuu0p8q_H-kdSM,2140
 sunholo/qna/retry.py,sha256=gFgOf9AxrZMIO9OwOYu1EW7rhNhyfnw_o4XAsNLBOVQ,2021
 sunholo/streaming/__init__.py,sha256=k8dBqhzyS1Oi6NfADtRtWfnPtU1FU2kQz-YxH9yrNeQ,197
 sunholo/streaming/content_buffer.py,sha256=fWcg0oTf470M3U40VAChfmHmWRFgRD8VaT90jNfBCH0,6455
-sunholo/streaming/langserve.py,sha256=6isOvFwZBfmiQY5N41PYPyrdJj9IgJXXHLfTzPvewGw,6299
+sunholo/streaming/langserve.py,sha256=4AeNt4FPv461s20_5q17Nx83cHjK7Dl3gVOcWAxMgOk,6350
 sunholo/streaming/streaming.py,sha256=9z6pXINEopuL_Z1RnmgXAoZJum9dzyuOxqYtEYnjf8w,16405
 sunholo/summarise/__init__.py,sha256=MZk3dblUMODcPb1crq4v-Z508NrFIpkSWNf9FIO8BcU,38
 sunholo/summarise/summarise.py,sha256=C3HhjepTjUhUC8FLk4jMQIBvq1BcORniwuTFHjPVhVo,3784
@@ -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.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,,
+sunholo-0.60.4.dist-info/LICENSE.txt,sha256=SdE3QjnD3GEmqqg9EX3TM9f7WmtOzqS1KJve8rhbYmU,11345
+sunholo-0.60.4.dist-info/METADATA,sha256=nHPHNqcRw2WAX2guIAM0QXFVcQLx3FzlB024g-jfK4k,8057
+sunholo-0.60.4.dist-info/WHEEL,sha256=GJ7t_kWBFywbagK5eo9IoUwLW6oyOeTKmQ-9iHFVNxQ,92
+sunholo-0.60.4.dist-info/entry_points.txt,sha256=bZuN5AIHingMPt4Ro1b_T-FnQvZ3teBes-3OyO0asl4,49
+sunholo-0.60.4.dist-info/top_level.txt,sha256=wt5tadn5--5JrZsjJz2LceoUvcrIvxjHJe-RxuudxAk,8
+sunholo-0.60.4.dist-info/RECORD,,