sunholo 0.62.14__tar.gz → 0.62.16__tar.gz

{sunholo-0.62.14 → sunholo-0.62.16}/PKG-INFO

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

{sunholo-0.62.14 → sunholo-0.62.16}/setup.py

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

{sunholo-0.62.14 → sunholo-0.62.16}/sunholo/agents/flask/qna_routes.py

@@ -45,7 +45,6 @@ def register_qna_routes(app, stream_interpreter, vac_interpreter):
         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)
@@ -111,8 +110,8 @@ def register_qna_routes(app, stream_interpreter, vac_interpreter):
         return response
 
     @app.route('/vac/<vector_name>', methods=['POST'])
-    @observe()
     def process_qna(vector_name):
+        observed_vac_interpreter = observe()(vac_interpreter)
         prep = prep_vac(request, vector_name)
         log.debug(f"Processing prep: {prep}")
         trace = prep["trace"]
@@ -132,13 +131,13 @@ def register_qna_routes(app, stream_interpreter, vac_interpreter):
                     input = all_input,
                     model=vac_config.get("model") or vac_config.get("llm")
                 )
-            bot_output = vac_interpreter(
+            bot_output = observed_vac_interpreter(
                 question=all_input["user_input"],
                 vector_name=vector_name,
                 chat_history=all_input["chat_history"],
                 **all_input["kwargs"]
             )
-            if generation:
+            if span:
                 generation.end(output=bot_output)
             # {"answer": "The answer", "source_documents": [{"page_content": "The page content", "metadata": "The metadata"}]}
             bot_output = parse_output(bot_output)

{sunholo-0.62.14 → sunholo-0.62.16}/sunholo/cli/cli.py

@@ -83,6 +83,8 @@ def main(args=None):
     # embed command
     setup_embedder_subparser(subparsers)
 
+    #TODO: add database setup commands: alloydb and supabase
+
     args = parser.parse_args(args)
 
     if args.debug:

{sunholo-0.62.14 → sunholo-0.62.16}/sunholo/cli/run_proxy.py

@@ -2,6 +2,7 @@ import subprocess
 import os
 import signal
 import json
+import socket
 
 from .sun_rich import console
 from rich.table import Table
@@ -11,6 +12,11 @@ PROXY_TRACKER_FILE = '.vac_proxy_tracker.json'
 DEFAULT_PORT = 8080
 
 
+def is_port_in_use(port):
+    """Check if a given port is in use on the localhost."""
+    with socket.socket(socket.AF_INET, socket.SOCK_STREAM) as s:
+        return s.connect_ex(('localhost', port)) == 0
+
 def get_next_available_port(proxies, default_port):
     """
     Get the next available port starting from the default port.
@@ -24,7 +30,7 @@ def get_next_available_port(proxies, default_port):
     """
     used_ports = {info["port"] for info in proxies.values()}
     port = default_port
-    while port in used_ports:
+    while port in used_ports or is_port_in_use(port):
         port += 1
     return port
 

{sunholo-0.62.14 → sunholo-0.62.16}/sunholo/components/retriever.py

@@ -29,7 +29,7 @@ from langchain.retrievers import ContextualCompressionRetriever
 def load_memories(vector_name):
     memories = load_config_key("memory", vector_name, kind="vacConfig")
     log.info(f"Found memory settings for {vector_name}: {memories}")
-    if len(memories) == 0:
+    if not memories or len(memories) == 0:
         log.info(f"No memory settings found for {vector_name}")
         return None
 
@@ -67,7 +67,7 @@ def pick_retriever(vector_name, embeddings=None):
             
             #TODO: more memory stores here
 
-    if len(retriever_list) == 0:
+    if not retriever_list or len(retriever_list) == 0:
         log.info(f"No retrievers were created for {memories}")
         return None
     

{sunholo-0.62.14 → sunholo-0.62.16}/sunholo/database/database.py

@@ -80,7 +80,8 @@ def setup_database(type, vector_name:str, verbose:bool=False):
     execute_sql_from_file("database/sql/sb/create_table.sql", params, verbose=verbose, connection_env=connection_env)
     execute_sql_from_file("database/sql/sb/create_function.sql", params, verbose=verbose, connection_env=connection_env)
 
-    if verbose: print("Ran all setup SQL statements")
+    if verbose: 
+        print("Ran all setup SQL statements")
     
     return True
 

{sunholo-0.62.14 → sunholo-0.62.16}/sunholo/qna/parsers.py

@@ -36,7 +36,7 @@ def parse_output(bot_output):
 
         return bot_output
     
-    elif isinstance(bot_output, dict) and 'metadata' in bot_output and isinstance(bot_output.get('metadata')) and 'source_documents' in bot_output.get('metadata'):
+    elif isinstance(bot_output, dict) and 'metadata' in bot_output and isinstance(bot_output.get('metadata'), dict) and 'source_documents' in bot_output.get('metadata'):
         metadata = bot_output.get('metadata')
         bot_output['source_documents'] = [document_to_dict(doc) for doc in metadata['source_documents']]
         if not bot_output.get("answer") or bot_output.get("answer") == "":

{sunholo-0.62.14 → sunholo-0.62.16}/sunholo/vertex/memory_tools.py

@@ -49,6 +49,10 @@ def get_vertex_memories(vector_name):
 
     memories = load_memories(vector_name)
     tools = []
+
+    if not memories:
+        return tools
+    
     for memory in memories:
         for key, value in memory.items():  # Now iterate over the dictionary
             log.info(f"Found memory {key}")
@@ -138,4 +142,5 @@ def print_grounding_response(response):
     for uri, source in sources.items():
         markdown_text += f"{source['footnote']}. [{source['title']}]({uri})\n"
     
-    log.info(markdown_text)
+    log.info(markdown_text)
+    return markdown_text

{sunholo-0.62.14 → sunholo-0.62.16}/sunholo.egg-info/PKG-INFO

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