sunholo 0.66.5__py3-none-any.whl → 0.66.7__py3-none-any.whl

sunholo/agents/swagger.py

@@ -7,28 +7,34 @@ from io import StringIO
 # check it here:
 # https://editor.swagger.io/
 from functools import lru_cache
+import uuid
 
 try:
-    from google.cloud import endpoints_v1
+    from google.cloud import servicecontrol_v1
 except ImportError:
-    endpoints_v1 = None
+    servicecontrol_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`")
+    if not servicecontrol_v1:
+        raise ImportError("Cloud Endpoints API key validation is required, install via `pip install sunholo[gcp]`")
 
     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(
+    client = servicecontrol_v1.ServiceControllerClient()
+    request = servicecontrol_v1.CheckRequest(
         service_name=service_name,
-        operation={'consumer_id': f'api_key:{api_key}'}
+        operation=servicecontrol_v1.Operation(
+            operation_id=str(uuid.uuid4()),
+            consumer_id=f'api_key:{api_key}',
+        )
     )
+    response = client.check(request=request)
 
     return response.check_errors is None
 

sunholo/gcs/add_file.py

@@ -51,10 +51,11 @@ def add_file_to_gcs(filename: str, vector_name:str, bucket_name: str=None, metad
         log.error(f"Error creating storage client: {str(err)}")
         return None
     
-    bucket_config = load_config_key("upload", vector_name, "vacConfig")
-    if bucket_config:
-        if bucket_config.get("buckets"):
-            bucket_name = bucket_config.get("buckets").get("all")
+    if bucket_name is None:
+        bucket_config = load_config_key("upload", vector_name, "vacConfig")
+        if bucket_config:
+            if bucket_config.get("buckets"):
+                bucket_name = bucket_config.get("buckets").get("all")
 
     bucket_name = bucket_name if bucket_name else os.getenv('GCS_BUCKET', None)
     if bucket_name is None:

{sunholo-0.66.5.dist-info → sunholo-0.66.7.dist-info}/METADATA

@@ -1,9 +1,9 @@
 Metadata-Version: 2.1
 Name: sunholo
-Version: 0.66.5
+Version: 0.66.7
 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.5.tar.gz
+Download-URL: https://github.com/sunholo-data/sunholo-py/archive/refs/tags/v0.66.7.tar.gz
 Author: Holosun ApS
 Author-email: multivac@sunholo.com
 License: Apache License, Version 2.0
@@ -19,9 +19,8 @@ Classifier: Programming Language :: Python :: 3.12
 Description-Content-Type: text/markdown
 License-File: LICENSE.txt
 Requires-Dist: google-auth
-Requires-Dist: tenacity ==8.3.0
 Requires-Dist: ruamel.yaml
-Requires-Dist: langchain
+Requires-Dist: langchain >=0.2.5
 Requires-Dist: langchain-experimental
 Requires-Dist: langchain-community
 Provides-Extra: all
@@ -36,7 +35,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-service-control ; extra == 'all'
 Requires-Dist: google-cloud-logging ; extra == 'all'
 Requires-Dist: google-cloud-storage ; extra == 'all'
 Requires-Dist: google-cloud-pubsub ; extra == 'all'
@@ -82,7 +81,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-service-control ; 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.5.dist-info → sunholo-0.66.7.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=bX4SkHt-0Qjm7dslK9Vf_6deyh-4ibEn2COjIEGbME4,12388
+sunholo/agents/swagger.py,sha256=Z_nTumM9KNtuY-jqDUvvkZbxKd15dOs3mWZavLS-pc0,12560
 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
@@ -61,7 +61,7 @@ sunholo/database/sql/sb/setup.sql,sha256=CvoFvZQev2uWjmFa3aj3m3iuPFzAAJZ0S7Qi3L3
 sunholo/embedder/__init__.py,sha256=sI4N_CqgEVcrMDxXgxKp1FsfsB4FpjoXgPGkl4N_u4I,44
 sunholo/embedder/embed_chunk.py,sha256=E6fHn2SFeQu9jsBO1wg5hSJUPTKbZ95Yc5QOltSn7jo,5840
 sunholo/gcs/__init__.py,sha256=DtVw_AZwQn-IguR5BJuIi2XJeF_FQXizhJikzRNrXiE,50
-sunholo/gcs/add_file.py,sha256=z5iWEqQpoqmuyhxoQlQcGXIuQ2lr8EKJnfes-NbiKrA,5493
+sunholo/gcs/add_file.py,sha256=ILU3Nq-rYjL0Ini9op6jBYtXCDl3iTO61ZA1q2zykJQ,5537
 sunholo/gcs/download_url.py,sha256=8XSEf8byfubqs5CMQeF_tn9wxqwUTq3n9mo5mLNIUTA,4801
 sunholo/gcs/metadata.py,sha256=C9sMPsHsq1ETetdQCqB3EBs3Kws8b8QHS9L7ei_v5aw,891
 sunholo/langfuse/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
@@ -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.5.dist-info/LICENSE.txt,sha256=SdE3QjnD3GEmqqg9EX3TM9f7WmtOzqS1KJve8rhbYmU,11345
-sunholo-0.66.5.dist-info/METADATA,sha256=ESpWjQSCpZfxbsF1eUCZ5Op13ztl3Kb0ANiyYdK4LpQ,6096
-sunholo-0.66.5.dist-info/WHEEL,sha256=cpQTJ5IWu9CdaPViMhC9YzF8gZuS5-vlfoFihTBC86A,91
-sunholo-0.66.5.dist-info/entry_points.txt,sha256=bZuN5AIHingMPt4Ro1b_T-FnQvZ3teBes-3OyO0asl4,49
-sunholo-0.66.5.dist-info/top_level.txt,sha256=wt5tadn5--5JrZsjJz2LceoUvcrIvxjHJe-RxuudxAk,8
-sunholo-0.66.5.dist-info/RECORD,,
+sunholo-0.66.7.dist-info/LICENSE.txt,sha256=SdE3QjnD3GEmqqg9EX3TM9f7WmtOzqS1KJve8rhbYmU,11345
+sunholo-0.66.7.dist-info/METADATA,sha256=NdblWyff5u7uZuxVpW-dXrXvw5TmFCXdRvQVPQyQjLg,6096
+sunholo-0.66.7.dist-info/WHEEL,sha256=cpQTJ5IWu9CdaPViMhC9YzF8gZuS5-vlfoFihTBC86A,91
+sunholo-0.66.7.dist-info/entry_points.txt,sha256=bZuN5AIHingMPt4Ro1b_T-FnQvZ3teBes-3OyO0asl4,49
+sunholo-0.66.7.dist-info/top_level.txt,sha256=wt5tadn5--5JrZsjJz2LceoUvcrIvxjHJe-RxuudxAk,8
+sunholo-0.66.7.dist-info/RECORD,,