sunholo 0.62.3__tar.gz → 0.62.5__tar.gz

{sunholo-0.62.3 → sunholo-0.62.5}/PKG-INFO

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

{sunholo-0.62.3 → sunholo-0.62.5}/setup.py

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

{sunholo-0.62.3 → sunholo-0.62.5}/sunholo/agents/dispatch_to_qa.py

@@ -59,7 +59,10 @@ def prep_request_payload(user_input, chat_history, vector_name, stream, **kwargs
     # {'stream': '', 'invoke': ''}
     endpoints = route_endpoint(vector_name, override_endpoint=override_endpoint)
 
-    qna_endpoint = endpoints["stream"] if stream else endpoints["invoke"]
+    if stream:
+        qna_endpoint = endpoints["stream"]
+    else: 
+        qna_endpoint = endpoints["invoke"]
 
     if agent == "langserve" or agent_type == "langserve":
         qna_data = prepare_request_data(user_input, endpoints["input_schema"], vector_name, **kwargs)
@@ -71,6 +74,9 @@ def prep_request_payload(user_input, chat_history, vector_name, stream, **kwargs
         # 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.3 → sunholo-0.62.5}/sunholo/agents/route.py

@@ -42,15 +42,8 @@ def route_endpoint(vector_name, override_endpoint=None):
         agent_type = load_config_key('agent', vector_name, kind="vacConfig")
 
     stem = route_qna(vector_name) if not override_endpoint else override_endpoint
-
-    agent_config, _ = load_config('config/agent_config.yaml')
-
-    # Select the appropriate configuration based on agent_type
-    if agent_type in agent_config:
-        endpoints_config = agent_config[agent_type]
-    else:
-        log.warning('Using default endpoints configuration')
-        endpoints_config = agent_config['default']
+    
+    endpoints_config = load_config_key(agent_type, vector_name, kind="agentConfig")
     
     log.info(f"endpoints_config: {endpoints_config}")
 

{sunholo-0.62.3 → sunholo-0.62.5}/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.3 → sunholo-0.62.5}/sunholo/cli/chat_vac.py

@@ -1,8 +1,9 @@
-from ..agents import send_to_qa
-from ..streaming import generate_proxy_stream
+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
@@ -42,7 +43,7 @@ def get_service_url(vac_name, project, region, no_config=False):
 
     return url
 
-def stream_chat_session(service_url, service_name):
+def stream_chat_session(service_url, service_name, stream=True):
 
     user_id = generate_user_id()
     chat_history = []
@@ -53,15 +54,19 @@ def stream_chat_session(service_url, service_name):
             console.print("[bold red]Exiting chat session.[/bold red]")
             break
 
-        def stream_response():
-            generate = generate_proxy_stream(
-                send_to_qa,
-                user_input,
+        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,
                 vector_name=service_name,
                 chat_history=chat_history,
-                generate_f_output=lambda x: x,  # Replace with actual processing function
-                stream_wait_time=0.5,
-                stream_timeout=120,
                 message_author=user_id,
                 #TODO: populate these
                 image_url=None,
@@ -77,34 +82,68 @@ def stream_chat_session(service_url, service_name):
                 user_id=user_id,
                 session_id=session_id, 
                 message_source="cli",
-                override_endpoint=service_url
-            )
-            for part in generate():
-                yield part
+                override_endpoint=service_url)
+            
+            # ensures {'answer': answer}
+            answer = parse_output(vac_response)
+            
+            console.print(f"[bold yellow]{service_name}:[/bold yellow] {answer.get('answer')}", end='\n')
+        else:
 
-        response_started = False
-        vac_response = ""
-
-        # point or star?
-        with console.status("[bold orange]Thinking...[/bold orange]", spinner="star") as status:
-            for token in stream_response():
-                if not response_started:
-                    status.stop()
-                    console.print(f"[bold yellow]{service_name}:[/bold yellow] ", end='')
-                    response_started = True
-
-                if isinstance(token, bytes):
-                    token = token.decode('utf-8')
-                console.print(token, end='')
-                vac_response += token
+            def stream_response():
+                generate = generate_proxy_stream(
+                    send_to_qa,
+                    user_input,
+                    vector_name=service_name,
+                    chat_history=chat_history,
+                    generate_f_output=lambda x: x,  # Replace with actual processing function
+                    stream_wait_time=0.5,
+                    stream_timeout=120,
+                    message_author=user_id,
+                    #TODO: populate these
+                    image_url=None,
+                    source_filters=None,
+                    search_kwargs=None,
+                    private_docs=None,
+                    whole_document=False,
+                    source_filters_and_or=False,
+                    # system kwargs
+                    configurable={
+                        "vector_name": service_name,
+                    },
+                    user_id=user_id,
+                    session_id=session_id, 
+                    message_source="cli",
+                    override_endpoint=service_url
+                )
+                for part in generate():
+                    yield part
+
+            response_started = False
+            vac_response = ""
+
+            # point or star?
+            with console.status("[bold orange]Thinking...[/bold orange]", spinner="star") as status:
+                for token in stream_response():
+                    if not response_started:
+                        status.stop()
+                        console.print(f"[bold yellow]{service_name}:[/bold yellow] ", end='')
+                        response_started = True
+
+                    if isinstance(token, bytes):
+                        token = token.decode('utf-8')
+                    console.print(token, end='')
+                    vac_response += token
+
+            response_started = False
 
         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_url, service_name, user_input, chat_history=None):
+def headless_mode(service_url, service_name, user_input, chat_history=None, stream=True):
     chat_history = chat_history or []
 
     user_id = generate_user_id()
@@ -196,16 +235,25 @@ def vac_command(args):
         service_url = resolve_service_url(args)
         agent_name   = load_config_key("agent", args.vac_name, kind="vacConfig")
 
+        streamer = can_agent_stream(agent_name)
+        log.debug(f"streamer: {streamer}")
+        if not streamer:
+            console.print(f"Non streaming agent: {args.vac_name}")
+
         if args.headless:
-            headless_mode(service_url, args.vac_name, args.user_input, args.chat_history)
+            headless_mode(service_url, args.vac_name, args.user_input, args.chat_history, stream=streamer)
         else:
             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")
+            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 = 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} - {service_url}/vac/{args.vac_name}"
+                subtitle = display_endpoints
 
             print(
                 Panel(description or "Starting VAC chat session", 
@@ -213,7 +261,7 @@ def vac_command(args):
                     subtitle=subtitle)
                     )
 
-            stream_chat_session(service_url, args.vac_name)
+            stream_chat_session(service_url, args.vac_name, stream=streamer)
         
         stop_proxy(agent_name, stop_local=False)
 

{sunholo-0.62.3 → sunholo-0.62.5}/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.3 → sunholo-0.62.5}/sunholo/components/__init__.py

@@ -1,4 +1,3 @@
 from .vectorstore import pick_vectorstore
 from .retriever import pick_retriever, load_memories
-from .prompt import pick_prompt
 from .llm import pick_llm, get_embeddings, get_llm, get_llm_chat, pick_embedding

{sunholo-0.62.3 → sunholo-0.62.5}/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.3 → sunholo-0.62.5}/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.3 → sunholo-0.62.5}/sunholo/streaming/__init__.py

@@ -1,2 +1,3 @@
 from .streaming import start_streaming_chat, generate_proxy_stream, generate_proxy_stream_async, start_streaming_chat_async
-from .langserve import parse_langserve_token, parse_langserve_token_async
+from .langserve import parse_langserve_token, parse_langserve_token_async
+from .stream_lookup import can_agent_stream

sunholo-0.62.5/sunholo/streaming/stream_lookup.py

@@ -0,0 +1,12 @@
+from ..utils import load_config_key
+from ..logging import log
+
+def can_agent_stream(agent_name: str):
+
+    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.3 → sunholo-0.62.5}/sunholo/utils/config.py

@@ -58,14 +58,14 @@ def load_all_configs():
     from ..logging import log
 
     if not os.getenv("_CONFIG_FOLDER", None):
-        log.warning("_CONFIG_FOLDER is not set, using os.getcwd() instead")
+        log.debug("_CONFIG_FOLDER is not set, using os.getcwd() instead")
     else:
-        log.warning(f"_CONFIG_FOLDER set to: {os.getenv('_CONFIG_FOLDER')}")
+        log.debug(f"_CONFIG_FOLDER set to: {os.getenv('_CONFIG_FOLDER')}")
 
     config_folder = os.getenv("_CONFIG_FOLDER", os.getcwd())
     config_folder = os.path.join(config_folder, "config")
 
-    log.info(f"Loading all configs from folder: {config_folder}")
+    log.debug(f"Loading all configs from folder: {config_folder}")
     current_time = datetime.now()
 
     configs_by_kind = defaultdict(dict)
@@ -82,7 +82,7 @@ def load_all_configs():
                 cached_config, cache_time = config_cache[filename]
                 time_to_recache = (current_time - cache_time)
                 if time_to_recache < timedelta(minutes=5):
-                    log.info(f"Returning cached config for {filename} - recache in {format_timedelta(time_to_recache)}")
+                    log.debug(f"Returning cached config for {filename} - recache in {format_timedelta(timedelta(minutes=5) - time_to_recache)}")
                     config = cached_config
                 else:
                     config = reload_config_file(config_file, filename)
@@ -109,7 +109,7 @@ def reload_config_file(config_file, filename):
             config = yaml.safe_load(file)
     
     config_cache[filename] = (config, datetime.now())
-    log.info(f"Loaded and cached {filename}")
+    log.debug(f"Loaded and cached {config_file}")
     return config
 
 
@@ -194,7 +194,9 @@ def load_config_key(key: str, vector_name: str, kind: str):
     """
     from ..logging import log
     
-    assert isinstance(key, str), f"key must be a string got a {type(key)}"
+    if kind != 'agentConfig':
+        assert isinstance(key, str), f"key must be a string got a {type(key)}"
+
     assert isinstance(vector_name, str), f"vector_name must be a string, got a {type(vector_name)}"
     
     configs_by_kind = load_all_configs()
@@ -243,3 +245,12 @@ def load_config_key(key: str, vector_name: str, kind: str):
         key_value = prompt_for_vector_name.get(key)
         
         return key_value
+    elif kind == 'agentConfig':
+        agents = config.get('agents')
+
+        if key in agents:
+            return agents[key]
+        else:
+            log.warning("Returning default agent endpoints")
+            return agents["default"]
+        

{sunholo-0.62.3 → sunholo-0.62.5}/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.3 → sunholo-0.62.5}/sunholo.egg-info/PKG-INFO

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

{sunholo-0.62.3 → sunholo-0.62.5}/sunholo.egg-info/SOURCES.txt

@@ -53,7 +53,6 @@ sunholo/cli/run_proxy.py
 sunholo/cli/sun_rich.py
 sunholo/components/__init__.py
 sunholo/components/llm.py
-sunholo/components/prompt.py
 sunholo/components/retriever.py
 sunholo/components/vectorstore.py
 sunholo/database/__init__.py
@@ -96,6 +95,7 @@ sunholo/qna/retry.py
 sunholo/streaming/__init__.py
 sunholo/streaming/content_buffer.py
 sunholo/streaming/langserve.py
+sunholo/streaming/stream_lookup.py
 sunholo/streaming/streaming.py
 sunholo/summarise/__init__.py
 sunholo/summarise/summarise.py

sunholo-0.62.3/sunholo/components/prompt.py

@@ -1,151 +0,0 @@
-#   Copyright [2024] [Holosun ApS]
-#
-#   Licensed under the Apache License, Version 2.0 (the "License");
-#   you may not use this file except in compliance with the License.
-#   You may obtain a copy of the License at
-#
-#       http://www.apache.org/licenses/LICENSE-2.0
-#
-#   Unless required by applicable law or agreed to in writing, software
-#   distributed under the License is distributed on an "AS IS" BASIS,
-#   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.
-from ..logging import log
-
-
-import datetime
-
-from langchain.prompts.prompt import PromptTemplate
-
-from ..utils import load_config_key
-from .vectorstore import pick_vectorstore
-
-
-def pick_prompt(vector_name, chat_history=[]):
-    """Pick a custom prompt"""
-    log.debug('Picking prompt')
-
-    prompt_str = load_config_key("prompt", vector_name, filename = "config/llm_config.yaml")
-
-    the_date = datetime.datetime.now().strftime('%Y-%m-%d %H:%M:%S %Z')
-    prompt_str_default = f"""You are Edmonbrain the chat bot created by Mark Edmondson. It is now {the_date}.
-Use your memory to answer the question at the end.
-Indicate in your reply how sure you are about your answer, for example whether you are certain, taking your best guess, or its very speculative.
-
-If you don't know, just say you don't know - don't make anything up. Avoid generic boilerplate answers.
-Consider why the question was asked, and offer follow up questions linked to those reasons.
-Any questions about how you work should direct users to issue the `!help` command.
-"""
-    if prompt_str is not None:
-        if "{context}" in prompt_str:
-            raise ValueError("prompt must not contain a string '{context}'")
-        if "{question}" in prompt_str:
-            raise ValueError("prompt must not contain a string '{question}'")
-        prompt_str_default = prompt_str_default + "\n" + prompt_str
-    
-    chat_summary = ""
-    original_question = ""
-    if len(chat_history) != 0:
-        original_question = chat_history[0][0]
-        chat_summary = get_chat_history(chat_history, vector_name)
-    
-    follow_up = "\nIf you can't answer the human's question without more information, ask a follow up question"
-
-    agent_buddy, agent_description = pick_chat_buddy(vector_name)
-    if agent_buddy:
-        follow_up += f""" either to the human, or to your friend bot.
-You bot friend will reply back to you within your chat history.
-Ask {agent_buddy} for help with topics: {agent_description}
-Ask clarification questions to the human and wait for response if your friend bot can't help.
-Don't repeat the question if you can see the answer in the chat history (from any source)  
-This means there are three people in this conversation - you, the human and your assistant bot.
-Asking questions to your friend bot are only allowed with this format:
-€€Question€€ 
-(your question here, including all required information needed to answer the question fully)
-Can you help, {agent_buddy} , with the above question?
-€€End Question€€
-"""
-    else:
-        follow_up += ".\n"
-
-    memory_str = "\n## Your Memory (ignore if not relevant to question)\n{context}\n"
-
-    current_conversation = ""
-    if chat_summary != "":
-        current_conversation =f"## Current Conversation\n{chat_summary}\n"
-        current_conversation = current_conversation.replace("{","{{").replace("}","}}") #escape {} characters
-   
-    buddy_question = ""
-    my_q = "## Current Question\n{question}\n"
-    if agent_buddy:
-        buddy_question = f"""(Including, if needed, your question to {agent_buddy})"""
-        my_q = f"## Original Question that started conversation\n{original_question}\n" + my_q
-
-    prompt_template = prompt_str_default + follow_up + memory_str + current_conversation + my_q + buddy_question + "\n## Your response:\n"
-    
-    log.debug(f"--Prompt_template: {prompt_template}") 
-    QA_PROMPT = PromptTemplate(
-        template=prompt_template, input_variables=["context", "question"]
-    )
-
-    return QA_PROMPT
-
-def pick_chat_buddy(vector_name):
-    chat_buddy = load_config_key("chat_buddy", vector_name, filename = "config/llm_config.yaml")
-    if chat_buddy is not None:
-        log.info(f"Got chat buddy {chat_buddy} for {vector_name}")
-        buddy_description = load_config_key("chat_buddy_description", vector_name)
-        return chat_buddy, buddy_description
-    return None, None
-
-
-def pick_agent(vector_name):
-    agent_str = load_config_key("agent", vector_name, filename = "config/llm_config.yaml")
-    if agent_str == "yes":
-        return True
-    
-    return False
-
-def pick_shared_vectorstore(vector_name, embeddings):
-    shared_vectorstore = load_config_key("shared_vectorstore", vector_name, filename = "config/llm_config.yaml")
-    vectorstore = pick_vectorstore(shared_vectorstore, embeddings)
-    return vectorstore
-
-
-def get_chat_history(inputs, vector_name, last_chars=1000, summary_chars=1500) -> str:
-    from langchain.schema import Document
-    from ..summarise import summarise_docs
-
-    # Prepare the full chat history
-    res = []
-    for human, ai in inputs:
-        res.append(f"Human:{human}\nAI:{ai}")
-    full_history = "\n".join(res)
-    
-    # Get the last `last_chars` characters of the full chat history
-    last_bits = []
-    for human, ai in reversed(inputs):
-        add_me = f"Human:{human}\nAI:{ai}"
-        last_bits.append(add_me)
-
-    recent_history = "\n".join(reversed(last_bits))
-    recent_history = recent_history[-last_chars:]
-    log.info(f"Recent chat history: {recent_history}")
-    
-    # Summarize chat history too
-    remaining_history = full_history
-    log.info(f"Remaining chat history: {remaining_history}")
-    doc_history = Document(page_content=remaining_history)
-    chat_summary = summarise_docs([doc_history], vector_name=vector_name, skip_if_less=last_chars)
-    text_sum = ""
-    for summ in chat_summary:
-        text_sum += summ.page_content + "\n"
-    
-    log.info(f"Conversation Summary: {text_sum}")
-    
-    # Make sure the summary is not longer than `summary_chars` characters
-    summary = text_sum[:summary_chars]
-    
-    # Concatenate the summary and the last `last_chars` characters of the chat history
-    return summary + "\n### Recent Chat History\n..." + recent_history