pytest-dsl 0.9.0__py3-none-any.whl → 0.10.0__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.9.0.dist-info → pytest_dsl-0.10.0.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: pytest-dsl
-Version: 0.9.0
+Version: 0.10.0
 Summary: A DSL testing framework based on pytest
 Author: Chen Shuanglin
 License: MIT
@@ -42,11 +42,12 @@ pytest-dsl是一个革命性的关键字驱动测试框架，基于pytest构建
 ## ✨ 核心特性
 
 - 🎯 **门槛上手低** - 自然语言风格，只需少量编程基础
-- 🔧 **高度可扩展** - 轻松创建自定义关键字
+- 🔧 **高度可扩展** - 轻松创建自定义关键字，支持参数默认值
 - 🌐 **分布式执行** - 支持远程关键字调用
 - 🔄 **无缝集成** - 完美兼容pytest生态
 - 📊 **丰富报告** - 集成Allure测试报告
 - 🛡️ **企业级** - 支持变量管理、环境隔离
+- ⚡ **智能简化** - 参数默认值让DSL更加简洁易读
 
 ## 🚀 5分钟快速开始
 
@@ -850,17 +851,19 @@ def database_query(**kwargs):
 
 @keyword_manager.register('发送邮件', [
     {'name': '收件人', 'mapping': 'to_email', 'description': '收件人邮箱'},
-    {'name': '主题', 'mapping': 'subject', 'description': '邮件主题'},
-    {'name': '内容', 'mapping': 'content', 'description': '邮件内容'}
+    {'name': '主题', 'mapping': 'subject', 'description': '邮件主题', 'default': '测试邮件'},
+    {'name': '内容', 'mapping': 'content', 'description': '邮件内容', 'default': '这是一封测试邮件'},
+    {'name': '优先级', 'mapping': 'priority', 'description': '邮件优先级', 'default': 'normal'}
 ])
 def send_email(**kwargs):
     """发送邮件通知"""
     to_email = kwargs.get('to_email')
-    subject = kwargs.get('subject')
-    content = kwargs.get('content')
+    subject = kwargs.get('subject', '测试邮件')
+    content = kwargs.get('content', '这是一封测试邮件')
+    priority = kwargs.get('priority', 'normal')
 
     # 实现邮件发送逻辑
-    print(f"发送邮件到 {to_email}: {subject}")
+    print(f"发送邮件到 {to_email}: {subject} (优先级: {priority})")
 
     return True
 ```
@@ -874,10 +877,71 @@ def send_email(**kwargs):
 users = [数据库查询], 查询语句: "SELECT * FROM users WHERE active = 1"
 [打印], 内容: "查询到 ${len(users)} 个活跃用户"
 
-# 发送测试报告邮件
-[发送邮件], 收件人: "admin@example.com", 主题: "测试报告", 内容: "测试已完成"
+# 发送测试报告邮件 - 使用默认值
+[发送邮件], 收件人: "admin@example.com"  # 主题和内容使用默认值
+
+# 发送自定义邮件 - 覆盖默认值
+[发送邮件], 收件人: "dev@example.com", 主题: "部署完成", 内容: "系统已成功部署到生产环境"
+```
+
+### 5. 参数默认值功能 🆕
+
+pytest-dsl 现在支持为关键字参数设置默认值，让DSL编写更加简洁：
+
+#### 定义带默认值的关键字
+
+```python
+from pytest_dsl.core.keyword_manager import keyword_manager
+
+@keyword_manager.register('HTTP请求', [
+    {'name': '地址', 'mapping': 'url', 'description': '请求地址'},
+    {'name': '方法', 'mapping': 'method', 'description': 'HTTP方法', 'default': 'GET'},
+    {'name': '超时', 'mapping': 'timeout', 'description': '超时时间（秒）', 'default': 30},
+    {'name': '重试次数', 'mapping': 'retries', 'description': '重试次数', 'default': 3},
+    {'name': '验证SSL', 'mapping': 'verify_ssl', 'description': '是否验证SSL证书', 'default': True}
+])
+def http_request(**kwargs):
+    """HTTP请求关键字，支持默认值"""
+    url = kwargs.get('url')
+    method = kwargs.get('method', 'GET')  # 默认值也会自动应用
+    timeout = kwargs.get('timeout', 30)
+    retries = kwargs.get('retries', 3)
+    verify_ssl = kwargs.get('verify_ssl', True)
+    
+    # 执行HTTP请求逻辑
+    return {"status": "success", "method": method, "url": url}
 ```
 
+#### 在DSL中使用默认值
+
+```python
+@name: "默认值功能演示"
+
+# 只传递必需参数，其他使用默认值
+response1 = [HTTP请求], 地址: "https://api.example.com/users"
+# 等价于：方法: "GET", 超时: 30, 重试次数: 3, 验证SSL: True
+
+# 部分覆盖默认值
+response2 = [HTTP请求], 地址: "https://api.example.com/users", 方法: "POST", 超时: 60
+# 只覆盖方法和超时，重试次数和SSL验证仍使用默认值
+
+# 内置关键字也支持默认值
+random_num = [生成随机数]  # 使用默认范围 0-100，整数
+custom_num = [生成随机数], 最大值: 50  # 只修改最大值，其他保持默认
+
+# 生成随机字符串
+default_string = [生成随机字符串]  # 长度8，字母数字混合
+custom_string = [生成随机字符串], 长度: 12, 类型: "letters"  # 自定义长度和类型
+```
+
+#### 默认值的优势
+
+- **🎯 简化调用** - 只需传递关键参数，常用配置自动应用
+- **🔧 灵活覆盖** - 可选择性地覆盖任何默认值
+- **📖 提高可读性** - DSL更加简洁，重点突出
+- **🛡️ 减少错误** - 避免重复配置常用参数
+- **🌐 远程支持** - 远程关键字也完整支持默认值功能
+
 #### 支持远程模式的关键字
 
 ```python
@@ -1037,20 +1101,6 @@ CMD ["pytest-dsl", "tests/", "--yaml-vars", "config/prod.yaml"]
 - **集成测试** - 跨系统测试协调
 - **性能测试** - 结合其他工具进行性能测试
 
-## 🤝 贡献与支持
-
-我们欢迎您的贡献和反馈！
-
-- 🐛 [报告问题](https://github.com/your-repo/pytest-dsl/issues)
-- 💡 [功能建议](https://github.com/your-repo/pytest-dsl/discussions)
-- 🔧 [提交PR](https://github.com/your-repo/pytest-dsl/pulls)
-
-## 📄 许可证
-
-MIT License - 详见 [LICENSE](LICENSE) 文件
-
----
-
 ## 📋 示例验证
 
 本README.md中的大部分示例都已经过验证，确保可以正常运行。验证示例位于 `examples/readme_validation/` 目录中。
@@ -1086,3 +1136,18 @@ pytest-dsl api_basic.dsl
 ---
 
 🚀 **开始使用pytest-dsl，让测试自动化变得简单而强大！**
+
+
+## 🤝 贡献与支持
+
+我们欢迎您的贡献和反馈！
+
+- 🐛 [报告问题](https://github.com/felix-1991/pytest-dsl/issues)
+- 💡 [功能建议](https://github.com/felix-1991/pytest-dsl/discussions)
+- 🔧 [提交PR](https://github.com/felix-1991/pytest-dsl/pulls)
+
+## 📄 许可证
+
+MIT License - 详见 [LICENSE](LICENSE) 文件
+
+---

{pytest_dsl-0.9.0.dist-info → pytest_dsl-0.10.0.dist-info}/RECORD

@@ -1,5 +1,5 @@
 pytest_dsl/__init__.py,sha256=FzwXGvmuvMhRBKxvCdh1h-yJ2wUOnDxcTbU4Nt5fHn8,301
-pytest_dsl/cli.py,sha256=4X-nq7TdBgFGN9oDBhgNHaoLBmTV0WQ_uxNY6cdRS4M,14944
+pytest_dsl/cli.py,sha256=1lsjCkfRk-goGoi4E37FjFTGrg74idyB1ktV2J1F2IM,17763
 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
@@ -14,7 +14,7 @@ pytest_dsl/core/dsl_executor_utils.py,sha256=cFoR2p3qQ2pb-UhkoefleK-zbuFqf0aBLh2
 pytest_dsl/core/global_context.py,sha256=NcEcS2V61MT70tgAsGsFWQq0P3mKjtHQr1rgT3yTcyY,3535
 pytest_dsl/core/http_client.py,sha256=1AHqtM_fkXf8JrM0ljMsJwUkyt-ysjR16NoyCckHfGc,15810
 pytest_dsl/core/http_request.py,sha256=nGMlx0mFc7rDLIdp9GJ3e09OQH3ryUA56yJdRZ99dOQ,57445
-pytest_dsl/core/keyword_manager.py,sha256=FtPsXlI7PxvVQMJfDN_nQYvRhkag5twvaHXjELQsCEo,4068
+pytest_dsl/core/keyword_manager.py,sha256=vm78au2s8waWD7k2sxltkOhJNgEJOGccDBTr8fgN3eU,4773
 pytest_dsl/core/lexer.py,sha256=WaLzt9IhtHiA90Fg2WGgfVztveCUhtgxzANBaEiy-F8,4347
 pytest_dsl/core/parser.py,sha256=xxy6yC6NdwHxln200aIuaWWN3w44uI8kkNlw8PTVpYI,11855
 pytest_dsl/core/parsetab.py,sha256=aN-2RRTr3MSbMyfe-9zOj_t96Xu84avE29GWqH6nqmg,31472
@@ -55,13 +55,18 @@ pytest_dsl/examples/quickstart/api_basics.auto,sha256=SrDRBASqy5ZMXnmfczuKNCXoTi
 pytest_dsl/examples/quickstart/assertions.auto,sha256=FWrwod3L8oxuKCnA-lnVO2fzs5bZsXWaVqd6zehKrzw,859
 pytest_dsl/examples/quickstart/loops.auto,sha256=ZNZ6qP636v8QMY8QRyTUBB43gWCsqHbpPQw2RqamvOk,516
 pytest_dsl/keywords/__init__.py,sha256=5aiyPU_t1UiB2MEZ6M9ffOKnV1mFT_2YHxnZvyWaBNI,372
-pytest_dsl/keywords/assertion_keywords.py,sha256=WOCGP7WX2wZ6mQPDGmi38LWdG2NaThHoNU54xc8VpxI,23027
+pytest_dsl/keywords/assertion_keywords.py,sha256=obW06H_3AizsvEM_9VE2JVuwvgrNVqP1kUTDd3U1SMk,23240
 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.9.0.dist-info/licenses/LICENSE,sha256=Rguy8cb9sYhK6cmrBdXvwh94rKVDh2tVZEWptsHIsVM,1071
-pytest_dsl-0.9.0.dist-info/METADATA,sha256=it5pFZgvhb4OBllvC5vPxn-rezLeMsvGVtjPrtEDw6g,26712
-pytest_dsl-0.9.0.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-pytest_dsl-0.9.0.dist-info/entry_points.txt,sha256=vuYIReCjHhS_cpaPAbQxOnFavQAwW0K66dKxUQSsRvc,190
-pytest_dsl-0.9.0.dist-info/top_level.txt,sha256=4CrSx4uNqxj7NvK6k1y2JZrSrJSzi-UvPZdqpUhumWM,11
-pytest_dsl-0.9.0.dist-info/RECORD,,
+pytest_dsl/keywords/http_keywords.py,sha256=B2IoWZjmAk0bQf1o5hHhHEDHpAl010PrDVA4iJ1mLk0,25605
+pytest_dsl/keywords/system_keywords.py,sha256=e65Mzyt56FYmw0vHegajLUSLeEYVI9Y-WSB1h6SKKLo,12089
+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=doXmg2Aenx9SclKtd5bT3n-DkxGK3MnMRwn4dpdug8s,16848
+pytest_dsl/remote/keyword_server.py,sha256=7eRBHXyTC2AyXBeXMHOYLjgj570ioiAhnq4CuEnkak4,21386
+pytest_dsl/remote/variable_bridge.py,sha256=KG2xTZcUExb8kNL-rR-IPFJmYGfo7ciE4W7xzet59sw,5520
+pytest_dsl-0.10.0.dist-info/licenses/LICENSE,sha256=Rguy8cb9sYhK6cmrBdXvwh94rKVDh2tVZEWptsHIsVM,1071
+pytest_dsl-0.10.0.dist-info/METADATA,sha256=wzdKD6pqnD0Xj4xP2GlWg5R0r5JewGH2hk7-rHTadZs,29613
+pytest_dsl-0.10.0.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+pytest_dsl-0.10.0.dist-info/entry_points.txt,sha256=PLOBbH02OGY1XR1JDKIZB1Em87loUvbgMRWaag-5FhY,204
+pytest_dsl-0.10.0.dist-info/top_level.txt,sha256=4CrSx4uNqxj7NvK6k1y2JZrSrJSzi-UvPZdqpUhumWM,11
+pytest_dsl-0.10.0.dist-info/RECORD,,

{pytest_dsl-0.9.0.dist-info → pytest_dsl-0.10.0.dist-info}/entry_points.txt

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