sunholo 0.110.2__tar.gz → 0.110.4__tar.gz

{sunholo-0.110.2 → sunholo-0.110.4}/PKG-INFO

@@ -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 → sunholo-0.110.4}/setup.py

@@ -1,6 +1,6 @@
 from setuptools import setup, find_packages
 
-version = '0.110.2'
+version = '0.110.4'
 
 setup(
     name='sunholo',

{sunholo-0.110.2 → sunholo-0.110.4}/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-0.110.2 → sunholo-0.110.4}/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 → sunholo-0.110.4}/sunholo.egg-info/PKG-INFO

@@ -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