Appium-Python-Client 5.1.2__tar.gz → 5.1.3__tar.gz

{appium_python_client-5.1.2 → appium_python_client-5.1.3}/Appium_Python_Client.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: Appium-Python-Client
-Version: 5.1.2
+Version: 5.1.3
 Summary: Python client for Appium
 Home-page: http://appium.io/
 Author: Isaac Murchie

{appium_python_client-5.1.2 → appium_python_client-5.1.3}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: Appium-Python-Client
-Version: 5.1.2
+Version: 5.1.3
 Summary: Python client for Appium
 Home-page: http://appium.io/
 Author: Isaac Murchie

{appium_python_client-5.1.2 → appium_python_client-5.1.3}/appium/options/common/base.py

@@ -69,7 +69,7 @@ class AppiumOptions(
         # FIXME: https://github.com/SeleniumHQ/selenium/issues/10755
         self._ignore_local_proxy = False
 
-    def set_capability(self: T, name: str, value: Any) -> T:
+    def set_capability(self: T, name: str, value: Any) -> T:  # type: ignore[override]
         w3c_name = name if name in self.W3C_CAPABILITY_NAMES or ':' in name else f'{APPIUM_PREFIX}{name}'
         if value is None:
             if w3c_name in self._caps:

{appium_python_client-5.1.2 → appium_python_client-5.1.3}/appium/protocols/webdriver/can_find_elements.py

@@ -12,13 +12,21 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-from typing import TYPE_CHECKING, Dict, List, Protocol, Union
+from typing import TYPE_CHECKING, Dict, List, Protocol, Union, runtime_checkable
 
 if TYPE_CHECKING:
     from appium.webdriver.webelement import WebElement
 
 
+@runtime_checkable
 class CanFindElements(Protocol):
+    """Protocol for objects that can find web elements.
+
+    Any class implementing this protocol must provide:
+    - find_element(by, value): Find a single element
+    - find_elements(by, value): Find multiple elements
+    """
+
     def find_element(self, by: str, value: Union[str, Dict, None] = None) -> 'WebElement': ...
 
     def find_elements(self, by: str, value: Union[str, Dict, None] = None) -> List['WebElement']: ...

appium_python_client-5.1.3/appium/version.py

@@ -0,0 +1 @@
+version = '5.1.3'

{appium_python_client-5.1.2 → appium_python_client-5.1.3}/appium/webdriver/common/appiumby.py

@@ -49,5 +49,6 @@ ByType = Literal[
     '-flutter semantics label',
     '-flutter type',
     '-flutter key',
+    '-flutter text',
     '-flutter text containing',
 ]

{appium_python_client-5.1.2 → appium_python_client-5.1.3}/appium/webdriver/extensions/android/activities.py

@@ -50,7 +50,9 @@ class Activities(CanExecuteCommands, CanExecuteScripts, CanRememberExtensionPres
             `True` if the target activity is shown
         """
         try:
-            WebDriverWait(self, timeout, interval).until(lambda d: d.current_activity == activity)
+            WebDriverWait(self, timeout, interval).until(  # type: ignore[type-var]
+                lambda d: d.current_activity == activity
+            )
             return True
         except TimeoutException:
             return False

{appium_python_client-5.1.2 → appium_python_client-5.1.3}/appium/webdriver/extensions/flutter_integration/flutter_commands.py

@@ -290,7 +290,7 @@ class FlutterCommand:
         """
         return self.driver.execute_script(f'flutter: {scriptName}', params)
 
-    def __get_locator_options(self, locator: Union[WebElement, 'FlutterFinder']) -> Dict[str, dict]:
+    def __get_locator_options(self, locator: Union[WebElement, 'FlutterFinder']) -> Dict[str, Union[dict, WebElement]]:
         if isinstance(locator, WebElement):
             return {'element': locator}
         return {'locator': locator.to_dict()}

{appium_python_client-5.1.2 → appium_python_client-5.1.3}/appium/webdriver/extensions/flutter_integration/flutter_finder.py

@@ -15,7 +15,7 @@
 # specific language governing permissions and limitations
 # under the License.
 
-from typing import Tuple, Union
+from typing import Tuple, Union, cast
 
 from selenium.webdriver.common.by import ByType as SeleniumByType
 
@@ -30,23 +30,23 @@ class FlutterFinder:
 
     @staticmethod
     def by_key(value: str) -> 'FlutterFinder':
-        return FlutterFinder(AppiumBy.FLUTTER_INTEGRATION_KEY, value)
+        return FlutterFinder(cast(AppiumByType, AppiumBy.FLUTTER_INTEGRATION_KEY), value)
 
     @staticmethod
     def by_text(value: str) -> 'FlutterFinder':
-        return FlutterFinder(AppiumBy.FLUTTER_INTEGRATION_TEXT, value)
+        return FlutterFinder(cast(AppiumByType, AppiumBy.FLUTTER_INTEGRATION_TEXT), value)
 
     @staticmethod
     def by_semantics_label(value: str) -> 'FlutterFinder':
-        return FlutterFinder(AppiumBy.FLUTTER_INTEGRATION_SEMANTICS_LABEL, value)
+        return FlutterFinder(cast(AppiumByType, AppiumBy.FLUTTER_INTEGRATION_SEMANTICS_LABEL), value)
 
     @staticmethod
     def by_type(value: str) -> 'FlutterFinder':
-        return FlutterFinder(AppiumBy.FLUTTER_INTEGRATION_TYPE, value)
+        return FlutterFinder(cast(AppiumByType, AppiumBy.FLUTTER_INTEGRATION_TYPE), value)
 
     @staticmethod
     def by_text_containing(value: str) -> 'FlutterFinder':
-        return FlutterFinder(AppiumBy.FLUTTER_INTEGRATION_TEXT_CONTAINING, value)
+        return FlutterFinder(cast(AppiumByType, AppiumBy.FLUTTER_INTEGRATION_TEXT_CONTAINING), value)
 
     def to_dict(self) -> dict:
         return {'using': self.using, 'value': self.value}

{appium_python_client-5.1.2 → appium_python_client-5.1.3}/appium/webdriver/webdriver.py

@@ -12,7 +12,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-from typing import Any, Callable, Dict, List, Optional, Set, Tuple, Union
+from typing import TYPE_CHECKING, Any, Callable, Dict, List, Optional, Set, Tuple, Type, Union
 
 from selenium import webdriver
 from selenium.common.exceptions import (
@@ -21,15 +21,12 @@ from selenium.common.exceptions import (
     UnknownMethodException,
     WebDriverException,
 )
-from selenium.webdriver.common.by import By
 from selenium.webdriver.remote.command import Command as RemoteCommand
 from selenium.webdriver.remote.remote_connection import RemoteConnection
 from typing_extensions import Self
 
 from appium.common.logger import logger
 from appium.options.common.base import AppiumOptions
-from appium.protocols.webdriver.can_find_elements import CanFindElements
-from appium.webdriver.common.appiumby import AppiumBy
 
 from .appium_connection import AppiumConnection
 from .client_config import AppiumClientConfig
@@ -238,12 +235,11 @@ class WebDriver(
     Settings,
     Sms,
     SystemBars,
-    CanFindElements,
 ):
     def __init__(
         self,
         command_executor: Union[str, AppiumConnection] = 'http://127.0.0.1:4723',
-        extensions: Optional[List['WebDriver']] = None,
+        extensions: Optional[List[Type['ExtensionBase']]] = None,
         options: Union[AppiumOptions, List[AppiumOptions], None] = None,
         client_config: Optional[AppiumClientConfig] = None,
     ):
@@ -252,12 +248,15 @@ class WebDriver(
         )
         super().__init__(
             command_executor=command_executor,
-            options=options,
+            options=options,  # type: ignore[arg-type]
             locator_converter=AppiumLocatorConverter(),
             web_element_cls=MobileWebElement,
             client_config=client_config,
         )
 
+        # to explicitly set type after the initialization
+        self.command_executor: RemoteConnection
+
         self._add_commands()
 
         self.error_handler = MobileErrorHandler()
@@ -265,15 +264,6 @@ class WebDriver(
         if client_config and client_config.direct_connection:
             self._update_command_executor(keep_alive=client_config.keep_alive)
 
-        # add new method to the `find_by_*` pantheon
-        By.IOS_PREDICATE = AppiumBy.IOS_PREDICATE
-        By.IOS_CLASS_CHAIN = AppiumBy.IOS_CLASS_CHAIN
-        By.ANDROID_UIAUTOMATOR = AppiumBy.ANDROID_UIAUTOMATOR
-        By.ANDROID_VIEWTAG = AppiumBy.ANDROID_VIEWTAG
-        By.ACCESSIBILITY_ID = AppiumBy.ACCESSIBILITY_ID
-        By.IMAGE = AppiumBy.IMAGE
-        By.CUSTOM = AppiumBy.CUSTOM
-
         self._absent_extensions: Set[str] = set()
 
         self._extensions = extensions or []
@@ -288,6 +278,14 @@ class WebDriver(
             method, url_cmd = instance.add_command()
             self.command_executor.add_command(method_name, method.upper(), url_cmd)
 
+    if TYPE_CHECKING:
+
+        def find_element(self, by: str, value: Union[str, Dict, None] = None) -> 'MobileWebElement':  # type: ignore[override]
+            ...
+
+        def find_elements(self, by: str, value: Union[str, Dict, None] = None) -> List['MobileWebElement']:  # type: ignore[override]
+            ...
+
     def delete_extensions(self) -> None:
         """Delete extensions added in the class with 'setattr'"""
         for extension in self._extensions:

{appium_python_client-5.1.2 → appium_python_client-5.1.3}/appium/webdriver/webelement.py

@@ -12,23 +12,29 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-from typing import Callable, Dict, Optional, Union
+from typing import TYPE_CHECKING, Callable, Dict, List, Optional, Union
 
 from selenium.webdriver.common.utils import keys_to_typing
 from selenium.webdriver.remote.command import Command as RemoteCommand
 from selenium.webdriver.remote.webelement import WebElement as SeleniumWebElement
 from typing_extensions import Self
 
-from appium.protocols.webdriver.can_find_elements import CanFindElements
-
 from .mobilecommand import MobileCommand as Command
 
 
-class WebElement(SeleniumWebElement, CanFindElements):
+class WebElement(SeleniumWebElement):
     _execute: Callable
     _id: str
 
-    def get_attribute(self, name: str) -> Optional[Union[str, Dict]]:
+    if TYPE_CHECKING:
+
+        def find_element(self, by: str, value: Union[str, Dict, None] = None) -> Self:  # type: ignore[override]
+            ...
+
+        def find_elements(self, by: str, value: Union[str, Dict, None] = None) -> List[Self]:  # type: ignore[override]
+            ...
+
+    def get_attribute(self, name: str) -> Optional[Union[str, Dict]]:  # type: ignore[override]
         """Gets the given attribute or property of the element.
 
         Override for Appium
@@ -80,7 +86,7 @@ class WebElement(SeleniumWebElement, CanFindElements):
         """
         return self._execute(Command.IS_ELEMENT_DISPLAYED)['value']
 
-    def clear(self) -> Self:
+    def clear(self) -> Self:  # type: ignore[override]
         """Clears text.
 
         Override for Appium
@@ -110,7 +116,7 @@ class WebElement(SeleniumWebElement, CanFindElements):
         return self._execute(Command.LOCATION_IN_VIEW)['value']
 
     # Override
-    def send_keys(self, *value: str) -> Self:
+    def send_keys(self, *value: str) -> Self:  # type: ignore[override]
         """Simulates typing into the element.
 
         Args:

appium_python_client-5.1.2/appium/version.py

@@ -1 +0,0 @@
-version = '5.1.2'