pytest-dsl 0.13.0__py3-none-any.whl → 0.14.0__py3-none-any.whl

pytest_dsl/core/yaml_loader.py

@@ -1,6 +1,7 @@
 """YAML变量加载器模块
 
 该模块负责处理YAML变量文件的加载和管理，支持从命令行参数加载单个文件或目录。
+同时支持通过hook机制从外部系统动态加载变量。
 """
 
 import os
@@ -29,14 +30,25 @@ def add_yaml_options(parser):
     )
 
 
-def load_yaml_variables_from_args(yaml_files=None, yaml_vars_dir=None, project_root=None):
+def load_yaml_variables_from_args(yaml_files=None, yaml_vars_dir=None,
+                                  project_root=None, environment=None):
     """从参数加载YAML变量文件（通用函数）
 
     Args:
         yaml_files: YAML文件列表
         yaml_vars_dir: YAML变量目录路径
         project_root: 项目根目录（用于默认config目录）
+        environment: 环境名称（用于hook加载）
     """
+    # 首先尝试通过hook加载变量
+    hook_variables = _load_variables_through_hooks(
+        project_root=project_root, environment=environment)
+
+    if hook_variables:
+        print(f"通过Hook加载了 {len(hook_variables)} 个变量")
+        # 将hook变量加载到yaml_vars中
+        yaml_vars._variables.update(hook_variables)
+
     # 加载单个YAML文件
     if yaml_files:
         yaml_vars.load_yaml_files(yaml_files)
@@ -55,7 +67,8 @@ def load_yaml_variables_from_args(yaml_files=None, yaml_vars_dir=None, project_r
         if loaded_files:
             # 过滤出当前目录的文件
             if yaml_vars_dir:
-                dir_files = [f for f in loaded_files if Path(f).parent == Path(yaml_vars_dir)]
+                dir_files = [f for f in loaded_files if Path(
+                    f).parent == Path(yaml_vars_dir)]
                 if dir_files:
                     print(f"目录中加载的文件: {', '.join(dir_files)}")
             else:
@@ -67,6 +80,103 @@ def load_yaml_variables_from_args(yaml_files=None, yaml_vars_dir=None, project_r
     load_remote_servers_from_yaml()
 
 
+def _load_variables_through_hooks(project_root=None, environment=None):
+    """通过hook机制加载变量
+
+    Args:
+        project_root: 项目根目录
+        environment: 环境名称
+
+    Returns:
+        dict: 通过hook加载的变量字典
+    """
+    try:
+        from .hook_manager import hook_manager
+
+        # 确保hook管理器已初始化
+        hook_manager.initialize()
+
+        # 如果没有已注册的插件，直接返回
+        if not hook_manager.get_plugins():
+            return {}
+
+        # 提取project_id（如果可以从项目根目录推断）
+        project_id = None
+        if project_root:
+            # 可以根据项目结构推断project_id，这里暂时不实现
+            pass
+
+        # 通过hook加载变量
+        hook_variables = {}
+
+        # 调用dsl_load_variables hook
+        try:
+            variable_results = hook_manager.pm.hook.dsl_load_variables(
+                project_id=project_id,
+                environment=environment,
+                filters={}
+            )
+
+            # 合并所有hook返回的变量
+            for result in variable_results:
+                if result and isinstance(result, dict):
+                    hook_variables.update(result)
+
+        except Exception as e:
+            print(f"通过Hook加载变量时出现警告: {e}")
+
+        # 列出变量源（用于调试）
+        try:
+            source_results = hook_manager.pm.hook.dsl_list_variable_sources(
+                project_id=project_id
+            )
+
+            sources = []
+            for result in source_results:
+                if result and isinstance(result, list):
+                    sources.extend(result)
+
+            if sources:
+                print(f"发现 {len(sources)} 个变量源")
+                for source in sources:
+                    source_name = source.get('name', '未知')
+                    source_type = source.get('type', '未知')
+                    print(f"  - {source_name} ({source_type})")
+
+        except Exception as e:
+            print(f"列出变量源时出现警告: {e}")
+
+        # 验证变量（如果有变量的话）
+        if hook_variables:
+            try:
+                validation_results = hook_manager.pm.hook.dsl_validate_variables(
+                    variables=hook_variables,
+                    project_id=project_id
+                )
+
+                validation_errors = []
+                for result in validation_results:
+                    if result and isinstance(result, list):
+                        validation_errors.extend(result)
+
+                if validation_errors:
+                    print(f"变量验证发现 {len(validation_errors)} 个问题:")
+                    for error in validation_errors:
+                        print(f"  - {error}")
+
+            except Exception as e:
+                print(f"验证变量时出现警告: {e}")
+
+        return hook_variables
+
+    except ImportError:
+        # 如果没有安装pluggy或hook_manager不可用，跳过hook加载
+        return {}
+    except Exception as e:
+        print(f"Hook变量加载失败: {e}")
+        return {}
+
+
 def load_yaml_variables(config):
     """加载YAML变量文件（pytest插件接口）
 
@@ -80,60 +190,50 @@ def load_yaml_variables(config):
     yaml_vars_dir = config.getoption('--yaml-vars-dir')
     project_root = config.rootdir
 
+    # 尝试从环境变量获取环境名称
+    environment = os.environ.get(
+        'PYTEST_DSL_ENVIRONMENT') or os.environ.get('ENVIRONMENT')
+
     # 调用通用加载函数
     load_yaml_variables_from_args(
         yaml_files=yaml_files,
         yaml_vars_dir=yaml_vars_dir,
-        project_root=project_root
+        project_root=project_root,
+        environment=environment
     )
 
 
 def load_remote_servers_from_yaml():
-    """从YAML配置中自动加载远程服务器
-
-    检查YAML变量中是否包含remote_servers配置，如果有则自动连接这些服务器。
-    """
+    """从YAML变量中加载远程服务器配置"""
     try:
+        from pytest_dsl.remote.keyword_client import remote_keyword_manager
+
         # 获取远程服务器配置
-        remote_servers_config = yaml_vars.get_variable('remote_servers')
-        if not remote_servers_config:
-            
+        remote_servers = yaml_vars.get_variable('remote_servers')
+        if not remote_servers:
             return
 
-        print(f"发现 {len(remote_servers_config)} 个远程服务器配置")
-
-        # 导入远程关键字管理器
-        from pytest_dsl.remote.keyword_client import remote_keyword_manager
+        print(f"发现 {len(remote_servers)} 个远程服务器配置")
 
-        # 遍历配置并连接服务器
-        for server_name, server_config in remote_servers_config.items():
-            try:
+        # 注册远程服务器
+        for server_config in remote_servers:
+            if isinstance(server_config, dict):
                 url = server_config.get('url')
-                alias = server_config.get('alias', server_name)
+                alias = server_config.get('alias')
                 api_key = server_config.get('api_key')
-                sync_config = server_config.get('sync_config')
-
-                if not url:
-                    print(f"跳过服务器 {server_name}: 缺少URL配置")
-                    continue
-
-                print(f"正在连接远程服务器: {server_name} ({url}) 别名: {alias}")
-
-                # 注册远程服务器
-                success = remote_keyword_manager.register_remote_server(
-                    url=url,
-                    alias=alias,
-                    api_key=api_key,
-                    sync_config=sync_config
-                )
-
-                if success:
-                    print(f"成功连接到远程服务器: {server_name} ({url})")
-                else:
-                    print(f"连接远程服务器失败: {server_name} ({url})")
-
-            except Exception as e:
-                print(f"连接远程服务器 {server_name} 时发生错误: {str(e)}")
 
+                if url and alias:
+                    print(f"自动连接远程服务器: {alias} -> {url}")
+                    success = remote_keyword_manager.register_remote_server(
+                        url, alias, api_key=api_key
+                    )
+                    if success:
+                        print(f"✓ 远程服务器 {alias} 连接成功")
+                    else:
+                        print(f"✗ 远程服务器 {alias} 连接失败")
+
+    except ImportError:
+        # 如果远程功能不可用，跳过
+        pass
     except Exception as e:
-        print(f"加载远程服务器配置时发生错误: {str(e)}")
+        print(f"自动连接远程服务器时出现警告: {e}")

pytest_dsl/core/yaml_vars.py

@@ -5,22 +5,32 @@ from pathlib import Path
 
 
 class YAMLVariableManager:
-    """管理YAML格式的变量文件"""
+    """管理YAML格式的变量文件，支持hook扩展"""
 
     def __init__(self):
         self._loaded_files: List[str] = []
         self._variables: Dict[str, Any] = {}
+        self._enable_hooks = True  # 是否启用hook
 
     def has_variable(self, name: str) -> bool:
         """检查变量是否存在
-        
+
         Args:
             name: 变量名
-            
+
         Returns:
             bool: 变量是否存在
         """
-        return name in self._variables
+        # 首先检查本地变量
+        if name in self._variables:
+            return True
+
+        # 如果启用了hook，尝试通过hook查找
+        if self._enable_hooks:
+            hook_value = self._get_variable_through_hook(name)
+            return hook_value is not None
+
+        return False
 
     def load_yaml_file(self, file_path: str) -> None:
         """加载单个YAML文件中的变量"""
@@ -54,8 +64,73 @@ class YAMLVariableManager:
             self.load_yaml_file(str(yaml_file))
 
     def get_variable(self, name: str) -> Optional[Any]:
-        """获取变量值"""
-        return self._variables.get(name)
+        """获取变量值，支持hook扩展
+
+        优先级：
+        1. 本地YAML变量
+        2. Hook提供的变量
+
+        Args:
+            name: 变量名
+
+        Returns:
+            变量值，如果不存在返回None
+        """
+        # 首先从本地变量获取
+        if name in self._variables:
+            return self._variables[name]
+
+        # 如果启用了hook，尝试通过hook获取
+        if self._enable_hooks:
+            hook_value = self._get_variable_through_hook(name)
+            if hook_value is not None:
+                # 可选：将hook获取的变量缓存到本地
+                # self._variables[name] = hook_value
+                return hook_value
+
+        return None
+
+    def _get_variable_through_hook(self, name: str) -> Optional[Any]:
+        """通过hook获取变量值
+
+        Args:
+            name: 变量名
+
+        Returns:
+            变量值，如果不存在返回None
+        """
+        try:
+            from .hook_manager import hook_manager
+
+            # 确保hook管理器已初始化
+            hook_manager.initialize()
+
+            # 如果没有已注册的插件，直接返回
+            if not hook_manager.get_plugins():
+                return None
+
+            # 尝试从环境变量获取当前环境
+            environment = os.environ.get(
+                'PYTEST_DSL_ENVIRONMENT') or os.environ.get('ENVIRONMENT')
+
+            # 调用dsl_get_variable hook
+            variable_results = hook_manager.pm.hook.dsl_get_variable(
+                var_name=name,
+                project_id=None,  # 可以根据需要传递project_id
+                environment=environment
+            )
+
+            # 返回第一个非None的结果
+            for result in variable_results:
+                if result is not None:
+                    return result
+
+            return None
+
+        except Exception as e:
+            # Hook调用失败时记录警告但不影响正常流程
+            print(f"通过hook获取变量失败: {e}")
+            return None
 
     def get_all_variables(self) -> Dict[str, Any]:
         """获取所有已加载的变量"""
@@ -65,6 +140,14 @@ class YAMLVariableManager:
         """获取已加载的文件列表"""
         return self._loaded_files.copy()
 
+    def set_enable_hooks(self, enable: bool) -> None:
+        """设置是否启用hook
+
+        Args:
+            enable: 是否启用hook
+        """
+        self._enable_hooks = enable
+
     def clear(self) -> None:
         """清除所有已加载的变量"""
         self._variables.clear()
@@ -72,4 +155,4 @@ class YAMLVariableManager:
 
 
 # 创建全局YAML变量管理器实例
-yaml_vars = YAMLVariableManager() 
+yaml_vars = YAMLVariableManager()

{pytest_dsl-0.13.0.dist-info → pytest_dsl-0.14.0.dist-info}/METADATA

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

{pytest_dsl-0.13.0.dist-info → pytest_dsl-0.14.0.dist-info}/RECORD

@@ -1,5 +1,5 @@
 pytest_dsl/__init__.py,sha256=FzwXGvmuvMhRBKxvCdh1h-yJ2wUOnDxcTbU4Nt5fHn8,301
-pytest_dsl/cli.py,sha256=kFGOoGQ3dzi5C895QPawnAkif6UmQ4f9zFZmmag0Zgo,34336
+pytest_dsl/cli.py,sha256=Pt1cyaQ9rd31LWC1e-8IqS-xqvPzBmFXjdw2QAruyvU,35689
 pytest_dsl/conftest_adapter.py,sha256=cevEb0oEZKTZfUrGe1-CmkFByxKhUtjuurBJP7kpLc0,149
 pytest_dsl/main_adapter.py,sha256=pUIPN_EzY3JCDlYK7yF_OeLDVqni8vtG15G7gVzPJXg,181
 pytest_dsl/plugin.py,sha256=Ymepaknms6N5mMoFgtiVi4YYiycE8a_6BPCBONmN-W8,1901
@@ -8,10 +8,14 @@ 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=vFXRfKXOu7CxoLsLCd6B2TI_JgOrfnE8JN9iShdv_hw,12308
-pytest_dsl/core/dsl_executor.py,sha256=T-8_U3s3KD3HIZ0fWcydftOh9qAwWZDbSNxiT2SBDeA,32039
+pytest_dsl/core/custom_keyword_manager.py,sha256=F9aSbth4x4-5nHb0N5uG04CpgwGnQv4RDGeRKR2WuIk,16001
+pytest_dsl/core/dsl_executor.py,sha256=PQvr7tbCM-ULPa6-2sBzaNFL7Q20xRSXZV-iNxFG9C0,38914
 pytest_dsl/core/dsl_executor_utils.py,sha256=cFoR2p3qQ2pb-UhkoefleK-zbuFqf0aBLh2Rlp8Ebs4,2180
 pytest_dsl/core/global_context.py,sha256=NcEcS2V61MT70tgAsGsFWQq0P3mKjtHQr1rgT3yTcyY,3535
+pytest_dsl/core/hook_manager.py,sha256=rqpcj9tBcxwFpoU2ZAfOWO8P0oyq02Ie_XUjq-9vFc0,2445
+pytest_dsl/core/hookable_executor.py,sha256=sxkyWF7bSkKzgVoNwUTvtDGOSgFKXXQHR5uYIf-9MaM,3969
+pytest_dsl/core/hookable_keyword_manager.py,sha256=e_guTVF1tU3pu_uzAUd4xNudFlYth42Ll2ESeRLlpjE,3833
+pytest_dsl/core/hookspecs.py,sha256=fBmvs8uIV9_M_FUQBgvHSDn51Z6ABXo9k0okf80wzeo,5071
 pytest_dsl/core/http_client.py,sha256=hdx8gI4JCmq1-96pbiKeyKzSQUzPAi08cRNmljiPQmY,15536
 pytest_dsl/core/http_request.py,sha256=6e-gTztH3wu2eSW27Nc0uPmyWjB6oBwndx8Vqnu5uyg,60030
 pytest_dsl/core/keyword_manager.py,sha256=hoNXHQcumnufPRUobnY0mnku4CHxSg2amwPFby4gQEs,7643
@@ -21,8 +25,8 @@ pytest_dsl/core/parsetab.py,sha256=o4XbFKwpsi3fYmfI_F6u5NSM61Qp6gTx-Sfh1jDINxI,3
 pytest_dsl/core/plugin_discovery.py,sha256=3pt3EXJ7EPF0rkUlyDZMVHkIiTy2vicdIIQJkrHXZjY,8305
 pytest_dsl/core/utils.py,sha256=q0AMdw5HO33JvlA3UJeQ7IXh1Z_8K1QlwiM1_yiITrU,5350
 pytest_dsl/core/variable_utils.py,sha256=sx5DFZAO_syi0E_0ACisiZUQL9yxGeOfNmMtV6w9V3E,13947
-pytest_dsl/core/yaml_loader.py,sha256=IOzRP3iEaVJ-4UiZGkuwy5VAD8_pWQjKHD0tZhwIGb8,4858
-pytest_dsl/core/yaml_vars.py,sha256=4Z0q9_ergpDjMrNUS0qU5oHrPPLYOL91bWoNxCioSLw,2551
+pytest_dsl/core/yaml_loader.py,sha256=PC-R05bmHDI1QyBhhnt2jEK2c50Sg2xKsMDDY7p5rRg,8165
+pytest_dsl/core/yaml_vars.py,sha256=PqbCGT_TmOXH09Pmm72sYtMEvV-sp9ocLqkuAUQYhhc,5047
 pytest_dsl/docs/custom_keywords.md,sha256=03dA_GeHxoLixA8Sqch14bhTbxXQCSfz9Kvged2fMCo,4381
 pytest_dsl/examples/__init__.py,sha256=FKkyLFOjxfC6XnJlW7iK_BUIX9dTIpXgoYN1pfs91ss,84
 pytest_dsl/examples/test_assert.py,sha256=zJ9bflsbyyl7v5AKdLHYTVPI4pe8QiQoeym-ULAs0tk,343
@@ -65,9 +69,9 @@ pytest_dsl/remote/keyword_client.py,sha256=BL80MOaLroUi0v-9sLtkJ55g1R0Iw9SE1k11I
 pytest_dsl/remote/keyword_server.py,sha256=vGIE3Bhh461xX_u1U-Cf5nrWL2GQFYdtQdcMWfFIYgE,22320
 pytest_dsl/remote/variable_bridge.py,sha256=dv-d3Gq9ttvvrXM1fdlLtoSOPB6vRp0_GBOwX4wvcy8,7121
 pytest_dsl/templates/keywords_report.html,sha256=7x84iq6hi08nf1iQ95jZ3izcAUPx6JFm0_8xS85CYws,31241
-pytest_dsl-0.13.0.dist-info/licenses/LICENSE,sha256=Rguy8cb9sYhK6cmrBdXvwh94rKVDh2tVZEWptsHIsVM,1071
-pytest_dsl-0.13.0.dist-info/METADATA,sha256=Z3ywUBY2yKn3V6BouBNFEcZ1l1D6I-_S2-NLCGBcGeE,29655
-pytest_dsl-0.13.0.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-pytest_dsl-0.13.0.dist-info/entry_points.txt,sha256=PLOBbH02OGY1XR1JDKIZB1Em87loUvbgMRWaag-5FhY,204
-pytest_dsl-0.13.0.dist-info/top_level.txt,sha256=4CrSx4uNqxj7NvK6k1y2JZrSrJSzi-UvPZdqpUhumWM,11
-pytest_dsl-0.13.0.dist-info/RECORD,,
+pytest_dsl-0.14.0.dist-info/licenses/LICENSE,sha256=Rguy8cb9sYhK6cmrBdXvwh94rKVDh2tVZEWptsHIsVM,1071
+pytest_dsl-0.14.0.dist-info/METADATA,sha256=Qryl8-XUSV2y1G1BEXS6RSnmjqKfTRdlTtfPPhi5kEU,29655
+pytest_dsl-0.14.0.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+pytest_dsl-0.14.0.dist-info/entry_points.txt,sha256=PLOBbH02OGY1XR1JDKIZB1Em87loUvbgMRWaag-5FhY,204
+pytest_dsl-0.14.0.dist-info/top_level.txt,sha256=4CrSx4uNqxj7NvK6k1y2JZrSrJSzi-UvPZdqpUhumWM,11
+pytest_dsl-0.14.0.dist-info/RECORD,,