Update logging methods to support multiple styles in type hints

Author: DefinetlyNotAI

ExceptionHandler/handler.py

@@ -2,6 +2,8 @@
 import datetime
 import sys
 import re
+from typing import Callable
+
 from ExceptionHandler.colors import Colors, Format
 from ExceptionHandler.messages import GENERIC_MESSAGES
 from TerminalPrint import TPrint
@@ -13,40 +15,40 @@ def __init__(self,
                  trace: bool = False,
                  use_timestamp: bool = False,
                  exit_script: bool = False,
-                 print_function: callable = TPrint().critical,
+                 print_function: Callable = TPrint().critical,
                  return_string_rather_than_print: bool = False
                  ):
         # Handler defaults
         self.show_line: bool = show_line
         self.trace: bool = trace
         self.use_timestamp: bool = use_timestamp
         self.exit_script: bool = exit_script
-        self.print_function: callable = print_function
+        self.print_function: Callable = print_function
         self.return_string_rather_than_print: bool = return_string_rather_than_print
 
         # Formatter defaults
         # # Color wise
-        self.main_color: Colors = Colors.WHITE
-        self.message_color: Colors = self.main_color
-        self.trace_color: Colors = self.main_color
-        self.timestamps_color: Colors = self.main_color
+        self.main_color: Colors | str = Colors.WHITE
+        self.message_color: Colors | str = self.main_color
+        self.trace_color: Colors | str = self.main_color
+        self.timestamps_color: Colors | str = self.main_color
         # # Format wise
-        self.main_format: Format = Format.NORMAL
+        self.main_format: Format | str = Format.NORMAL
         self.message_text_format: Format = self.main_format
         self.trace_text_format: Format = self.main_format
         self.timestamps_text_format: Format = self.main_format
         # # # Datetime wise
         self.datetime_format: str = "%Y-%m-%d %H:%M:%S"
 
     def formatter(self,
-                  main_format: Format = None,
-                  timestamps_format: Format = None,
-                  trace_format: Format = None,
-                  message_format: Format = None,
-                  main_color: Colors = None,
-                  timestamps_color: Colors = None,
-                  trace_color: Colors = None,
-                  message_color: Colors = None,
+                  main_format: Format | str = None,
+                  timestamps_format: Format | str = None,
+                  trace_format: Format | str = None,
+                  message_format: Format | str = None,
+                  main_color: Colors | str = None,
+                  timestamps_color: Colors | str = None,
+                  trace_color: Colors | str = None,
+                  message_color: Colors | str = None,
                   datetime_format: str = None
                   ):
         # Format wise
@@ -95,8 +97,9 @@ def exception(self,
                 f"\n{self.trace_text_format}{self.trace_color}{trace_str}{Colors.RESET}"
             )
 
-        if (
-                return_string_rather_than_print is None and self.return_string_rather_than_print) or return_string_rather_than_print:
+        if ((
+                return_string_rather_than_print is None and self.return_string_rather_than_print)
+                or return_string_rather_than_print):
             return final_msg
         self.print_function(final_msg)
 

TerminalPrint/__init__.py

@@ -92,7 +92,7 @@ def __log_message(self, message, symbol: str, timestamp=None):
                     log.write(f"[{symbol}] {message}\n")
 
     # Log levels
-    def info(self, message, log_to_file: bool = None, style: TPrintColors = None):
+    def info(self, message, log_to_file: bool = None, style: TPrintColors | str = None):
         """
         Logs an informational message.
 
@@ -108,7 +108,7 @@ def info(self, message, log_to_file: bool = None, style: TPrintColors = None):
         if log_to_file:
             self.__log_message(message, "*", timestamp)
 
-    def warning(self, message, log_to_file: bool = None, style: TPrintColors = None):
+    def warning(self, message, log_to_file: bool = None, style: TPrintColors | str = None):
         """
         Logs a warning message.
 
@@ -124,7 +124,7 @@ def warning(self, message, log_to_file: bool = None, style: TPrintColors = None)
         if log_to_file:
             self.__log_message(message, "!", timestamp)
 
-    def error(self, message, log_to_file: bool = None, style: TPrintColors = None):
+    def error(self, message, log_to_file: bool = None, style: TPrintColors | str = None):
         """
         Logs an error message.
 
@@ -140,7 +140,7 @@ def error(self, message, log_to_file: bool = None, style: TPrintColors = None):
         if log_to_file:
             self.__log_message(message, "x", timestamp)
 
-    def debug(self, message, log_to_file: bool = None, style: TPrintColors = None):
+    def debug(self, message, log_to_file: bool = None, style: TPrintColors | str = None):
         """
         Logs a debug message if debug mode is enabled.
 
@@ -157,7 +157,7 @@ def debug(self, message, log_to_file: bool = None, style: TPrintColors = None):
             if log_to_file:
                 self.__log_message(message, "-", timestamp)
 
-    def critical(self, message, log_to_file: bool = None, style: TPrintColors = None):
+    def critical(self, message, log_to_file: bool = None, style: TPrintColors | str = None):
         """
         Logs a critical message.
 
@@ -173,7 +173,7 @@ def critical(self, message, log_to_file: bool = None, style: TPrintColors = None
         if log_to_file:
             self.__log_message(message, "x", timestamp)
 
-    def success(self, message, log_to_file: bool = None, style: TPrintColors = None):
+    def success(self, message, log_to_file: bool = None, style: TPrintColors | str = None):
         """
         Logs a success message.