sunholo 0.62.6__tar.gz → 0.62.8__tar.gz

{sunholo-0.62.6 → sunholo-0.62.8}/PKG-INFO

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

{sunholo-0.62.6 → sunholo-0.62.8}/setup.py

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

{sunholo-0.62.6 → sunholo-0.62.8}/sunholo/chunker/publish.py

@@ -1,7 +1,7 @@
 from ..logging import log
 from ..pubsub import PubSubManager
 from ..utils.parsers import contains_url, extract_urls
-from ..utils.gcp import get_gcp_project
+from ..utils.gcp_project import get_gcp_project
 
 from langchain.schema import Document
 

{sunholo-0.62.6 → sunholo-0.62.8}/sunholo/components/retriever.py

@@ -15,7 +15,7 @@ from ..logging import log
 from .vectorstore import pick_vectorstore
 from ..utils import load_config_key
 from .llm import get_embeddings
-from ..utils.gcp import get_gcp_project
+from ..utils.gcp_project import get_gcp_project
 
 from langchain.retrievers import MergerRetriever
 from langchain_community.retrievers import GoogleCloudEnterpriseSearchRetriever

{sunholo-0.62.6 → sunholo-0.62.8}/sunholo/logging.py

@@ -18,16 +18,16 @@ try:
 except ImportError:
     Client = None
 
-from .utils.gcp import get_gcp_project, 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:
@@ -36,6 +36,8 @@ 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
+
             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
@@ -52,6 +54,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')
@@ -98,6 +101,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:
@@ -222,6 +226,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.6 → sunholo-0.62.8}/sunholo/pubsub/pubsub_manager.py

@@ -21,7 +21,7 @@ except ImportError:
 
 import json
 from ..logging import log
-from ..utils.gcp import get_gcp_project
+from ..utils.gcp_project import get_gcp_project
 
 
 

{sunholo-0.62.6 → sunholo-0.62.8}/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.6 → sunholo-0.62.8}/sunholo/utils/gcp.py

@@ -17,7 +17,6 @@ import socket
 # can't install due to circular import sunholo.logging
 import logging
 
-from .config import load_config_key
 
 def is_running_on_cloudrun():
     """
@@ -66,15 +65,6 @@ def is_gcp_logged_in():
     except DefaultCredentialsError:
         return False
 
-def get_env_project_id():
-    """
-    Attempts to retrieve the project ID from environment variables.
-
-    Returns:
-        str or None: The project ID if found in environment variables, None otherwise.
-    """
-    return os.environ.get('GCP_PROJECT') or os.environ.get('GOOGLE_CLOUD_PROJECT')
-
 is_gcp_cached = None  # Global variable for caching the result
 def is_running_on_gcp():
     """
@@ -122,32 +112,6 @@ def get_service_account_email():
     os.environ['GCP_DEFAULT_SERVICE_EMAIL'] = service_email
     return service_email
 
-def get_gcp_project():
-    """
-    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')
-
-    project_id = get_env_project_id()
-    if project_id:
-        return project_id
-    
-    project_id = get_metadata('project/project-id')
-    if project_id:
-        os.environ["GCP_PROJECT"] = project_id 
-        return project_id
-
-    if not is_running_on_gcp():
-        return None
-
-    logging.warning("GCP Project ID not found. Ensure you are running on GCP or have the GCP_PROJECT environment variable set.")
-    return None
 
 
 def get_region():

sunholo-0.62.8/sunholo/utils/gcp_project.py

@@ -0,0 +1,40 @@
+import os
+from .config import load_config_key
+from .gcp import get_metadata, is_running_on_gcp
+import logging
+
+def get_env_project_id():
+    """
+    Attempts to retrieve the project ID from environment variables.
+
+    Returns:
+        str or None: The project ID if found in environment variables, None otherwise.
+    """
+    return os.environ.get('GCP_PROJECT') or os.environ.get('GOOGLE_CLOUD_PROJECT')
+
+def get_gcp_project():
+    """
+    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')
+
+    project_id = get_env_project_id()
+    if project_id:
+        return project_id
+    
+    project_id = get_metadata('project/project-id')
+    if project_id:
+        os.environ["GCP_PROJECT"] = project_id 
+        return project_id
+
+    if not is_running_on_gcp():
+        return None
+
+    logging.warning("GCP Project ID not found. Ensure you are running on GCP or have the GCP_PROJECT environment variable set.")
+    return None

{sunholo-0.62.6 → sunholo-0.62.8}/sunholo.egg-info/PKG-INFO

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

{sunholo-0.62.6 → sunholo-0.62.8}/sunholo.egg-info/SOURCES.txt

@@ -104,6 +104,7 @@ sunholo/utils/big_context.py
 sunholo/utils/config.py
 sunholo/utils/config_schema.py
 sunholo/utils/gcp.py
+sunholo/utils/gcp_project.py
 sunholo/utils/parsers.py
 sunholo/utils/timedelta.py
 sunholo/utils/user_ids.py