sunholo 0.66.22__py3-none-any.whl → 0.67.2__py3-none-any.whl

sunholo/agents/swagger.py

@@ -198,24 +198,20 @@ See more at https://dev.sunholo.com/
             }
         }
     }
-    
     vac_services = vac_config['vac']
     
-    for vector_name, config in vac_services.items():
+    def configure_agent(vector_name, config, agent_config_paths):
         agent_type = config['agent']
-        agent_config_paths = agent_config['agents'].get(agent_type, {})
         log.info(f'Configuring swagger for agent_type: {agent_type} for vector_name: {vector_name}')
         try:
             stem = route_vac(vector_name).strip()
         except ValueError:
             log.warning(f"Failed to find URL stem for {vector_name}/{agent_type} - skipping")
-            continue
-        
+            return
+
         for method, endpoints in agent_config_paths.items():
-            # controls if get requests are protected or not
             do_auth = True
 
-            # default get: noauth, post: auth
             if method not in ['get', 'post', 'get-auth', 'post-noauth']:
                 continue
 
@@ -228,7 +224,7 @@ See more at https://dev.sunholo.com/
             elif method == 'get':
                 do_auth = False
             elif method == 'post':
-                do_auth = True # not needed but to be clear whats happening
+                do_auth = True
 
             for endpoint_key, endpoint_template in endpoints.items():
                 endpoint_template = endpoint_template.strip()
@@ -262,79 +258,26 @@ See more at https://dev.sunholo.com/
                         }
                     }))
                 }
-    # Handle default agent configuration for agent types without specific entries
+
+    for vector_name, config in vac_services.items():
+        agent_type = config['agent']
+        agent_config_paths = agent_config['agents'].get(agent_type, {})
+        configure_agent(vector_name, config, agent_config_paths)
+
     default_agent_config = agent_config['agents'].get('default', {})
-    
+
     for vector_name, config in vac_services.items():
         agent_type = config['agent']
         if agent_type in agent_config['agents']:
             continue
         log.info(f'Applying default configuration for agent_type: {agent_type} for vector_name: {vector_name}')
-        try:
-            stem = route_vac(vector_name).strip()
-        except ValueError:
-            log.warning(f"Failed to find URL stem for {vector_name}/{agent_type} - skipping")
-            continue
-
-        for method, endpoints in default_agent_config.items():
-            # controls if get requests are protected or not
-            do_auth = True
-
-            # default get: noauth, post: auth
-            if method not in ['get', 'post', 'get-auth', 'post-noauth']:
-                continue
-
-            if method == 'get-auth':
-                do_auth = True
-                method = 'get'
-            elif method == 'post-noauth':
-                do_auth = False
-                method = 'post'
-            elif method == 'get':
-                do_auth = False
-            elif method == 'post':
-                do_auth = True # not needed but to be clear whats happening
-
-            for endpoint_key, endpoint_template in endpoints.items():
-                endpoint_template = endpoint_template.strip()
-                endpoint_address = endpoint_template.replace("{stem}", stem).replace("{vector_name}", vector_name).strip()
-                endpoint_path = endpoint_template.replace("{stem}", f"/{agent_type}").replace("{vector_name}", vector_name).strip()
-                log.debug(f"default Endpoint_template: {endpoint_template}")
-                log.debug(f"default endpoint address: {endpoint_address}")
-                log.debug(f"default endpoint_path: {endpoint_path}")
-                if endpoint_path not in swagger_template['paths']:
-                    swagger_template['paths'][endpoint_path] = {}
-                
-                operation_id = f"{method}_{agent_type}_{endpoint_key}_{vector_name}"
-
-                security = [{'ApiKeyAuth': []}] if do_auth else [{'None': []}]
-
-                swagger_template['paths'][endpoint_path][method] = {
-                    'summary': f"{method.capitalize()} {agent_type}",
-                    'operationId': operation_id,
-                    'x-google-backend': {
-                        'address': endpoint_address,
-                        'protocol': 'h2',
-                        'deadline': 180000  # Timeout of 3 minutes (1,800,00 milliseconds)
-                    },
-                    'security': security,
-                    'responses': copy.deepcopy(default_agent_config.get('response', {}).get(endpoint_key, {
-                        '200': {
-                            'description': 'Default - A successful response',
-                            'schema': {
-                                'type': 'string'
-                            }
-                        }
-                    }))
-                }
+        configure_agent(vector_name, config, default_agent_config)
 
     yaml = YAML()
-    yaml.width = 4096 # to avoid breaking urls
+    yaml.width = 4096
 
-    # Capture YAML output in a string buffer
     string_stream = StringIO()
     yaml.dump(swagger_template, string_stream)
     yaml_string = string_stream.getvalue()
 
-    return yaml_string
-    
+    return yaml_string

sunholo/chunker/publish.py

@@ -27,9 +27,14 @@ def publish_chunks(chunks: list[Document], vector_name: str):
     
     log.info("Publishing chunks to embed_chunk")
     
-    pubsub_manager = PubSubManager(vector_name, 
-                                   pubsub_topic="chunk-to-pubsub-embed", 
-                                   project_id=project)
+    try:
+        pubsub_manager = PubSubManager(vector_name, 
+                                    pubsub_topic="chunk-to-pubsub-embed", 
+                                    project_id=project)
+    except Exception as err:
+        log.error(f"PubSubManager init error: Could not publish chunks to {project} {vector_name} pubsub_topic chunk-to-pubsub-embed - {str(err)}")
+        
+        return None
         
     for chunk in chunks:
         # Convert chunk to string, as Pub/Sub messages must be strings or bytes

sunholo/cli/chat_vac.py

@@ -12,7 +12,6 @@ import sys
 import subprocess
 import json
 import requests
-import os
 from pathlib import Path
 
 from rich import print
@@ -320,7 +319,7 @@ def vac_command(args):
 def invoke_vac(service_url, data, vector_name=None, metadata=None, is_file=False):
     try:
         if is_file:
-            console.print("Uploading file to chunker...")
+            console.print("Uploading file...")
             # Handle file upload
             if not isinstance(data, Path) or not data.is_file():
                 raise ValueError("For file uploads, 'data' must be a Path object pointing to a valid file.")
@@ -335,7 +334,7 @@ def invoke_vac(service_url, data, vector_name=None, metadata=None, is_file=False
 
             response = requests.post(service_url, files=files, data=form_data)
         else:
-            console.print("Uploading JSON to chunker...")
+            console.print("Uploading JSON...")
             try:
                 if isinstance(data, dict):
                     json_data = data

sunholo/database/alloydb.py

@@ -8,6 +8,7 @@ try:
     from langchain_google_alloydb_pg import AlloyDBEngine, Column, AlloyDBLoader, AlloyDBDocumentSaver
     from google.cloud.alloydb.connector import IPTypes
 except ImportError:
+    AlloyDBEngine = None
     pass
 
 from .database import get_vector_size
@@ -16,6 +17,10 @@ from ..utils.config import load_config_key
 
 def create_alloydb_engine(vector_name):
 
+    if not AlloyDBEngine:
+        log.error("Can't create AlloyDBEngine - install via `pip install sunholo[gcp,database]`")
+        raise ValueError("Can't import AlloyDBEngine")
+
     alloydb_config = load_config_key(
         'alloydb_config', 
         vector_name=vector_name, 

sunholo/embedder/embed_chunk.py

@@ -124,6 +124,23 @@ def embed_pubsub_chunk(data: dict):
                 if vector_name_other:
                     log.warning(f"Using different vector_name for vectorstore: {vector_name_other} overriding {vector_name}")
                     vector_name = vector_name_other
+                
+                # dynamic vectorstore names (for per user_id stores)
+                if value.get('from_metadata_id'):
+                    the_id = value.get('from_metadata_id')
+                    log.info(f"Lookup vectorstore vector_name from id: {the_id}")
+
+                    if the_id not in metadata:
+                        log.warning("Could not find vectorstore from_metadata_id {the_id} in metadata - skipping")
+                        continue
+                    else:
+                        match_id = metadata.get(the_id)
+                        if match_id:
+                            vector_name = match_id
+                        else:
+                            log.warning("Could not find any value for vectorstore from_metadata_id: {the_id} - skipping")
+                            continue
+
                 vectorstore_obj = pick_vectorstore(vectorstore, vector_name=vector_name, embeddings=embeddings)
                 vs_retriever = vectorstore_obj.as_retriever(search_kwargs=dict(k=3))
                 vectorstore_list.append(vs_retriever)

{sunholo-0.66.22.dist-info → sunholo-0.67.2.dist-info}/METADATA

@@ -1,9 +1,9 @@
 Metadata-Version: 2.1
 Name: sunholo
-Version: 0.66.22
+Version: 0.67.2
 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.66.22.tar.gz
+Download-URL: https://github.com/sunholo-data/sunholo-py/archive/refs/tags/v0.67.2.tar.gz
 Author: Holosun ApS
 Author-email: multivac@sunholo.com
 License: Apache License, Version 2.0
@@ -21,7 +21,7 @@ License-File: LICENSE.txt
 Requires-Dist: google-auth
 Requires-Dist: ruamel.yaml
 Requires-Dist: langchain >=0.2.5
-Requires-Dist: langchain-experimental
+Requires-Dist: langchain-experimental >0.0.60
 Requires-Dist: langchain-community
 Provides-Extra: all
 Requires-Dist: asyncpg ; extra == 'all'
@@ -52,7 +52,7 @@ Requires-Dist: langchain-community ; extra == 'all'
 Requires-Dist: langchain-openai ; extra == 'all'
 Requires-Dist: langchain-google-genai ; extra == 'all'
 Requires-Dist: langchain-google-alloydb-pg ; extra == 'all'
-Requires-Dist: langchain-anthropic ; extra == 'all'
+Requires-Dist: langchain-anthropic >=0.1.13 ; extra == 'all'
 Requires-Dist: langfuse ; extra == 'all'
 Requires-Dist: pg8000 ; extra == 'all'
 Requires-Dist: pgvector ; extra == 'all'
@@ -63,9 +63,9 @@ Requires-Dist: rich ; extra == 'all'
 Requires-Dist: supabase ; extra == 'all'
 Requires-Dist: tiktoken ; extra == 'all'
 Provides-Extra: anthropic
-Requires-Dist: langchain-anthropic ; extra == 'anthropic'
+Requires-Dist: langchain-anthropic >=0.1.13 ; extra == 'anthropic'
 Provides-Extra: cli
-Requires-Dist: jsonschema ; extra == 'cli'
+Requires-Dist: jsonschema >=4.21.1 ; extra == 'cli'
 Requires-Dist: rich ; extra == 'cli'
 Provides-Extra: database
 Requires-Dist: asyncpg ; extra == 'database'
@@ -86,9 +86,9 @@ Requires-Dist: google-cloud-storage ; extra == 'gcp'
 Requires-Dist: google-cloud-logging ; extra == 'gcp'
 Requires-Dist: google-cloud-pubsub ; extra == 'gcp'
 Requires-Dist: google-cloud-discoveryengine ; extra == 'gcp'
-Requires-Dist: google-generativeai ; extra == 'gcp'
-Requires-Dist: langchain-google-genai ; extra == 'gcp'
-Requires-Dist: langchain-google-alloydb-pg ; extra == 'gcp'
+Requires-Dist: google-generativeai >=0.4.1 ; extra == 'gcp'
+Requires-Dist: langchain-google-genai >=1.0.5 ; extra == 'gcp'
+Requires-Dist: langchain-google-alloydb-pg >=0.2.2 ; extra == 'gcp'
 Requires-Dist: google-api-python-client ; extra == 'gcp'
 Requires-Dist: google-cloud-alloydb-connector[pg8000] ; extra == 'gcp'
 Provides-Extra: http

{sunholo-0.66.22.dist-info → sunholo-0.67.2.dist-info}/RECORD

@@ -7,7 +7,7 @@ sunholo/agents/langserve.py,sha256=FdhQjorAY2bMn2rpuabNT6bU3uqSKWrl8DjpH3L_V7k,4
 sunholo/agents/pubsub.py,sha256=5hbbhbBGyVWRpt2sAGC5FEheYH1mCCwVUhZEB1S7vGg,1337
 sunholo/agents/route.py,sha256=V1HKXTvaNuYgjmT5_QgIQum4O7O0Mw497m6YiMpEzX0,2383
 sunholo/agents/special_commands.py,sha256=ecD5jrBVXo170sdgPILi0m_m_4nRFEv6qKn5zYEvEK8,6494
-sunholo/agents/swagger.py,sha256=npZT7jRJA65xMXNjTcYsC3-RMd8qYP71vy_fSCCcKGg,13572
+sunholo/agents/swagger.py,sha256=wK90aGOgUojZjfMcjqhhJ_ksJ6ZCsVT1Iy02oU6Q5XM,10786
 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
@@ -29,10 +29,10 @@ sunholo/chunker/images.py,sha256=Xmh1vwHrVhoXm5iH2dhCc52O8YgdzE8KrDSdL-pGnp8,186
 sunholo/chunker/loaders.py,sha256=xiToUVgPz2ZzcqpUAq7aNP3PTenb_rBUAFzu0JPycIg,10268
 sunholo/chunker/message_data.py,sha256=X6aA4yX5aGN_mEvsDPWvdYRqqn5GO1BU9QhT9w5A0ec,6789
 sunholo/chunker/pdfs.py,sha256=daCZ1xjn1YvxlifIyxskWNpLJLe-Q9D_Jq12MWx3tZo,2473
-sunholo/chunker/publish.py,sha256=GNXV6IPdKM2GZUcjGXIERu49D0ITYtizsLIktKVtMjM,2768
+sunholo/chunker/publish.py,sha256=Rh6cfcDjjkMVQeweOaPxc9U1w7u1wiXlIDML20rrxhE,2989
 sunholo/chunker/splitter.py,sha256=FLkDhkePkg_zGQpFBK13Cznw575D-Rf9pcaCpc1HUxY,6726
 sunholo/cli/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-sunholo/cli/chat_vac.py,sha256=_M0M1t03QJUdkJEe4Ro74FWRa1LohiztLivbjvK0ECA,18691
+sunholo/cli/chat_vac.py,sha256=CceXT-nNVhXIGtVUg07FT8Azd0LBZN18kvCGIkJq7zM,18659
 sunholo/cli/cli.py,sha256=8e00HBN6eYIUJ8cnvKteBJNn7aZPRMk4b82jwcGg9D4,3741
 sunholo/cli/cli_init.py,sha256=JMZ9AX2cPDZ-_mv3adiv2ToFVNyRPtjk9Biszl1kiR0,2358
 sunholo/cli/configs.py,sha256=QUM9DvKOdZmEQRM5uI3Nh887T0YDiSMr7O240zTLqws,4546
@@ -47,7 +47,7 @@ sunholo/components/llm.py,sha256=T4we3tGmqUj4tPwxQr9M6AXv_BALqZV_dRSvINan-oU,103
 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=Myk1l97c7cMgZIk3eiJiJzjQW0GLNTlGqbJJwxFIDdQ,17122
+sunholo/database/alloydb.py,sha256=UeWbk_DAqivquMGibX_tz8v1Jza9qnf4SWThNBG2Dh4,17327
 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
@@ -59,7 +59,7 @@ 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=E6fHn2SFeQu9jsBO1wg5hSJUPTKbZ95Yc5QOltSn7jo,5840
+sunholo/embedder/embed_chunk.py,sha256=P744zUQJgqrjILunzaqtTerB9AwoXFU6tXBtz4rjWgQ,6673
 sunholo/gcs/__init__.py,sha256=DtVw_AZwQn-IguR5BJuIi2XJeF_FQXizhJikzRNrXiE,50
 sunholo/gcs/add_file.py,sha256=ILU3Nq-rYjL0Ini9op6jBYtXCDl3iTO61ZA1q2zykJQ,5537
 sunholo/gcs/download_url.py,sha256=8XSEf8byfubqs5CMQeF_tn9wxqwUTq3n9mo5mLNIUTA,4801
@@ -105,9 +105,9 @@ sunholo/vertex/__init__.py,sha256=JvHcGFuv6R_nAhY2AdoqqhMpJ5ugeWPZ_svGhWrObBk,13
 sunholo/vertex/init.py,sha256=JDMUaBRdednzbKF-5p33qqLit2LMsvgvWW-NRz0AqO0,1801
 sunholo/vertex/memory_tools.py,sha256=8F1iTWnqEK9mX4W5RzCVKIjydIcNp6OFxjn_dtQ3GXo,5379
 sunholo/vertex/safety.py,sha256=3meAX0HyGZYrH7rXPUAHxtI_3w_zoy_RX7Shtkoa660,1275
-sunholo-0.66.22.dist-info/LICENSE.txt,sha256=SdE3QjnD3GEmqqg9EX3TM9f7WmtOzqS1KJve8rhbYmU,11345
-sunholo-0.66.22.dist-info/METADATA,sha256=IlI07pylXN-AMnC-00izt6cVpgCDJhbHpVzIom3CMwE,6098
-sunholo-0.66.22.dist-info/WHEEL,sha256=cpQTJ5IWu9CdaPViMhC9YzF8gZuS5-vlfoFihTBC86A,91
-sunholo-0.66.22.dist-info/entry_points.txt,sha256=bZuN5AIHingMPt4Ro1b_T-FnQvZ3teBes-3OyO0asl4,49
-sunholo-0.66.22.dist-info/top_level.txt,sha256=wt5tadn5--5JrZsjJz2LceoUvcrIvxjHJe-RxuudxAk,8
-sunholo-0.66.22.dist-info/RECORD,,
+sunholo-0.67.2.dist-info/LICENSE.txt,sha256=SdE3QjnD3GEmqqg9EX3TM9f7WmtOzqS1KJve8rhbYmU,11345
+sunholo-0.67.2.dist-info/METADATA,sha256=G-TlF50LwSi1KvftHrX-teBH5e0RIAk8xFQtS0JGCDg,6155
+sunholo-0.67.2.dist-info/WHEEL,sha256=cpQTJ5IWu9CdaPViMhC9YzF8gZuS5-vlfoFihTBC86A,91
+sunholo-0.67.2.dist-info/entry_points.txt,sha256=bZuN5AIHingMPt4Ro1b_T-FnQvZ3teBes-3OyO0asl4,49
+sunholo-0.67.2.dist-info/top_level.txt,sha256=wt5tadn5--5JrZsjJz2LceoUvcrIvxjHJe-RxuudxAk,8
+sunholo-0.67.2.dist-info/RECORD,,