sunholo 0.64.8__tar.gz → 0.64.10__tar.gz

{sunholo-0.64.8 → sunholo-0.64.10}/PKG-INFO

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

{sunholo-0.64.8 → sunholo-0.64.10}/setup.py

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

{sunholo-0.64.8 → sunholo-0.64.10}/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-0.64.8 → sunholo-0.64.10}/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),
+                        '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),
+                        'address': endpoint_path,
                         'protocol': 'h2'
                     },
                     'responses': copy.deepcopy(default_agent_config.get('response', {}).get(endpoint_key, {

{sunholo-0.64.8 → sunholo-0.64.10}/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-0.64.8 → sunholo-0.64.10}/sunholo.egg-info/PKG-INFO

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