Appium-Python-Client 5.2.2__py3-none-any.whl → 5.2.3__py3-none-any.whl

appium/webdriver/extensions/images_comparison.py

@@ -18,9 +18,11 @@ from appium.protocols.webdriver.can_execute_commands import CanExecuteCommands
 
 from ..mobilecommand import MobileCommand as Command
 
+Base64Payload = Union[str, bytes]
+
 
 class ImagesComparison(CanExecuteCommands):
-    def match_images_features(self, base64_image1: bytes, base64_image2: bytes, **opts: Any) -> Dict[str, Any]:
+    def match_images_features(self, base64_image1: Base64Payload, base64_image2: Base64Payload, **opts: Any) -> Dict[str, Any]:
         """Performs images matching by features.
 
         Read
@@ -66,11 +68,16 @@ class ImagesComparison(CanExecuteCommands):
             rect2 (dict): The bounding rect for the `points2` array or a zero rect if not enough matching points
                 were found. The rect is represented by a dictionary with 'x', 'y', 'width' and 'height' keys
         """
-        options = {'mode': 'matchFeatures', 'firstImage': base64_image1, 'secondImage': base64_image2, 'options': opts}
+        options = {
+            'mode': 'matchFeatures',
+            'firstImage': _adjust_image_payload(base64_image1),
+            'secondImage': _adjust_image_payload(base64_image2),
+            'options': opts,
+        }
         return self.execute(Command.COMPARE_IMAGES, options)['value']
 
     def find_image_occurrence(
-        self, base64_full_image: bytes, base64_partial_image: bytes, **opts: Any
+        self, base64_full_image: Base64Payload, base64_partial_image: Base64Payload, **opts: Any
     ) -> Dict[str, Union[bytes, Dict]]:
         """Performs images matching by template to find possible occurrence of the partial image
         in the full image.
@@ -97,13 +104,15 @@ class ImagesComparison(CanExecuteCommands):
         """
         options = {
             'mode': 'matchTemplate',
-            'firstImage': base64_full_image,
-            'secondImage': base64_partial_image,
+            'firstImage': _adjust_image_payload(base64_full_image),
+            'secondImage': _adjust_image_payload(base64_partial_image),
             'options': opts,
         }
         return self.execute(Command.COMPARE_IMAGES, options)['value']
 
-    def get_images_similarity(self, base64_image1: bytes, base64_image2: bytes, **opts: Any) -> Dict[str, Union[bytes, Dict]]:
+    def get_images_similarity(
+        self, base64_image1: Base64Payload, base64_image2: Base64Payload, **opts: Any
+    ) -> Dict[str, Union[bytes, Dict]]:
         """Performs images matching to calculate the similarity score between them.
 
         The flow there is similar to the one used in
@@ -125,8 +134,17 @@ class ImagesComparison(CanExecuteCommands):
                 score (float): The similarity score as a float number in range [0.0, 1.0].
                     1.0 is the highest score (means both images are totally equal).
         """
-        options = {'mode': 'getSimilarity', 'firstImage': base64_image1, 'secondImage': base64_image2, 'options': opts}
+        options = {
+            'mode': 'getSimilarity',
+            'firstImage': _adjust_image_payload(base64_image1),
+            'secondImage': _adjust_image_payload(base64_image2),
+            'options': opts,
+        }
         return self.execute(Command.COMPARE_IMAGES, options)['value']
 
     def _add_commands(self) -> None:
         self.command_executor.add_command(Command.COMPARE_IMAGES, 'POST', '/session/$sessionId/appium/compare_images')
+
+
+def _adjust_image_payload(payload: Base64Payload) -> str:
+    return payload if isinstance(payload, str) else payload.decode('utf-8')

{appium_python_client-5.2.2.dist-info → appium_python_client-5.2.3.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: Appium-Python-Client
-Version: 5.2.2
+Version: 5.2.3
 Summary: Python client for Appium
 Project-URL: Homepage, http://appium.io/
 Project-URL: Repository, https://github.com/appium/python-client

{appium_python_client-5.2.2.dist-info → appium_python_client-5.2.3.dist-info}/RECORD

@@ -294,7 +294,7 @@ appium/webdriver/extensions/device_time.py,sha256=gYozvXnUr3pwguf7RZ33W1a_fuK3HB
 appium/webdriver/extensions/execute_driver.py,sha256=nzjQq4SxNWJTgan2McyF4eXBB4SzZXhvJ9l1XAnfq84,2615
 appium/webdriver/extensions/execute_mobile_command.py,sha256=XDrmFgv1-DJYtsNRrUW15VAiOgJlGfbL7Sh-ySOnQ_U,2364
 appium/webdriver/extensions/hw_actions.py,sha256=IpJ9c4fEgsxq8wKOhOb6YIq08YtSmE8lUSi9MW6ciwA,5930
-appium/webdriver/extensions/images_comparison.py,sha256=7WjcksD4xGMlp7SHea5tm3ZcF8jOno3FqIu4PEPl_es,7044
+appium/webdriver/extensions/images_comparison.py,sha256=ug2lHqJKABl5R12iPtIu-xFMlhlAHVMbiaLGNjZgQgE,7533
 appium/webdriver/extensions/keyboard.py,sha256=b8BNbG0MDlnmRX8ITXSo2kglD0JS07zIqjafJ_25Xy8,6495
 appium/webdriver/extensions/location.py,sha256=1IJbYlTuiQ2yi4O6btEq4uRbmRswnTeEFpYQ_XFWDeg,3608
 appium/webdriver/extensions/log_event.py,sha256=XG4wCgF2BbIiqrmv5QD9waoXsz-Apq_r1NUSXvcj-XE,2472
@@ -318,7 +318,7 @@ appium/webdriver/extensions/flutter_integration/__init__.py,sha256=wSUl6yC2TJNla
 appium/webdriver/extensions/flutter_integration/flutter_commands.py,sha256=zKWaVM-Vaqz-FxItSeYI7YXvld5DPrKhrXyrYPbRbFw,12125
 appium/webdriver/extensions/flutter_integration/flutter_finder.py,sha256=P4rQpiye73aRBq5VOSt1vBD7rTDHrEv0052B1u81_YY,2184
 appium/webdriver/extensions/flutter_integration/scroll_directions.py,sha256=CkOv7k21SMe-h2-EYSZ6MBKBGTRC1csQ-tuowHgMn0E,85
-appium_python_client-5.2.2.dist-info/METADATA,sha256=vcEyVuQZU_JANgoudYk4_DU1h5z_CI45n_FpHSvwPHo,20823
-appium_python_client-5.2.2.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
-appium_python_client-5.2.2.dist-info/licenses/LICENSE,sha256=QxeKfXNmPWCfFyrXiwdVzMFPFMK0nlBrKhYLUoIcqhk,11384
-appium_python_client-5.2.2.dist-info/RECORD,,
+appium_python_client-5.2.3.dist-info/METADATA,sha256=W8tpr12w1seuNgy0X3sxVfvzMQx7GTWpeY0Wqomrv-w,20823
+appium_python_client-5.2.3.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
+appium_python_client-5.2.3.dist-info/licenses/LICENSE,sha256=QxeKfXNmPWCfFyrXiwdVzMFPFMK0nlBrKhYLUoIcqhk,11384
+appium_python_client-5.2.3.dist-info/RECORD,,