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

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/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/logging.py

@@ -37,6 +37,7 @@ 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

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

@@ -1,9 +1,9 @@
 Metadata-Version: 2.1
 Name: sunholo
-Version: 0.62.8
+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.8.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.8.dist-info → sunholo-0.62.9.dist-info}/RECORD

@@ -1,5 +1,5 @@
 sunholo/__init__.py,sha256=0CdpufyRKWyZe7J7UKigL6j_qOorM-p0OjHIAuf9M38,864
-sunholo/logging.py,sha256=A8e9vE0byIAg-CDPL1DwOvq7ybdxqH1s5qPJwViZyPA,11615
+sunholo/logging.py,sha256=hPmB5VgHV9fN2Ze55jNkRx5QNfxRtezYQkhu_RaE8mc,11667
 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=LhiF_Mp2z5xZnXhnuUeOrJn29AitcYEbiRkwuQ7IrAU,2711
+sunholo/chunker/publish.py,sha256=GNXV6IPdKM2GZUcjGXIERu49D0ITYtizsLIktKVtMjM,2768
 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=-ecLCuSBiilCyZKJ9cMwtj7uMLuxJwMtyHIDWTkoDME,3763
+sunholo/components/retriever.py,sha256=lqVwKXRU8Lu0-Tp4dgCvjDdUfBKkUMWUPpggMde0cx8,3782
 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=7ZGarPVMifsQZYFs-1pYXNiz3lBc6TDFYucvzuebzUs,6408
+sunholo/pubsub/pubsub_manager.py,sha256=NjeChrorhIFmakAzwzVqGYQdG7Q8lJT6UvppiYlrFjI,6427
 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
@@ -93,16 +93,16 @@ sunholo/utils/big_context.py,sha256=gJIP7_ZL-YSLhOMq8jmFTMqH1wq8eB1NK7oKPeZAq2s,
 sunholo/utils/config.py,sha256=GdEXYq2NeO7tz--vZp4ZSdNt5lpIuJb3nb_2BP1KE9Y,8953
 sunholo/utils/config_schema.py,sha256=Wv-ncitzljOhgbDaq9qnFqH5LCuxNv59dTGDWgd1qdk,4189
 sunholo/utils/gcp.py,sha256=uueODEpA-P6O15-t0hmcGC9dONLO_hLfzSsSoQnkUss,4854
-sunholo/utils/gcp_project.py,sha256=qJ7xn0TqkodaeTVPFmPd33jFZItN6OwLF00WzHHZA2U,1218
+sunholo/utils/gcp_project.py,sha256=0ozs6tzI4qEvEeXb8MxLnCdEVoWKxlM6OH05htj7_tc,1325
 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.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,,
+sunholo-0.62.9.dist-info/LICENSE.txt,sha256=SdE3QjnD3GEmqqg9EX3TM9f7WmtOzqS1KJve8rhbYmU,11345
+sunholo-0.62.9.dist-info/METADATA,sha256=7GfasmMaFnU6q65tZPbDG5tB_uMmqOnJ7aFM4RMtptA,8057
+sunholo-0.62.9.dist-info/WHEEL,sha256=GJ7t_kWBFywbagK5eo9IoUwLW6oyOeTKmQ-9iHFVNxQ,92
+sunholo-0.62.9.dist-info/entry_points.txt,sha256=bZuN5AIHingMPt4Ro1b_T-FnQvZ3teBes-3OyO0asl4,49
+sunholo-0.62.9.dist-info/top_level.txt,sha256=wt5tadn5--5JrZsjJz2LceoUvcrIvxjHJe-RxuudxAk,8
+sunholo-0.62.9.dist-info/RECORD,,