mbu-dev-shared-components 4.1.0__tar.gz → 4.2.1__tar.gz

{mbu_dev_shared_components-4.1.0 → mbu_dev_shared_components-4.2.1}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: mbu_dev_shared_components
-Version: 4.1.0
+Version: 4.2.1
 Summary: Shared components to use in RPA projects
 Author-email: MBU <rpa@mbu.aarhus.dk>
 License-Expression: MIT
@@ -12,6 +12,7 @@ License-File: LICENSE
 Requires-Dist: cryptography>=43.0.0
 Requires-Dist: pyodbc>=5.1.0
 Requires-Dist: python-dateutil==2.9.*
+Requires-Dist: dotenv
 Provides-Extra: getorganized
 Requires-Dist: requests_ntlm>=1.2.0; extra == "getorganized"
 Provides-Extra: google

{mbu_dev_shared_components-4.1.0 → mbu_dev_shared_components-4.2.1}/mbu_dev_shared_components/database/utility.py

@@ -1,15 +1,17 @@
 """This module handles general database connection and calls"""
 
-import os
 import json
-from typing import Dict, Union, Tuple, Any
-from dateutil import parser
+import os
+from typing import Any, Dict, Tuple, Union
+
 import pyodbc
-from dotenv import load_dotenv 
+from dateutil import parser
+from dotenv import load_dotenv
 
 
 class Utility:
     """Base class handling general utilities"""
+
     def connect_to_db(self, autocommit=True, db_env="PROD") -> pyodbc.Connection:
         """Establish connection to sql database
 
@@ -22,17 +24,24 @@ class Utility:
         rpa_conn = pyodbc.connect(rpa_conn_string, autocommit=autocommit)
         return rpa_conn
 
-    def execute_query(self, query: str, params: list = None) -> pyodbc.Cursor:
+    def execute_query(
+        self, query: str, params: list = None, return_dict: bool = False
+    ) -> list | None:
         """Execute SQL query with pyodbc"""
         params = [] if not params else params
-        is_select = query.strip().upper().startswith('SELECT')
+        is_select = query.strip().upper().startswith("SELECT")
         try:
             res = self.cursor.execute(query, params)
             if is_select:
-                res = self.cursor.fetchall()
-                if len(res) == 0:
+                rows = self.cursor.fetchall()
+                if len(rows) == 0:
                     print("No results from query")
                     return None
+                if return_dict:
+                    columns = [column[0] for column in self.cursor.description]
+                    res = [dict(zip(columns, row)) for row in rows]
+                else:
+                    res = rows
                 return res
             else:
                 return None
@@ -44,15 +53,19 @@ class Utility:
     def fetch_env(self, db_env):
         """Get env variable based on context, PROD or TEST"""
         if db_env.upper() == "PROD":
-            connection_env = "DBCONNECTIONSTRINGPROD" 
+            connection_env = "DBCONNECTIONSTRINGPROD"
             return connection_env
         if db_env.upper() == "TEST":
-            connection_env = "DBCONNECTIONSTRINGDEV" 
+            connection_env = "DBCONNECTIONSTRINGDEV"
             return connection_env
 
-        raise ValueError(f"arg db_env is {db_env.upper()} but should be 'PROD' or 'TEST'")
+        raise ValueError(
+            f"arg db_env is {db_env.upper()} but should be 'PROD' or 'TEST'"
+        )
 
-    def execute_stored_procedure(self, stored_procedure: str, params: Dict[str, Tuple[type, Any]] | None = None) -> Dict[str, Union[bool, str, Any]]:
+    def execute_stored_procedure(
+        self, stored_procedure: str, params: Dict[str, Tuple[type, Any]] | None = None
+    ) -> Dict[str, Union[bool, str, Any]]:
         """
         Executes a stored procedure with the given parameters.
 
@@ -76,12 +89,12 @@ class Utility:
             "int": int,
             "float": float,
             "datetime": parser.isoparse,
-            "json": lambda x: json.dumps(x, ensure_ascii=False)
+            "json": lambda x: json.dumps(x, ensure_ascii=False),
         }
 
         try:
             if params:
-                param_placeholders = ', '.join([f"@{key} = ?" for key in params.keys()])
+                param_placeholders = ", ".join([f"@{key} = ?" for key in params.keys()])
                 param_values = []
 
                 for key, value in params.items():
@@ -92,7 +105,9 @@ class Utility:
                         else:
                             param_values.append(actual_value)
                     else:
-                        raise ValueError("Each parameter value must be a tuple of (type, actual_value).")
+                        raise ValueError(
+                            "Each parameter value must be a tuple of (type, actual_value)."
+                        )
 
                 sql = f"EXEC {stored_procedure} {param_placeholders}"
                 rows_updated = self.cursor.execute(sql, tuple(param_values))

{mbu_dev_shared_components-4.1.0 → mbu_dev_shared_components-4.2.1}/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.1.0 → mbu_dev_shared_components-4.2.1}/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.1.0 → mbu_dev_shared_components-4.2.1}/mbu_dev_shared_components.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: mbu_dev_shared_components
-Version: 4.1.0
+Version: 4.2.1
 Summary: Shared components to use in RPA projects
 Author-email: MBU <rpa@mbu.aarhus.dk>
 License-Expression: MIT
@@ -12,6 +12,7 @@ License-File: LICENSE
 Requires-Dist: cryptography>=43.0.0
 Requires-Dist: pyodbc>=5.1.0
 Requires-Dist: python-dateutil==2.9.*
+Requires-Dist: dotenv
 Provides-Extra: getorganized
 Requires-Dist: requests_ntlm>=1.2.0; extra == "getorganized"
 Provides-Extra: google

{mbu_dev_shared_components-4.1.0 → mbu_dev_shared_components-4.2.1}/mbu_dev_shared_components.egg-info/requires.txt

@@ -1,6 +1,7 @@
 cryptography>=43.0.0
 pyodbc>=5.1.0
 python-dateutil==2.9.*
+dotenv
 
 [dev]
 pylint

{mbu_dev_shared_components-4.1.0 → mbu_dev_shared_components-4.2.1}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "mbu_dev_shared_components"
-version = "4.1.0"
+version = "4.2.1"
 authors = [
   { name="MBU", email="rpa@mbu.aarhus.dk" },
 ]
@@ -20,6 +20,7 @@ dependencies = [
   "cryptography >= 43.0.0",
   "pyodbc >= 5.1.0",
   "python-dateutil == 2.9.*",
+  "dotenv",
 ]
 
 [project.optional-dependencies]