pytest-dsl 0.8.0__py3-none-any.whl → 0.9.1__py3-none-any.whl

pytest_dsl/remote/variable_bridge.py

@@ -0,0 +1,164 @@
+"""远程服务器变量桥接模块
+
+该模块提供了变量桥接机制，让远程服务器中的关键字能够无缝访问客户端同步的变量。
+通过hook机制拦截变量访问，实现变量的透明传递。
+"""
+
+import logging
+from typing import Any, Optional
+from pytest_dsl.remote.hook_manager import register_startup_hook, register_before_keyword_hook
+from pytest_dsl.core.yaml_vars import yaml_vars
+from pytest_dsl.core.global_context import global_context
+
+logger = logging.getLogger(__name__)
+
+
+class VariableBridge:
+    """变量桥接器，负责在远程服务器中桥接客户端同步的变量"""
+    
+    def __init__(self):
+        self.shared_variables = {}  # 引用远程服务器的shared_variables
+        self.original_yaml_get_variable = None
+        self.original_global_get_variable = None
+        self._bridge_installed = False
+    
+    def install_bridge(self, shared_variables: dict):
+        """安装变量桥接机制
+        
+        Args:
+            shared_variables: 远程服务器的共享变量字典
+        """
+        if self._bridge_installed:
+            return
+            
+        self.shared_variables = shared_variables
+        
+        # 备份原始方法
+        self.original_yaml_get_variable = yaml_vars.get_variable
+        self.original_global_get_variable = global_context.get_variable
+        
+        # 安装桥接方法
+        yaml_vars.get_variable = self._bridged_yaml_get_variable
+        global_context.get_variable = self._bridged_global_get_variable
+        
+        self._bridge_installed = True
+        logger.info("变量桥接机制已安装")
+    
+    def _bridged_yaml_get_variable(self, name: str) -> Optional[Any]:
+        """桥接的YAML变量获取方法
+        
+        优先级：
+        1. 原始YAML变量
+        2. 客户端同步的变量
+        """
+        # 首先尝试从原始YAML变量获取
+        original_value = self.original_yaml_get_variable(name)
+        if original_value is not None:
+            return original_value
+        
+        # 如果原始YAML中没有，尝试从同步变量获取
+        if name in self.shared_variables:
+            logger.debug(f"从同步变量获取YAML变量: {name}")
+            return self.shared_variables[name]
+        
+        return None
+    
+    def _bridged_global_get_variable(self, name: str) -> Any:
+        """桥接的全局变量获取方法
+        
+        优先级：
+        1. 原始全局变量（包括YAML变量）
+        2. 客户端同步的变量
+        """
+        try:
+            # 首先尝试从原始全局上下文获取
+            original_value = self.original_global_get_variable(name)
+            if original_value is not None:
+                return original_value
+        except:
+            # 如果原始方法抛出异常，继续尝试同步变量
+            pass
+        
+        # 如果原始全局变量中没有，尝试从同步变量获取
+        if name in self.shared_variables:
+            logger.debug(f"从同步变量获取全局变量: {name}")
+            return self.shared_variables[name]
+        
+        # 如果都没有找到，返回None（保持原有行为）
+        return None
+    
+    def uninstall_bridge(self):
+        """卸载变量桥接机制"""
+        if not self._bridge_installed:
+            return
+            
+        # 恢复原始方法
+        if self.original_yaml_get_variable:
+            yaml_vars.get_variable = self.original_yaml_get_variable
+        if self.original_global_get_variable:
+            global_context.get_variable = self.original_global_get_variable
+        
+        self._bridge_installed = False
+        logger.info("变量桥接机制已卸载")
+
+
+# 全局变量桥接器实例
+variable_bridge = VariableBridge()
+
+
+@register_startup_hook
+def setup_variable_bridge(context):
+    """服务器启动时安装变量桥接机制"""
+    shared_variables = context.get('shared_variables')
+    if shared_variables is not None:
+        variable_bridge.install_bridge(shared_variables)
+        logger.info("变量桥接机制已在服务器启动时安装")
+    else:
+        logger.warning("无法获取shared_variables，变量桥接机制安装失败")
+
+
+@register_before_keyword_hook
+def ensure_variable_bridge(context):
+    """关键字执行前确保变量桥接机制正常工作"""
+    # 这个hook主要用于调试和监控
+    shared_variables = context.get('shared_variables')
+    keyword_name = context.get('keyword_name')
+    
+    # 只对特定关键字进行调试日志
+    if keyword_name in ['HTTP请求', '数据库查询'] and shared_variables:
+        synced_count = len(shared_variables)
+        if synced_count > 0:
+            logger.debug(f"关键字 {keyword_name} 执行前，可用同步变量数量: {synced_count}")
+
+
+def get_synced_variable(name: str) -> Optional[Any]:
+    """直接从同步变量中获取变量值
+    
+    Args:
+        name: 变量名
+        
+    Returns:
+        变量值，如果不存在则返回None
+    """
+    return variable_bridge.shared_variables.get(name)
+
+
+def list_synced_variables() -> dict:
+    """列出所有同步的变量
+    
+    Returns:
+        同步变量字典的副本
+    """
+    return variable_bridge.shared_variables.copy()
+
+
+def has_synced_variable(name: str) -> bool:
+    """检查是否存在指定的同步变量
+    
+    Args:
+        name: 变量名
+        
+    Returns:
+        是否存在该同步变量
+    """
+    return name in variable_bridge.shared_variables

{pytest_dsl-0.8.0.dist-info → pytest_dsl-0.9.1.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: pytest-dsl
-Version: 0.8.0
+Version: 0.9.1
 Summary: A DSL testing framework based on pytest
 Author: Chen Shuanglin
 License: MIT

{pytest_dsl-0.8.0.dist-info → pytest_dsl-0.9.1.dist-info}/RECORD

@@ -1,5 +1,5 @@
 pytest_dsl/__init__.py,sha256=FzwXGvmuvMhRBKxvCdh1h-yJ2wUOnDxcTbU4Nt5fHn8,301
-pytest_dsl/cli.py,sha256=rOkGrHaBJE0a0QmT1YTob-z8N5kpnzYowrgCdZrfVzE,4467
+pytest_dsl/cli.py,sha256=x3zSHJqAGUNPUsJfhFRzVVwRE0zM02Lcr2bx_V8v4YA,15806
 pytest_dsl/conftest_adapter.py,sha256=cevEb0oEZKTZfUrGe1-CmkFByxKhUtjuurBJP7kpLc0,149
 pytest_dsl/main_adapter.py,sha256=pUIPN_EzY3JCDlYK7yF_OeLDVqni8vtG15G7gVzPJXg,181
 pytest_dsl/plugin.py,sha256=MEQcdK0xdxwxCxPEDLNHX_kGF9Jc7bNxlNi4mx588DU,1190
@@ -8,8 +8,8 @@ pytest_dsl/core/auth_provider.py,sha256=IZfXXrr4Uuc8QHwRPvhHSzNa2fwrqhjYts1xh78D
 pytest_dsl/core/auto_decorator.py,sha256=9Mga-GB4AzV5nkB6zpfaq8IuHa0KOH8LlFvnWyH_tnU,6623
 pytest_dsl/core/auto_directory.py,sha256=egyTnVxtGs4P75EIivRauLRPJfN9aZpoGVvp_Ma72AM,2714
 pytest_dsl/core/context.py,sha256=fXpVQon666Lz_PCexjkWMBBr-Xcd1SkDMp2vHar6eIs,664
-pytest_dsl/core/custom_keyword_manager.py,sha256=QY-wXvzON2kkFwojBSXqWcQpo_aKixKhG-rsacV8gzE,7955
-pytest_dsl/core/dsl_executor.py,sha256=-pOZ-FAU6BqUhjydE2a9uUOolxAtVwrKWSD9j_5rYGk,29488
+pytest_dsl/core/custom_keyword_manager.py,sha256=Y3MftSklqGSS3FfeZjmyfcGHfQw6FrhFTwgS_O8zQh4,7606
+pytest_dsl/core/dsl_executor.py,sha256=aEEfocFCFxNDN1puBFhQzL5fzw9eZx8BAyYJI5XSt4Y,30472
 pytest_dsl/core/dsl_executor_utils.py,sha256=cFoR2p3qQ2pb-UhkoefleK-zbuFqf0aBLh2Rlp8Ebs4,2180
 pytest_dsl/core/global_context.py,sha256=NcEcS2V61MT70tgAsGsFWQq0P3mKjtHQr1rgT3yTcyY,3535
 pytest_dsl/core/http_client.py,sha256=1AHqtM_fkXf8JrM0ljMsJwUkyt-ysjR16NoyCckHfGc,15810
@@ -59,9 +59,14 @@ pytest_dsl/keywords/assertion_keywords.py,sha256=WOCGP7WX2wZ6mQPDGmi38LWdG2NaThH
 pytest_dsl/keywords/global_keywords.py,sha256=4yw5yeXoGf_4W26F39EA2Pp-mH9GiKGy2jKgFO9a_wM,2509
 pytest_dsl/keywords/http_keywords.py,sha256=DY1SvUgOziN6Ga-QgE0q4XFd2qGGwvbv1B_k2gTdPLw,25554
 pytest_dsl/keywords/system_keywords.py,sha256=n_jRrMvSv2v6Pm_amokfyLNVOLYP7CFWbBE3_dlO7h4,11299
-pytest_dsl-0.8.0.dist-info/licenses/LICENSE,sha256=Rguy8cb9sYhK6cmrBdXvwh94rKVDh2tVZEWptsHIsVM,1071
-pytest_dsl-0.8.0.dist-info/METADATA,sha256=hdWrlddZUtb3iV3hpz1YJdiv2y7jgWMnPPB_k6wyKP4,26712
-pytest_dsl-0.8.0.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-pytest_dsl-0.8.0.dist-info/entry_points.txt,sha256=qqxFwSHQtjoae8_WWiO6w8y0N9nC4H8eFRvOnr_OipE,152
-pytest_dsl-0.8.0.dist-info/top_level.txt,sha256=4CrSx4uNqxj7NvK6k1y2JZrSrJSzi-UvPZdqpUhumWM,11
-pytest_dsl-0.8.0.dist-info/RECORD,,
+pytest_dsl/remote/__init__.py,sha256=syRSxTlTUfdAPleJnVS4MykRyEN8_SKiqlsn6SlIK8k,120
+pytest_dsl/remote/hook_manager.py,sha256=0hwRKP8yhcnfAnrrnZGVT-S0TBgo6c0A4qO5XRpvV1U,4899
+pytest_dsl/remote/keyword_client.py,sha256=Zem86qW6TudPAiiqU8wAFQeCoBl5urPRiAhFDPkAGgQ,15618
+pytest_dsl/remote/keyword_server.py,sha256=5nKLUIqgAVJoLL2t2dHaJb9S95z4K3UusSMEBylU6X4,20549
+pytest_dsl/remote/variable_bridge.py,sha256=KG2xTZcUExb8kNL-rR-IPFJmYGfo7ciE4W7xzet59sw,5520
+pytest_dsl-0.9.1.dist-info/licenses/LICENSE,sha256=Rguy8cb9sYhK6cmrBdXvwh94rKVDh2tVZEWptsHIsVM,1071
+pytest_dsl-0.9.1.dist-info/METADATA,sha256=tmPXjA1YZtuduO_Fus6vujf1vMOYxx3L2n7c7ZV4oyc,26712
+pytest_dsl-0.9.1.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+pytest_dsl-0.9.1.dist-info/entry_points.txt,sha256=PLOBbH02OGY1XR1JDKIZB1Em87loUvbgMRWaag-5FhY,204
+pytest_dsl-0.9.1.dist-info/top_level.txt,sha256=4CrSx4uNqxj7NvK6k1y2JZrSrJSzi-UvPZdqpUhumWM,11
+pytest_dsl-0.9.1.dist-info/RECORD,,

{pytest_dsl-0.8.0.dist-info → pytest_dsl-0.9.1.dist-info}/entry_points.txt

@@ -1,5 +1,6 @@
 [console_scripts]
 pytest-dsl = pytest_dsl.cli:main
+pytest-dsl-list = pytest_dsl.cli:main_list_keywords
 pytest-dsl-server = pytest_dsl.remote.keyword_server:main
 
 [pytest11]