sunholo 0.66.3__tar.gz → 0.66.5__tar.gz

{sunholo-0.66.3 → sunholo-0.66.5}/PKG-INFO

@@ -1,9 +1,9 @@
 Metadata-Version: 2.1
 Name: sunholo
-Version: 0.66.3
+Version: 0.66.5
 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.5.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-endpoints; extra == "all"
 Requires-Dist: google-cloud-logging; extra == "all"
 Requires-Dist: google-cloud-storage; extra == "all"
 Requires-Dist: google-cloud-pubsub; extra == "all"
@@ -84,6 +85,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-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 → sunholo-0.66.5}/setup.py

@@ -1,7 +1,7 @@
 from setuptools import setup, find_packages
 
 # Define your base version
-version = '0.66.3'
+version = '0.66.5'
 
 setup(
     name='sunholo',
@@ -29,7 +29,7 @@ setup(
     install_requires=[
         # Base dependencies
         "google-auth", # to check if on gcp
-        "tenacity==8.3.0",
+        "tenacity==8.3.0", #TODO: remove soon
         "ruamel.yaml",
         "langchain",
         "langchain_experimental",
@@ -50,6 +50,7 @@ setup(
             "google-cloud-alloydb-connector[pg8000]",
             "google-cloud-bigquery",
             "google-cloud-build",
+            "google-endpoints",
             "google-cloud-logging",
             "google-cloud-storage",
             "google-cloud-pubsub",
@@ -103,6 +104,7 @@ setup(
             "google-cloud-aiplatform",
             "google-cloud-bigquery",
             "google-cloud-build",
+            "google-endpoints",
             "google-cloud-storage",
             "google-cloud-logging",
             "google-cloud-pubsub",

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

@@ -1,9 +1,9 @@
 Metadata-Version: 2.1
 Name: sunholo
-Version: 0.66.3
+Version: 0.66.5
 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.5.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-endpoints; extra == "all"
 Requires-Dist: google-cloud-logging; extra == "all"
 Requires-Dist: google-cloud-storage; extra == "all"
 Requires-Dist: google-cloud-pubsub; extra == "all"
@@ -84,6 +85,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-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 → sunholo-0.66.5}/sunholo.egg-info/requires.txt

@@ -17,6 +17,7 @@ google-api-python-client
 google-cloud-alloydb-connector[pg8000]
 google-cloud-bigquery
 google-cloud-build
+google-endpoints
 google-cloud-logging
 google-cloud-storage
 google-cloud-pubsub
@@ -66,6 +67,7 @@ google-auth-oauthlib
 google-cloud-aiplatform
 google-cloud-bigquery
 google-cloud-build
+google-endpoints
 google-cloud-storage
 google-cloud-logging
 google-cloud-pubsub

{sunholo-0.66.3 → sunholo-0.66.5}/tests/test_swagger.py

@@ -10,6 +10,6 @@ def test_config_to_swagger():
     assert 'swagger' in swagger_dict
     assert swagger_dict['swagger'] == '2.0'
     assert 'info' in swagger_dict
-    assert swagger_dict['info']['title'] == 'Multivac - Cloud Endpoints + Cloud Run'
+    assert swagger_dict['info']['title'] == 'Multivac ${_BRANCH_NAME} - Cloud Endpoints + Cloud Run'
     assert 'paths' in swagger_dict
     #TODO: more tests for specific agents