pyxecm 2.0.3__py3-none-any.whl → 3.0.0__py3-none-any.whl

pyxecm_customizer/log.py

@@ -0,0 +1,35 @@
+"""Common logging handler for VictoriaLogs and the LogCountFilter."""
+
+import logging
+
+import pandas as pd
+
+
+class LogCountFilter(logging.Filter):
+    """LogFilter to be assinged to thread_logger to count the number os messages by level."""
+
+    def __init__(self, payload_items: pd.DataFrame, index: int) -> None:
+        """LogCountFilter initializer.
+
+        Args:
+            payload_items (pd.DataFrame): _description_
+            index (int): _description_
+
+        """
+        super().__init__()
+        self.index = index
+        self.payload_items = payload_items
+
+    def filter(self, record: logging.LogRecord) -> bool:
+        """Filter method.
+
+        Args:
+            record (_type_): _description_
+
+        Returns:
+            bool: _description_
+
+        """
+        level_name = (record.levelname).lower()
+        self.payload_items.loc[self.index, f"log_{level_name}"] += 1
+        return True

{pyxecm/customizer → pyxecm_customizer}/m365.py

@@ -16,16 +16,16 @@ import re
 import time
 import urllib.parse
 import zipfile
-from datetime import datetime, timezone
+from datetime import UTC, datetime
 from http import HTTPStatus
 from urllib.parse import quote
 
 import requests
-
-from pyxecm.customizer.browser_automation import BrowserAutomation
 from pyxecm.helper import HTTP
 
-default_logger = logging.getLogger("pyxecm.customizer.m365")
+from .browser_automation import BrowserAutomation
+
+default_logger = logging.getLogger("pyxecm_customizer.m365")
 
 request_login_headers = {
     "Content-Type": "application/x-www-form-urlencoded",
@@ -1297,8 +1297,7 @@ class M365:
 
             try:
                 with open(file_path, "wb") as file:
-                    for chunk in response.iter_content(chunk_size=8192):
-                        file.write(chunk)
+                    file.writelines(response.iter_content(chunk_size=8192))
             except OSError:
                 self.logger.error(
                     "Error saving photo for user with ID -> %s!",
@@ -2267,13 +2266,14 @@ class M365:
                     counter += 1
 
                 self.logger.info(
-                    "%s M365 Teams with name -> '%s' have been deleted.",
+                    "%s M365 Team%s with name -> '%s' have been deleted.",
                     str(counter),
+                    "s" if counter > 1 else "",
                     name,
                 )
                 return True
             else:
-                self.logger.info("No M365 Teams with name -> '%s' found.", name)
+                self.logger.info("No M365 Team with name -> '%s' found.", name)
                 return False
         else:
             self.logger.error("Failed to retrieve M365 Teams with name -> '%s'", name)
@@ -4221,7 +4221,7 @@ class M365:
                 # Extract just the date:
                 latest_email_date = latest_email["receivedDateTime"].split("T")[0]
                 # Get the current date (today):
-                today_date = datetime.now(timezone.utc).strftime("%Y-%m-%d")
+                today_date = datetime.now(UTC).strftime("%Y-%m-%d")
                 # We do a sanity check here: the verification mail should be from today,
                 # otherwise we assume it is an old mail and we need to wait for the
                 # new verification mail to yet arrive:
@@ -4256,17 +4256,23 @@ class M365:
                     return False
                 # Simulate a "click" on this URL:
                 if use_browser_automation:
+                    self.logger.info("Using browser automation for email verification...")
                     # Core Share needs a full browser:
-                    browser_automation_object = BrowserAutomation(
-                        take_screenshots=True,
-                        automation_name="email-verification",
-                        logger=self.logger,
-                    )
+                    try:
+                        browser_automation_object = BrowserAutomation(
+                            take_screenshots=True,
+                            automation_name="email-verification",
+                            logger=self.logger,
+                        )
+                    except Exception:
+                        self.logger.error("Failed to create browser automation object. Bailing out...")
+                        return False
+
                     self.logger.info(
-                        "Open URL -> %s to verify account or email change (using browser automation)",
+                        "Open URL -> %s to verify account or email change...",
                         url,
                     )
-                    success = browser_automation_object.get_page(url)
+                    success = browser_automation_object.get_page(url=url)
                     if success:
                         user_interaction_required = False
                         self.logger.info(
@@ -4275,7 +4281,7 @@ class M365:
                         )
                         if password_field_id:
                             password_field = browser_automation_object.find_elem(
-                                find_elem=password_field_id,
+                                selector=password_field_id,
                                 show_error=False,
                             )
                             if password_field:
@@ -4286,8 +4292,8 @@ class M365:
                                     "Found password field on returned page - it seems email verification requests password entry!",
                                 )
                                 result = browser_automation_object.find_elem_and_set(
-                                    find_elem=password_field_id,
-                                    elem_value=password,
+                                    selector=password_field_id,
+                                    value=password,
                                     is_sensitive=True,
                                 )
                                 if not result:
@@ -4302,7 +4308,7 @@ class M365:
                                 )
                         if user_interaction_required and password_confirmation_field_id:
                             password_confirm_field = browser_automation_object.find_elem(
-                                find_elem=password_confirmation_field_id,
+                                selector=password_confirmation_field_id,
                                 show_error=False,
                             )
                             if password_confirm_field:
@@ -4310,8 +4316,8 @@ class M365:
                                     "Found password confirmation field on returned page - it seems email verification requests consecutive password!",
                                 )
                                 result = browser_automation_object.find_elem_and_set(
-                                    find_elem=password_confirmation_field_id,
-                                    elem_value=password,
+                                    selector=password_confirmation_field_id,
+                                    value=password,
                                     is_sensitive=True,
                                 )
                                 if not result:
@@ -4322,19 +4328,19 @@ class M365:
                                     success = False
                         if user_interaction_required and password_submit_xpath:
                             password_submit_button = browser_automation_object.find_elem(
-                                find_elem=password_submit_xpath,
-                                find_method="xpath",
+                                selector=password_submit_xpath,
+                                selector_type="xpath",
                                 show_error=False,
                             )
                             if password_submit_button:
                                 self.logger.info(
                                     "Submit password change dialog with button -> '%s' (found with XPath -> %s)",
-                                    password_submit_button.text,
+                                    password_submit_button.inner_text(),
                                     password_submit_xpath,
                                 )
                                 result = browser_automation_object.find_elem_and_click(
-                                    find_elem=password_submit_xpath,
-                                    find_method="xpath",
+                                    selector=password_submit_xpath,
+                                    selector_type="xpath",
                                 )
                                 if not result:
                                     self.logger.error(
@@ -4346,30 +4352,32 @@ class M365:
                             # which require a short wait time. It seems it is required!
                             time.sleep(1)
                             terms_accept_button = browser_automation_object.find_elem(
-                                find_elem=terms_of_service_xpath,
-                                find_method="xpath",
+                                selector=terms_of_service_xpath,
+                                selector_type="xpath",
                                 show_error=False,
                             )
                             if terms_accept_button:
                                 self.logger.info(
                                     "Accept terms of service with button -> '%s' (found with XPath -> %s)",
-                                    terms_accept_button.text,
+                                    terms_accept_button.inner_text(),
                                     terms_of_service_xpath,
                                 )
                                 result = browser_automation_object.find_elem_and_click(
-                                    find_elem=terms_of_service_xpath,
-                                    find_method="xpath",
+                                    selector=terms_of_service_xpath,
+                                    selector_type="xpath",
                                 )
                                 if not result:
                                     self.logger.error(
                                         "Failed to accept terms of service with button -> '%s'",
-                                        terms_accept_button.text,
+                                        terms_accept_button.inner_text(),
                                     )
                                     success = False
                             else:
                                 self.logger.info(
                                     "No Terms of Service acceptance required.",
                                 )
+                        # end if user_interaction_required and password_submit_xpath:
+                    # end if success:
                 # end if use_browser_automation
                 else:
                     # Salesforce (other than Core Share) is OK with the simple HTTP GET request: