sunholo 0.62.14__py3-none-any.whl → 0.62.16__py3-none-any.whl

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/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/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/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/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/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/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.dist-info → sunholo-0.62.16.dist-info}/METADATA

@@ -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.dist-info → sunholo-0.62.16.dist-info}/RECORD

@@ -12,7 +12,7 @@ sunholo/agents/fastapi/base.py,sha256=clk76cHbUAvU0OYJrRfCWX_5f0ACbhDsIzYBhI3wyo
 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=FgSaCODyoTtlstJtsqlLPScdgRUtv9_plxftdzHdVFo,809
-sunholo/agents/flask/qna_routes.py,sha256=x9QMY-z-1_ThCLAAtHQPC-oTmVulch3sTy_9KwsKHtI,8617
+sunholo/agents/flask/qna_routes.py,sha256=Twx6bitUAQ8Urtuwu9PtdoxYv-3aBDbF4cOUl9kdas8,8652
 sunholo/archive/__init__.py,sha256=qNHWm5rGPVOlxZBZCpA1wTYPbalizRT7f8X4rs2t290,31
 sunholo/archive/archive.py,sha256=C-UhG5x-XtZ8VheQp92IYJqgD0V3NFQjniqlit94t18,1197
 sunholo/auth/__init__.py,sha256=4owDjSaWYkbTlPK47UHTOC0gCWbZsqn4ZIEw5NWZTlg,28
@@ -32,21 +32,21 @@ sunholo/chunker/publish.py,sha256=GNXV6IPdKM2GZUcjGXIERu49D0ITYtizsLIktKVtMjM,27
 sunholo/chunker/splitter.py,sha256=FLkDhkePkg_zGQpFBK13Cznw575D-Rf9pcaCpc1HUxY,6726
 sunholo/cli/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 sunholo/cli/chat_vac.py,sha256=Ht8EsGTeubV_-4KEUAA1P5M545Lt_wMAZU8esR6rHyI,16419
-sunholo/cli/cli.py,sha256=k_qlBzDDTLWVPNETPFIMlNvApbRjXZs7W1tdyKUhXv0,3570
+sunholo/cli/cli.py,sha256=1-grjOE5sB5k0wrccsqCWSXB1vfrYNgdHBFH5F94pa0,3632
 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=5m_FaAqF6bnLJQj93HGySC-OOCXo2NCUVG_ZBjE1oUM,6937
 sunholo/cli/merge_texts.py,sha256=U9vdMwKmcPoc6iPOWX5MKSxn49dNGbNzVLw8ui5PhEU,1823
-sunholo/cli/run_proxy.py,sha256=5CihmxymaCSwu1U58ySux38T3CQhx_FZkGRJLs99ix4,11294
+sunholo/cli/run_proxy.py,sha256=CkNpgyogF6722NNQLECPlH72VhqMP51vWN34XP5ngUk,11538
 sunholo/cli/sun_rich.py,sha256=UpMqeJ0C8i0pkue1AHnnyyX0bFJ9zZeJ7HBR6yhuA8A,54
 sunholo/components/__init__.py,sha256=IDoylb74zFKo6NIS3RQqUl0PDFBGVxM1dfUmO7OJ44U,176
 sunholo/components/llm.py,sha256=T4we3tGmqUj4tPwxQr9M6AXv_BALqZV_dRSvINan-oU,10374
-sunholo/components/retriever.py,sha256=lqVwKXRU8Lu0-Tp4dgCvjDdUfBKkUMWUPpggMde0cx8,3782
+sunholo/components/retriever.py,sha256=jAgcmEM_D2Qfb3hYqHVZMZMLUEUqUbqmhD6G5czmEas,3820
 sunholo/components/vectorstore.py,sha256=lB8vx_N6eBA44orNeVo1WRn0Q8GCIjvPPT9AfiPWBWE,5620
 sunholo/database/__init__.py,sha256=Zz0Shcq-CtStf9rJGIYB_Ybzb8rY_Q9mfSj-nviM490,241
 sunholo/database/alloydb.py,sha256=zvT50Df7r-jJPo5lEEWbjlXzVr0KuqN6WINgRtiSyxo,17014
-sunholo/database/database.py,sha256=doY05kG8BZBLL-arh4hq5ef1ouWOtGHqdsDc6M2YHgk,7345
+sunholo/database/database.py,sha256=UDHkceiEvJmS3esQX2LYEjEMrHcogN_JHuJXoVWCH3M,7354
 sunholo/database/lancedb.py,sha256=2rAbJVusMrm5TPtVTsUtmwn0z1iZ_wvbKhc6eyT6ClE,708
 sunholo/database/static_dbs.py,sha256=aOyU3AJ-Dzz3qSNjbuN2293cfYw5PhkcQuQxdwPMJ4w,435
 sunholo/database/uuid.py,sha256=GtUL_uq80u2xkozPF9kwNpvhBf03hbZR3xUhO3NomBM,237
@@ -79,7 +79,7 @@ sunholo/pubsub/__init__.py,sha256=wgkrtlL3h8uzNpnlWSHdVMOq0l5Q3D7gkxF_Rp1A6Ro,94
 sunholo/pubsub/process_pubsub.py,sha256=64hvqMsxbBrf0WGJsprz_SXf9FpjeszAIsqUSBlJrA8,2780
 sunholo/pubsub/pubsub_manager.py,sha256=NjeChrorhIFmakAzwzVqGYQdG7Q8lJT6UvppiYlrFjI,6427
 sunholo/qna/__init__.py,sha256=F8q1uR_HreoSX0IfmKY1qoSwIgXhO2Q8kuDSxh9_-EE,28
-sunholo/qna/parsers.py,sha256=mH_SIgN2yXzvcoQZt9ITkdJSw3jgZGuu0p8q_H-kdSM,2140
+sunholo/qna/parsers.py,sha256=Wn2X47_yeE39oeqxxgDr7jgBT-N1anYpJtVBq-623O4,2146
 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
@@ -99,11 +99,11 @@ sunholo/utils/timedelta.py,sha256=BbLabEx7_rbErj_YbNM0MBcaFN76DC4PTe4zD2ucezg,49
 sunholo/utils/user_ids.py,sha256=SQd5_H7FE7vcTZp9AQuQDWBXd4FEEd7TeVMQe1H4Ny8,292
 sunholo/vertex/__init__.py,sha256=JvHcGFuv6R_nAhY2AdoqqhMpJ5ugeWPZ_svGhWrObBk,136
 sunholo/vertex/init.py,sha256=JDMUaBRdednzbKF-5p33qqLit2LMsvgvWW-NRz0AqO0,1801
-sunholo/vertex/memory_tools.py,sha256=PMMJa0ecb0GUavUX275lhJjhmelc7bEIoM81G_uH4ys,5306
+sunholo/vertex/memory_tools.py,sha256=8F1iTWnqEK9mX4W5RzCVKIjydIcNp6OFxjn_dtQ3GXo,5379
 sunholo/vertex/safety.py,sha256=3meAX0HyGZYrH7rXPUAHxtI_3w_zoy_RX7Shtkoa660,1275
-sunholo-0.62.14.dist-info/LICENSE.txt,sha256=SdE3QjnD3GEmqqg9EX3TM9f7WmtOzqS1KJve8rhbYmU,11345
-sunholo-0.62.14.dist-info/METADATA,sha256=fOpbqUK_ycWdrySd41SQ2xXuyLP79cnGzyyEefc3iHU,8059
-sunholo-0.62.14.dist-info/WHEEL,sha256=GJ7t_kWBFywbagK5eo9IoUwLW6oyOeTKmQ-9iHFVNxQ,92
-sunholo-0.62.14.dist-info/entry_points.txt,sha256=bZuN5AIHingMPt4Ro1b_T-FnQvZ3teBes-3OyO0asl4,49
-sunholo-0.62.14.dist-info/top_level.txt,sha256=wt5tadn5--5JrZsjJz2LceoUvcrIvxjHJe-RxuudxAk,8
-sunholo-0.62.14.dist-info/RECORD,,
+sunholo-0.62.16.dist-info/LICENSE.txt,sha256=SdE3QjnD3GEmqqg9EX3TM9f7WmtOzqS1KJve8rhbYmU,11345
+sunholo-0.62.16.dist-info/METADATA,sha256=00B_xzRZRDW3jM5p_5XUk4be1JZaRU5N0f2IMreqteQ,8059
+sunholo-0.62.16.dist-info/WHEEL,sha256=GJ7t_kWBFywbagK5eo9IoUwLW6oyOeTKmQ-9iHFVNxQ,92
+sunholo-0.62.16.dist-info/entry_points.txt,sha256=bZuN5AIHingMPt4Ro1b_T-FnQvZ3teBes-3OyO0asl4,49
+sunholo-0.62.16.dist-info/top_level.txt,sha256=wt5tadn5--5JrZsjJz2LceoUvcrIvxjHJe-RxuudxAk,8
+sunholo-0.62.16.dist-info/RECORD,,