sunholo 0.129.1__py3-none-any.whl → 0.129.2__py3-none-any.whl

sunholo/custom_logging.py

@@ -142,14 +142,25 @@ class GoogleCloudLogging:
         """
         from .utils.version import sunholo_version
         
+        # Add version to log_text if it exists
         if log_text is not None:
             log_text = f"[{sunholo_version()}] {log_text}"
-            # Apply trace ID to log text
             log_text = self._append_trace_id(log_text)
         
-        if log_struct is not None:
-            # Add trace ID to structured log
-            log_struct = self._add_trace_to_struct(log_struct)
+        # Always create or update log_struct with trace_id if available
+        if not log_struct:
+            log_struct = {}
+        
+        # Make sure log_struct is a dictionary
+        if not isinstance(log_struct, dict):
+            log_struct = {"original_non_dict_value": str(log_struct)}
+        
+        # Add trace ID to log_struct
+        if hasattr(self, 'trace_id') and self.trace_id:
+            log_struct["trace_id"] = self.trace_id
+        
+        # Add version to log_struct
+        log_struct["version"] = sunholo_version()
         
         if not logger_name and not self.logger_name:
             raise ValueError("Must provide a logger name e.g. 'run.googleapis.com%2Fstderr'")
@@ -159,30 +170,28 @@ class GoogleCloudLogging:
             import logging as log
             log.basicConfig(level=log.INFO, format='%(asctime)s - %(levelname)s - %(message)s')
             if log_text:
-                log.info(f"[{severity}][{logger_name or self.logger_name}][{self.version}] - {log_text}")
-            elif log_struct:
+                log.info(f"[{severity}][{logger_name or self.logger_name}][{self.version}] - {log_text} - {log_struct}")
+            else:
                 log.info(f"[{severity}][{logger_name or self.logger_name}][{self.version}] - {str(log_struct)}")
             return
         
         logger = self.client.logger(logger_name or self.logger_name)
-        
         caller_info = self._get_caller_info()
         
+        # Always log struct, and include message if provided
         if log_text:
-            try:
-                turn_to_text = str(log_text)
-                logger.log_text(turn_to_text, severity=severity, source_location=caller_info)
-            except Exception as err:
-                print(f"Could not log this: {log_text=} - {str(err)}")
+            log_struct["message"] = log_text
         
-        if log_struct:
-            if not isinstance(log_struct, dict):
-                print(f"Warning: log_struct must be a dictionary, got {type(log_struct)}")
-            else:
-                try:
-                    logger.log_struct(log_struct, severity=severity, source_location=caller_info)
-                except Exception as err:
-                    print(f"Could not log struct: {log_struct=} - {str(err)}")
+        try:
+            logger.log_struct(log_struct, severity=severity, source_location=caller_info)
+        except Exception as err:
+            print(f"Failed to log struct: {err}")
+            # Fallback to text logging
+            fallback_message = log_text if log_text else str(log_struct)
+            try:
+                logger.log_text(fallback_message, severity=severity, source_location=caller_info)
+            except Exception as text_err:
+                print(f"Even fallback text logging failed: {text_err}")
 
     def debug(self, log_text=None, log_struct=None):
 

{sunholo-0.129.1.dist-info → sunholo-0.129.2.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: sunholo
-Version: 0.129.1
+Version: 0.129.2
 Summary: Large Language Model DevOps - a package to help deploy LLMs to the Cloud.
 Author-email: Holosun ApS <multivac@sunholo.com>
 License: Apache License, Version 2.0

{sunholo-0.129.1.dist-info → sunholo-0.129.2.dist-info}/RECORD

@@ -1,5 +1,5 @@
 sunholo/__init__.py,sha256=InRbX4V0-qdNHo9zYH3GEye7ASLR6LX8-SMvPV4Jsaw,1212
-sunholo/custom_logging.py,sha256=37oyAGc8PWqxelXX_LB298HgiwBlYfJrHyk4R4_li6o,17080
+sunholo/custom_logging.py,sha256=-n7YvgqWQ8nRjCKl1bfcbeZOMTV3m-rBdZGuVyXWDR8,17433
 sunholo/langchain_types.py,sha256=uZ4zvgej_f7pLqjtu4YP7qMC_eZD5ym_5x4pyvA1Ih4,1834
 sunholo/agents/__init__.py,sha256=X2I3pPkGeKWjc3d0QgSpkTyqD8J8JtrEWqwrumf1MMc,391
 sunholo/agents/chat_history.py,sha256=Gph_CdlP2otYnNdR1q1Umyyyvcad2F6K3LxU5yBQ9l0,5387
@@ -168,9 +168,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.129.1.dist-info/licenses/LICENSE.txt,sha256=SdE3QjnD3GEmqqg9EX3TM9f7WmtOzqS1KJve8rhbYmU,11345
-sunholo-0.129.1.dist-info/METADATA,sha256=1fAuA2lDi15g88z6xm0RR7vKAnhEJTCpr6nOEJ9Ly9I,10084
-sunholo-0.129.1.dist-info/WHEEL,sha256=CmyFI0kx5cdEMTLiONQRbGQwjIoR1aIYB7eCAQ4KPJ0,91
-sunholo-0.129.1.dist-info/entry_points.txt,sha256=bZuN5AIHingMPt4Ro1b_T-FnQvZ3teBes-3OyO0asl4,49
-sunholo-0.129.1.dist-info/top_level.txt,sha256=wt5tadn5--5JrZsjJz2LceoUvcrIvxjHJe-RxuudxAk,8
-sunholo-0.129.1.dist-info/RECORD,,
+sunholo-0.129.2.dist-info/licenses/LICENSE.txt,sha256=SdE3QjnD3GEmqqg9EX3TM9f7WmtOzqS1KJve8rhbYmU,11345
+sunholo-0.129.2.dist-info/METADATA,sha256=-G-cXG-Chu5B82pBh_4sww6YzAOkcF_6BIt1RDTJuMk,10084
+sunholo-0.129.2.dist-info/WHEEL,sha256=CmyFI0kx5cdEMTLiONQRbGQwjIoR1aIYB7eCAQ4KPJ0,91
+sunholo-0.129.2.dist-info/entry_points.txt,sha256=bZuN5AIHingMPt4Ro1b_T-FnQvZ3teBes-3OyO0asl4,49
+sunholo-0.129.2.dist-info/top_level.txt,sha256=wt5tadn5--5JrZsjJz2LceoUvcrIvxjHJe-RxuudxAk,8
+sunholo-0.129.2.dist-info/RECORD,,