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

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/plugin.py

@@ -38,6 +38,13 @@ def pytest_configure(config):
     # 确保全局变量存储目录存在
     os.makedirs(global_context._storage_dir, exist_ok=True)
 
+    # 首先导入内置关键字模块，确保内置关键字被注册
+    try:
+        import pytest_dsl.keywords  # noqa: F401
+        print("pytest环境：内置关键字模块加载完成")
+    except ImportError as e:
+        print(f"pytest环境：加载内置关键字模块失败: {e}")
+
     # 加载所有已安装的关键字插件
     load_all_plugins()
 
@@ -46,7 +53,9 @@ def pytest_configure(config):
 
     # 自动导入项目中的resources目录
     try:
-        from pytest_dsl.core.custom_keyword_manager import custom_keyword_manager
+        from pytest_dsl.core.custom_keyword_manager import (
+            custom_keyword_manager
+        )
 
         # 获取pytest的根目录
         project_root = str(config.rootdir) if config.rootdir else os.getcwd()

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

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

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

@@ -1,28 +1,35 @@
-pytest_dsl/__init__.py,sha256=FzwXGvmuvMhRBKxvCdh1h-yJ2wUOnDxcTbU4Nt5fHn8,301
-pytest_dsl/cli.py,sha256=kFGOoGQ3dzi5C895QPawnAkif6UmQ4f9zFZmmag0Zgo,34336
+pytest_dsl/__init__.py,sha256=VZz4wtSOB6NkY8jkO69YM8xVfD0y0v6xwob-ljkATnE,4817
+pytest_dsl/cli.py,sha256=pkom2w-7AWEDVH-khQGfUDs3NTeiG9pmWLk04gKD-gM,27289
 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
+pytest_dsl/plugin.py,sha256=CEwi-ci2rMevaAl9PwBw2WKXWRbXuHI1IkkDV0I0VIo,2224
 pytest_dsl/core/__init__.py,sha256=ersUoxIWSrisxs9GX_STlH4XAbjNxAWUQB0NboaC5zI,322
 pytest_dsl/core/auth_provider.py,sha256=IZfXXrr4Uuc8QHwRPvhHSzNa2fwrqhjYts1xh78D39Q,14861
 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/dsl_executor_utils.py,sha256=cFoR2p3qQ2pb-UhkoefleK-zbuFqf0aBLh2Rlp8Ebs4,2180
+pytest_dsl/core/custom_keyword_manager.py,sha256=F9aSbth4x4-5nHb0N5uG04CpgwGnQv4RDGeRKR2WuIk,16001
+pytest_dsl/core/dsl_executor.py,sha256=DQVPLCh0_Z1PQtMdU_We5Pv1im_CDEwLI0q-9DkzmIQ,47992
+pytest_dsl/core/dsl_executor_utils.py,sha256=ZJLSYSsiKHqg53d3Bl--ZF8m9abd5kpqdevWl31KEZg,2276
+pytest_dsl/core/execution_tracker.py,sha256=Pwcxraxt_xkOouq32KBqola-OVfnbaomCoMTyUIqoN4,9476
 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
+pytest_dsl/core/keyword_loader.py,sha256=3GQ4w5Zf2XdkoJ85uYXh9YB93_8L8OAb7vvuKE3-gVA,13864
+pytest_dsl/core/keyword_manager.py,sha256=5WZWwlYk74kGHh1T6WjCuVd8eelq2-UEXvDIe4U7rEI,7730
 pytest_dsl/core/lexer.py,sha256=WaLzt9IhtHiA90Fg2WGgfVztveCUhtgxzANBaEiy-F8,4347
-pytest_dsl/core/parser.py,sha256=pZjbfvab-VLjGJ28AV-69Nrdom_F1L0hwO76TyTyC2s,11947
+pytest_dsl/core/parser.py,sha256=iDxZ6MHa6EtDUieWDBYP36f2QYPBxKnIdoWgTrpulkI,14471
 pytest_dsl/core/parsetab.py,sha256=o4XbFKwpsi3fYmfI_F6u5NSM61Qp6gTx-Sfh1jDINxI,31767
 pytest_dsl/core/plugin_discovery.py,sha256=3pt3EXJ7EPF0rkUlyDZMVHkIiTy2vicdIIQJkrHXZjY,8305
 pytest_dsl/core/utils.py,sha256=q0AMdw5HO33JvlA3UJeQ7IXh1Z_8K1QlwiM1_yiITrU,5350
+pytest_dsl/core/validator.py,sha256=Zl7aSRF52HifE0vsRj5cXsLInLiyfcuWPuIlgxYY_dY,14686
 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 +72,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.15.0.dist-info/licenses/LICENSE,sha256=Rguy8cb9sYhK6cmrBdXvwh94rKVDh2tVZEWptsHIsVM,1071
+pytest_dsl-0.15.0.dist-info/METADATA,sha256=C0m-LwNfCj8xXE_CzU1rIUVCuUsxQkeodkC7IQxxDSk,29655
+pytest_dsl-0.15.0.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+pytest_dsl-0.15.0.dist-info/entry_points.txt,sha256=PLOBbH02OGY1XR1JDKIZB1Em87loUvbgMRWaag-5FhY,204
+pytest_dsl-0.15.0.dist-info/top_level.txt,sha256=4CrSx4uNqxj7NvK6k1y2JZrSrJSzi-UvPZdqpUhumWM,11
+pytest_dsl-0.15.0.dist-info/RECORD,,