persona-dsl 26.1.20.12__py3-none-any.whl → 26.1.20.16__py3-none-any.whl

persona_dsl/expectations/web/matches_aria_snapshot.py

@@ -69,6 +69,7 @@ class MatchesAriaSnapshot(Expectation):
 
     def _perform(self, persona: Any, *args: Any, **kwargs: Any) -> None:
         actual_value = args[0]
+
         if not isinstance(actual_value, str):
             raise TypeError(
                 f"MatchesAriaSnapshot ожидает YAML строку, получено: {type(actual_value)}"

persona_dsl/ops/web/generate_page_object.py

@@ -80,7 +80,7 @@ class GeneratePageObject(Ops):
 
         # Используем rich ARIA snapshot вместо стандартного
         rich_snapshot_op = RichAriaSnapshot()
-        snapshot_struct = rich_snapshot_op._perform(persona)
+        snapshot_struct = rich_snapshot_op.get_tree(persona)
 
         # Сохраняем ARIA снепшот на диск как YAML-строку
         assets_dir = self.output_path.parent / "aria"
@@ -90,7 +90,7 @@ class GeneratePageObject(Ops):
         snapshot_abs_path = assets_dir / snapshot_file
 
         snapshot_yaml: str = (
-            rich_snapshot_op._tree_to_yaml(snapshot_struct) if snapshot_struct else ""
+            RichAriaSnapshot.to_yaml(snapshot_struct) if snapshot_struct else ""
         )
         if snapshot_yaml:
             snapshot_abs_path.write_text(snapshot_yaml, encoding="utf-8")

persona_dsl/ops/web/rich_aria_snapshot.py

@@ -22,21 +22,16 @@ class RichAriaSnapshot(Ops):
     def _get_step_description(self, persona: Any) -> str:
         return f"{persona} получает богатый ARIA-снепшот страницы (через Runtime)"
 
-    def _perform(self, persona: Any, *args: Any, **kwargs: Any) -> Dict[str, Any]:
-        page = persona.skill(SkillId.BROWSER).page
-
-        # 1. Получаем чистое JSON-дерево от ядра
-        snapshot_tree = page.evaluate(
-            "window.__PERSONA__ && window.__PERSONA__.getTreeForTransport && window.__PERSONA__.getTreeForTransport()"
-        )
-
-        if not snapshot_tree:
-            raise RuntimeError(
-                "Persona Runtime не вернул JSON-дерево (getTreeForTransport). Убедитесь, что Runtime инициализирован."
-            )
+    def _perform(self, persona: Any, *args: Any, **kwargs: Any) -> str:
+        """
+        Выполняет операцию получения снепшота.
+        Returns:
+            str: YAML-строка снепшота (как в Playwright).
+        """
+        snapshot_tree = self.get_tree(persona)
 
         # 2. Рендерим YAML для отчетов (визуализация)
-        snapshot_yaml = self._tree_to_yaml(snapshot_tree)
+        snapshot_yaml = self.to_yaml(snapshot_tree)
 
         try:
             allure.attach(
@@ -47,10 +42,29 @@ class RichAriaSnapshot(Ops):
         except Exception:
             pass
 
-        # Возвращаем структуру данных (dict) для Генератора
+        return snapshot_yaml
+
+    def get_tree(self, persona: Any) -> Dict[str, Any] | List[Any]:
+        """
+        Получает сырое дерево элементов (dict/list) от Persona Runtime.
+        Используется в генераторах кода.
+        """
+        page = persona.skill(SkillId.BROWSER).page
+
+        # 1. Получаем чистое JSON-дерево от ядра
+        snapshot_tree = page.evaluate(
+            "window.__PERSONA__ && window.__PERSONA__.getTreeForTransport && window.__PERSONA__.getTreeForTransport()"
+        )
+
+        if not snapshot_tree:
+            raise RuntimeError(
+                "Persona Runtime не вернул JSON-дерево (getTreeForTransport). Убедитесь, что Runtime инициализирован."
+            )
+
         return snapshot_tree
 
-    def _tree_to_yaml(self, root: Dict[str, Any] | List[Any]) -> str:
+    @staticmethod
+    def to_yaml(root: Dict[str, Any] | List[Any]) -> str:
         """
         Преобразует JSON-дерево в читаемый структурный YAML формат.
         Формат:
@@ -60,18 +74,17 @@ class RichAriaSnapshot(Ops):
         """
         lines = []
         if isinstance(root, dict):
-            lines.extend(self._render_node_yaml(root, indent=0))
+            lines.extend(RichAriaSnapshot._render_node_yaml(root, indent=0))
         elif isinstance(root, list):
             for node in root:
-                lines.extend(self._render_node_yaml(node, indent=0))
+                lines.extend(RichAriaSnapshot._render_node_yaml(node, indent=0))
 
         return "\n".join(lines)
 
-    def _render_node_yaml(self, node: Dict[str, Any], indent: int) -> List[str]:
+    @staticmethod
+    def _render_node_yaml(node: Dict[str, Any] | str, indent: int) -> List[str]:
         if isinstance(node, str):
             # Текстовый узел (строка)
-            # В новом Runtime children могут быть строками? Вроде в TreeWalker мы делаем узлы для текста.
-            # Но на всякий случай.
             return [f"{'  ' * indent}- \"{node}\""]
 
         lines = []
@@ -141,6 +154,6 @@ class RichAriaSnapshot(Ops):
 
             # Рендерим детей
             for child in children:
-                lines.extend(self._render_node_yaml(child, indent + 1))
+                lines.extend(RichAriaSnapshot._render_node_yaml(child, indent + 1))
 
         return lines

{persona_dsl-26.1.20.12.dist-info → persona_dsl-26.1.20.16.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: persona-dsl
-Version: 26.1.20.12
+Version: 26.1.20.16
 Summary: DSL для реализации паттерна Screenplay в Python-тестах.
 Requires-Python: >=3.9
 Description-Content-Type: text/markdown

{persona_dsl-26.1.20.12.dist-info → persona_dsl-26.1.20.16.dist-info}/RECORD

@@ -18,7 +18,7 @@ persona_dsl/expectations/generic/is_greater_than.py,sha256=k6V34pyxPhHX1V7uDOmxP
 persona_dsl/expectations/generic/path_equal.py,sha256=cvxwCdfiDXC_WhosfmIRqfwaQUogfU0YhUtP2duPTlI,967
 persona_dsl/expectations/web/__init__.py,sha256=lBKeJqO4GO9yjKID37tbdbzS8iD_bZJlSk7GcJ8LCAM,214
 persona_dsl/expectations/web/is_displayed.py,sha256=VNrGo6yJ_kvmUPrT8gVO0YPL-o-5XMXVM6jsBWqtO9s,578
-persona_dsl/expectations/web/matches_aria_snapshot.py,sha256=2YeO5jbfqQNrdH8mCtizpqOsPnQ1Hd6P3sQtqEiILFA,8657
+persona_dsl/expectations/web/matches_aria_snapshot.py,sha256=TP8oe95SUfX64mU4jbsYioIENTJsQS_IvdTqk2zWECg,8658
 persona_dsl/expectations/web/matches_screenshot.py,sha256=JOg9IdREJ7LNOsZpIbXesLiJa0nHAvMmmgl8x3jgV-Y,7376
 persona_dsl/generators/__init__.py,sha256=xgjQ0rhC7p6sRir9MFJ4WGt0CWT1fX3_3rsrcy-wkSk,163
 persona_dsl/generators/api_generator.py,sha256=epA8VEblLt09h5F0oMS04ltn8btDXHtonh4rhDI7OSU,17863
@@ -47,11 +47,11 @@ persona_dsl/ops/web/element_is_visible.py,sha256=xEotfLF9hw83gzRP1ax1Bb7cukC4pUN
 persona_dsl/ops/web/element_text.py,sha256=MQe1uaerDpqi4pp3w0FUw7K1QY1yKgQbV5dvPDCVGVg,1147
 persona_dsl/ops/web/elements_count.py,sha256=ME6bjLCxeZIKkiFBx4-jlJELy-CjHG6yFueKcHhq-9I,2034
 persona_dsl/ops/web/fill.py,sha256=WD4DvcMaTdkUFfVgnWgt05TP3NzQtL48IMcahbDh5l0,1755
-persona_dsl/ops/web/generate_page_object.py,sha256=LoiUNTe4cpY7BGhr9FpwR1oykjaPybZ4PmDLSxvZHQE,5413
+persona_dsl/ops/web/generate_page_object.py,sha256=NKo6-vdo792Ns7F9lefIiyiSZ_A1h1_YIdHtQepzuLQ,5407
 persona_dsl/ops/web/input_value.py,sha256=BAMmJ2XsDBNWT0mjXyCJswwhyk5RJx1dM_zvNtYBjdc,918
 persona_dsl/ops/web/navigate.py,sha256=hsG6PCt6tnKn1BU3a4kZDpAPDubnZzgQv_yNxXchlUo,2241
 persona_dsl/ops/web/press_key.py,sha256=QcTo8PtP0Ks-plBOZ6ojPL8bJerB4IUGhvYJRlCNmtY,1709
-persona_dsl/ops/web/rich_aria_snapshot.py,sha256=sfcABy8v1eje8mSuLCbMJ5PUdyCgyNpEhxs6QeiTV1o,5671
+persona_dsl/ops/web/rich_aria_snapshot.py,sha256=M1-C5LsGPUo96uv3EArMzAjdFtrdlHO5_N5W-ECsQMo,5948
 persona_dsl/ops/web/screenshot.py,sha256=Wue5XKIXXbkDNhS5tkHZ5jty7NHd0LLFrFSQ_F01w7c,2378
 persona_dsl/ops/web/table_data.py,sha256=4nKOUDPofFwzjSUcxiiZauNO7V-jXvNTlXXDmuqZpqQ,1920
 persona_dsl/ops/web/wait_for_navigation.py,sha256=a1026yNa3LmWzacfFLUXnjleID3sfXIZ67G3SZuTxRI,977
@@ -79,8 +79,8 @@ persona_dsl/utils/path.py,sha256=wwYUS3euYqwKQdxWHD8Lq93Ln1G0M5LIJ6AMqiwpmDI,725
 persona_dsl/utils/retry.py,sha256=kBbu6rpySdeaqRzUkgdrsEWrc9PwkvRhYtRzyhrYj9g,2215
 persona_dsl/utils/taas_integration.py,sha256=OZzSjgC1_90eTYXo3WPsCgCtYc35U216SBnxClpdIkw,5046
 persona_dsl/utils/waits.py,sha256=I9e_9rs_0Rju61yx_hS-qwcXd4zNWfVNyfhY0mOHrj0,4386
-persona_dsl-26.1.20.12.dist-info/METADATA,sha256=4LVxQK5kjvq6Ou-dpE3y5PdR7BmdXKnpDTPSOzD_h6s,7057
-persona_dsl-26.1.20.12.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-persona_dsl-26.1.20.12.dist-info/entry_points.txt,sha256=8lYko6uS1gGeYX9_FYbbeO5XV_BP62T7RngyKuKDD7k,180
-persona_dsl-26.1.20.12.dist-info/top_level.txt,sha256=N1YAJab5h4iPt-srbrjzDk6bY40bwR1AHZS5Z0eOzvM,12
-persona_dsl-26.1.20.12.dist-info/RECORD,,
+persona_dsl-26.1.20.16.dist-info/METADATA,sha256=RyYFxQ5cT4Dw2iGagSr2wVPs7Rker7vHCrb4CTx8-Vw,7057
+persona_dsl-26.1.20.16.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+persona_dsl-26.1.20.16.dist-info/entry_points.txt,sha256=8lYko6uS1gGeYX9_FYbbeO5XV_BP62T7RngyKuKDD7k,180
+persona_dsl-26.1.20.16.dist-info/top_level.txt,sha256=N1YAJab5h4iPt-srbrjzDk6bY40bwR1AHZS5Z0eOzvM,12
+persona_dsl-26.1.20.16.dist-info/RECORD,,