sunholo 0.64.9__py3-none-any.whl → 0.64.11__py3-none-any.whl

sunholo/agents/route.py

@@ -14,8 +14,10 @@
 from ..logging import log
 from ..utils import load_config_key, load_config
 
-def route_vac(vector_name):
-
+def route_vac(vector_name: str) -> str :
+    """
+    Considers what VAC this vector_name belongs to
+    """
     agent_url = load_config_key('agent_url', vector_name=vector_name, kind="vacConfig")
     if agent_url:
         log.info('agent_url found in llm_config.yaml')

sunholo/agents/swagger.py

@@ -138,7 +138,7 @@ def generate_swagger(vac_config, agent_config):
         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)
+            stem = route_vac(vector_name).strip()
         except ValueError:
             stem = f"${{{agent_type.upper()}_BACKEND_URL}}"
             log.warning(f"Failed to find URL stem for {vector_name}/{agent_type} - using {stem} instead")
@@ -148,14 +148,19 @@ def generate_swagger(vac_config, agent_config):
                 log.warning(f"Skipping {endpoints}")
                 continue
             for endpoint_key, endpoint_template in endpoints.items():
-                endpoint_path = endpoint_template.replace("{stem}", f"/{agent_type}").replace("{vector_name}", vector_name)
+                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"Endpoint_template: {endpoint_template}")
+                log.debug(f"endpoint address: {endpoint_address}")
+                log.debug(f"endpoint_path: {endpoint_path}")
                 if endpoint_path not in swagger_template['paths']:
                     swagger_template['paths'][endpoint_path] = {}
                 swagger_template['paths'][endpoint_path][method] = {
                     'summary': f"{method.capitalize()} {vector_name}",
                     'operationId': f"{method}_{agent_type}_{endpoint_key}",
                     'x-google-backend': {
-                        'address': endpoint_template.replace("{stem}", stem).replace("{vector_name}", vector_name).strip(),
+                        'address': endpoint_address,
                         'protocol': 'h2'
                     },
                     'responses': copy.deepcopy(agent_config_paths.get('response', {}).get(endpoint_key, {
@@ -176,7 +181,7 @@ def generate_swagger(vac_config, agent_config):
             continue
         log.info(f'Applying default configuration for agent_type: {agent_type} for vector_name: {vector_name}')
         try:
-            stem = route_vac(vector_name)
+            stem = route_vac(vector_name).strip()
         except ValueError:
             stem = f"${{{agent_type.upper()}_BACKEND_URL}}"
             log.warning(f"Failed to find URL stem for {vector_name}/{agent_type} - using {stem} instead")
@@ -185,14 +190,19 @@ def generate_swagger(vac_config, agent_config):
             if method not in ['get', 'post']:
                 continue
             for endpoint_key, endpoint_template in endpoints.items():
-                endpoint_path = endpoint_template.replace("{stem}", f"/{agent_type}").replace("{vector_name}", vector_name)
+                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] = {}
                 swagger_template['paths'][endpoint_path][method] = {
                     'summary': f"{method.capitalize()} {agent_type}",
                     'operationId': f"{method}_{agent_type}_{endpoint_key}",
                     'x-google-backend': {
-                        'address': endpoint_template.replace("{stem}", stem).replace("{vector_name}", vector_name).strip(),
+                        'address': endpoint_address,
                         'protocol': 'h2'
                     },
                     'responses': copy.deepcopy(default_agent_config.get('response', {}).get(endpoint_key, {
@@ -205,4 +215,4 @@ def generate_swagger(vac_config, agent_config):
                     }))
                 }
     
-    return yaml.dump(swagger_template, default_flow_style=False)
+    return yaml.dump(swagger_template, default_flow_style=False, width=float("inf"))

sunholo/logging.py

@@ -18,6 +18,7 @@ try:
 except ImportError:
     Client = None
 
+from .utils.version import sunholo_version
 import logging
 import inspect
 import os
@@ -44,6 +45,7 @@ class GoogleCloudLogging:
             self.logger_name = logger_name
             self.log_level = log_level
             self.initialized = True  # Mark as initialized
+            self.version = sunholo_version()
         print(f"Initialized logging object for logger_name: {logger_name}")
 
 
@@ -106,9 +108,9 @@ class GoogleCloudLogging:
         if not is_running_on_gcp() and not is_gcp_logged_in():
             log.basicConfig(level=log.INFO, format='%(asctime)s - %(levelname)s - %(message)s')
             if log_text:
-                log.info(f"[{severity}][{logger_name or self.logger_name}] - {log_text}")
+                log.info(f"[{severity}][{logger_name or self.logger_name}][{self.version}] - {log_text}")
             elif log_struct:
-                log.info(f"[{severity}][{logger_name or self.logger_name}] - {str(log_struct)}")
+                log.info(f"[{severity}][{logger_name or self.logger_name}][{self.version}] - {str(log_struct)}")
 
         logger = self.client.logger(logger_name or self.logger_name)
 

sunholo/utils/config.py

@@ -70,7 +70,7 @@ def load_all_configs():
 
     configs_by_kind = defaultdict(dict)
     for filename in os.listdir(config_folder):
-        log.debug(f"config file: {filename}")
+        #log.debug(f"config file: {filename}")
         if filename in ["cloudbuild.yaml", "cloud_run_urls.json"]:
             # skip these
             continue

{sunholo-0.64.9.dist-info → sunholo-0.64.11.dist-info}/METADATA

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

{sunholo-0.64.9.dist-info → sunholo-0.64.11.dist-info}/RECORD

@@ -1,13 +1,13 @@
 sunholo/__init__.py,sha256=0CdpufyRKWyZe7J7UKigL6j_qOorM-p0OjHIAuf9M38,864
-sunholo/logging.py,sha256=hPmB5VgHV9fN2Ze55jNkRx5QNfxRtezYQkhu_RaE8mc,11667
+sunholo/logging.py,sha256=00VGGArfWHbJuHHSJ4kXhHTggWnRfbVYMcZNOYIsqnA,11787
 sunholo/agents/__init__.py,sha256=Hb4NXy2rN-83Z0-UDRwX-LXv2R29lcbSFPf8G6q4fZg,380
 sunholo/agents/chat_history.py,sha256=bkII7PNEbGCaobu2Rnr2rM9dim3BCK0kM-tiWhoI1tw,5219
 sunholo/agents/dispatch_to_qa.py,sha256=7Dl82DL3Wt-MxpLyCi_Udf8OPvxU6-UXbgP-pojoPuY,8339
 sunholo/agents/langserve.py,sha256=FdhQjorAY2bMn2rpuabNT6bU3uqSKWrl8DjpH3L_V7k,4375
 sunholo/agents/pubsub.py,sha256=5hbbhbBGyVWRpt2sAGC5FEheYH1mCCwVUhZEB1S7vGg,1337
-sunholo/agents/route.py,sha256=-O6kljLSPdBOsysKyn6hZvXZlNlqNDHGwWl2WwR6Tss,2304
+sunholo/agents/route.py,sha256=V1HKXTvaNuYgjmT5_QgIQum4O7O0Mw497m6YiMpEzX0,2383
 sunholo/agents/special_commands.py,sha256=ecD5jrBVXo170sdgPILi0m_m_4nRFEv6qKn5zYEvEK8,6494
-sunholo/agents/swagger.py,sha256=wQ6i72OIqrjbmdc0mSL7_PUsqsiiQQXVXZcmn7oLC2g,8444
+sunholo/agents/swagger.py,sha256=KCSXoVvZLDYDLxJNqOJocpc5wMfD8_z9MEmap0kNFPY,9142
 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
@@ -92,7 +92,7 @@ sunholo/summarise/__init__.py,sha256=MZk3dblUMODcPb1crq4v-Z508NrFIpkSWNf9FIO8BcU
 sunholo/summarise/summarise.py,sha256=C3HhjepTjUhUC8FLk4jMQIBvq1BcORniwuTFHjPVhVo,3784
 sunholo/utils/__init__.py,sha256=G11nN_6ATjxpuMfG_BvcUr9UU8onPIgkpTK6CjOcbr8,48
 sunholo/utils/big_context.py,sha256=gJIP7_ZL-YSLhOMq8jmFTMqH1wq8eB1NK7oKPeZAq2s,5578
-sunholo/utils/config.py,sha256=v5J5j2K9TDDw2mJne5q63jCqvp9Few0Wgesc7j-46HI,8950
+sunholo/utils/config.py,sha256=xwI-3Ire8vGzvUydokfNz4Ubolxy4tA_4DNGcyGPO90,8951
 sunholo/utils/config_schema.py,sha256=Wv-ncitzljOhgbDaq9qnFqH5LCuxNv59dTGDWgd1qdk,4189
 sunholo/utils/gcp.py,sha256=uueODEpA-P6O15-t0hmcGC9dONLO_hLfzSsSoQnkUss,4854
 sunholo/utils/gcp_project.py,sha256=0ozs6tzI4qEvEeXb8MxLnCdEVoWKxlM6OH05htj7_tc,1325
@@ -104,9 +104,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.64.9.dist-info/LICENSE.txt,sha256=SdE3QjnD3GEmqqg9EX3TM9f7WmtOzqS1KJve8rhbYmU,11345
-sunholo-0.64.9.dist-info/METADATA,sha256=ZYfvslnkrApniDFnCslb3MPOyoNn2L9qZZczHNvfJCI,5971
-sunholo-0.64.9.dist-info/WHEEL,sha256=cpQTJ5IWu9CdaPViMhC9YzF8gZuS5-vlfoFihTBC86A,91
-sunholo-0.64.9.dist-info/entry_points.txt,sha256=bZuN5AIHingMPt4Ro1b_T-FnQvZ3teBes-3OyO0asl4,49
-sunholo-0.64.9.dist-info/top_level.txt,sha256=wt5tadn5--5JrZsjJz2LceoUvcrIvxjHJe-RxuudxAk,8
-sunholo-0.64.9.dist-info/RECORD,,
+sunholo-0.64.11.dist-info/LICENSE.txt,sha256=SdE3QjnD3GEmqqg9EX3TM9f7WmtOzqS1KJve8rhbYmU,11345
+sunholo-0.64.11.dist-info/METADATA,sha256=B9yM3g1RYqAHvbQJZAkMDhhWM1GQtzwn6k8IhTDM_KU,5973
+sunholo-0.64.11.dist-info/WHEEL,sha256=cpQTJ5IWu9CdaPViMhC9YzF8gZuS5-vlfoFihTBC86A,91
+sunholo-0.64.11.dist-info/entry_points.txt,sha256=bZuN5AIHingMPt4Ro1b_T-FnQvZ3teBes-3OyO0asl4,49
+sunholo-0.64.11.dist-info/top_level.txt,sha256=wt5tadn5--5JrZsjJz2LceoUvcrIvxjHJe-RxuudxAk,8
+sunholo-0.64.11.dist-info/RECORD,,