sunholo 0.62.4__py3-none-any.whl → 0.62.6__py3-none-any.whl

sunholo/agents/dispatch_to_qa.py

@@ -70,11 +70,13 @@ def prep_request_payload(user_input, chat_history, vector_name, stream, **kwargs
         # Base qna_data dictionary
         qna_data = {
             'user_input': user_input,
-            'vector_name': vector_name,
         }
         # Update qna_data with optional values from kwargs
         qna_data.update(kwargs)
 
+        if not 'vector_name' not in qna_data:
+            qna_data['vector_name'] = vector_name
+
     return qna_endpoint, qna_data
 
 def send_to_qa(user_input, vector_name, chat_history, stream=False, **kwargs):

sunholo/agents/special_commands.py

@@ -46,6 +46,8 @@ def handle_special_commands(user_input,
     hourmin = now.strftime("%H%M%S")
     the_datetime = datetime.datetime.now().strftime('%Y-%m-%d %H:%M:%S')
 
+    user_input = user_input.strip()
+
     if not cmds:
         cmds = load_config_key("user_special_cmds", vector_name=vector_name, kind="vacConfig")
         if not cmds:

sunholo/cli/chat_vac.py

@@ -1,9 +1,9 @@
-from ..agents import send_to_qa
+from ..agents import send_to_qa, handle_special_commands
 from ..streaming import generate_proxy_stream, can_agent_stream
 from ..utils.user_ids import generate_user_id
 from ..utils.config import load_config_key
 from ..logging import log
-
+from ..qna.parsers import parse_output
 from .run_proxy import clean_proxy_list, start_proxy, stop_proxy
 
 import uuid
@@ -53,6 +53,15 @@ def stream_chat_session(service_url, service_name, stream=True):
         if user_input.lower() in ["exit", "quit"]:
             console.print("[bold red]Exiting chat session.[/bold red]")
             break
+
+        special_reply = handle_special_commands(
+            user_input, 
+            vector_name=service_name,
+            chat_history=chat_history)
+
+        if special_reply:
+             console.print(f"[bold yellow]{service_name}:[/bold yellow] {special_reply}", end='\n')
+             continue     
         
         if not stream:
             vac_response = send_to_qa(user_input,
@@ -75,7 +84,10 @@ def stream_chat_session(service_url, service_name, stream=True):
                 message_source="cli",
                 override_endpoint=service_url)
             
-            console.print(f"[bold yellow]{service_name}:[/bold yellow] {vac_response}", end='\n')
+            # ensures {'answer': answer}
+            answer = parse_output(vac_response)
+            
+            console.print(f"[bold yellow]{service_name}:[/bold yellow] {answer.get('answer')}", end='\n')
         else:
 
             def stream_response():
@@ -224,7 +236,7 @@ def vac_command(args):
         agent_name   = load_config_key("agent", args.vac_name, kind="vacConfig")
 
         streamer = can_agent_stream(agent_name)
-        log.warning(f"streamer: {streamer}")
+        log.debug(f"streamer: {streamer}")
         if not streamer:
             console.print(f"Non streaming agent: {args.vac_name}")
 
@@ -235,11 +247,13 @@ def vac_command(args):
             description  = load_config_key("description", vector_name=args.vac_name, kind="vacConfig")
             endpoints_config = load_config_key(agent_name, "dummy_value", kind="agentConfig")
 
-            display_endpoints = ', '.join(f"{key}: {value}" for key, value in endpoints_config.items())
+            display_endpoints = ' '.join(f"{key}: {value}" for key, value in endpoints_config.items())
+            display_endpoints = display_endpoints.replace("{stem}", service_url).replace("{vector_name}", args.vac_name)
+
             if agent_name == "langserve":
                 subtitle = f"{service_url}/{args.vac_name}/playground/"
             else:
-                subtitle = f"{agent_name} - {display_endpoints}"
+                subtitle = display_endpoints
 
             print(
                 Panel(description or "Starting VAC chat session", 

sunholo/cli/cli.py

@@ -45,9 +45,6 @@ class CustomHelpAction(argparse.Action):
         parser.exit()
 
 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.

sunholo/embedder/embed_chunk.py

@@ -66,7 +66,7 @@ def embed_pubsub_chunk(data: dict):
     log.info(f"Embedding: {vector_name} page_content: {page_content[:30]}...[{len(page_content)}] - {metadata}")
 
     if 'eventTime' not in metadata:
-        metadata['eventTime'] = datetime.datetime.now(datetime.UTC).isoformat(timespec='microseconds') + "Z"
+        metadata['eventTime'] = datetime.datetime.now().isoformat(timespec='microseconds') + "Z"
     metadata['eventtime'] = metadata['eventTime']
 
     if 'source' not in metadata:

sunholo/gcs/add_file.py

@@ -20,8 +20,7 @@ except ImportError:
     storage = None
 
 from ..logging import log
-
-
+from ..utils.config import load_config_key
 
 def add_file_to_gcs(filename: str, vector_name:str, bucket_name: str=None, metadata:dict=None, bucket_filepath:str=None):
 
@@ -33,6 +32,11 @@ def add_file_to_gcs(filename: str, vector_name:str, bucket_name: str=None, metad
     except Exception as err:
         log.error(f"Error creating storage client: {str(err)}")
         return None
+    
+    bucket_config = load_config_key("upload", vector_name, "vacConfig")
+    if bucket_config:
+        if bucket_config.get("buckets"):
+            bucket_name = bucket_config.get("buckets").get("all")
 
     bucket_name = bucket_name if bucket_name else os.getenv('GCS_BUCKET', None)
     if bucket_name is None:

sunholo/streaming/stream_lookup.py

@@ -3,7 +3,7 @@ from ..logging import log
 
 def can_agent_stream(agent_name: str):
 
-    log.warning(f"agent_type: {agent_name} checking streaming...")
+    log.debug(f"agent_type: {agent_name} checking streaming...")
     endpoints_config = load_config_key(agent_name, "dummy_value", kind="agentConfig")
     
     return 'stream' in endpoints_config

sunholo/utils/config.py

@@ -192,8 +192,9 @@ def load_config_key(key: str, vector_name: str, kind: str):
     print(f'API URL: {api_url}')
     ```
     """
-    from ..logging import log
-    
+    import logging # can't use sunholo.logging due to circular import
+    log = logging.getLogger("sunholo")
+
     if kind != 'agentConfig':
         assert isinstance(key, str), f"key must be a string got a {type(key)}"
 

sunholo/utils/gcp.py

@@ -17,6 +17,8 @@ import socket
 # can't install due to circular import sunholo.logging
 import logging
 
+from .config import load_config_key
+
 def is_running_on_cloudrun():
     """
     Check if the current environment is a Google Cloud Run instance.
@@ -127,9 +129,11 @@ def get_gcp_project():
     Returns:
         str or None: The project ID if found, None otherwise.
     """
-    if not is_running_on_gcp():
-        return None
-    
+    gcp_config = load_config_key("gcp_config", "global", "vacConfig")
+    if gcp_config:
+        if gcp_config.get('project_id'):
+            return gcp_config.get('project_id')
+
     project_id = get_env_project_id()
     if project_id:
         return project_id
@@ -137,6 +141,10 @@ def get_gcp_project():
     project_id = get_metadata('project/project-id')
     if project_id:
         os.environ["GCP_PROJECT"] = project_id 
+        return project_id
+
+    if not is_running_on_gcp():
+        return None
 
     logging.warning("GCP Project ID not found. Ensure you are running on GCP or have the GCP_PROJECT environment variable set.")
     return None

{sunholo-0.62.4.dist-info → sunholo-0.62.6.dist-info}/METADATA

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

{sunholo-0.62.4.dist-info → sunholo-0.62.6.dist-info}/RECORD

@@ -2,11 +2,11 @@ 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=bkII7PNEbGCaobu2Rnr2rM9dim3BCK0kM-tiWhoI1tw,5219
-sunholo/agents/dispatch_to_qa.py,sha256=VaUUD4Y8XmPvrUlHP63yRl8Z2o1wagbcGZi9GwlDTTQ,8286
+sunholo/agents/dispatch_to_qa.py,sha256=rJvqFLH6V-bKm3Xi_US0L2tMbGgpws3dDmKO2Jy_6v0,8343
 sunholo/agents/langserve.py,sha256=FdhQjorAY2bMn2rpuabNT6bU3uqSKWrl8DjpH3L_V7k,4375
 sunholo/agents/pubsub.py,sha256=5hbbhbBGyVWRpt2sAGC5FEheYH1mCCwVUhZEB1S7vGg,1337
 sunholo/agents/route.py,sha256=R_j-o2-K0RiDkj8Gt1yZivBohcI9SCl-8j79h03H1mQ,2109
-sunholo/agents/special_commands.py,sha256=PI4ADgFQvPDCeCpOeWIrD4bD432NYFeVcBBnkqTBWi8,6457
+sunholo/agents/special_commands.py,sha256=ecD5jrBVXo170sdgPILi0m_m_4nRFEv6qKn5zYEvEK8,6494
 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
@@ -31,8 +31,8 @@ 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=H-UzYtQDHM4TQZ8wYkcXfNB5SW5sdYhM7lb17OcZa24,15841
-sunholo/cli/cli.py,sha256=if2xx99fIUQG_ZYvMpQsRQIvrjBZJTJSn1JBhjeVAZU,3573
+sunholo/cli/chat_vac.py,sha256=Ht8EsGTeubV_-4KEUAA1P5M545Lt_wMAZU8esR6rHyI,16419
+sunholo/cli/cli.py,sha256=k_qlBzDDTLWVPNETPFIMlNvApbRjXZs7W1tdyKUhXv0,3570
 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
@@ -57,9 +57,9 @@ sunholo/database/sql/sb/delete_source_row.sql,sha256=r6fEuUKdbiLHCDGKSbKINDCpJjs
 sunholo/database/sql/sb/return_sources.sql,sha256=89KAnxfK8n_qGK9jy1OQT8f9n4uYUtYL5cCxbC2mj_c,255
 sunholo/database/sql/sb/setup.sql,sha256=CvoFvZQev2uWjmFa3aj3m3iuPFzAAJZ0S7Qi3L3-zZI,89
 sunholo/embedder/__init__.py,sha256=sI4N_CqgEVcrMDxXgxKp1FsfsB4FpjoXgPGkl4N_u4I,44
-sunholo/embedder/embed_chunk.py,sha256=XV1kdDUWw2QO-am5_Yl7GrYP9V_4i1XRNNFPhqUSnZQ,5851
+sunholo/embedder/embed_chunk.py,sha256=x6rt-wJcMEYVPvPZDNOalAt2A-_waQLk46C9ltLVArY,5839
 sunholo/gcs/__init__.py,sha256=DtVw_AZwQn-IguR5BJuIi2XJeF_FQXizhJikzRNrXiE,50
-sunholo/gcs/add_file.py,sha256=JmJIuz5Z1h7-eJ6s2eE3wc8Y4IAv3Jridq1xfQbD9_E,4711
+sunholo/gcs/add_file.py,sha256=QBzPnl5HVZ2Z-rWmBua7gJHBnLAizgXkObjC3dTbccs,4958
 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
@@ -84,24 +84,24 @@ sunholo/qna/retry.py,sha256=gFgOf9AxrZMIO9OwOYu1EW7rhNhyfnw_o4XAsNLBOVQ,2021
 sunholo/streaming/__init__.py,sha256=MpbydI2UYo_adttPQFkxNM33b-QRyNEbrKJx0C2AGPc,241
 sunholo/streaming/content_buffer.py,sha256=fWcg0oTf470M3U40VAChfmHmWRFgRD8VaT90jNfBCH0,6455
 sunholo/streaming/langserve.py,sha256=4AeNt4FPv461s20_5q17Nx83cHjK7Dl3gVOcWAxMgOk,6350
-sunholo/streaming/stream_lookup.py,sha256=5oYtTSBRU1FtjtugXmBEpyxei2hQOweiLhIhKovYFLk,311
+sunholo/streaming/stream_lookup.py,sha256=vUeQS7-QFXMIqN2hIIA9syjxVVIjkxQvuBkxsH33dYM,309
 sunholo/streaming/streaming.py,sha256=9z6pXINEopuL_Z1RnmgXAoZJum9dzyuOxqYtEYnjf8w,16405
 sunholo/summarise/__init__.py,sha256=MZk3dblUMODcPb1crq4v-Z508NrFIpkSWNf9FIO8BcU,38
 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=y3Ja87ZESlA5x_PVLeNVcpp516rE9LiemmxNrAir3EQ,8902
+sunholo/utils/config.py,sha256=wqwmrQed6_N8ygyLd5QwiFj0GE9xv6aodJMI_mKag70,8977
 sunholo/utils/config_schema.py,sha256=Wv-ncitzljOhgbDaq9qnFqH5LCuxNv59dTGDWgd1qdk,4189
-sunholo/utils/gcp.py,sha256=B2G1YKjeD7X9dqO86Jrp2vPuFwZ223Xl5Tg09Ndw-oc,5760
+sunholo/utils/gcp.py,sha256=oi0r8pbsUK63sf1RR4XjrETCZVvkRnBiUnTCThEctkI,5998
 sunholo/utils/parsers.py,sha256=OrHmASqIbI45atVOhiGodgLvnfrzkvVzyHnSvAXD89I,3841
 sunholo/utils/timedelta.py,sha256=BbLabEx7_rbErj_YbNM0MBcaFN76DC4PTe4zD2ucezg,493
 sunholo/utils/user_ids.py,sha256=SQd5_H7FE7vcTZp9AQuQDWBXd4FEEd7TeVMQe1H4Ny8,292
 sunholo/vertex/__init__.py,sha256=7B5Wf41da0dl9JOOrwq35Ob5jcKen_w5T-Tw5f4eoWE,75
 sunholo/vertex/init.py,sha256=JDMUaBRdednzbKF-5p33qqLit2LMsvgvWW-NRz0AqO0,1801
 sunholo/vertex/memory_tools.py,sha256=-o9cas_UeRU5gPLi0qcvNwR0HTU5TamzddGLTHOVjZ4,3598
-sunholo-0.62.4.dist-info/LICENSE.txt,sha256=SdE3QjnD3GEmqqg9EX3TM9f7WmtOzqS1KJve8rhbYmU,11345
-sunholo-0.62.4.dist-info/METADATA,sha256=GJYTdsOwRl-RhWvQ5x3oZoh3BDn57DzkubpJrwcBHS0,8057
-sunholo-0.62.4.dist-info/WHEEL,sha256=GJ7t_kWBFywbagK5eo9IoUwLW6oyOeTKmQ-9iHFVNxQ,92
-sunholo-0.62.4.dist-info/entry_points.txt,sha256=bZuN5AIHingMPt4Ro1b_T-FnQvZ3teBes-3OyO0asl4,49
-sunholo-0.62.4.dist-info/top_level.txt,sha256=wt5tadn5--5JrZsjJz2LceoUvcrIvxjHJe-RxuudxAk,8
-sunholo-0.62.4.dist-info/RECORD,,
+sunholo-0.62.6.dist-info/LICENSE.txt,sha256=SdE3QjnD3GEmqqg9EX3TM9f7WmtOzqS1KJve8rhbYmU,11345
+sunholo-0.62.6.dist-info/METADATA,sha256=a_1-YOqnCw4eBCw2Z6s1LCANDibu9TM5b-K25DGKCJU,8057
+sunholo-0.62.6.dist-info/WHEEL,sha256=GJ7t_kWBFywbagK5eo9IoUwLW6oyOeTKmQ-9iHFVNxQ,92
+sunholo-0.62.6.dist-info/entry_points.txt,sha256=bZuN5AIHingMPt4Ro1b_T-FnQvZ3teBes-3OyO0asl4,49
+sunholo-0.62.6.dist-info/top_level.txt,sha256=wt5tadn5--5JrZsjJz2LceoUvcrIvxjHJe-RxuudxAk,8
+sunholo-0.62.6.dist-info/RECORD,,