pytest-dsl 0.10.0__py3-none-any.whl → 0.11.0__py3-none-any.whl

pytest_dsl/core/custom_keyword_manager.py

@@ -1,11 +1,8 @@
-from typing import Dict, Any, List, Optional
 import os
-import pathlib
 from pytest_dsl.core.lexer import get_lexer
 from pytest_dsl.core.parser import get_parser, Node
 from pytest_dsl.core.dsl_executor import DSLExecutor
 from pytest_dsl.core.keyword_manager import keyword_manager
-from pytest_dsl.core.context import TestContext
 
 
 class CustomKeywordManager:
@@ -127,7 +124,7 @@ class CustomKeywordManager:
             return
 
         for node in statements_node.children:
-            if node.type == 'CustomKeyword':
+            if node.type in ['CustomKeyword', 'Function']:
                 self._register_custom_keyword(node, file_path)
 
     def _register_custom_keyword(self, node: Node, file_path: str) -> None:

pytest_dsl/core/keyword_manager.py

@@ -16,8 +16,14 @@ class KeywordManager:
         self._keywords: Dict[str, Dict] = {}
         self.current_context = None
 
-    def register(self, name: str, parameters: List[Dict]):
-        """关键字注册装饰器"""
+    def register(self, name: str, parameters: List[Dict], source_info: Optional[Dict] = None):
+        """关键字注册装饰器
+        
+        Args:
+            name: 关键字名称
+            parameters: 参数列表
+            source_info: 来源信息，包含 source_type, source_name, module_name 等
+        """
         def decorator(func: Callable) -> Callable:
             @functools.wraps(func)
             def wrapper(**kwargs):
@@ -40,15 +46,71 @@ class KeywordManager:
             # 自动添加 step_name 到 mapping 中
             mapping["步骤名称"] = "step_name"
             
-            self._keywords[name] = {
+            # 构建关键字信息，包含来源信息
+            keyword_info = {
                 'func': wrapper,
                 'mapping': mapping,
                 'parameters': param_list,
                 'defaults': defaults  # 存储默认值
             }
+            
+            # 添加来源信息
+            if source_info:
+                keyword_info.update(source_info)
+            else:
+                # 尝试从函数模块推断来源信息
+                keyword_info.update(self._infer_source_info(func))
+            
+            self._keywords[name] = keyword_info
             return wrapper
         return decorator
 
+    def _infer_source_info(self, func: Callable) -> Dict:
+        """从函数推断来源信息"""
+        source_info = {}
+        
+        if hasattr(func, '__module__'):
+            module_name = func.__module__
+            source_info['module_name'] = module_name
+            
+            if module_name.startswith('pytest_dsl.keywords'):
+                # 内置关键字
+                source_info['source_type'] = 'builtin'
+                source_info['source_name'] = 'pytest-dsl内置'
+            elif 'pytest_dsl' in module_name:
+                # pytest-dsl相关但不是内置的
+                source_info['source_type'] = 'internal'
+                source_info['source_name'] = 'pytest-dsl'
+            else:
+                # 第三方插件或用户自定义
+                source_info['source_type'] = 'external'
+                # 提取可能的包名
+                parts = module_name.split('.')
+                if len(parts) > 1:
+                    source_info['source_name'] = parts[0]
+                else:
+                    source_info['source_name'] = module_name
+        
+        return source_info
+
+    def register_with_source(self, name: str, parameters: List[Dict], 
+                           source_type: str, source_name: str, **kwargs):
+        """带来源信息的关键字注册装饰器
+        
+        Args:
+            name: 关键字名称
+            parameters: 参数列表
+            source_type: 来源类型 (builtin, plugin, local, remote, project_custom)
+            source_name: 来源名称 (插件名、文件路径等)
+            **kwargs: 其他来源相关信息
+        """
+        source_info = {
+            'source_type': source_type,
+            'source_name': source_name,
+            **kwargs
+        }
+        return self.register(name, parameters, source_info)
+
     def execute(self, keyword_name: str, **params: Any) -> Any:
         """执行关键字"""
         keyword_info = self._keywords.get(keyword_name)
@@ -84,6 +146,18 @@ class KeywordManager:
             
         return keyword_info
 
+    def get_keywords_by_source(self) -> Dict[str, List[str]]:
+        """按来源分组获取关键字"""
+        by_source = {}
+        
+        for name, info in self._keywords.items():
+            source_name = info.get('source_name', '未知来源')
+            if source_name not in by_source:
+                by_source[source_name] = []
+            by_source[source_name].append(name)
+        
+        return by_source
+
     def _log_execution(self, keyword_name: str, params: Dict, result: Any) -> None:
         """记录关键字执行结果"""
         allure.attach(

pytest_dsl/core/plugin_discovery.py

@@ -62,7 +62,28 @@ def load_plugin_keywords(plugin_name: str) -> None:
         
         # 如果插件有register_keywords函数，调用它
         if hasattr(plugin, 'register_keywords') and callable(plugin.register_keywords):
-            plugin.register_keywords(keyword_manager)
+            # 创建一个包装的关键字管理器，自动添加来源信息
+            class PluginKeywordManager:
+                def __init__(self, original_manager, plugin_name):
+                    self.original_manager = original_manager
+                    self.plugin_name = plugin_name
+                
+                def register(self, name: str, parameters):
+                    """带插件来源信息的注册方法"""
+                    return self.original_manager.register_with_source(
+                        name, parameters, 
+                        source_type='plugin',
+                        source_name=plugin_name,
+                        module_name=plugin_name
+                    )
+                
+                def __getattr__(self, name):
+                    # 代理其他方法到原始管理器
+                    return getattr(self.original_manager, name)
+            
+            plugin_manager = PluginKeywordManager(keyword_manager, plugin_name)
+            plugin.register_keywords(plugin_manager)
+            print(f"通过register_keywords加载插件: {plugin_name}")
             return
         
         # 否则，遍历包中的所有模块
@@ -71,13 +92,29 @@ def load_plugin_keywords(plugin_name: str) -> None:
                 if not is_pkg:
                     try:
                         module = importlib.import_module(name)
+                        print(f"加载插件模块: {name}")
                         # 模块已导入，关键字装饰器会自动注册
+                        # 但我们需要在导入后更新来源信息
+                        _update_keywords_source_info(plugin_name, name)
                     except ImportError as e:
                         print(f"无法导入模块 {name}: {e}")
     except ImportError as e:
         print(f"无法导入插件 {plugin_name}: {e}")
 
 
+def _update_keywords_source_info(plugin_name: str, module_name: str):
+    """更新模块中关键字的来源信息"""
+    # 找到可能是新注册的关键字
+    for keyword_name, keyword_info in keyword_manager._keywords.items():
+        if keyword_info.get('module_name') == module_name:
+            # 更新来源信息
+            keyword_info.update({
+                'source_type': 'plugin',
+                'source_name': plugin_name,
+                'plugin_module': module_name
+            })
+
+
 def load_all_plugins() -> None:
     """
     发现并加载所有已安装的关键字插件