PyEmailerAJM 1.9.2__tar.gz → 1.9.2.1__tar.gz

{pyemailerajm-1.9.2 → pyemailerajm-1.9.2.1}/PKG-INFO

@@ -1,9 +1,9 @@
 Metadata-Version: 2.4
 Name: PyEmailerAJM
-Version: 1.9.2
+Version: 1.9.2.1
 Summary: Allows for automating sending Email with the Outlook Desktop client. Future releases will add more client support
 Home-page: https://github.com/amcsparron2793-Water/PyEmailer
-Download-URL: https://github.com/amcsparron2793-Water/PyEmailer/archive/refs/tags/1.9.2.tar.gz
+Download-URL: https://github.com/amcsparron2793-Water/PyEmailer/archive/refs/tags/1.9.2.1.tar.gz
 Author: Amcsparron
 Author-email: amcsparron@albanyny.gov
 License: MIT License

pyemailerajm-1.9.2.1/PyEmailerAJM/_version.py

@@ -0,0 +1 @@
+__version__ = '1.9.2.1'

{pyemailerajm-1.9.2 → pyemailerajm-1.9.2.1}/PyEmailerAJM/backend/logger.py

@@ -1,7 +1,8 @@
 from logging import Filter, DEBUG, ERROR, Handler, FileHandler, StreamHandler, Logger, WARNING
 from typing import Union
 
-from EasyLoggerAJM import EasyLogger, OutlookEmailHandler, StreamHandlerIgnoreExecInfo
+from EasyLoggerAJM import EasyLogger
+from EasyLoggerAJM.logger_parts import OutlookEmailHandler, StreamHandlerIgnoreExecInfo
 from PyEmailerAJM.msg import Msg
 
 

{pyemailerajm-1.9.2 → pyemailerajm-1.9.2.1}/PyEmailerAJM/continuous_monitor/backend/continuous_monitor_base.py

@@ -75,13 +75,28 @@ class ContinuousMonitorBase(PyEmailer, EmailState):
                 continue
             raise ValueError(f"{c} must be a list of email addresses")
 
+    def _normalize_logger(self, **kwargs):
+        # Normalize logger: if it's a factory, call it to get the instance
+        logger_arg = kwargs.pop('logger', self.logger)
+        if callable(logger_arg) and not hasattr(logger_arg, 'info'):
+            # It's a factory, not a logger instance
+            logger = logger_arg()
+        else:
+            logger = logger_arg
+        return logger
+
     def initialize_helper_classes(self, **kwargs):
-        colorizer = ContinuousColorizer(logger=self.logger)
+
+        logger = self._normalize_logger(**kwargs)
+        # remove old logger if any from kwargs after normalization
+        kwargs.pop('logger', None)
+        colorizer = ContinuousColorizer(logger=logger, **kwargs)
         snooze_tracker = SnoozeTracking(
-            Path(kwargs.get('file_name', './snooze_tracker.json')),
-            logger=self.logger,
+            Path(kwargs.pop('file_name', './snooze_tracker.json')),
+            logger=logger, **kwargs
         )
-        sleep_timer = TheSandman(sleep_time_seconds=kwargs.get('sleep_time_seconds', None), logger=self.logger)
+        sleep_timer = TheSandman(sleep_time_seconds=kwargs.pop('sleep_time_seconds', None),
+                                 logger=logger, **kwargs)
         return colorizer, snooze_tracker, sleep_timer
 
     def log_dev_mode_warnings(self):
@@ -94,7 +109,6 @@ class ContinuousMonitorBase(PyEmailer, EmailState):
 
     # Issue with PyEmailer 1.8.5 causes the base version to disable email handler
     #  (issue with check for setup_email_handler attr) - below is a functional work around
-    # TODO: allow the logger_class to be passed in as an arg
     def email_handler_init(self, **kwargs):
         logger_class = kwargs.get('logger_class', self.logger_class)
         try:

{pyemailerajm-1.9.2 → pyemailerajm-1.9.2.1}/PyEmailerAJM/continuous_monitor/continuous_monitor.py

@@ -41,6 +41,25 @@ class ContinuousMonitor(ContinuousMonitorBase):
     def _postprocess_alert(self, alert_level=None, **kwargs):
         ...
 
+    def _process_no_alert(self, **kwargs):
+        no_alert_str = kwargs.get('no_alert_string',
+                                  self.__class__.NO_ALERTS_STR.format(read_folder=self.read_folder,
+                                                                      num_snoozed=self.num_snoozed_msgs))
+        self.logger.info(no_alert_str, print_msg=True)
+
+    def _classify_and_process(self, **kwargs):
+        if self.has_overdue:
+            self._print_and_postprocess(AlertTypes.OVERDUE)
+
+        elif self.has_warning:
+            self._print_and_postprocess(AlertTypes.WARNING)
+
+        elif self.has_critical_warning:
+            self._print_and_postprocess(AlertTypes.CRITICAL_WARNING)
+
+        else:
+            self._process_no_alert(**kwargs)
+
     # TODO: make no_alerts_string property so there is more flexibility with format
     def check_for_alerts(self, **kwargs):
         """
@@ -56,20 +75,7 @@ class ContinuousMonitor(ContinuousMonitorBase):
         self.logger.info(alert_check_string, print_msg=True)
         self.refresh_messages()
 
-        if self.has_overdue:
-            self._print_and_postprocess(AlertTypes.OVERDUE)
-
-        elif self.has_warning:
-            self._print_and_postprocess(AlertTypes.WARNING)
-
-        elif self.has_critical_warning:
-            self._print_and_postprocess(AlertTypes.CRITICAL_WARNING)
-
-        else:
-            no_alert_str = kwargs.get('no_alert_string',
-                                      self.__class__.NO_ALERTS_STR.format(read_folder=self.read_folder,
-                                                                          num_snoozed=self.num_snoozed_msgs))
-            self.logger.info(no_alert_str, print_msg=True)
+        self._classify_and_process(**kwargs)
 
         self.snooze_tracker.snooze_msgs(self.all_messages)
 

{pyemailerajm-1.9.2 → pyemailerajm-1.9.2.1}/PyEmailerAJM.egg-info/PKG-INFO

@@ -1,9 +1,9 @@
 Metadata-Version: 2.4
 Name: PyEmailerAJM
-Version: 1.9.2
+Version: 1.9.2.1
 Summary: Allows for automating sending Email with the Outlook Desktop client. Future releases will add more client support
 Home-page: https://github.com/amcsparron2793-Water/PyEmailer
-Download-URL: https://github.com/amcsparron2793-Water/PyEmailer/archive/refs/tags/1.9.2.tar.gz
+Download-URL: https://github.com/amcsparron2793-Water/PyEmailer/archive/refs/tags/1.9.2.1.tar.gz
 Author: Amcsparron
 Author-email: amcsparron@albanyny.gov
 License: MIT License

pyemailerajm-1.9.2/PyEmailerAJM/_version.py

@@ -1 +0,0 @@
-__version__ = '1.9.2'