sunholo 0.62.4__tar.gz → 0.62.6__tar.gz

{sunholo-0.62.4 → sunholo-0.62.6}/PKG-INFO

@@ -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 → sunholo-0.62.6}/setup.py

@@ -1,7 +1,7 @@
 from setuptools import setup, find_packages
 
 # Define your base version
-version = '0.62.4'
+version = '0.62.6'
 
 setup(
     name='sunholo',

{sunholo-0.62.4 → sunholo-0.62.6}/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-0.62.4 → sunholo-0.62.6}/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-0.62.4 → sunholo-0.62.6}/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-0.62.4 → sunholo-0.62.6}/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-0.62.4 → sunholo-0.62.6}/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-0.62.4 → sunholo-0.62.6}/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-0.62.4 → sunholo-0.62.6}/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-0.62.4 → sunholo-0.62.6}/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-0.62.4 → sunholo-0.62.6}/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 → sunholo-0.62.6}/sunholo.egg-info/PKG-INFO

@@ -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