sunholo 0.110.2__py3-none-any.whl → 0.110.4__py3-none-any.whl

sunholo/genai/file_handling.py

@@ -121,20 +121,27 @@ async def construct_file_content(gs_list, bucket:str):
         display_url = file_info.get('url')
         mime_type = file_info['contentType']
         name = sanitize_file(file_info['name'])
-        log.info(f"Processing {name=}")
+        display_name = file_info['name']
+        log.info(f"Processing {name=} {display_name=}")
         try:
             myfile = genai.get_file(name)
             content.append(
                 {"role": "user", "parts": [
                     {"file_data": myfile}, 
-                    {"text": f"You have been given the ability to work with file {name=} with {mime_type=} {display_url=}"}
+                    {"text": f"You have been given the ability to work with file {display_name=} with {mime_type=} {display_url=}"}
                     ]
                 })
             log.info(f"Found existing genai.get_file {name=}")
             
         except Exception as e:
             log.info(f"Not found checking genai.get_file: '{name}' {str(e)}")
-            tasks.append(download_gcs_upload_genai(img_url, mime_type=mime_type, name=name, display_url=display_url))
+            tasks.append(
+                download_gcs_upload_genai(img_url, 
+                                          mime_type=mime_type, 
+                                          name=name, 
+                                          display_url=display_url, 
+                                          display_name=display_name)
+                                          )
 
     # Run all tasks in parallel
     if tasks:
@@ -152,7 +159,12 @@ async def download_file_with_error_handling(img_url, mime_type, name):
         log.error(msg)
         return {"role": "user", "parts": [{"text": msg}]}
 
-async def download_gcs_upload_genai(img_url, mime_type, name=None, display_url=None, retries=3, delay=2):
+async def download_gcs_upload_genai(img_url, 
+                                    mime_type, 
+                                    name=None, 
+                                    display_url=None, 
+                                    display_name=None, 
+                                    retries=3, delay=2):
     import aiofiles
     from google.generativeai.types import file_types
     """
@@ -202,11 +214,11 @@ async def download_gcs_upload_genai(img_url, mime_type, name=None, display_url=N
             # Upload the file and get its content reference
             try:
                 downloaded_content: file_types.File = await asyncio.to_thread(
-                    partial(genai.upload_file, name=name, mime_type=mime_type), 
+                    partial(genai.upload_file, name=name, mime_type=mime_type, display_name=display_name), 
                     sanitized_file
                     )
                 return {"role": "user", "parts": [{"file_data": downloaded_content}, 
-                                                  {"text": f"You have been given the ability to read and work with filename '{name=}' with {mime_type=} {display_url=}"}
+                                                  {"text": f"You have been given the ability to read and work with filename '{display_name=}' with {mime_type=} {display_url=}"}
                                                   ]}
             except Exception as err:
                 msg = f"Could not upload {sanitized_file} to genai.upload_file: {str(err)} {traceback.format_exc()} {display_url=}"

sunholo/langfuse/prompts.py

@@ -1,5 +1,11 @@
 from ..custom_logging import log
 from ..utils import ConfigManager
+import threading
+try:
+    from langfuse import Langfuse
+    langfuse = Langfuse()
+except ImportError:
+    langfuse = None
 
 # Load the YAML file
 def load_prompt_from_yaml(key, prefix="sunholo", load_from_file=False, f_string=True):
@@ -50,31 +56,33 @@ def load_prompt_from_yaml(key, prefix="sunholo", load_from_file=False, f_string=
     ```
 
     """
-    config = ConfigManager(prefix)
+    # Initialize Langfuse client
     if load_from_file:
+        config = ConfigManager(prefix)
         
         return config.promptConfig(key)
 
-
-    from langfuse import Langfuse
-
-    # Initialize Langfuse client
-    langfuse = Langfuse()
-
-    try:
-        if prefix is None:
-            langfuse_template = key
-        else:
-            langfuse_template = f"{prefix}-{key}"
-            
-        langfuse_prompt = langfuse.get_prompt(langfuse_template, cache_ttl_seconds=300)
-
-        if f_string:
-            return langfuse_prompt.get_langchain_prompt()
+    if langfuse is None:
+        log.warning("No Langfuse import available - install via sunholo[http]")
+    else:
+        langfuse_result = [None]
         
-        return langfuse_prompt
-    
-    except Exception as err:
-        log.warning(f"Could not find langfuse template: {langfuse_template} - {str(err)} - attempting to load from promptConfig")
+        def langfuse_load():
+            try:
+                template = f"{prefix}-{key}" if prefix else key
+                prompt = langfuse.get_prompt(template, cache_ttl_seconds=300)
+                langfuse_result[0] = prompt.get_langchain_prompt() if f_string else prompt
+            except Exception as err:
+                log.warning(f"Langfuse error: {template} - {str(err)}")
+                config = ConfigManager(prefix)
+                langfuse_result[0] = config.promptConfig(key)
+
+        thread = threading.Thread(target=langfuse_load)
+        thread.start()
+        thread.join(timeout=1)
+
+        if langfuse_result[0]:
+            return langfuse_result[0]
 
+    config = ConfigManager(prefix)
     return config.promptConfig(key)

{sunholo-0.110.2.dist-info → sunholo-0.110.4.dist-info}/METADATA

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

{sunholo-0.110.2.dist-info → sunholo-0.110.4.dist-info}/RECORD

@@ -86,7 +86,7 @@ sunholo/gcs/download_url.py,sha256=Ul81n1rklr8WogPsuxWWD1Nr8RHU451LzHPMJNhAKzw,6
 sunholo/gcs/extract_and_sign.py,sha256=paRrTCvCN5vkQwCB7OSkxWi-pfOgOtZ0bwdXE08c3Ps,1546
 sunholo/gcs/metadata.py,sha256=oQLcXi4brsZ74aegWyC1JZmhlaEV270HS5_UWtAYYWE,898
 sunholo/genai/__init__.py,sha256=6SWK7uV5F625J-P3xQoD6WKL59a9RSaidj-Guslyt8Q,192
-sunholo/genai/file_handling.py,sha256=N2AOqBaPJ9xGMQ1T_W45-rENyaMK7RRSBUZOOVrCDIg,7803
+sunholo/genai/file_handling.py,sha256=Z3E7TR1DnP9WnneeEGC8LcT6k-9GFxwXDPaVZWw8HLE,8366
 sunholo/genai/images.py,sha256=EyjsDqt6XQw99pZUQamomCpMOoIah9bp3XY94WPU7Ms,1678
 sunholo/genai/init.py,sha256=yG8E67TduFCTQPELo83OJuWfjwTnGZsyACospahyEaY,687
 sunholo/genai/process_funcs_cls.py,sha256=7_RQMqIAZ3nPP-GFgCHBvS39fwuWuGtvSyuJaJN_G3E,31590
@@ -98,7 +98,7 @@ sunholo/invoke/invoke_vac_utils.py,sha256=sJc1edHTHMzMGXjji1N67c3iUaP7BmAL5nj82Q
 sunholo/langfuse/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 sunholo/langfuse/callback.py,sha256=jl0SZsFS53uMW9DGeM9SOL_EsRZsba0wwFGLqKzu9_U,1684
 sunholo/langfuse/evals.py,sha256=fQBaC0dBTYfgCzyfv9QBRvUfc9f42lbwQAeZmynaHO8,3841
-sunholo/langfuse/prompts.py,sha256=J-oePqMyd2xPoTDb5G4fM-LNsC9jEa-udZ4dpbQle-w,2332
+sunholo/langfuse/prompts.py,sha256=E3ZBd51k8NWkeO7K-uYkUPJhbqJWXee8X0N79pVCaIA,2744
 sunholo/llamaindex/__init__.py,sha256=DlY_cHWCsVEV1C5WBgDdHRgOMlJc8pDoCRukUJ8PT9w,88
 sunholo/llamaindex/get_files.py,sha256=6rhXCDqQ_lrIapISQ_OYQDjiSATXvS_9m3qq53-oIl0,781
 sunholo/llamaindex/import_files.py,sha256=Bnic5wz8c61af9Kwq8KSrNBbc4imYnzMtBCb2jzSImI,6224
@@ -150,9 +150,9 @@ sunholo/vertex/init.py,sha256=1OQwcPBKZYBTDPdyU7IM4X4OmiXLdsNV30C-fee2scQ,2875
 sunholo/vertex/memory_tools.py,sha256=tBZxqVZ4InTmdBvLlOYwoSEWu4-kGquc-gxDwZCC4FA,7667
 sunholo/vertex/safety.py,sha256=S9PgQT1O_BQAkcqauWncRJaydiP8Q_Jzmu9gxYfy1VA,2482
 sunholo/vertex/type_dict_to_json.py,sha256=uTzL4o9tJRao4u-gJOFcACgWGkBOtqACmb6ihvCErL8,4694
-sunholo-0.110.2.dist-info/LICENSE.txt,sha256=SdE3QjnD3GEmqqg9EX3TM9f7WmtOzqS1KJve8rhbYmU,11345
-sunholo-0.110.2.dist-info/METADATA,sha256=eeKUvm2g8BO0YeyjHYZKTFgJxEDTmsm7vFX3wVS9dlU,8705
-sunholo-0.110.2.dist-info/WHEEL,sha256=R06PA3UVYHThwHvxuRWMqaGcr-PuniXahwjmQRFMEkY,91
-sunholo-0.110.2.dist-info/entry_points.txt,sha256=bZuN5AIHingMPt4Ro1b_T-FnQvZ3teBes-3OyO0asl4,49
-sunholo-0.110.2.dist-info/top_level.txt,sha256=wt5tadn5--5JrZsjJz2LceoUvcrIvxjHJe-RxuudxAk,8
-sunholo-0.110.2.dist-info/RECORD,,
+sunholo-0.110.4.dist-info/LICENSE.txt,sha256=SdE3QjnD3GEmqqg9EX3TM9f7WmtOzqS1KJve8rhbYmU,11345
+sunholo-0.110.4.dist-info/METADATA,sha256=4EZvfegaiERNSi6qN-RUVWy1CojNXbCjGg4sZ89g2cI,8705
+sunholo-0.110.4.dist-info/WHEEL,sha256=R06PA3UVYHThwHvxuRWMqaGcr-PuniXahwjmQRFMEkY,91
+sunholo-0.110.4.dist-info/entry_points.txt,sha256=bZuN5AIHingMPt4Ro1b_T-FnQvZ3teBes-3OyO0asl4,49
+sunholo-0.110.4.dist-info/top_level.txt,sha256=wt5tadn5--5JrZsjJz2LceoUvcrIvxjHJe-RxuudxAk,8
+sunholo-0.110.4.dist-info/RECORD,,