sunholo 0.62.6__py3-none-any.whl → 0.62.8__py3-none-any.whl

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/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/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/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/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/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/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.dist-info → sunholo-0.62.8.dist-info}/METADATA

@@ -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.dist-info → sunholo-0.62.8.dist-info}/RECORD

@@ -1,5 +1,5 @@
 sunholo/__init__.py,sha256=0CdpufyRKWyZe7J7UKigL6j_qOorM-p0OjHIAuf9M38,864
-sunholo/logging.py,sha256=1jzfy4q9h5DNG4MjwtbTiM8keZxymlrZ0gDQEtGLMHY,11400
+sunholo/logging.py,sha256=A8e9vE0byIAg-CDPL1DwOvq7ybdxqH1s5qPJwViZyPA,11615
 sunholo/agents/__init__.py,sha256=CnlbVohPt-Doth9PyROSlN3P8xMV9j9yS19YE-wCS90,341
 sunholo/agents/chat_history.py,sha256=bkII7PNEbGCaobu2Rnr2rM9dim3BCK0kM-tiWhoI1tw,5219
 sunholo/agents/dispatch_to_qa.py,sha256=rJvqFLH6V-bKm3Xi_US0L2tMbGgpws3dDmKO2Jy_6v0,8343
@@ -28,7 +28,7 @@ sunholo/chunker/images.py,sha256=Xmh1vwHrVhoXm5iH2dhCc52O8YgdzE8KrDSdL-pGnp8,186
 sunholo/chunker/loaders.py,sha256=xiToUVgPz2ZzcqpUAq7aNP3PTenb_rBUAFzu0JPycIg,10268
 sunholo/chunker/message_data.py,sha256=X6aA4yX5aGN_mEvsDPWvdYRqqn5GO1BU9QhT9w5A0ec,6789
 sunholo/chunker/pdfs.py,sha256=daCZ1xjn1YvxlifIyxskWNpLJLe-Q9D_Jq12MWx3tZo,2473
-sunholo/chunker/publish.py,sha256=PoT8q3XJeFCg10WrLkYhuaaXIrGVkvUD3-R9IfoWoH4,2703
+sunholo/chunker/publish.py,sha256=LhiF_Mp2z5xZnXhnuUeOrJn29AitcYEbiRkwuQ7IrAU,2711
 sunholo/chunker/splitter.py,sha256=FLkDhkePkg_zGQpFBK13Cznw575D-Rf9pcaCpc1HUxY,6726
 sunholo/cli/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 sunholo/cli/chat_vac.py,sha256=Ht8EsGTeubV_-4KEUAA1P5M545Lt_wMAZU8esR6rHyI,16419
@@ -42,7 +42,7 @@ sunholo/cli/run_proxy.py,sha256=0ft_9FUL9d1NKM2ABMMPpvXRTRZd9f-lR2FCahiGzlU,1128
 sunholo/cli/sun_rich.py,sha256=UpMqeJ0C8i0pkue1AHnnyyX0bFJ9zZeJ7HBR6yhuA8A,54
 sunholo/components/__init__.py,sha256=IDoylb74zFKo6NIS3RQqUl0PDFBGVxM1dfUmO7OJ44U,176
 sunholo/components/llm.py,sha256=T4we3tGmqUj4tPwxQr9M6AXv_BALqZV_dRSvINan-oU,10374
-sunholo/components/retriever.py,sha256=_Lyt9RIgb2PD-rhV6oKAadiUs3ukT5uAYGW197tEskw,3755
+sunholo/components/retriever.py,sha256=-ecLCuSBiilCyZKJ9cMwtj7uMLuxJwMtyHIDWTkoDME,3763
 sunholo/components/vectorstore.py,sha256=lB8vx_N6eBA44orNeVo1WRn0Q8GCIjvPPT9AfiPWBWE,5620
 sunholo/database/__init__.py,sha256=Zz0Shcq-CtStf9rJGIYB_Ybzb8rY_Q9mfSj-nviM490,241
 sunholo/database/alloydb.py,sha256=zvT50Df7r-jJPo5lEEWbjlXzVr0KuqN6WINgRtiSyxo,17014
@@ -77,7 +77,7 @@ sunholo/patches/langchain/lancedb.py,sha256=KstVpYtI2E1s6_l_kq6js8ruIPJduO6nnvAX
 sunholo/patches/langchain/vertexai.py,sha256=kX1IvC2D1kMgM3SaSzP9HEosbD6CUymLJd7w9eXo3eE,17677
 sunholo/pubsub/__init__.py,sha256=wgkrtlL3h8uzNpnlWSHdVMOq0l5Q3D7gkxF_Rp1A6Ro,94
 sunholo/pubsub/process_pubsub.py,sha256=64hvqMsxbBrf0WGJsprz_SXf9FpjeszAIsqUSBlJrA8,2780
-sunholo/pubsub/pubsub_manager.py,sha256=M85QPCXYBPzmE8Ha0FYHdzpA-LRX9p3lu6b-UAHAyac,6400
+sunholo/pubsub/pubsub_manager.py,sha256=7ZGarPVMifsQZYFs-1pYXNiz3lBc6TDFYucvzuebzUs,6408
 sunholo/qna/__init__.py,sha256=F8q1uR_HreoSX0IfmKY1qoSwIgXhO2Q8kuDSxh9_-EE,28
 sunholo/qna/parsers.py,sha256=mH_SIgN2yXzvcoQZt9ITkdJSw3jgZGuu0p8q_H-kdSM,2140
 sunholo/qna/retry.py,sha256=gFgOf9AxrZMIO9OwOYu1EW7rhNhyfnw_o4XAsNLBOVQ,2021
@@ -90,18 +90,19 @@ sunholo/summarise/__init__.py,sha256=MZk3dblUMODcPb1crq4v-Z508NrFIpkSWNf9FIO8BcU
 sunholo/summarise/summarise.py,sha256=C3HhjepTjUhUC8FLk4jMQIBvq1BcORniwuTFHjPVhVo,3784
 sunholo/utils/__init__.py,sha256=G11nN_6ATjxpuMfG_BvcUr9UU8onPIgkpTK6CjOcbr8,48
 sunholo/utils/big_context.py,sha256=gJIP7_ZL-YSLhOMq8jmFTMqH1wq8eB1NK7oKPeZAq2s,5578
-sunholo/utils/config.py,sha256=wqwmrQed6_N8ygyLd5QwiFj0GE9xv6aodJMI_mKag70,8977
+sunholo/utils/config.py,sha256=GdEXYq2NeO7tz--vZp4ZSdNt5lpIuJb3nb_2BP1KE9Y,8953
 sunholo/utils/config_schema.py,sha256=Wv-ncitzljOhgbDaq9qnFqH5LCuxNv59dTGDWgd1qdk,4189
-sunholo/utils/gcp.py,sha256=oi0r8pbsUK63sf1RR4XjrETCZVvkRnBiUnTCThEctkI,5998
+sunholo/utils/gcp.py,sha256=uueODEpA-P6O15-t0hmcGC9dONLO_hLfzSsSoQnkUss,4854
+sunholo/utils/gcp_project.py,sha256=qJ7xn0TqkodaeTVPFmPd33jFZItN6OwLF00WzHHZA2U,1218
 sunholo/utils/parsers.py,sha256=OrHmASqIbI45atVOhiGodgLvnfrzkvVzyHnSvAXD89I,3841
 sunholo/utils/timedelta.py,sha256=BbLabEx7_rbErj_YbNM0MBcaFN76DC4PTe4zD2ucezg,493
 sunholo/utils/user_ids.py,sha256=SQd5_H7FE7vcTZp9AQuQDWBXd4FEEd7TeVMQe1H4Ny8,292
 sunholo/vertex/__init__.py,sha256=7B5Wf41da0dl9JOOrwq35Ob5jcKen_w5T-Tw5f4eoWE,75
 sunholo/vertex/init.py,sha256=JDMUaBRdednzbKF-5p33qqLit2LMsvgvWW-NRz0AqO0,1801
 sunholo/vertex/memory_tools.py,sha256=-o9cas_UeRU5gPLi0qcvNwR0HTU5TamzddGLTHOVjZ4,3598
-sunholo-0.62.6.dist-info/LICENSE.txt,sha256=SdE3QjnD3GEmqqg9EX3TM9f7WmtOzqS1KJve8rhbYmU,11345
-sunholo-0.62.6.dist-info/METADATA,sha256=a_1-YOqnCw4eBCw2Z6s1LCANDibu9TM5b-K25DGKCJU,8057
-sunholo-0.62.6.dist-info/WHEEL,sha256=GJ7t_kWBFywbagK5eo9IoUwLW6oyOeTKmQ-9iHFVNxQ,92
-sunholo-0.62.6.dist-info/entry_points.txt,sha256=bZuN5AIHingMPt4Ro1b_T-FnQvZ3teBes-3OyO0asl4,49
-sunholo-0.62.6.dist-info/top_level.txt,sha256=wt5tadn5--5JrZsjJz2LceoUvcrIvxjHJe-RxuudxAk,8
-sunholo-0.62.6.dist-info/RECORD,,
+sunholo-0.62.8.dist-info/LICENSE.txt,sha256=SdE3QjnD3GEmqqg9EX3TM9f7WmtOzqS1KJve8rhbYmU,11345
+sunholo-0.62.8.dist-info/METADATA,sha256=dBltxZ-H_ayYM5k_lcqS0Hmlc73MUqxgpk_Cg9BgfuM,8057
+sunholo-0.62.8.dist-info/WHEEL,sha256=GJ7t_kWBFywbagK5eo9IoUwLW6oyOeTKmQ-9iHFVNxQ,92
+sunholo-0.62.8.dist-info/entry_points.txt,sha256=bZuN5AIHingMPt4Ro1b_T-FnQvZ3teBes-3OyO0asl4,49
+sunholo-0.62.8.dist-info/top_level.txt,sha256=wt5tadn5--5JrZsjJz2LceoUvcrIvxjHJe-RxuudxAk,8
+sunholo-0.62.8.dist-info/RECORD,,