sunholo 0.66.3__py3-none-any.whl → 0.66.4__py3-none-any.whl

sunholo/agents/flask/qna_routes.py

@@ -27,7 +27,8 @@ from ...utils.config import load_config
 from ...utils.version import sunholo_version
 import os
 from ...gcs.add_file import add_file_to_gcs, handle_base64_image
-
+from ..swagger import validate_api_key
+from datetime import datetime, timedelta
 
 try:
     from flask import request, jsonify, Response
@@ -39,6 +40,9 @@ try:
 except ImportError:
     pass    
 
+# Cache dictionary to store validated API keys
+api_key_cache = {}
+cache_duration = timedelta(minutes=5)  # Cache duration
 
 def register_qna_routes(app, stream_interpreter, vac_interpreter):
     """
@@ -219,6 +223,43 @@ def register_qna_routes(app, stream_interpreter, vac_interpreter):
         # {'answer': 'output'}
         return jsonify(bot_output)
 
+    @app.before_request
+    def check_authentication_header():
+        if request.path.startswith('/openai/'):
+            auth_header = request.headers.get('Authorization')
+            if auth_header:
+                api_key = auth_header.split(' ')[1]  # Assuming "Bearer <api_key>"
+                endpoints_host = os.getenv('_ENDPOINTS_HOST')
+                if not endpoints_host:
+                    return jsonify({'error': '_ENDPOINTS_HOST environment variable not found'}), 401
+                
+                # Check cache first
+                current_time = datetime.now()
+                if api_key in api_key_cache:
+                    cached_result, cache_time = api_key_cache[api_key]
+                    if current_time - cache_time < cache_duration:
+                        if not cached_result:
+                            return jsonify({'error': 'Invalid cached API key'}), 401
+                        else:
+                            return  # Valid API key, continue to the endpoint
+                    else:
+                        # Cache expired, remove from cache
+                        del api_key_cache[api_key]
+                
+                # Validate API key
+                is_valid = validate_api_key(api_key, endpoints_host)
+                # Update cache
+                api_key_cache[api_key] = (is_valid, current_time)
+                
+                if not is_valid:
+                    return jsonify({'error': 'Invalid API key'}), 401
+            else:
+                return jsonify({'error': 'Missing Authorization header'}), 401
+
+    @app.route('/openai/health', methods=['GET', 'POST'])
+    def openai_health_endpoint():
+        return jsonify({'message': 'Success'})
+
     @app.route('/openai/v1/chat/completions', methods=['POST'])
     @app.route('/openai/v1/chat/completions/<vector_name>', methods=['POST'])
     def openai_compatible_endpoint(vector_name=None):

sunholo/agents/swagger.py

@@ -6,6 +6,31 @@ from ruamel.yaml import YAML
 from io import StringIO
 # check it here:
 # https://editor.swagger.io/
+from functools import lru_cache
+
+try:
+    from google.cloud import endpoints_v1
+except ImportError:
+    endpoints_v1 = None
+
+def validate_api_key(api_key: str, service_name: str) -> bool:
+    """
+    Validate an API key against the service name e.g. 'endpoints-xxxx.a.run.app'
+    """
+    if not endpoints_v1:
+        raise ImportError("Cloud Endpoints API key validation is required, install via `pip install google-cloud-endpoints`")
+
+    return _validate_api_key_cached(api_key, service_name)
+
+@lru_cache(maxsize=1024)
+def _validate_api_key_cached(api_key: str, service_name: str) -> bool:
+    client = endpoints_v1.ServiceControlServiceClient()
+    response = client.check(
+        service_name=service_name,
+        operation={'consumer_id': f'api_key:{api_key}'}
+    )
+
+    return response.check_errors is None
 
 def config_to_swagger():
     """
@@ -123,8 +148,8 @@ def generate_swagger(vac_config, agent_config):
     swagger_template = {
         'swagger': '2.0',
         'info': {
-            'title': 'Multivac - Cloud Endpoints + Cloud Run',
-            'description': 'Multivac - Cloud Endpoints with a Cloud Run backend',
+            'title': 'Multivac ${_BRANCH_NAME} - Cloud Endpoints + Cloud Run',
+            'description': 'Multivac Endpoints - see documentation at https://dev.sunholo.com/',
             'version': '0.1.0'
         },
         'host': '${_ENDPOINTS_HOST}',

{sunholo-0.66.3.dist-info → sunholo-0.66.4.dist-info}/METADATA

@@ -1,9 +1,9 @@
 Metadata-Version: 2.1
 Name: sunholo
-Version: 0.66.3
+Version: 0.66.4
 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.3.tar.gz
+Download-URL: https://github.com/sunholo-data/sunholo-py/archive/refs/tags/v0.66.4.tar.gz
 Author: Holosun ApS
 Author-email: multivac@sunholo.com
 License: Apache License, Version 2.0
@@ -36,6 +36,7 @@ Requires-Dist: google-api-python-client ; extra == 'all'
 Requires-Dist: google-cloud-alloydb-connector[pg8000] ; extra == 'all'
 Requires-Dist: google-cloud-bigquery ; extra == 'all'
 Requires-Dist: google-cloud-build ; extra == 'all'
+Requires-Dist: google-cloud-endpoints ; extra == 'all'
 Requires-Dist: google-cloud-logging ; extra == 'all'
 Requires-Dist: google-cloud-storage ; extra == 'all'
 Requires-Dist: google-cloud-pubsub ; extra == 'all'
@@ -81,6 +82,7 @@ Requires-Dist: google-auth-oauthlib ; extra == 'gcp'
 Requires-Dist: google-cloud-aiplatform ; extra == 'gcp'
 Requires-Dist: google-cloud-bigquery ; extra == 'gcp'
 Requires-Dist: google-cloud-build ; extra == 'gcp'
+Requires-Dist: google-cloud-endpoints ; extra == 'gcp'
 Requires-Dist: google-cloud-storage ; extra == 'gcp'
 Requires-Dist: google-cloud-logging ; extra == 'gcp'
 Requires-Dist: google-cloud-pubsub ; extra == 'gcp'

{sunholo-0.66.3.dist-info → sunholo-0.66.4.dist-info}/RECORD

@@ -7,13 +7,13 @@ 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=muFMQ1-9MtVlvSyUrLKjmULe4inC_QMb0Iofa14QnXw,11540
+sunholo/agents/swagger.py,sha256=bX4SkHt-0Qjm7dslK9Vf_6deyh-4ibEn2COjIEGbME4,12388
 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
 sunholo/agents/flask/__init__.py,sha256=uqfHNw2Ru3EJ4dJEcbp86h_lkquBQPMxZbjhV_xe3rs,72
 sunholo/agents/flask/base.py,sha256=FgSaCODyoTtlstJtsqlLPScdgRUtv9_plxftdzHdVFo,809
-sunholo/agents/flask/qna_routes.py,sha256=9wJC_SDbn7A6EzqsbkQicApztAzvvtKvs6cztXhh9Dw,19027
+sunholo/agents/flask/qna_routes.py,sha256=bHZSsNrgBCu-AVhOJ5WmvKCogsHHOXEXK65k4tccnnM,20948
 sunholo/archive/__init__.py,sha256=qNHWm5rGPVOlxZBZCpA1wTYPbalizRT7f8X4rs2t290,31
 sunholo/archive/archive.py,sha256=C-UhG5x-XtZ8VheQp92IYJqgD0V3NFQjniqlit94t18,1197
 sunholo/auth/__init__.py,sha256=4owDjSaWYkbTlPK47UHTOC0gCWbZsqn4ZIEw5NWZTlg,28
@@ -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.66.3.dist-info/LICENSE.txt,sha256=SdE3QjnD3GEmqqg9EX3TM9f7WmtOzqS1KJve8rhbYmU,11345
-sunholo-0.66.3.dist-info/METADATA,sha256=leJE_PT71BuDO_rc6o3ftNGgyzG0xGGzTDVbnclv6Ug,5998
-sunholo-0.66.3.dist-info/WHEEL,sha256=cpQTJ5IWu9CdaPViMhC9YzF8gZuS5-vlfoFihTBC86A,91
-sunholo-0.66.3.dist-info/entry_points.txt,sha256=bZuN5AIHingMPt4Ro1b_T-FnQvZ3teBes-3OyO0asl4,49
-sunholo-0.66.3.dist-info/top_level.txt,sha256=wt5tadn5--5JrZsjJz2LceoUvcrIvxjHJe-RxuudxAk,8
-sunholo-0.66.3.dist-info/RECORD,,
+sunholo-0.66.4.dist-info/LICENSE.txt,sha256=SdE3QjnD3GEmqqg9EX3TM9f7WmtOzqS1KJve8rhbYmU,11345
+sunholo-0.66.4.dist-info/METADATA,sha256=D-c9BmPEj6dR-BUFMrhkDsW6X1UIQyHi5uTl_fu0FS4,6108
+sunholo-0.66.4.dist-info/WHEEL,sha256=cpQTJ5IWu9CdaPViMhC9YzF8gZuS5-vlfoFihTBC86A,91
+sunholo-0.66.4.dist-info/entry_points.txt,sha256=bZuN5AIHingMPt4Ro1b_T-FnQvZ3teBes-3OyO0asl4,49
+sunholo-0.66.4.dist-info/top_level.txt,sha256=wt5tadn5--5JrZsjJz2LceoUvcrIvxjHJe-RxuudxAk,8
+sunholo-0.66.4.dist-info/RECORD,,