Locator type rework

Author: VladimirPodolian

mops/__init__.py

@@ -1,2 +1,2 @@
-__version__ = '3.0.1'
+__version__ = '3.1.0'
 __project_name__ = 'mops'

mops/base/element.py

@@ -152,7 +152,7 @@ def __init_base_class__(self) -> None:
             raise DriverWrapperException(f'Cant specify {self.__class__.__name__}')
 
         self._set_static(self._base_cls)
-        self._base_cls.__init__(self, locator=self.locator)
+        self._base_cls.__init__(self)
         self._initialized = True
 
     # Following methods works same for both Selenium/Appium and Playwright APIs using internal methods

mops/mixins/internal_mixin.py

@@ -16,19 +16,24 @@
 available_kwarg_keys = ('desktop', 'mobile', 'ios', 'android')
 
 
-def get_element_info(element: Any) -> str:
+def get_element_info(element: Any, is_for_container: bool = False) -> str:
     """
     Get element selector information with parent object selector if it exists
 
     :param element: element to collect log data
+    :param is_for_container: element to collect log data
     :return: log string
     """
+    label = '' if is_for_container else 'Selector: '
+
+    selector = f"{label}'{element.log_locator}'"
+
     parent = element.parent
-    current_data = f'Selector: ["{element.locator_type}": "{element.locator}"]'
     if parent:
-        parent_data = f'Parent selector: ["{parent.locator_type}": "{parent.locator}"]'
-        current_data = f'{current_data}. {parent_data}'
-    return current_data
+        container_data = get_element_info(parent, is_for_container=True)
+        selector = f"{selector} <= {container_data}"
+
+    return selector
 
 @lru_cache(maxsize=16)
 def get_static(cls: Any):
@@ -63,13 +68,12 @@ def _repr_builder(self: Any):
             parent_class = self.parent.__class__.__name__ if parent else None
             locator_holder = getattr(self, 'anchor', self)
 
-            locator = f'locator="{locator_holder.locator}", '
-            locator_type = f'locator_type="{locator_holder.locator_type}", ' if locator_holder.locator_type else ''
+            locator = f'locator="{locator_holder.log_locator}", '
             name = f'name="{self.name}", '
             parent = f'parent={parent_class}'
             driver = f'{self.driver_wrapper.label}={self.driver}'
 
-            base = f'{class_name}({locator}{locator_type}{name}{parent}) at {obj_id}'
+            base = f'{class_name}({locator}{name}{parent}) at {obj_id}'
             additional_info = driver
             return f'{base}, {additional_info}'
         except AttributeError:

mops/mixins/objects/locator.py

@@ -1,5 +1,5 @@
 from dataclasses import dataclass
-from typing import Optional, Any, Union
+from typing import Optional
 
 
 @dataclass
@@ -11,13 +11,6 @@ class Locator:
     All: The default locator for the object, used by default if no other locators are specified 
      or if no specific platform/device type is detected.
     """
-    loc_type: Optional[str] = None
-    """
-    Selenium & Appium only: Specifies the locator type 
-    (e.g., :obj:`~selenium.webdriver.common.by.By.CSS_SELECTOR`, :obj:`~selenium.webdriver.common.by.By.XPATH`, etc.).  
-
-    If not provided, the locator type is automatically determined based on the given locator.
-    """
 
     desktop: Optional[str] = None
     """
@@ -47,13 +40,3 @@ class Locator:
     Appium only: The locator specifically for Android devices, 
      allowing for targeting locators specific to Android applications.
     """
-
-
-def take_locator_type(locator: Union[Locator, str]) -> Union[str, None]:
-    """
-    Safe take locator type from given object.
-
-    :param locator: a Locator object or string containing locator.
-    :return: locator type if given arg is Locator object.
-    """
-    return locator.loc_type if type(locator) is Locator else None

mops/playwright/play_element.py

@@ -13,7 +13,7 @@
 
 from mops.mixins.objects.size import Size
 from mops.mixins.objects.location import Location
-from mops.utils.selector_synchronizer import get_platform_locator, get_playwright_locator
+from mops.utils.selector_synchronizer import get_platform_locator, set_playwright_locator
 from mops.abstraction.element_abc import ElementABC
 from mops.exceptions import TimeoutException
 from mops.utils.logs import Logging
@@ -35,14 +35,12 @@ class PlayElement(ElementABC, Logging, ABC):
     parent: Union[ElementABC, PlayElement]
     _element: Locator = None
 
-    def __init__(self, locator: str):  # noqa
+    def __init__(self):  # noqa
         """
         Initializing of web element with playwright driver
-
-        :param locator: anchor locator of page. Can be defined without locator_type
         """
-        self.locator = get_playwright_locator(get_platform_locator(self))
-        self.locator_type = None
+        self.locator = get_platform_locator(self)
+        set_playwright_locator(self)
 
     # Element
 

mops/selenium/elements/mobile_element.py

@@ -2,29 +2,25 @@
 
 import time
 from abc import ABC
-from typing import Union
 
 from PIL.Image import Image
 
 from mops.selenium.core.core_element import CoreElement
 from mops.mixins.objects.location import Location
-from mops.mixins.objects.locator import Locator, take_locator_type
 from mops.mixins.objects.size import Size
 from mops.utils.internal_utils import calculate_coordinate_to_click
-from mops.utils.selector_synchronizer import get_platform_locator, get_selenium_locator_type, get_appium_selector
+from mops.utils.selector_synchronizer import get_platform_locator, set_selenium_selector, set_appium_selector
 
 
 class MobileElement(CoreElement, ABC):
 
-    def __init__(self, locator: Union[Locator, str]):
+    def __init__(self):
         """
         Initializing of mobile element with appium driver
-
-        :param locator: anchor locator of page. Can be defined without locator_type
         """
         self.locator = get_platform_locator(self)
-        locator_type = take_locator_type(locator) or get_selenium_locator_type(self.locator)
-        self.locator, self.locator_type = get_appium_selector(self.locator, locator_type)
+        set_selenium_selector(self)
+        set_appium_selector(self)
 
     def click_outside(self, x: int = -5, y: int = -5) -> MobileElement:
         """

mops/selenium/elements/web_element.py

@@ -1,25 +1,21 @@
 from __future__ import annotations
 
 from abc import ABC
-from typing import Union
 
 from mops.selenium.core.core_element import CoreElement
 from mops.js_scripts import js_click
-from mops.mixins.objects.locator import take_locator_type, Locator
 from mops.utils.internal_utils import calculate_coordinate_to_click
-from mops.utils.selector_synchronizer import get_platform_locator, get_selenium_locator_type
+from mops.utils.selector_synchronizer import get_platform_locator, set_selenium_selector
 
 
 class WebElement(CoreElement, ABC):
 
-    def __init__(self, locator: Union[Locator, str]):
+    def __init__(self):
         """
         Initializing of web element with selenium driver
-
-        :param locator: anchor locator of page. Can be defined without locator_type
         """
         self.locator = get_platform_locator(self)
-        self.locator_type = take_locator_type(locator) or get_selenium_locator_type(self.locator)
+        set_selenium_selector(self)
 
     def click(self, *, force_wait: bool = True, **kwargs) -> WebElement:
         """