mbu-dev-shared-components 3.0.3__tar.gz → 3.0.4__tar.gz

{mbu_dev_shared_components-3.0.3 → mbu_dev_shared_components-3.0.4}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: mbu_dev_shared_components
-Version: 3.0.3
+Version: 3.0.4
 Summary: Shared components to use in RPA projects
 Author-email: MBU <rpa@mbu.aarhus.dk>
 License-Expression: MIT

{mbu_dev_shared_components-3.0.3 → mbu_dev_shared_components-3.0.4}/mbu_dev_shared_components/solteqtand/application/document.py

@@ -1,8 +1,10 @@
 """Base UI-Automation helper methods for SolteqTand project."""
+
 import os
 import shutil
 import time
 import psutil
+from psutil import NoSuchProcess, ZombieProcess, AccessDenied
 from docx2pdf import convert
 import uiautomation as auto
 from datetime import datetime
@@ -17,7 +19,12 @@ class DocumentHandler(HandlerBase):
     sending via Digital Post, and creating a digital-printed journal.
     """
 
-    def create_document(self, document_full_path: str = None, document_type: str = None, document_description: str = None):
+    def create_document(
+        self,
+        document_full_path: str = None,
+        document_type: str = None,
+        document_description: str = None,
+    ):
         """
         Creates a new document under the 'Dokumenter' tab.
 
@@ -31,32 +38,28 @@ class DocumentHandler(HandlerBase):
         document_list = self.find_element_by_property(
             control=self.app_window,
             control_type=auto.ControlType.ListControl,
-            automation_id="cleverListView1"
+            automation_id="cleverListView1",
         )
         document_list.RightClick(simulateMove=False, waitTime=0)
 
         document_list_menu = self.wait_for_control(
-            auto.MenuControl,
-            {'Name': 'Kontekst'},
-            search_depth=2
+            auto.MenuControl, {"Name": "Kontekst"}, search_depth=2
         )
 
         menu_create_document = self.find_element_by_property(
             control=document_list_menu,
             control_type=auto.ControlType.MenuItemControl,
-            name="Opret"
+            name="Opret",
         )
         menu_create_document.Click(simulateMove=False, waitTime=0)
 
         create_document_window = self.wait_for_control(
-            auto.WindowControl,
-            {'AutomationId': 'UploadFile'},
-            search_depth=2
+            auto.WindowControl, {"AutomationId": "UploadFile"}, search_depth=2
         )
         file_path_textbox = self.find_element_by_property(
             control=create_document_window,
             control_type=auto.ControlType.EditControl,
-            automation_id="textBoxLocalFilePath"
+            automation_id="textBoxLocalFilePath",
         )
         legacy_pattern = file_path_textbox.GetLegacyIAccessiblePattern()
         legacy_pattern.SetValue(document_full_path)
@@ -65,14 +68,14 @@ class DocumentHandler(HandlerBase):
             document_type_drop_down = self.find_element_by_property(
                 control=create_document_window,
                 control_type=auto.ControlType.ButtonControl,
-                name="Åbn"
+                name="Åbn",
             )
             document_type_drop_down.Click(simulateMove=False, waitTime=0)
 
             document_type_button = self.find_element_by_property(
                 control=create_document_window,
                 control_type=auto.ControlType.ListItemControl,
-                name=document_type
+                name=document_type,
             )
             document_type_button.Click(simulateMove=False, waitTime=0)
 
@@ -80,18 +83,94 @@ class DocumentHandler(HandlerBase):
             description_text_field = self.find_element_by_property(
                 control=create_document_window,
                 control_type=auto.ControlType.DocumentControl,
-                automation_id="richTextBoxDescription"
+                automation_id="richTextBoxDescription",
+            )
+            value_pattern = description_text_field.GetPattern(
+                auto.PatternId.ValuePattern
             )
-            value_pattern = description_text_field.GetPattern(auto.PatternId.ValuePattern)
             value_pattern.SetValue(document_description)
 
         button_create_document = self.find_element_by_property(
             control=create_document_window,
             control_type=auto.ControlType.PaneControl,
-            automation_id="buttonOpen"
+            automation_id="buttonOpen",
         )
         button_create_document.Click(simulateMove=False, waitTime=0)
 
+    def kill_process_by_name_safe(self, process_name: str) -> None:
+        """
+        Safely kills all processes matching the given name.
+        Handles race conditions where processes may exit between enumeration and killing.
+
+        Args:
+            process_name: Name of the process to kill (e.g., 'WINWORD.EXE')
+        """
+        print(f"Attempting to kill processes: {process_name}")
+
+        # Find all matching processes first
+        target_processes = []
+        for proc in psutil.process_iter(["pid", "name"]):
+            try:
+                if proc.info["name"] == process_name:
+                    target_processes.append(proc)
+            except (NoSuchProcess, ZombieProcess, AccessDenied):
+                # Process already gone or inaccessible, skip it
+                continue
+            except Exception as e:
+                print(f"Error checking process {getattr(proc, 'pid', 'unknown')}: {e}")
+                continue
+
+        if not target_processes:
+            print(f"No processes found matching: {process_name}")
+            return
+
+        print(f"Found {len(target_processes)} process(es) matching {process_name}")
+
+        # First, try graceful termination
+        for proc in target_processes:
+            try:
+                proc.terminate()
+                print(f"Terminated {process_name} (PID: {proc.pid})")
+            except (NoSuchProcess, ZombieProcess):
+                # Process already gone - this is actually what we want
+                print(f"Process {process_name} (PID: {proc.pid}) already terminated")
+                continue
+            except AccessDenied:
+                print(f"Access denied terminating {process_name} (PID: {proc.pid})")
+                continue
+            except Exception as e:
+                print(f"Error terminating {process_name} (PID: {proc.pid}): {e}")
+                continue
+
+        # Wait for processes to exit gracefully
+        try:
+            gone, alive = psutil.wait_procs(target_processes, timeout=3)
+
+            # Log successful terminations
+            for proc in gone:
+                print(f"{process_name} (PID: {proc.pid}) exited gracefully")
+
+            # Force kill any remaining processes
+            for proc in alive:
+                try:
+                    proc.kill()
+                    print(f"Force killed {process_name} (PID: {proc.pid})")
+                except (NoSuchProcess, ZombieProcess):
+                    # Process already gone - this is fine
+                    print(
+                        f"Process {process_name} (PID: {proc.pid}) already gone during force kill"
+                    )
+                    continue
+                except AccessDenied:
+                    print(f"Access denied killing {process_name} (PID: {proc.pid})")
+                    continue
+                except Exception as e:
+                    print(f"Error force killing {process_name} (PID: {proc.pid}): {e}")
+                    continue
+
+        except Exception as e:
+            print(f"Error waiting for processes to terminate: {e}")
+
     def create_document_from_template(self, metadata: dict) -> None:
         """
         Under “Print/Flet patienter” → select template → merge → wait for Word to open,
@@ -103,86 +182,103 @@ class DocumentHandler(HandlerBase):
             self.open_tab("Stamkort")
 
             from_date = time.strftime("%d-%m-%Y")
-            to_date = time.strftime("%d-%m-%Y", time.localtime(time.time() + 50 * 365 * 86400))
+            to_date = time.strftime(
+                "%d-%m-%Y", time.localtime(time.time() + 50 * 365 * 86400)
+            )
 
             from_date_field = self.wait_for_control(
                 auto.PaneControl,
-                {'AutomationId': 'DateTimePickerFromDate'},
-                search_depth=14
+                {"AutomationId": "DateTimePickerFromDate"},
+                search_depth=14,
             )
             to_date_field = self.wait_for_control(
                 auto.PaneControl,
-                {'AutomationId': 'DateTimePickerToDate'},
-                search_depth=14
+                {"AutomationId": "DateTimePickerToDate"},
+                search_depth=14,
             )
             from_date_field.SendKeys(from_date)
             to_date_field.SendKeys(to_date)
 
             list_bookings = self.get_list_of_appointments()
 
-            controls = list_bookings.get('controls') if list_bookings else None
+            controls = list_bookings.get("controls") if list_bookings else None
             if not controls or len(controls) == 0:
                 raise ValueError("No appointments found in the list.")
             first_booking = controls[0]
             first_booking.RightClick(simulateMove=False, waitTime=0)
 
             pop_up_right_click_menu = self.wait_for_control(
-                auto.MenuControl,
-                {'Name': 'Kontekst'},
-                search_depth=2
+                auto.MenuControl, {"Name": "Kontekst"}, search_depth=2
             )
-            pop_up_right_click_menu.MenuItemControl(Name="Print/Flet patienter").GetLegacyIAccessiblePattern().DoDefaultAction()
+            pop_up_right_click_menu.MenuItemControl(
+                Name="Print/Flet patienter"
+            ).GetLegacyIAccessiblePattern().DoDefaultAction()
 
             form_print_merge = self.wait_for_control(
                 auto.WindowControl,
-                {'AutomationId': 'FormQueryPrintOrMerge'},
-                search_depth=3
+                {"AutomationId": "FormQueryPrintOrMerge"},
+                search_depth=3,
             )
-            form_print_merge.RadioButtonControl(AutomationId="RadioButtonMerge").GetLegacyIAccessiblePattern().DoDefaultAction()
-            form_print_merge.PaneControl(AutomationId="ButtonOK").GetLegacyIAccessiblePattern().DoDefaultAction()
+            form_print_merge.RadioButtonControl(
+                AutomationId="RadioButtonMerge"
+            ).GetLegacyIAccessiblePattern().DoDefaultAction()
+            form_print_merge.PaneControl(
+                AutomationId="ButtonOK"
+            ).GetLegacyIAccessiblePattern().DoDefaultAction()
 
             form_mail_merge = self.wait_for_control(
-                auto.WindowControl,
-                {'AutomationId': 'FormMailMerge'},
-                search_depth=3
+                auto.WindowControl, {"AutomationId": "FormMailMerge"}, search_depth=3
             )
-            form_mail_merge.ComboBoxControl(AutomationId="ComboTemplet").GetPattern(auto.PatternId.ExpandCollapsePattern).Expand()
+            form_mail_merge.ComboBoxControl(AutomationId="ComboTemplet").GetPattern(
+                auto.PatternId.ExpandCollapsePattern
+            ).Expand()
 
             form_mail_merge_expanded = self.wait_for_control(
-                auto.ListControl,
-                {'ClassName': 'ComboLBox'},
-                search_depth=3
+                auto.ListControl, {"ClassName": "ComboLBox"}, search_depth=3
             )
 
             selection_made = False
             for item in form_mail_merge_expanded.GetChildren():
-                if item.Name == metadata['templateName']:
+                if item.Name == metadata["templateName"]:
                     print(f"Selecting '{metadata['templateName']}'")
                     item.Click(simulateMove=False, waitTime=0)
                     selection_made = True
                     break
 
             if not selection_made:
-                raise ValueError(f"Expected status '{metadata['templateName']}' not found in ComboBox list.")
+                raise ValueError(
+                    f"Expected status '{metadata['templateName']}' not found in ComboBox list."
+                )
 
             time.sleep(0.5)
-            new_value = form_mail_merge.ComboBoxControl(AutomationId="ComboTemplet").GetPattern(auto.PatternId.ValuePattern).Value
+            new_value = (
+                form_mail_merge.ComboBoxControl(AutomationId="ComboTemplet")
+                .GetPattern(auto.PatternId.ValuePattern)
+                .Value
+            )
             print(f"New selected status: '{new_value}'")
-            if new_value != metadata['templateName']:
-                raise ValueError(f"Failed to set the correct status. Expected '{metadata['templateName']}', but got '{new_value}'.")
+            if new_value != metadata["templateName"]:
+                raise ValueError(
+                    f"Failed to set the correct status. Expected '{metadata['templateName']}', but got '{new_value}'."
+                )
 
             if os.path.exists(folder_path):
                 shutil.rmtree(folder_path, ignore_errors=True)
 
-            form_mail_merge.PaneControl(AutomationId="ButtonMerge").GetLegacyIAccessiblePattern().DoDefaultAction()
+            form_mail_merge.PaneControl(
+                AutomationId="ButtonMerge"
+            ).GetLegacyIAccessiblePattern().DoDefaultAction()
 
             word_window = self.wait_for_control(
-                auto.WindowControl,
-                {'ClassName': 'OpusApp'},
-                search_depth=2
+                auto.WindowControl, {"ClassName": "OpusApp"}, search_depth=2
             )
 
-            def convert_docx_to_pdf(source_file_path: str, destination_path: str, new_filename: str, temp_filename: str) -> str:
+            def convert_docx_to_pdf(
+                source_file_path: str,
+                destination_path: str,
+                new_filename: str,
+                temp_filename: str,
+            ) -> str:
                 """
                 Converts a DOCX file to a PDF file.
 
@@ -193,17 +289,23 @@ class DocumentHandler(HandlerBase):
                 """
                 try:
                     source_file_path = os.path.join(folder_path, temp_filename)
-                    destination_file_path = os.path.join(destination_path, new_filename + ".pdf")
+                    destination_file_path = os.path.join(
+                        destination_path, new_filename + ".pdf"
+                    )
                     print(f"{source_file_path=} -> {destination_file_path=}")
                     convert(source_file_path, destination_file_path)
                     timeout = 30
                     start_time = time.time()
                     while not os.path.exists(destination_file_path):
                         if time.time() - start_time > timeout:
-                            raise TimeoutError("Timeout: Failed to create PDF file from Word document.")
+                            raise TimeoutError(
+                                "Timeout: Failed to create PDF file from Word document."
+                            )
                         time.sleep(1)
                     if not os.path.exists(destination_file_path):
-                        raise FileNotFoundError("Failed to create PDF file from Word document.")
+                        raise FileNotFoundError(
+                            "Failed to create PDF file from Word document."
+                        )
                     else:
                         print(f"PDF file created successfully: {destination_file_path}")
                         return destination_file_path
@@ -213,18 +315,12 @@ class DocumentHandler(HandlerBase):
 
             path_to_converted_file = convert_docx_to_pdf(
                 source_file_path=folder_path,
-                destination_path=metadata['destinationPath'],
-                new_filename=metadata['dischargeDocumentFilename'],
-                temp_filename=word_window.Name.split(" - ")[0]
+                destination_path=metadata["destinationPath"],
+                new_filename=metadata["dischargeDocumentFilename"],
+                temp_filename=word_window.Name.split(" - ")[0],
             )
 
-            def kill_process_by_name(process_name):
-                for proc in psutil.process_iter(attrs=['pid', 'name']):
-                    if proc.info['name'] == process_name:
-                        proc.kill()
-                        print(f"Killed process: {process_name} (PID: {proc.info['pid']})")
-
-            kill_process_by_name("WINWORD.EXE")
+            self.kill_process_by_name_safe("WINWORD.EXE")
             self.open_sub_tab("Dokumenter")
             self.create_document(document_full_path=path_to_converted_file)
         except Exception as e:
@@ -245,13 +341,19 @@ class DocumentHandler(HandlerBase):
             document_store = self.wait_for_control(
                 self.app_window.PaneControl,
                 {"AutomationId": "TabPagePatientDocumentStore"},
-                search_depth=7
+                search_depth=7,
+            )
+            list_control = (
+                document_store.PaneControl(
+                    AutomationId="ControlPatientRecordDocumentStore1"
+                )
+                .PaneControl(AutomationId="ctrlDocumentStore")
+                .ListControl(AutomationId="cleverListView1")
             )
-            list_control = document_store.PaneControl(AutomationId="ControlPatientRecordDocumentStore1").PaneControl(AutomationId="ctrlDocumentStore").ListControl(AutomationId="cleverListView1")
             for item in list_control.GetChildren():
                 print(f"Item: {item}, AutomationId: {item.AutomationId}")
 
-            target_filename = metadata['documentTitle']
+            target_filename = metadata["documentTitle"]
             matching_row = None
             latest_created = None
 
@@ -275,7 +377,9 @@ class DocumentHandler(HandlerBase):
                 if len(children) >= 4:
                     try:
                         date_text_created = children[3].Name.strip()
-                        created_obj = datetime.strptime(date_text_created, "%d-%m-%Y %H:%M")
+                        created_obj = datetime.strptime(
+                            date_text_created, "%d-%m-%Y %H:%M"
+                        )
                     except Exception as e:
                         print(f"Error parsing date: {e}")
                         created_obj = None
@@ -288,7 +392,9 @@ class DocumentHandler(HandlerBase):
                     matching_row = item
 
             if matching_row is None:
-                raise ValueError(f"Discharge document '{target_filename}' not found in the document list.")
+                raise ValueError(
+                    f"Discharge document '{target_filename}' not found in the document list."
+                )
 
             children = matching_row.GetChildren()
             child9_date = None
@@ -302,52 +408,61 @@ class DocumentHandler(HandlerBase):
             if child9_date is None:
                 matching_row.RightClick(simulateMove=False, waitTime=0)
             else:
-                raise ValueError("Send to digitalpost date is not None, which is unexpected.")
+                raise ValueError(
+                    "Send to digitalpost date is not None, which is unexpected."
+                )
 
             right_click_menu = self.wait_for_control(
-                auto.MenuControl,
-                {"Name": "Kontekst"},
-                search_depth=2
+                auto.MenuControl, {"Name": "Kontekst"}, search_depth=2
             )
-            right_click_menu.MenuItemControl(Name="Send til digital postkasse").GetLegacyIAccessiblePattern().DoDefaultAction()
+            right_click_menu.MenuItemControl(
+                Name="Send til digital postkasse"
+            ).GetLegacyIAccessiblePattern().DoDefaultAction()
 
             digital_message_window = self.wait_for_control(
                 auto.WindowControl,
-                {'AutomationId': 'ToolContextWrapperUI'},
-                search_depth=2
+                {"AutomationId": "ToolContextWrapperUI"},
+                search_depth=2,
+            )
+            digital_message_window_group = (
+                digital_message_window.PaneControl(AutomationId="viewPortPanel")
+                .PaneControl(AutomationId="SendNemSMSMessageControl")
+                .GroupControl(AutomationId="groupBoxMain")
+            )
+            digital_message_window_group.EditControl(
+                AutomationId="textBoxSubject"
+            ).GetPattern(auto.PatternId.ValuePattern).SetValue(
+                metadata["digitalPostSubject"]
             )
-            digital_message_window_group = digital_message_window.PaneControl(AutomationId="viewPortPanel").PaneControl(AutomationId="SendNemSMSMessageControl").GroupControl(AutomationId="groupBoxMain")
-            digital_message_window_group.EditControl(AutomationId="textBoxSubject").GetPattern(auto.PatternId.ValuePattern).SetValue(metadata['digitalPostSubject'])
 
-            is_discharge_document_attachment = digital_message_window_group.PaneControl(AutomationId="panel2").ListControl(AutomationId="listBoxAttachment").ListItemControl(Name=metadata['documentTitle'])
+            is_discharge_document_attachment = (
+                digital_message_window_group.PaneControl(AutomationId="panel2")
+                .ListControl(AutomationId="listBoxAttachment")
+                .ListItemControl(Name=metadata["documentTitle"])
+            )
             if is_discharge_document_attachment is None:
-                raise ValueError(f"Discharge document '{metadata['documentTitle']}' not found in the attachment list.")
+                raise ValueError(
+                    f"Discharge document '{metadata['documentTitle']}' not found in the attachment list."
+                )
 
             self.wait_for_control(
-                auto.PaneControl,
-                {'AutomationId': '&Send'},
-                search_depth=4,
-                timeout=5
+                auto.PaneControl, {"AutomationId": "&Send"}, search_depth=4, timeout=5
             ).Click(simulateMove=False, waitTime=0)
 
             try:
                 self.wait_for_control(
                     auto.TextControl,
-                    {'Name': 'Kan ikke sende Digital Post uden modtager.'},
+                    {"Name": "Kan ikke sende Digital Post uden modtager."},
                     search_depth=4,
-                    timeout=5
+                    timeout=5,
                 )
 
                 self.wait_for_control(
-                    auto.ButtonControl,
-                    {'Name': 'OK'},
-                    search_depth=4
+                    auto.ButtonControl, {"Name": "OK"}, search_depth=4
                 ).Click(simulateMove=False, waitTime=0)
 
                 self.wait_for_control(
-                    auto.PaneControl,
-                    {'Name': 'Annuller'},
-                    search_depth=5
+                    auto.PaneControl, {"Name": "Annuller"}, search_depth=5
                 ).Click(simulateMove=False, waitTime=0)
                 raise ValueError("Cannot send Digital Post without a recipient.")
             except TimeoutError:
@@ -368,33 +483,39 @@ class DocumentHandler(HandlerBase):
             menu_fil_button = self.find_element_by_property(
                 control=self.app_window,
                 control_type=auto.ControlType.MenuItemControl,
-                name="Fil"
+                name="Fil",
             )
             menu_fil_button.Click(simulateMove=False, waitTime=0)
             print_journal_button = self.find_element_by_property(
                 control=self.app_window,
                 control_type=auto.ControlType.MenuItemControl,
-                name="Udskriv journal"
+                name="Udskriv journal",
             )
             print_journal_button.Click(simulateMove=False, waitTime=0)
 
             print_journal_window = self.wait_for_control(
-                auto.WindowControl,
-                {'AutomationId': 'JournalPrintForm'},
-                search_depth=3
+                auto.WindowControl, {"AutomationId": "JournalPrintForm"}, search_depth=3
             )
 
-            stamkort_toggle_state = print_journal_window.CheckBoxControl(AutomationId="datacardCheckbox").GetPattern(auto.PatternId.TogglePattern).ToggleState
+            stamkort_toggle_state = (
+                print_journal_window.CheckBoxControl(AutomationId="datacardCheckbox")
+                .GetPattern(auto.PatternId.TogglePattern)
+                .ToggleState
+            )
             if stamkort_toggle_state == 1:
-                print_journal_window.CheckBoxControl(AutomationId="datacardCheckbox").GetPattern(auto.PatternId.TogglePattern).Toggle()
+                print_journal_window.CheckBoxControl(
+                    AutomationId="datacardCheckbox"
+                ).GetPattern(auto.PatternId.TogglePattern).Toggle()
 
-            print_journal_window.PaneControl(AutomationId="printButton").Click(simulateMove=False, waitTime=0)
+            print_journal_window.PaneControl(AutomationId="printButton").Click(
+                simulateMove=False, waitTime=0
+            )
 
             journal_pdf_window = self.wait_for_control(
                 auto.WindowControl,
-                {'ClassName': 'AcrobatSDIWindow'},
+                {"ClassName": "AcrobatSDIWindow"},
                 search_depth=2,
-                timeout=60
+                timeout=60,
             )
             journal_pdf_window.Name.split(" - ")[0]
             journal_pdf_window.GetWindowPattern().Close()

{mbu_dev_shared_components-3.0.3 → mbu_dev_shared_components-3.0.4}/mbu_dev_shared_components.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: mbu_dev_shared_components
-Version: 3.0.3
+Version: 3.0.4
 Summary: Shared components to use in RPA projects
 Author-email: MBU <rpa@mbu.aarhus.dk>
 License-Expression: MIT

{mbu_dev_shared_components-3.0.3 → mbu_dev_shared_components-3.0.4}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "mbu_dev_shared_components"
-version = "3.0.3"
+version = "3.0.4"
 authors = [
   { name="MBU", email="rpa@mbu.aarhus.dk" },
 ]