sunholo 0.61.6__py3-none-any.whl → 0.61.8__py3-none-any.whl

sunholo/agents/flask/base.py

@@ -16,5 +16,6 @@ def create_app(name):
     # Initialize Flask app
     app = Flask(name)
     app.config['TRAP_HTTP_EXCEPTIONS'] = True
+    app.config['PROPAGATE_EXCEPTIONS'] = True
    
     return app

sunholo/agents/flask/qna_routes.py

@@ -27,13 +27,12 @@ from ...utils.config import load_config
 try:
     from flask import request, jsonify, Response
 except ImportError:
-    print("No flask installed for agents.flask.register_qna_routes, install via `pip install sunholo[http]`")
+    pass
 
 try:
     from langfuse.decorators import langfuse_context, observe
-except ImportError as err:
-    print(f"No langfuse installed for agents.flask.register_qna_routes, install via `pip install sunholo[http]` - {str(err)}")
-    
+except ImportError:
+    pass    
 
 def register_qna_routes(app, stream_interpreter, vac_interpreter):
 

sunholo/chunker/data_to_embed_pubsub.py

@@ -11,11 +11,31 @@
 #   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 #   See the License for the specific language governing permissions and
 #   limitations under the License.
+import pathlib
+
 from ..logging import log
 from ..pubsub import process_pubsub_message
 from .message_data import handle_gcs_message, handle_google_drive_message, handle_github_message, handle_http_message, handle_json_content_message
 from .publish import process_docs_chunks_vector_name
+from .splitter import chunk_doc_to_docs
+
 from ..llamaindex.import_files import llamaindex_chunker_check
+from . import loaders
+
+def direct_file_to_embed(file_name: pathlib.Path, metadata: dict, vector_name: str):
+        
+    log.info(f"Sending direct file upload {file_name} to loaders.read_file_to_documents {metadata}")
+    docs = loaders.read_file_to_documents(file_name, metadata=metadata)
+    if docs is None:
+        log.warning(f"loaders.read_file_to_documents docs2 failed to load file {metadata}")
+
+        return None
+
+    chunks = chunk_doc_to_docs(docs, file_name.suffix, vector_name=vector_name)
+    
+    return format_chunk_return(chunks, metadata, vector_name)
+
+
 
 def data_to_embed_pubsub(data: dict):
     """Triggered from a message on a Cloud Pub/Sub topic.
@@ -62,7 +82,11 @@ def process_chunker_data(message_data, metadata, vector_name):
 
     else: 
         chunks, metadata = handle_json_content_message(message_data, metadata, vector_name) 
+    
+    return format_chunk_return(chunks, metadata, vector_name)
+
 
+def format_chunk_return(chunks, metadata, vector_name):
     # to be really sure
     if metadata:
         metadata["vector_name"] = vector_name

sunholo/cli/chat_vac.py

@@ -157,20 +157,19 @@ def resolve_service_url(args, no_config=False):
 
         return args.url_override
 
-    if not args.no_proxy:
-        try:
-            service_url = get_service_url(args.vac_name, args.project, args.region, no_config=no_config)
-        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:
-        console.print(f"Not using a proxy, connecting directly to {service_url}")
-
+    if args.no_proxy:
         agent_url = load_config_key("agent_url", args.vac_name, "vacConfig")
         if agent_url:
             console.print("Found agent_url within vacConfig: {agent_url}")
         
         service_url = agent_url or get_cloud_run_service_url(args.project, args.region, args.vac_name)
+        console.print(f"No proxy, connecting directly to {service_url}")
+    else:
+        try:
+            service_url = get_service_url(args.vac_name, args.project, args.region, no_config=no_config)
+        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)
     
     return service_url
 

sunholo/cli/cli.py

@@ -15,6 +15,7 @@ from ..logging import log
 
 from .sun_rich import console
 import sys
+from rich.panel import Panel
 
 
 def load_default_gcp_config():
@@ -31,6 +32,12 @@ def load_default_gcp_config():
 
 def main(args=None):
 
+    console.print(
+        Panel("Welcome to Sunholo Command Line Interface, your assistant to deploy GenAI Virtual Agent Computers (VACs) to Multivac or your own Cloud.", 
+            title="Sunholo GenAIOps Assistant CLI",
+            subtitle="Documentation at https://dev.sunholo.com/")
+            )
+    console.rule()
 
     """
     Entry point for the sunholo console script. This function parses command line arguments

sunholo/cli/run_proxy.py

@@ -1,6 +1,5 @@
 import subprocess
 import os
-import sys
 import signal
 import json
 
@@ -11,19 +10,6 @@ from rich import print
 PROXY_TRACKER_FILE = '.vac_proxy_tracker.json'
 DEFAULT_PORT = 8080
 
-def create_hyperlink(url, text):
-    """
-    Creates a hyperlink for the console.
-
-    Args:
-        url (str): The URL for the hyperlink.
-        text (str): The text to display for the hyperlink.
-
-    Returns:
-        str: The formatted hyperlink.
-    """
-    return f"\033]8;;{url}\033\\{text}\033]8;;\033\\"
-
 
 def get_next_available_port(proxies, default_port):
     """
@@ -94,9 +80,6 @@ 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, local=False, app_type=None, app_folder=None, log_file=None):
     """
     Starts the gcloud proxy to the Cloud Run service and stores the PID.
@@ -116,8 +99,6 @@ def start_proxy(service_name, region, project, port=None, local=False, app_type=
     if not port:
         port = get_next_available_port(proxies, DEFAULT_PORT)
     
-
-
     if local:
         start_local(service_name, port, app_type, app_folder, log_file)
     else:
@@ -160,6 +141,9 @@ def stop_proxy(service_name, stop_local=True):
     """
     proxies = clean_proxy_list()
 
+    # ps aux | grep gcloud
+    # kill PID
+
     if service_name not in proxies:
         print(f"No proxy found for service: {service_name}")
         return
@@ -248,7 +232,7 @@ def start_local(service_name, port, app_type, app_folder, log_file):
         return
 
     if app_type == 'flask':
-        command = [sys.executable, 'app.py']
+        command = ["gunicorn", "--bind", f"0.0.0.0:{port}", "--workers", "4", "app:app"]
     elif app_type == 'fastapi':
         command = ["uvicorn", "app:app", f"--port={port}"]
     else:
@@ -304,11 +288,11 @@ def setup_proxy_subparser(subparsers):
                                                             args.app_folder,
                                                             args.log_file))
     
-    stop_parser = proxy_subparsers.add_parser('stop', help='Stop the proxy to the Cloud Run service.')
+    stop_parser = proxy_subparsers.add_parser('stop', help='Stop the proxy to the Cloud Run service. Backup: `kill -9 PID`')
     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))
 
-    list_parser = proxy_subparsers.add_parser('list', help='List all running proxies.')
+    list_parser = proxy_subparsers.add_parser('list', help='List all running proxies. Examine port via `lsof-i :PORT`')
     list_parser.set_defaults(func=lambda args: list_proxies())
 
     stop_all_parser = proxy_subparsers.add_parser('stop-all', help='Stop all running proxies.')

sunholo/database/alloydb.py

@@ -8,7 +8,7 @@ try:
     from langchain_google_alloydb_pg import AlloyDBEngine, Column, AlloyDBLoader, AlloyDBDocumentSaver
     from google.cloud.alloydb.connector import IPTypes
 except ImportError:
-    print("No database.alloydb functions - install via `pip install sunholo[database,gcp]`")
+    pass
 
 from .database import get_vector_size
 from ..logging import log

{sunholo-0.61.6.dist-info → sunholo-0.61.8.dist-info}/METADATA

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

{sunholo-0.61.6.dist-info → sunholo-0.61.8.dist-info}/RECORD

@@ -11,8 +11,8 @@ sunholo/agents/fastapi/__init__.py,sha256=S_pj4_bTUmDGoq_exaREHlOKThi0zTuGT0VZY0
 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=9xQUIadDtQIgTRa-nXIYJbzwQokqtVjeLp-tcSxGy9Y,8788
+sunholo/agents/flask/base.py,sha256=FgSaCODyoTtlstJtsqlLPScdgRUtv9_plxftdzHdVFo,809
+sunholo/agents/flask/qna_routes.py,sha256=t5BabGKjlK3sMcaXZywja47gtQRoROXXz6NMm8H-SSc,8561
 sunholo/archive/__init__.py,sha256=qNHWm5rGPVOlxZBZCpA1wTYPbalizRT7f8X4rs2t290,31
 sunholo/archive/archive.py,sha256=C-UhG5x-XtZ8VheQp92IYJqgD0V3NFQjniqlit94t18,1197
 sunholo/auth/__init__.py,sha256=4owDjSaWYkbTlPK47UHTOC0gCWbZsqn4ZIEw5NWZTlg,28
@@ -22,7 +22,7 @@ sunholo/bots/discord.py,sha256=cCFae5K1BCa6JVkWGLh_iZ9qFO1JpXb6K4eJrlDfEro,2442
 sunholo/bots/github_webhook.py,sha256=5pQPRLM_wxxcILVaIzUDV8Kt7Arcm2dL1r1kMMHA524,9629
 sunholo/bots/webapp.py,sha256=EIMxdAJ_xtufwJmvnn7N_Fb_1hZ9DjhJ0Kf_hp02vEU,1926
 sunholo/chunker/__init__.py,sha256=UhQBZTKwDfBXm0TPv4LvsGc5pdUGCbYzi3qPTOkU4gw,55
-sunholo/chunker/data_to_embed_pubsub.py,sha256=IY9SBRA7IO77QJBEgQuO1FiSCd6Dfm-TMEf1Ey-pLoo,3065
+sunholo/chunker/data_to_embed_pubsub.py,sha256=_uIf1hLD-fF3_S_TaG5PzpzoEcnooehN9K9CaGN7PwI,3820
 sunholo/chunker/doc_handling.py,sha256=rIyknpzDyj5A0u_DqSQVD_CXLRNZPOU6TCL4bhCdjOI,8563
 sunholo/chunker/images.py,sha256=Xmh1vwHrVhoXm5iH2dhCc52O8YgdzE8KrDSdL-pGnp8,1861
 sunholo/chunker/loaders.py,sha256=xiToUVgPz2ZzcqpUAq7aNP3PTenb_rBUAFzu0JPycIg,10268
@@ -31,14 +31,14 @@ 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=FEtaKQVYWenV1WKh4mfW7lTAaxOTvzmbG9MucG-UZoU,13179
-sunholo/cli/cli.py,sha256=HEuCRCxzwMPO0JtT3X1liGVyvEq20Mb1-SlKn7HPx6E,2775
+sunholo/cli/chat_vac.py,sha256=A_xavw034dE_Pr6dCRDp_OJrO3xs_F7S-W_QkK3r1Og,13165
+sunholo/cli/cli.py,sha256=ya5gCK9z4c4tF3XhK9gga1TAC7DnDJES1voDV2TV5xQ,3128
 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/embedder.py,sha256=hqIfqGCeV5UI_0dllNFsjdyjVWgC0Kmnw8kAKhN4jCI,5482
 sunholo/cli/merge_texts.py,sha256=U9vdMwKmcPoc6iPOWX5MKSxn49dNGbNzVLw8ui5PhEU,1823
-sunholo/cli/run_proxy.py,sha256=9ILCxSVHPzS-cSBvjdHhfZFlwsJ4Ttmu0vLtNoPCRgo,11469
+sunholo/cli/run_proxy.py,sha256=0ft_9FUL9d1NKM2ABMMPpvXRTRZd9f-lR2FCahiGzlU,11281
 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=lB8vx_N6eBA44orNeVo1WRn0Q8GCIjvPPT9AfiPWBWE,5620
 sunholo/database/__init__.py,sha256=Zz0Shcq-CtStf9rJGIYB_Ybzb8rY_Q9mfSj-nviM490,241
-sunholo/database/alloydb.py,sha256=0zRLyeC9nACzj3v36ET9NqLeuzdwBJ2bE09CzgVTTFM,17098
+sunholo/database/alloydb.py,sha256=zvT50Df7r-jJPo5lEEWbjlXzVr0KuqN6WINgRtiSyxo,17014
 sunholo/database/database.py,sha256=doY05kG8BZBLL-arh4hq5ef1ouWOtGHqdsDc6M2YHgk,7345
 sunholo/database/lancedb.py,sha256=2rAbJVusMrm5TPtVTsUtmwn0z1iZ_wvbKhc6eyT6ClE,708
 sunholo/database/static_dbs.py,sha256=aOyU3AJ-Dzz3qSNjbuN2293cfYw5PhkcQuQxdwPMJ4w,435
@@ -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.61.6.dist-info/LICENSE.txt,sha256=SdE3QjnD3GEmqqg9EX3TM9f7WmtOzqS1KJve8rhbYmU,11345
-sunholo-0.61.6.dist-info/METADATA,sha256=Hoo-nKG0luMJ4XKms0VT9vm6LhE7ZGskG3nv3tfkpjg,8057
-sunholo-0.61.6.dist-info/WHEEL,sha256=GJ7t_kWBFywbagK5eo9IoUwLW6oyOeTKmQ-9iHFVNxQ,92
-sunholo-0.61.6.dist-info/entry_points.txt,sha256=bZuN5AIHingMPt4Ro1b_T-FnQvZ3teBes-3OyO0asl4,49
-sunholo-0.61.6.dist-info/top_level.txt,sha256=wt5tadn5--5JrZsjJz2LceoUvcrIvxjHJe-RxuudxAk,8
-sunholo-0.61.6.dist-info/RECORD,,
+sunholo-0.61.8.dist-info/LICENSE.txt,sha256=SdE3QjnD3GEmqqg9EX3TM9f7WmtOzqS1KJve8rhbYmU,11345
+sunholo-0.61.8.dist-info/METADATA,sha256=yW6gVMlt1_S4pAeXHijSp86J2dR3P9-qvjabNZ6J1qU,8057
+sunholo-0.61.8.dist-info/WHEEL,sha256=GJ7t_kWBFywbagK5eo9IoUwLW6oyOeTKmQ-9iHFVNxQ,92
+sunholo-0.61.8.dist-info/entry_points.txt,sha256=bZuN5AIHingMPt4Ro1b_T-FnQvZ3teBes-3OyO0asl4,49
+sunholo-0.61.8.dist-info/top_level.txt,sha256=wt5tadn5--5JrZsjJz2LceoUvcrIvxjHJe-RxuudxAk,8
+sunholo-0.61.8.dist-info/RECORD,,