sunholo 0.64.18__tar.gz → 0.66.0__tar.gz

{sunholo-0.64.18 → sunholo-0.66.0}/PKG-INFO

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

{sunholo-0.64.18 → sunholo-0.66.0}/setup.py

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

{sunholo-0.64.18 → sunholo-0.66.0}/sunholo/agents/swagger.py

@@ -130,7 +130,19 @@ def generate_swagger(vac_config, agent_config):
         'host': '${_ENDPOINTS_HOST}',
         'schemes': ['https'],
         'produces': ['application/json'],
-        'paths': {}
+        'paths': {},
+        'securityDefinitions': { 
+            'ApiKeyAuth': {        # For private VAC endpoint
+                'type': 'apiKey',
+                'name': 'x-api-key', # Custom header name for API key
+                'in': 'header'
+            },
+            'None': {              # For public documentation
+                'type': 'apiKey',
+                'name': 'allow',    # Dummy parameter for public access
+                'in': 'query'       # Use query parameter to avoid interfering with other headers
+            }
+        }
     }
     
     vac_services = vac_config['vac']
@@ -146,9 +158,24 @@ def generate_swagger(vac_config, agent_config):
             log.warning(f"Failed to find URL stem for {vector_name}/{agent_type} - using {stem} instead")
         
         for method, endpoints in agent_config_paths.items():
-            if method not in ['get', 'post']:
-                log.warning(f"Skipping {endpoints}")
+            # 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()
@@ -161,6 +188,8 @@ def generate_swagger(vac_config, agent_config):
 
                 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()} {vector_name}",
                     'operationId': operation_id,
@@ -168,6 +197,7 @@ def generate_swagger(vac_config, agent_config):
                         'address': endpoint_address,
                         'protocol': 'h2'
                     },
+                    'security': security,
                     'responses': copy.deepcopy(agent_config_paths.get('response', {}).get(endpoint_key, {
                         '200': {
                             'description': 'Default - A successful response',
@@ -191,9 +221,26 @@ def generate_swagger(vac_config, agent_config):
             stem = f"${{{agent_type.upper()}_BACKEND_URL}}"
             log.warning(f"Failed to find URL stem for {vector_name}/{agent_type} - using {stem} instead")
         
+
         for method, endpoints in default_agent_config.items():
-            if method not in ['get', 'post']:
+            # 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()
@@ -205,6 +252,8 @@ def generate_swagger(vac_config, agent_config):
                     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}",
@@ -213,6 +262,7 @@ def generate_swagger(vac_config, agent_config):
                         'address': endpoint_address,
                         'protocol': 'h2'
                     },
+                    'security': security,
                     'responses': copy.deepcopy(default_agent_config.get('response', {}).get(endpoint_key, {
                         '200': {
                             'description': 'Default - A successful response',

{sunholo-0.64.18 → sunholo-0.66.0}/sunholo/utils/config.py

@@ -82,7 +82,6 @@ def load_all_configs():
                 cached_config, cache_time = config_cache[filename]
                 time_to_recache = (current_time - cache_time)
                 if time_to_recache < timedelta(minutes=5):
-                    log.debug(f"Returning cached config for {filename} - recache in {format_timedelta(timedelta(minutes=5) - time_to_recache)}")
                     config = cached_config
                 else:
                     config = reload_config_file(config_file, filename)
@@ -94,6 +93,8 @@ def load_all_configs():
                 configs_by_kind[kind] = config
             else:
                 log.warning(f"No 'kind' found in {filename}")
+    
+    #log.debug(f"Config recache in {format_timedelta(timedelta(minutes=5) - time_to_recache)}")
 
     return configs_by_kind
 

{sunholo-0.64.18 → sunholo-0.66.0}/sunholo.egg-info/PKG-INFO

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