mbu-dev-shared-components 4.2.0__tar.gz → 4.2.2__tar.gz

{mbu_dev_shared_components-4.2.0 → mbu_dev_shared_components-4.2.2}/PKG-INFO

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

{mbu_dev_shared_components-4.2.0 → mbu_dev_shared_components-4.2.2}/mbu_dev_shared_components/msoffice365/sharepoint_api/files.py

@@ -46,7 +46,6 @@ from openpyxl import load_workbook
 
 import pandas as pd
 
-from office365.runtime.auth.user_credential import UserCredential
 from office365.sharepoint.client_context import ClientContext
 from office365.sharepoint.files.file import File
 
@@ -57,25 +56,29 @@ class Sharepoint:
     downloading, uploading, and saving functionalities within a specified SharePoint document library.
 
     Attributes:
-        username (str): Username for authentication.
-        password (str): Password for authentication.
-        site_url (str): URL of the SharePoint site.
-        site_name (str): Name of the SharePoint site.
-        document_library (str): Document library path.
+        tenant (str): Tenant name or domain (e.g. 'yourtenant.onmicrosoft.com').
+        client_id (str): The Azure AD application (client) ID.
+        thumbprint (str): The certificate thumbprint registered in Azure AD.
+        cert_path (str): Path to the PEM file containing the private key and certificate.
+        site_url (str): Base URL of the SharePoint tenant (e.g. 'https://contoso.sharepoint.com').
+        site_name (str): Name of the SharePoint site (e.g. 'MyTeamSite').
+        document_library (str): Name of the document library within the site.
     """
 
     def __init__(
-        self, username: str, password: str, site_url: str, site_name: str, document_library: str
+            self, tenant: str, client_id: str, thumbprint: str, cert_path: str, site_url: str, site_name: str, document_library: str
     ):
         """Initializes the Sharepoint class with credentials and site details."""
-        self.username = username
-        self.password = password
+        self.tenant = tenant
+        self.client_id = client_id
+        self.thumbprint = thumbprint
+        self.cert_path = cert_path
         self.site_url = site_url
         self.site_name = site_name
         self.document_library = document_library
         self.ctx = self._auth()
 
-    def _auth(self) -> Optional[ClientContext]:
+    def _auth(self):
         """
         Authenticates to the SharePoint site and returns the client context.
 
@@ -85,9 +88,20 @@ class Sharepoint:
         """
         try:
             site_full_url = f"{self.site_url}/teams/{self.site_name}"
-            ctx = ClientContext(site_full_url).with_credentials(
-                UserCredential(self.username, self.password)
+
+            ctx = ClientContext(site_full_url).with_client_certificate(
+                tenant=self.tenant,
+                client_id=self.client_id,
+                thumbprint=self.thumbprint,
+                cert_path=self.cert_path
             )
+
+            web = ctx.web
+            ctx.load(web)
+            ctx.execute_query()
+
+            print(f"Authenticated successfully. Site Title: {web.properties['Title']}")
+
             return ctx
         except Exception as e:
             print(f"Failed to authenticate: {e}")
@@ -108,13 +122,20 @@ class Sharepoint:
                 folder_url = f"/teams/{self.site_name}/{self.document_library}/{folder_name}"
                 folder = self.ctx.web.get_folder_by_server_relative_url(folder_url)
                 files = folder.files
+
                 self.ctx.load(files)
                 self.ctx.execute_query()
+
                 files_list = [{"Name": file.name} for file in files]
+
                 return files_list
+
             except Exception as e:
+
                 print(f"Error retrieving files: {e}")
+
                 return None
+
         return None
 
     def fetch_file_content(self, file_name: str, folder_name: str) -> Optional[bytes]:
@@ -146,12 +167,18 @@ class Sharepoint:
         if self.ctx:
             try:
                 file_url = f"/teams/{self.site_name}/{self.document_library}/{folder_name}/{file_name}"
+
                 file_content = File.open_binary(self.ctx, file_url)
+
                 return file_content.content
+
             except Exception:
                 print("Failed to download file:")
+
                 traceback.print_exc()
+
                 return None
+
         return None
 
     def _write_file(self, folder_destination: str, file_name: str, file_content: bytes):
@@ -255,10 +282,13 @@ class Sharepoint:
         if self.ctx:
             try:
                 folder_url = f"/teams/{self.site_name}/{self.document_library}/{folder_name}"
+
                 target_folder = self.ctx.web.get_folder_by_server_relative_url(folder_url)
 
                 target_folder.upload_file(file_name, binary_content).execute_query()
+
                 print(f"File '{file_name}' uploaded successfully to '{folder_url}'.")
+
             except Exception as e:
                 print(f"Failed to upload file '{file_name}': {e}")
 

{mbu_dev_shared_components-4.2.0 → mbu_dev_shared_components-4.2.2}/mbu_dev_shared_components/solteqtand/application/app_handler.py

@@ -2,6 +2,7 @@
 
 import os
 
+import psutil
 import uiautomation as auto
 
 from .aftalebog import AftalebogHandler
@@ -158,6 +159,14 @@ class SolteqTandApp(
         try:
             if self.app_window:
                 self.close_window(self.app_window)
+                print(
+                    "\n".join([p.info["name"] for p in psutil.process_iter(["name"])])
+                )
+                assert "TMTand.exe" not in [
+                    p.info["name"] for p in psutil.process_iter(["name"])
+                ]
                 self.app_window = None
         except Exception as error:
-            print(f"Error closing Solteq Tand application window: {error}")
+            raise RuntimeError(
+                f"Error closing Solteq Tand application window: {error}"
+            ) from error

{mbu_dev_shared_components-4.2.0 → mbu_dev_shared_components-4.2.2}/mbu_dev_shared_components/solteqtand/application/base_ui.py

@@ -1,12 +1,16 @@
 """Base UI-Automation helper methods for SolteqTand project."""
+
 import time
+
 import uiautomation as auto
 
 
 class BaseUI:
     """Base UI-Automation helper methods."""
 
-    def find_element_by_property(self, control, control_type=None, automation_id=None, name=None, class_name=None) -> auto.Control:
+    def find_element_by_property(
+        self, control, control_type=None, automation_id=None, name=None, class_name=None
+    ) -> auto.Control:
         """
         Uses GetChildren to traverse through controls and find an element based on the specified properties.
 
@@ -24,20 +28,29 @@ class BaseUI:
 
         for child in children:
             if (
-                (control_type is None or child.ControlType == control_type) and
-                (automation_id is None or child.AutomationId == automation_id) and
-                (name is None or child.Name == name) and
-                (class_name is None or child.ClassName == class_name)
+                (control_type is None or child.ControlType == control_type)
+                and (automation_id is None or child.AutomationId == automation_id)
+                and (name is None or child.Name == name)
+                and (class_name is None or child.ClassName == class_name)
             ):
                 return child
 
-            found = self.find_element_by_property(child, control_type, automation_id, name, class_name)
+            found = self.find_element_by_property(
+                child, control_type, automation_id, name, class_name
+            )
             if found:
                 return found
 
         return None
 
-    def wait_for_control(self, control_type, search_params, search_depth=1, timeout=30, retry_interval=0.5):
+    def wait_for_control(
+        self,
+        control_type,
+        search_params,
+        search_depth=1,
+        timeout=30,
+        retry_interval=0.5,
+    ):
         """
         Waits for a given control type to become available with the specified search parameters.
 
@@ -67,9 +80,13 @@ class BaseUI:
             time.sleep(retry_interval)
             print(f"Retrying to find control: {search_params}...")
 
-        raise TimeoutError(f"Control with parameters {search_params} was not found within the {timeout} second timeout.")
+        raise TimeoutError(
+            f"Control with parameters {search_params} was not found within the {timeout} second timeout."
+        )
 
-    def wait_for_control_to_disappear(self, control_type, search_params, search_depth=1, timeout=30):
+    def wait_for_control_to_disappear(
+        self, control_type, search_params, search_depth=1, timeout=30
+    ):
         """
         Waits for a given control type to disappear with the specified search parameters.
 
@@ -95,7 +112,9 @@ class BaseUI:
             time.sleep(0.5)
             print(f"Retrying to find control: {search_params}...")
 
-        raise TimeoutError(f"Control with parameters {search_params} did not disappear within the timeout period.")
+        raise TimeoutError(
+            f"Control with parameters {search_params} did not disappear within the timeout period."
+        )
 
     def close_window(self, window_to_close: auto.WindowControl) -> None:
         """Closes specified window."""
@@ -105,7 +124,6 @@ class BaseUI:
 
         # Handle popup when closin main window
         if window_name.lower().startswith("hovedvindue"):
-
             pop_up_window = window_to_close.WindowControl(Name="TMT - Afslut")
             pop_up_window.SetFocus()
             pop_up_window.ButtonControl(Name="Ja").Click(simulateMove=False, waitTime=0)
@@ -113,4 +131,7 @@ class BaseUI:
             time.sleep(2)
 
         else:
-            self.app_window = self.wait_for_control(search_params={'AutomationId': 'FormFront'}, control_type=auto.WindowControl)
+            self.app_window = self.wait_for_control(
+                search_params={"AutomationId": "FormFront"},
+                control_type=auto.WindowControl,
+            )

{mbu_dev_shared_components-4.2.0 → mbu_dev_shared_components-4.2.2}/mbu_dev_shared_components/solteqtand/application/edi_portal.py

@@ -1,5 +1,7 @@
 """This module contains the EDIHandler class for handling EDI portal interactions."""
+
 import time
+
 import uiautomation as auto
 
 from .handler_base import HandlerBase
@@ -18,13 +20,13 @@ class EDIHandler(HandlerBase):
             menu_edi_button = self.find_element_by_property(
                 control=self.app_window,
                 control_type=auto.ControlType.MenuItemControl,
-                name="EDI Portal"
+                name="EDI Portal",
             )
             menu_edi_button.Click(simulateMove=False, waitTime=0)
             journalforsendelse_button = self.find_element_by_property(
                 control=self.app_window,
                 control_type=auto.ControlType.MenuItemControl,
-                name="Opret journalforsendelse"
+                name="Opret journalforsendelse",
             )
             journalforsendelse_button.Click(simulateMove=False, waitTime=0)
 
@@ -62,9 +64,7 @@ class EDIHandler(HandlerBase):
 
             try:
                 next_button = self.wait_for_control(
-                    auto.ButtonControl, {"Name": "Næste"},
-                    search_depth=50,
-                    timeout=5
+                    auto.ButtonControl, {"Name": "Næste"}, search_depth=50, timeout=5
                 )
             except TimeoutError:
                 next_button = None
@@ -72,9 +72,10 @@ class EDIHandler(HandlerBase):
             if not next_button:
                 try:
                     next_button = self.wait_for_control(
-                        auto.ButtonControl, {"AutomationId": "patientInformationNextButton"},
+                        auto.ButtonControl,
+                        {"AutomationId": "patientInformationNextButton"},
                         search_depth=50,
-                        timeout=5
+                        timeout=5,
                     )
                 except TimeoutError:
                     next_button = None
@@ -87,7 +88,9 @@ class EDIHandler(HandlerBase):
             print(f"Error while clicking next button in EDI Portal: {e}")
             raise
 
-    def edi_portal_check_contractor_id(self, extern_clinic_data: dict, sleep_time: int = 5) -> dict:
+    def edi_portal_check_contractor_id(
+        self, extern_clinic_data: dict, sleep_time: int = 5
+    ) -> dict:
         """
         Checks if the contractor ID is valid in the EDI portal.
 
@@ -100,36 +103,46 @@ class EDIHandler(HandlerBase):
         """
         try:
             # Handle Hasle Torv Clinic special case
-            if extern_clinic_data[0]["contractorId"] == "477052" or extern_clinic_data[0]["contractorId"] == "470678":
+            if (
+                extern_clinic_data[0]["contractorId"] == "477052"
+                or extern_clinic_data[0]["contractorId"] == "470678"
+            ):
                 contractor_id = "485055"
                 clinic_phone_number = "86135240"
             else:
                 contractor_id = extern_clinic_data[0]["contractorId"]
                 clinic_phone_number = extern_clinic_data[0]["phoneNumber"]
 
-            self.edi_portal_click_next_button(sleep_time=2)
+            self.edi_portal_click_next_button(sleep_time=3)
+
+            root_web_area = self.wait_for_control(
+                auto.DocumentControl, {"AutomationId": "RootWebArea"}, search_depth=20
+            )
 
             class_options = [
                 "form-control filter_search",
                 "form-control filter_search valid",
             ]
-
+            search_box = None
             for class_name in class_options:
                 try:
                     search_box = self.wait_for_control(
-                        auto.EditControl,
+                        root_web_area.EditControl,
                         {"ClassName": class_name},
                         search_depth=22,
-                        timeout=1,
+                        timeout=2,
                     )
                 except TimeoutError:
                     continue
                 if search_box:
                     break
-                else:
-                    raise RuntimeError("Search box not found")
+            if not search_box:
+                raise RuntimeError("Search box not found")
+
             search_box.SetFocus()
-            search_box_value_pattern = search_box.GetPattern(auto.PatternId.ValuePattern)
+            search_box_value_pattern = search_box.GetPattern(
+                auto.PatternId.ValuePattern
+            )
             search_box_value_pattern.SetValue(contractor_id)
             search_box.SendKeys("{ENTER}")
 
@@ -137,7 +150,7 @@ class EDIHandler(HandlerBase):
 
             table_dentists = self.wait_for_control(
                 auto.TableControl,
-                {'AutomationId': 'table_id1'},
+                {"AutomationId": "table_id1"},
                 search_depth=25,
             )
             grid_pattern = table_dentists.GetPattern(auto.PatternId.GridPattern)

{mbu_dev_shared_components-4.2.0 → mbu_dev_shared_components-4.2.2}/mbu_dev_shared_components.egg-info/PKG-INFO

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

{mbu_dev_shared_components-4.2.0 → mbu_dev_shared_components-4.2.2}/pyproject.toml

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