sunholo 0.62.7__tar.gz → 0.62.9__tar.gz

{sunholo-0.62.7 → sunholo-0.62.9}/PKG-INFO

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

{sunholo-0.62.7 → sunholo-0.62.9}/setup.py

@@ -1,7 +1,7 @@
 from setuptools import setup, find_packages
 
 # Define your base version
-version = '0.62.7'
+version = '0.62.9'
 
 setup(
     name='sunholo',

{sunholo-0.62.7 → sunholo-0.62.9}/sunholo/chunker/publish.py

@@ -19,7 +19,7 @@ def publish_if_urls(the_content, vector_name):
 
 
 def publish_chunks(chunks: list[Document], vector_name: str):
-    project = get_gcp_project()
+    project = get_gcp_project(include_config=True)
     if not project:
         log.warning("No GCP project found for PubSub, no message sent")
 
@@ -42,7 +42,7 @@ def publish_chunks(chunks: list[Document], vector_name: str):
     
 
 def publish_text(text:str, vector_name: str):
-    project = get_gcp_project()
+    project = get_gcp_project(include_config=True)
     if not project:
         log.warning("No GCP project found for PubSub, no message sent")
 
@@ -56,7 +56,7 @@ def publish_text(text:str, vector_name: str):
     pubsub_manager.publish_message(text)
 
 def process_docs_chunks_vector_name(chunks, vector_name, metadata):
-    project = get_gcp_project()
+    project = get_gcp_project(include_config=True)
     if not project:
         log.warning("No GCP project found for PubSub, no message sent")
 

{sunholo-0.62.7 → sunholo-0.62.9}/sunholo/components/retriever.py

@@ -57,7 +57,7 @@ def pick_retriever(vector_name, embeddings=None):
             if value.get('provider') == "GoogleCloudEnterpriseSearchRetriever":
                 log.info(f"Found GoogleCloudEnterpriseSearchRetriever {value['provider']}")
                 gcp_retriever = GoogleCloudEnterpriseSearchRetriever(
-                    project_id=get_gcp_project(),
+                    project_id=get_gcp_project(include_config=True),
                     search_engine_id=value["db_id"],
                     location_id=value.get("location", "global"),
                     engine_data_type=1 if value.get("type","unstructured") == "structured" else 0,

{sunholo-0.62.7 → sunholo-0.62.9}/sunholo/logging.py

@@ -18,17 +18,16 @@ try:
 except ImportError:
     Client = None
 
-from .utils.gcp_project import get_gcp_project
-from .utils.gcp import is_running_on_gcp, is_gcp_logged_in
 import logging
 import inspect
 import os
 
-
 class GoogleCloudLogging:
     
     _instances = {}  # Dictionary to hold instances keyed by a tuple of (project_id, logger_name)
 
+    
+
     def __new__(cls, project_id=None, log_level=logging.INFO, logger_name=None):
         key = (project_id, logger_name)
         if key not in cls._instances:
@@ -37,6 +36,9 @@ class GoogleCloudLogging:
 
     def __init__(self, project_id=None, log_level=logging.INFO, logger_name=None):
         if not hasattr(self, 'initialized'):  # Avoid re-initialization
+            from .utils.gcp_project import get_gcp_project # circular import if outside
+            from .utils.gcp import is_gcp_logged_in
+
             self.project_id = project_id or get_gcp_project()
             self.client = Client(project=self.project_id) if is_gcp_logged_in() else None
             self.logger_name = logger_name
@@ -53,6 +55,7 @@ class GoogleCloudLogging:
 
         try:
             caller_info = self._get_caller_info()
+            from .utils.gcp import is_running_on_gcp, is_gcp_logged_in
             if not is_running_on_gcp() and not is_gcp_logged_in():
                 import logging
                 logging.basicConfig(level=self.log_level, format='%(asctime)s - %(levelname)s - %(message)s')
@@ -99,6 +102,7 @@ class GoogleCloudLogging:
         if not logger_name and not self.logger_name:
             raise ValueError("Must provide a logger name e.g. 'run.googleapis.com%2Fstderr'")
         
+        from .utils.gcp import is_running_on_gcp, is_gcp_logged_in
         if not is_running_on_gcp() and not is_gcp_logged_in():
             log.basicConfig(level=log.INFO, format='%(asctime)s - %(levelname)s - %(message)s')
             if log_text:
@@ -223,6 +227,7 @@ def setup_logging(logger_name=None, log_level=logging.INFO, project_id=None):
 
     if Client and os.environ.get('GOOGLE_CLOUD_LOGGING') == "1":
         if project_id is None:
+            from .utils.gcp_project import get_gcp_project
             project_id = get_gcp_project()
         # Instantiate the GoogleCloudLogging class
         gc_logger = GoogleCloudLogging(project_id, log_level=log_level, logger_name=logger_name)

{sunholo-0.62.7 → sunholo-0.62.9}/sunholo/pubsub/pubsub_manager.py

@@ -43,7 +43,7 @@ class PubSubManager:
         # Get the project ID from the default Google Cloud settings or the environment variable
         if self.project_id is None:
             _, project_id = default()
-            self.project_id = project_id or get_gcp_project()
+            self.project_id = project_id or get_gcp_project(include_config=True)
 
         if self.project_id:
             log.info(f"Pubsub Project ID: {self.project_id}")

{sunholo-0.62.7 → sunholo-0.62.9}/sunholo/utils/config.py

@@ -192,8 +192,8 @@ def load_config_key(key: str, vector_name: str, kind: str):
     print(f'API URL: {api_url}')
     ```
     """
-    import logging # can't use sunholo.logging due to circular import
-    log = logging.getLogger("sunholo")
+    # can't use sunholo.logging due to circular import
+    from ..logging import log
 
     if kind != 'agentConfig':
         assert isinstance(key, str), f"key must be a string got a {type(key)}"

{sunholo-0.62.7 → sunholo-0.62.9}/sunholo/utils/gcp_project.py

@@ -12,17 +12,19 @@ def get_env_project_id():
     """
     return os.environ.get('GCP_PROJECT') or os.environ.get('GOOGLE_CLOUD_PROJECT')
 
-def get_gcp_project():
+
+def get_gcp_project(include_config=False):
     """
     Retrieve the GCP project ID from environment variables or the GCP metadata server.
 
     Returns:
         str or None: The project ID if found, None otherwise.
     """
-    gcp_config = load_config_key("gcp_config", "global", "vacConfig")
-    if gcp_config:
-        if gcp_config.get('project_id'):
-            return gcp_config.get('project_id')
+    if include_config: # to avoid circular imports, must be specified
+        gcp_config = load_config_key("gcp_config", "global", "vacConfig")
+        if gcp_config:
+            if gcp_config.get('project_id'):
+                return gcp_config.get('project_id')
 
     project_id = get_env_project_id()
     if project_id:

{sunholo-0.62.7 → sunholo-0.62.9}/sunholo.egg-info/PKG-INFO

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