sunholo 0.66.4__tar.gz → 0.66.7__tar.gz

{sunholo-0.66.4 → sunholo-0.66.7}/PKG-INFO

@@ -1,9 +1,9 @@
 Metadata-Version: 2.1
 Name: sunholo
-Version: 0.66.4
+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.4.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-cloud-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"
@@ -85,7 +84,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-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.4 → sunholo-0.66.7}/setup.py

@@ -1,7 +1,7 @@
 from setuptools import setup, find_packages
 
 # Define your base version
-version = '0.66.4'
+version = '0.66.7'
 
 setup(
     name='sunholo',
@@ -29,9 +29,9 @@ setup(
     install_requires=[
         # Base dependencies
         "google-auth", # to check if on gcp
-        "tenacity==8.3.0", #TODO: remove soon
+        #"tenacity==8.3.0", #TODO: remove soon
         "ruamel.yaml",
-        "langchain",
+        "langchain>=0.2.5",
         "langchain_experimental",
         "langchain-community",
         # Add the minimal dependencies that your package requires here
@@ -50,7 +50,7 @@ setup(
             "google-cloud-alloydb-connector[pg8000]",
             "google-cloud-bigquery",
             "google-cloud-build",
-            "google-cloud-endpoints",
+            "google-cloud-service-control",
             "google-cloud-logging",
             "google-cloud-storage",
             "google-cloud-pubsub",
@@ -104,7 +104,7 @@ setup(
             "google-cloud-aiplatform",
             "google-cloud-bigquery",
             "google-cloud-build",
-            "google-cloud-endpoints",
+            "google-cloud-service-control",
             "google-cloud-storage",
             "google-cloud-logging",
             "google-cloud-pubsub",

{sunholo-0.66.4 → sunholo-0.66.7}/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-0.66.4 → sunholo-0.66.7}/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.4 → sunholo-0.66.7}/sunholo.egg-info/PKG-INFO

@@ -1,9 +1,9 @@
 Metadata-Version: 2.1
 Name: sunholo
-Version: 0.66.4
+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.4.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-cloud-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"
@@ -85,7 +84,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-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.4 → sunholo-0.66.7}/sunholo.egg-info/requires.txt

@@ -1,7 +1,6 @@
 google-auth
-tenacity==8.3.0
 ruamel.yaml
-langchain
+langchain>=0.2.5
 langchain_experimental
 langchain-community
 
@@ -17,7 +16,7 @@ google-api-python-client
 google-cloud-alloydb-connector[pg8000]
 google-cloud-bigquery
 google-cloud-build
-google-cloud-endpoints
+google-cloud-service-control
 google-cloud-logging
 google-cloud-storage
 google-cloud-pubsub
@@ -67,7 +66,7 @@ google-auth-oauthlib
 google-cloud-aiplatform
 google-cloud-bigquery
 google-cloud-build
-google-cloud-endpoints
+google-cloud-service-control
 google-cloud-storage
 google-cloud-logging
 google-cloud-pubsub