sunholo 0.60.8__py3-none-any.whl → 0.61.0__py3-none-any.whl

sunholo/agents/flask/qna_routes.py

@@ -41,9 +41,14 @@ def register_qna_routes(app, stream_interpreter, vac_interpreter):
     def home():
         return jsonify("OK")
 
+    @app.route("/health")
+    def health():
+        return jsonify({"status": "healthy"})
+
     @app.route('/vac/streaming/<vector_name>', methods=['POST'])
     @observe()
     def stream_qa(vector_name):
+        observed_stream_interpreter = observe()(stream_interpreter)
         prep = prep_vac(request, vector_name)
         log.debug(f"Processing prep: {prep}")
         trace = prep["trace"]
@@ -69,7 +74,7 @@ def register_qna_routes(app, stream_interpreter, vac_interpreter):
 
             for chunk in start_streaming_chat(question=all_input["user_input"],
                                               vector_name=vector_name,
-                                              qna_func=stream_interpreter,
+                                              qna_func=observed_stream_interpreter,
                                               chat_history=all_input["chat_history"],
                                               wait_time=all_input["stream_wait_time"],
                                               timeout=all_input["stream_timeout"],

sunholo/cli/chat_vac.py

@@ -186,7 +186,7 @@ def vac_command(args):
 
             stream_chat_session(service_url, args.vac_name)
         
-        stop_proxy(agent_name)
+        stop_proxy(agent_name, stop_local=False)
 
 
 def list_cloud_run_services(project, region):

sunholo/cli/cli.py

@@ -11,10 +11,17 @@ from ..utils.config import load_config_key
 
 from ..logging import log
 
+from .sun_rich import console
+import sys
 
 
 def load_default_gcp_config():
-    gcp_config = load_config_key('gcp_config', 'global', kind="vacConfig")
+    try:
+        gcp_config = load_config_key('gcp_config', 'global', kind="vacConfig")
+    except FileNotFoundError as e:
+        console.print(f"{e} - move config/ folder to working directory or set the _CONFIG_FOLDER environment variable to its location")
+        sys.exit(1)
+
     if gcp_config:
         return gcp_config.get('project_id', ''), gcp_config.get('location', 'europe-west1')
     else:

sunholo/cli/run_proxy.py

@@ -1,5 +1,6 @@
 import subprocess
 import os
+import sys
 import signal
 import json
 
@@ -96,7 +97,7 @@ def save_proxies(proxies):
 
 
 
-def start_proxy(service_name, region, project, port=None):
+def start_proxy(service_name, region, project, port=None, local=False, app_type=None, app_folder=None, log_file=None):
     """
     Starts the gcloud proxy to the Cloud Run service and stores the PID.
 
@@ -114,34 +115,48 @@ def start_proxy(service_name, region, project, port=None):
 
     if not port:
         port = get_next_available_port(proxies, DEFAULT_PORT)
-
-    command = [
-        "gcloud", "run", "services", "proxy", service_name,
-        "--region", region,
-        "--project", project,
-        "--port", str(port)
-    ]
-    with open(os.devnull, 'w') as devnull:
-        process = subprocess.Popen(command, stdout=devnull, stderr=devnull, preexec_fn=os.setpgrp)
-    
-    proxies[service_name] = {
-        "pid": process.pid,
-        "port": port
-    }
-    save_proxies(proxies)
     
-    console.print(f"Proxy for [bold orange]'{service_name}'[/bold orange] setup complete on port {port}")
-    list_proxies()
+
+
+    if local:
+        start_local(service_name, port, app_type, app_folder, log_file)
+    else:
+        command = [
+            "gcloud", "run", "services", "proxy", service_name,
+            "--region", region,
+            "--project", project,
+            "--port", str(port)
+        ]
+        if log_file:
+            log_file_path = os.path.join(app_folder, f"{service_name}_log.txt")
+            with open(log_file_path, 'a') as logf:
+                process = subprocess.Popen(command, stdout=logf, stderr=logf, preexec_fn=os.setpgrp)
+        else:
+            log_file_path = "No log file specified"
+            with open(os.devnull, 'w') as devnull:
+                process = subprocess.Popen(command, stdout=devnull, stderr=devnull, preexec_fn=os.setpgrp)
+            
+        proxies[service_name] = {
+            "pid": process.pid,
+            "port": port,
+            "local": "No",
+            "logs": log_file_path
+        }
+        save_proxies(proxies)
+        
+        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}"
 
 
-def stop_proxy(service_name):
+def stop_proxy(service_name, stop_local=True):
     """
     Stops the gcloud proxy to the Cloud Run service using the stored PID.
 
     Args:
         service_name (str): Name of the Cloud Run service.
+        stop_local (bool): Whether to stop locally running services or not. Defaults to True.
     """
     proxies = clean_proxy_list()
 
@@ -149,16 +164,21 @@ def stop_proxy(service_name):
         print(f"No proxy found for service: {service_name}")
         return
 
-    pid = proxies[service_name]["pid"]
-    try:
-        os.kill(pid, signal.SIGTERM)
-        del proxies[service_name]
-        save_proxies(proxies)
-        console.print(f"Proxy for [bold orange]'{service_name}'[bold orange] stopped.")
-    except ProcessLookupError:
-        console.print(f"No process found with PID: {pid}")
-    except Exception as e:
-        console.print(f"[bold red]Error stopping proxy for {service_name}: {e}[/bold red]")
+    if not stop_local:
+        local = proxies[service_name]["local"]
+        if local != "No":
+            console.print(f"Not stopping local VAC running on: {local}")
+    else:
+        pid = proxies[service_name]["pid"]
+        try:
+            os.kill(pid, signal.SIGTERM)
+            del proxies[service_name]
+            save_proxies(proxies)
+            console.print(f"Proxy for [bold orange]'{service_name}'[bold orange] stopped.")
+        except ProcessLookupError:
+            console.print(f"No process found with PID: {pid}")
+        except Exception as e:
+            console.print(f"[bold red]Error stopping proxy for {service_name}: {e}[/bold red]")
     
     list_proxies()
 
@@ -192,18 +212,71 @@ def list_proxies():
     if not proxies:
         print("No proxies currently running.")
     else:
-        table = Table(title="VAC Proxies")
+        table = Table(title="VAC Proxies - `sunholo proxy list`")
         table.add_column("VAC")
         table.add_column("Port")
         table.add_column("PID")
         table.add_column("URL")
+        table.add_column("Local")
+        table.add_column("Logs")
         
         for service_name, info in proxies.items():
             url = f"http://127.0.0.1:{info['port']}"
-            table.add_row(service_name, str(info['port']), str(info['pid']), url)
+            table.add_row(service_name, 
+                          str(info['port']), 
+                          str(info['pid']), 
+                          url, 
+                          str(info['local']), 
+                          str(info['logs']) )
         
         console.print(table)
 
+def start_local(service_name, port, app_type, app_folder, log_file):
+    """
+    Starts a local Flask or FastAPI VAC app.
+
+    Args:
+        service_name (str): Name of the service.
+        port (int): Port to run the local app on.
+        app_type (str): Type of the app ('flask' or 'fastapi').
+        app_folder (str): Folder containing the app.
+    """
+    proxies = clean_proxy_list()
+
+    if service_name in proxies:
+        console.print(f"Local VAC app [bold orange]'{service_name}'[/bold orange] is already running on port {proxies[service_name]['port']}.")
+        return
+
+    if app_type == 'flask':
+        command = [sys.executable, 'app.py']
+    elif app_type == 'fastapi':
+        command = ["uvicorn", "app:app", f"--port={port}"]
+    else:
+        print(f"[bold red]Unknown app type: {app_type}[/bold red]")
+        return
+
+    if log_file:
+        log_file_path = os.path.join(app_folder, f"{service_name}_log.txt")
+        with open(log_file_path, 'w') as logf:
+            process = subprocess.Popen(command, cwd=app_folder, stdout=logf, stderr=logf, preexec_fn=os.setpgrp)
+    else:
+        log_file_path = "No log file specified"
+        with open(os.devnull, 'a') as devnull:
+            process = subprocess.Popen(command, cwd=app_folder, stdout=devnull, stderr=devnull, preexec_fn=os.setpgrp)
+
+    proxies[service_name] = {
+        "pid": process.pid,
+        "port": port,
+        "local": f"{app_folder}/app.py - {app_type}",
+        "logs": log_file_path
+    }
+    save_proxies(proxies)
+    
+    console.print(f"Local app [bold orange]'{service_name}'[/bold orange] started on port {port}")
+    list_proxies()
+
+    return f"http://127.0.0.1:{port}"
+
 def setup_proxy_subparser(subparsers):
     """
     Sets up an argparse subparser for the 'proxy' command.
@@ -218,8 +291,19 @@ def setup_proxy_subparser(subparsers):
     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))
-
+    start_parser.add_argument('--local', action='store_true', help='Run the service locally instead of proxying to Cloud Run.')
+    start_parser.add_argument('--app-type', choices=['flask', 'fastapi'], help='If local, type of the local app (flask or fastapi).')
+    start_parser.add_argument('--app-folder', help='If local, folder containing the local app.py')
+    start_parser.add_argument('--log-file', action='store_true', help='Whether to create a file containing proxy logs.')
+    start_parser.set_defaults(func=lambda args: start_proxy(args.service_name, 
+                                                            args.region, 
+                                                            args.project, 
+                                                            args.port, 
+                                                            args.local, 
+                                                            args.app_type, 
+                                                            args.app_folder,
+                                                            args.log_file))
+    
     stop_parser = proxy_subparsers.add_parser('stop', help='Stop the proxy to the Cloud Run service.')
     stop_parser.add_argument('service_name', help='Name of the Cloud Run service.')
     stop_parser.set_defaults(func=lambda args: stop_proxy(args.service_name))

sunholo/database/lancedb.py

@@ -5,7 +5,7 @@ def create_lancedb_index(bucket, vector_name, num_partitions=256, num_sub_vector
         import lancedb
         #import tantivy
     except ImportError:
-        raise ValueError("Could not import lancedb module, install via `pip intall sunholo[database]`")
+        raise ValueError("Could not import lancedb module, install via `pip install sunholo[database]`")
         
     try:
         db = lancedb.connect(bucket) 

{sunholo-0.60.8.dist-info → sunholo-0.61.0.dist-info}/METADATA

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

{sunholo-0.60.8.dist-info → sunholo-0.61.0.dist-info}/RECORD

@@ -7,13 +7,12 @@ sunholo/agents/langserve.py,sha256=FdhQjorAY2bMn2rpuabNT6bU3uqSKWrl8DjpH3L_V7k,4
 sunholo/agents/pubsub.py,sha256=5hbbhbBGyVWRpt2sAGC5FEheYH1mCCwVUhZEB1S7vGg,1337
 sunholo/agents/route.py,sha256=0klBifx-QtMGsjq8HB04s9Bytm0nFXPYaWKeyt-S9S4,2356
 sunholo/agents/special_commands.py,sha256=PI4ADgFQvPDCeCpOeWIrD4bD432NYFeVcBBnkqTBWi8,6457
-sunholo/agents/test_chat_history.py,sha256=vPbPu0xREEs4J4X_zJKBY1f19Vy5yV05_CKfUUQqfFg,3923
 sunholo/agents/fastapi/__init__.py,sha256=S_pj4_bTUmDGoq_exaREHlOKThi0zTuGT0VZY0YfODQ,88
 sunholo/agents/fastapi/base.py,sha256=clk76cHbUAvU0OYJrRfCWX_5f0ACbhDsIzYBhI3wyoE,2514
 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=Pr2dxM7GKhXNKv6t7_J578BN6oMETAYFe6ydEm4D90g,8620
+sunholo/agents/flask/qna_routes.py,sha256=9xQUIadDtQIgTRa-nXIYJbzwQokqtVjeLp-tcSxGy9Y,8788
 sunholo/archive/__init__.py,sha256=qNHWm5rGPVOlxZBZCpA1wTYPbalizRT7f8X4rs2t290,31
 sunholo/archive/archive.py,sha256=C-UhG5x-XtZ8VheQp92IYJqgD0V3NFQjniqlit94t18,1197
 sunholo/auth/__init__.py,sha256=4owDjSaWYkbTlPK47UHTOC0gCWbZsqn4ZIEw5NWZTlg,28
@@ -32,13 +31,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=FvQTgFA4h0vfPSXvAx0_KCe8DUr2u_Wv1Md8-p6BkHk,11361
-sunholo/cli/cli.py,sha256=LWA5OveHx3ocy9KD1XwAwosBFrTUwifArIbltYgpul4,2420
+sunholo/cli/chat_vac.py,sha256=_NUjwATKvzwfnBJRedP2GqPFNeaCF5F8OvdygXRH1LY,11379
+sunholo/cli/cli.py,sha256=cogY1F5rcIGFYpZVFtbDNlAIElpfyPSCvSLC1ZIpHXg,2666
 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=53bRzm6IVf5SB07fiwqKpJrGQBTt3xAWi-669w6VYSU,7591
+sunholo/cli/run_proxy.py,sha256=9ILCxSVHPzS-cSBvjdHhfZFlwsJ4Ttmu0vLtNoPCRgo,11469
 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
@@ -48,7 +47,7 @@ sunholo/components/vectorstore.py,sha256=dzspqOBtuxSjCFxem5_50sqwUUjbZ4oBYERtCwx
 sunholo/database/__init__.py,sha256=Zz0Shcq-CtStf9rJGIYB_Ybzb8rY_Q9mfSj-nviM490,241
 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/lancedb.py,sha256=2rAbJVusMrm5TPtVTsUtmwn0z1iZ_wvbKhc6eyT6ClE,708
 sunholo/database/static_dbs.py,sha256=aOyU3AJ-Dzz3qSNjbuN2293cfYw5PhkcQuQxdwPMJ4w,435
 sunholo/database/uuid.py,sha256=GtUL_uq80u2xkozPF9kwNpvhBf03hbZR3xUhO3NomBM,237
 sunholo/database/sql/sb/create_function.sql,sha256=HuDyp3fxS5Etop3gGDy28_AuFuhgEgVcq9-q3oeecPU,1033
@@ -96,9 +95,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.8.dist-info/LICENSE.txt,sha256=SdE3QjnD3GEmqqg9EX3TM9f7WmtOzqS1KJve8rhbYmU,11345
-sunholo-0.60.8.dist-info/METADATA,sha256=TN1eHOBtuzd5fypSsbUpXwexrvfQ12ZPPE8IkRYq_A8,8057
-sunholo-0.60.8.dist-info/WHEEL,sha256=GJ7t_kWBFywbagK5eo9IoUwLW6oyOeTKmQ-9iHFVNxQ,92
-sunholo-0.60.8.dist-info/entry_points.txt,sha256=bZuN5AIHingMPt4Ro1b_T-FnQvZ3teBes-3OyO0asl4,49
-sunholo-0.60.8.dist-info/top_level.txt,sha256=wt5tadn5--5JrZsjJz2LceoUvcrIvxjHJe-RxuudxAk,8
-sunholo-0.60.8.dist-info/RECORD,,
+sunholo-0.61.0.dist-info/LICENSE.txt,sha256=SdE3QjnD3GEmqqg9EX3TM9f7WmtOzqS1KJve8rhbYmU,11345
+sunholo-0.61.0.dist-info/METADATA,sha256=bgegQWs1_EJTqy_Xqwebux6L8ACVcJn-wtuVPxpw_yw,8057
+sunholo-0.61.0.dist-info/WHEEL,sha256=GJ7t_kWBFywbagK5eo9IoUwLW6oyOeTKmQ-9iHFVNxQ,92
+sunholo-0.61.0.dist-info/entry_points.txt,sha256=bZuN5AIHingMPt4Ro1b_T-FnQvZ3teBes-3OyO0asl4,49
+sunholo-0.61.0.dist-info/top_level.txt,sha256=wt5tadn5--5JrZsjJz2LceoUvcrIvxjHJe-RxuudxAk,8
+sunholo-0.61.0.dist-info/RECORD,,

sunholo/agents/test_chat_history.py

@@ -1,119 +0,0 @@
-import pytest
-from .chat_history import *
-
-
-def test_extract_chat_history_null_input():
-    assert extract_chat_history(None) == [], 'Expected empty list for null input'
-
-
-def test_extract_chat_history_no_chat():
-    assert extract_chat_history([]) == [], 'Expected empty list for no chat history'
-
-
-def test_extract_chat_history_with_chat():
-    chat_history = [('User', 'Hello'), ('Bot', 'Hi'), ('User', 'How are you?'), ('Bot', 'I am fine.')]
-    expected_output = [('User', 'Hello'), ('Bot', 'Hi'), ('User', 'How are you?'), ('Bot', 'I am fine.')]
-    assert extract_chat_history(chat_history) == expected_output, 'Expected list of paired messages for chat history'
-
-
-# Test cases for embeds_to_json function
-
-def test_embeds_to_json_no_embeds():
-    message = 'Hello, world!'
-    assert embeds_to_json(message) == '', 'Expected empty string for message with no embeds'
-
-
-def test_embeds_to_json_one_embed():
-    message = 'Hello, world! [embed]'
-    expected_output = '{"embeds": ["embed"]}'
-    assert embeds_to_json(message) == expected_output, 'Expected JSON string with one embed for message with one embed'
-
-
-def test_embeds_to_json_multiple_embeds():
-    message = 'Hello, world! [embed1] [embed2]'
-    expected_output = '{"embeds": ["embed1", "embed2"]}'
-    assert embeds_to_json(message) == expected_output, 'Expected JSON string with multiple embeds for message with multiple embeds'
-
-
-# Test cases for create_message_element function
-
-def test_create_message_element_text():
-    message = {'text': 'Hello, world!'}
-    assert create_message_element(message) == 'Hello, world!', 'Expected text element for message with text'
-
-
-def test_create_message_element_content():
-    message = {'content': 'Hello, world!'}
-    assert create_message_element(message) == 'Hello, world!', 'Expected content element for message with content'
-
-
-def test_create_message_element_no_text_or_content():
-    message = {}
-    with pytest.raises(KeyError):
-        create_message_element(message)
-
-
-# Test cases for is_human function
-
-def test_is_human_name_human():
-    message = {'name': 'Human'}
-    assert is_human(message) == True, 'Expected True for message with name Human'
-
-
-def test_is_human_sender_type_human():
-    message = {'sender': {'type': 'HUMAN'}}
-    assert is_human(message) == True, 'Expected True for message with sender type HUMAN'
-
-
-def test_is_human_user_no_bot_id():
-    message = {'user': 'User1', 'bot_id': None}
-    assert is_human(message) == True, 'Expected True for message with user field and no bot_id field'
-
-
-def test_is_human_not_human():
-    message = {'name': 'Bot'}
-    assert is_human(message) == False, 'Expected False for message not from a human'
-
-
-# Test cases for is_bot function
-
-def test_is_bot_name_bot():
-    message = {'name': 'Bot'}
-    assert is_bot(message) == True, 'Expected True for message with name Bot'
-
-
-def test_is_bot_sender_type_bot():
-    message = {'sender': {'type': 'BOT'}}
-    assert is_bot(message) == True, 'Expected True for message with sender type BOT'
-
-
-def test_is_bot_with_bot_id():
-    message = {'bot_id': 'bot1'}
-    assert is_bot(message) == True, 'Expected True for message with bot_id field'
-
-
-def test_is_bot_not_bot():
-    message = {'name': 'Human'}
-    assert is_bot(message) == False, 'Expected False for message not from a bot'
-
-
-# Test cases for is_ai function
-
-def test_is_ai_name_ai():
-    message = {'name': 'AI'}
-    assert is_ai(message) == True, 'Expected True for message with name AI'
-
-
-def test_is_ai_sender_type_bot():
-    message = {'sender': {'type': 'BOT'}}
-    assert is_ai(message) == True, 'Expected True for message with sender type BOT'
-
-
-def test_is_ai_with_bot_id():
-    message = {'bot_id': 'bot1'}
-    assert is_ai(message) == True, 'Expected True for message with bot_id field'
-
-
-def test_is_ai_not_ai():
-    message = {'name': 'Human'}
-    assert is_ai(message) == False, 'Expected False for message not from an AI'