sunholo 0.64.17__py3-none-any.whl → 0.64.19__py3-none-any.whl

sunholo/agents/swagger.py

@@ -4,6 +4,8 @@ from .route import route_vac
 from ..logging import log
 from ruamel.yaml import YAML
 from io import StringIO
+# check it here:
+# https://editor.swagger.io/
 
 def config_to_swagger():
     """
@@ -128,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']
@@ -156,13 +170,17 @@ def generate_swagger(vac_config, agent_config):
                 log.debug(f"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}"
+
                 swagger_template['paths'][endpoint_path][method] = {
                     'summary': f"{method.capitalize()} {vector_name}",
-                    'operationId': f"{method}_{agent_type}_{endpoint_key}",
+                    'operationId': operation_id,
                     'x-google-backend': {
                         'address': endpoint_address,
                         'protocol': 'h2'
                     },
+                    'security': [{'ApiKeyAuth': []}] if method == 'post' else [{'None': []}],
                     'responses': copy.deepcopy(agent_config_paths.get('response', {}).get(endpoint_key, {
                         '200': {
                             'description': 'Default - A successful response',
@@ -198,13 +216,17 @@ def generate_swagger(vac_config, agent_config):
                 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}"
+
                 swagger_template['paths'][endpoint_path][method] = {
                     'summary': f"{method.capitalize()} {agent_type}",
-                    'operationId': f"{method}_{agent_type}_{endpoint_key}",
+                    'operationId': operation_id,
                     'x-google-backend': {
                         'address': endpoint_address,
                         'protocol': 'h2'
                     },
+                    'security': [{'ApiKeyAuth': []}] if method == 'post' else [{'None': []}],
                     'responses': copy.deepcopy(default_agent_config.get('response', {}).get(endpoint_key, {
                         '200': {
                             'description': 'Default - A successful response',

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

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

{sunholo-0.64.17.dist-info → sunholo-0.64.19.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=jxQ-NeKJ5BGQS29SiIbFhS_drb4_R5ahdR3m8-jDzWk,9354
+sunholo/agents/swagger.py,sha256=nnaf9JtHeJwdzlpXmgFBpI71nf5oE7tSLG1VoZZj0SY,10261
 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=xwI-3Ire8vGzvUydokfNz4Ubolxy4tA_4DNGcyGPO90,8951
+sunholo/utils/config.py,sha256=5lzO9CkLpDslp66ZwSBC_95aA1FQs-zpiOLi5YaYWbM,8907
 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.17.dist-info/LICENSE.txt,sha256=SdE3QjnD3GEmqqg9EX3TM9f7WmtOzqS1KJve8rhbYmU,11345
-sunholo-0.64.17.dist-info/METADATA,sha256=V0EKYPEHEw0VqknXtTiT2GfhWhmQwxqeMqD0cwPZDuk,6000
-sunholo-0.64.17.dist-info/WHEEL,sha256=cpQTJ5IWu9CdaPViMhC9YzF8gZuS5-vlfoFihTBC86A,91
-sunholo-0.64.17.dist-info/entry_points.txt,sha256=bZuN5AIHingMPt4Ro1b_T-FnQvZ3teBes-3OyO0asl4,49
-sunholo-0.64.17.dist-info/top_level.txt,sha256=wt5tadn5--5JrZsjJz2LceoUvcrIvxjHJe-RxuudxAk,8
-sunholo-0.64.17.dist-info/RECORD,,
+sunholo-0.64.19.dist-info/LICENSE.txt,sha256=SdE3QjnD3GEmqqg9EX3TM9f7WmtOzqS1KJve8rhbYmU,11345
+sunholo-0.64.19.dist-info/METADATA,sha256=8J1J8ApDb-Q3I3afrKM4RTck6U2_Lgb8K8ogxUZ8hTU,6000
+sunholo-0.64.19.dist-info/WHEEL,sha256=cpQTJ5IWu9CdaPViMhC9YzF8gZuS5-vlfoFihTBC86A,91
+sunholo-0.64.19.dist-info/entry_points.txt,sha256=bZuN5AIHingMPt4Ro1b_T-FnQvZ3teBes-3OyO0asl4,49
+sunholo-0.64.19.dist-info/top_level.txt,sha256=wt5tadn5--5JrZsjJz2LceoUvcrIvxjHJe-RxuudxAk,8
+sunholo-0.64.19.dist-info/RECORD,,