crawlo 1.1.4__py3-none-any.whl → 1.1.6__py3-none-any.whl

crawlo/project.py

@@ -1,153 +1,188 @@
-#!/usr/bin/python
-# -*- coding: UTF-8 -*-
-"""
-Crawlo 项目初始化模块
-
-负责：
-1. 向上搜索项目根目录（通过 crawlo.cfg 或 settings.py）
-2. 将项目根目录加入 sys.path
-3. 加载 settings 模块
-4. 返回 SettingManager 实例
-"""
-import os
-import sys
-import configparser
-from importlib import import_module
-from inspect import iscoroutinefunction
-from typing import Callable, Optional, Tuple
-
-from crawlo.utils.log import get_logger
-from crawlo.settings.setting_manager import SettingManager
-
-logger = get_logger(__name__)
-
-
-def _find_project_root(start_path: str = ".") -> Optional[str]:
-    """
-    从指定路径向上查找项目根目录。
-    识别依据：
-        1. 存在 'crawlo.cfg'
-        2. 存在 '__init__.py' 和 'settings.py'（即 Python 包）
-    """
-    path = os.path.abspath(start_path)
-    while True:
-        cfg_file = os.path.join(path, "crawlo.cfg")
-        if os.path.isfile(cfg_file):
-            logger.info(f"✅ 找到项目配置文件: {cfg_file}")
-            return path
-
-        settings_file = os.path.join(path, "settings.py")
-        init_file = os.path.join(path, "__init__.py")
-        if os.path.isfile(settings_file) and os.path.isfile(init_file):
-            logger.info(f"✅ 找到项目模块: {path}")
-            return path
-
-        parent = os.path.dirname(path)
-        if parent == path:
-            break
-        path = parent
-
-    logger.warning("❌ 未找到 Crawlo 项目根目录。请确保在包含 'crawlo.cfg' 或 'settings.py' 的目录运行。")
-    return None
-
-
-def _get_settings_module_from_cfg(cfg_path: str) -> str:
-    """从 crawlo.cfg 读取 settings 模块路径"""
-    config = configparser.ConfigParser()
-    try:
-        config.read(cfg_path, encoding="utf-8")
-        if config.has_section("settings") and config.has_option("settings", "default"):
-            module_path = config.get("settings", "default")
-            logger.info(f"📄 从 crawlo.cfg 加载 settings 模块: {module_path}")
-            return module_path
-        else:
-            raise RuntimeError(f"配置文件缺少 [settings] 或 default 选项: {cfg_path}")
-    except Exception as e:
-        raise RuntimeError(f"解析 crawlo.cfg 失败: {e}")
-
-
-def get_settings(custom_settings: Optional[dict] = None) -> SettingManager:
-    """
-    获取配置管理器实例（主入口函数）
-
-    Args:
-        custom_settings: 运行时自定义配置，会覆盖 settings.py
-
-    Returns:
-        SettingManager: 已加载配置的实例
-    """
-    logger.info("🚀 正在初始化 Crawlo 项目配置...")
-
-    # 1. 查找项目根
-    project_root = _find_project_root()
-    if not project_root:
-        raise RuntimeError("未找到 Crawlo 项目，请检查项目结构")
-
-    # 2. 确定 settings 模块
-    settings_module_path = None
-    cfg_file = os.path.join(project_root, "crawlo.cfg")
-
-    if os.path.isfile(cfg_file):
-        settings_module_path = _get_settings_module_from_cfg(cfg_file)
-    else:
-        # 推断：项目目录名.settings
-        project_name = os.path.basename(project_root)
-        settings_module_path = f"{project_name}.settings"
-        logger.warning(f"⚠️ 未找到 crawlo.cfg，推断 settings 模块为: {settings_module_path}")
-
-    # 3. 注入 sys.path
-    project_root_str = os.path.abspath(project_root)
-    if project_root_str not in sys.path:
-        sys.path.insert(0, project_root_str)
-        logger.info(f"📁 项目根目录已加入 sys.path: {project_root_str}")
-
-    # 4. 加载 SettingManager
-    logger.info(f"⚙️ 正在加载配置模块: {settings_module_path}")
-    settings = SettingManager()
-
-    try:
-        settings.set_settings(settings_module_path)
-        logger.info("✅ settings 模块加载成功")
-    except Exception as e:
-        raise ImportError(f"加载 settings 模块失败 '{settings_module_path}': {e}")
-
-    # 5. 合并运行时配置
-    if custom_settings:
-        settings.update_attributes(custom_settings)
-        logger.info(f"🔧 已应用运行时自定义配置: {list(custom_settings.keys())}")
-
-    logger.info("🎉 Crawlo 项目配置初始化完成！")
-    return settings
-
-
-def load_class(_path):
-    if not isinstance(_path, str):
-        if callable(_path):
-            return _path
-        else:
-            raise TypeError(f"args expect str or object, got {_path}")
-
-    module_name, class_name = _path.rsplit('.', 1)
-    module = import_module(module_name)
-
-    try:
-        cls = getattr(module, class_name)
-    except AttributeError:
-        raise NameError(f"Module {module_name!r} has no class named {class_name!r}")
-    return cls
-
-
-def merge_settings(spider, settings):
-    spider_name = getattr(spider, 'name', 'UnknownSpider')
-    if hasattr(spider, 'custom_settings'):
-        custom_settings = getattr(spider, 'custom_settings')
-        settings.update_attributes(custom_settings)
-    else:
-        logger.debug(f"爬虫 '{spider_name}' 无 custom_settings，跳过合并")  # 添加日志
-
-
-async def common_call(func: Callable, *args, **kwargs):
-    if iscoroutinefunction(func):
-        return await func(*args, **kwargs)
-    else:
-        return func(*args, **kwargs)
+#!/usr/bin/python
+# -*- coding: UTF-8 -*-
+"""
+Crawlo 项目初始化模块
+
+负责：
+1. 向上搜索项目根目录（通过 crawlo.cfg 或 settings.py）
+2. 将项目根目录加入 sys.path
+3. 加载 settings 模块
+4. 返回 SettingManager 实例
+"""
+import os
+import sys
+import configparser
+from importlib import import_module
+from inspect import iscoroutinefunction
+from typing import Callable, Optional, Tuple
+
+from crawlo.utils.log import get_logger
+from crawlo.settings.setting_manager import SettingManager
+
+logger = get_logger(__name__)
+
+
+def _find_project_root(start_path: str = ".") -> Optional[str]:
+    """
+    从指定路径向上查找项目根目录。
+    识别依据：
+        1. 存在 'crawlo.cfg'
+        2. 存在 '__init__.py' 和 'settings.py'（即 Python 包）
+    """
+    path = os.path.abspath(start_path)
+    
+    # 首先检查当前目录及其子目录
+    for root, dirs, files in os.walk(path):
+        if "crawlo.cfg" in files:
+            cfg_path = os.path.join(root, "crawlo.cfg")
+            logger.info(f"✅ 找到项目配置文件: {cfg_path}")
+            return root
+    
+    # 如果在子目录中没找到，再向上查找
+    while True:
+        cfg_file = os.path.join(path, "crawlo.cfg")
+        if os.path.isfile(cfg_file):
+            logger.info(f"✅ 找到项目配置文件: {cfg_file}")
+            return path
+
+        settings_file = os.path.join(path, "settings.py")
+        init_file = os.path.join(path, "__init__.py")
+        if os.path.isfile(settings_file) and os.path.isfile(init_file):
+            logger.info(f"✅ 找到项目模块: {path}")
+            return path
+
+        parent = os.path.dirname(path)
+        if parent == path:
+            break
+        path = parent
+
+    logger.warning("❌ 未找到 Crawlo 项目根目录。请确保在包含 'crawlo.cfg' 或 'settings.py' 的目录运行。")
+    return None
+
+
+def _get_settings_module_from_cfg(cfg_path: str) -> str:
+    """从 crawlo.cfg 读取 settings 模块路径"""
+    config = configparser.ConfigParser()
+    try:
+        config.read(cfg_path, encoding="utf-8")
+        if config.has_section("settings") and config.has_option("settings", "default"):
+            module_path = config.get("settings", "default")
+            logger.info(f"📄 从 crawlo.cfg 加载 settings 模块: {module_path}")
+            return module_path
+        else:
+            raise RuntimeError(f"配置文件缺少 [settings] 或 default 选项: {cfg_path}")
+    except Exception as e:
+        raise RuntimeError(f"解析 crawlo.cfg 失败: {e}")
+
+
+def get_settings(custom_settings: Optional[dict] = None) -> SettingManager:
+    """
+    获取配置管理器实例（主入口函数）
+
+    Args:
+        custom_settings: 运行时自定义配置，会覆盖 settings.py
+
+    Returns:
+        SettingManager: 已加载配置的实例
+    """
+    logger.info("🚀 正在初始化 Crawlo 项目配置...")
+
+    # 1. 查找项目根
+    project_root = _find_project_root()
+    if not project_root:
+        raise RuntimeError("未找到 Crawlo 项目，请检查项目结构")
+
+    # 2. 确定 settings 模块
+    settings_module_path = None
+    cfg_file = os.path.join(project_root, "crawlo.cfg")
+
+    if os.path.isfile(cfg_file):
+        settings_module_path = _get_settings_module_from_cfg(cfg_file)
+    else:
+        # 推断：项目目录名.settings
+        project_name = os.path.basename(project_root)
+        settings_module_path = f"{project_name}.settings"
+        logger.warning(f"⚠️ 未找到 crawlo.cfg，推断 settings 模块为: {settings_module_path}")
+
+    # 3. 注入 sys.path
+    project_root_str = os.path.abspath(project_root)
+    if project_root_str not in sys.path:
+        sys.path.insert(0, project_root_str)
+        logger.info(f"📁 项目根目录已加入 sys.path: {project_root_str}")
+
+    # 4. 加载 SettingManager
+    logger.info(f"⚙️ 正在加载配置模块: {settings_module_path}")
+    settings = SettingManager()
+
+    try:
+        settings.set_settings(settings_module_path)
+        logger.info("✅ settings 模块加载成功")
+    except Exception as e:
+        raise ImportError(f"加载 settings 模块失败 '{settings_module_path}': {e}")
+
+    # 5. 合并运行时配置
+    if custom_settings:
+        settings.update_attributes(custom_settings)
+        logger.info(f"🔧 已应用运行时自定义配置: {list(custom_settings.keys())}")
+
+    logger.info("🎉 Crawlo 项目配置初始化完成！")
+    return settings
+
+
+def load_class(_path):
+    if not isinstance(_path, str):
+        if callable(_path):
+            return _path
+        else:
+            raise TypeError(f"args expect str or object, got {_path}")
+
+    module_name, class_name = _path.rsplit('.', 1)
+    
+    try:
+        module = import_module(module_name)
+    except ImportError as e:
+        # 尝试不同的导入方式
+        try:
+            # 尝试直接导入完整路径
+            module = import_module(_path)
+            return module
+        except ImportError:
+            pass
+        raise ImportError(f"Cannot import module {module_name}: {e}")
+
+    try:
+        cls = getattr(module, class_name)
+    except AttributeError:
+        # 提供更详细的错误信息
+        available_attrs = [attr for attr in dir(module) if not attr.startswith('_')]
+        raise NameError(f"Module {module_name!r} has no class named {class_name!r}. Available attributes: {available_attrs}")
+    return cls
+
+
+def merge_settings(spider, settings):
+    spider_name = getattr(spider, 'name', 'UnknownSpider')
+    # 检查 settings 是否为 SettingManager 实例
+    if not hasattr(settings, 'update_attributes'):
+        logger.error(f"merge_settings 接收到的 settings 不是 SettingManager 实例: {type(settings)}")
+        # 如果是字典，创建一个新的 SettingManager 实例
+        if isinstance(settings, dict):
+            from crawlo.settings.setting_manager import SettingManager
+            new_settings = SettingManager()
+            new_settings.update_attributes(settings)
+            settings = new_settings
+        else:
+            logger.error("无法处理的 settings 类型")
+            return
+            
+    if hasattr(spider, 'custom_settings'):
+        custom_settings = getattr(spider, 'custom_settings')
+        settings.update_attributes(custom_settings)
+    else:
+        logger.debug(f"爬虫 '{spider_name}' 无 custom_settings，跳过合并")  # 添加日志
+
+
+async def common_call(func: Callable, *args, **kwargs):
+    if iscoroutinefunction(func):
+        return await func(*args, **kwargs)
+    else:
+        return func(*args, **kwargs)

crawlo/queue/pqueue.py

@@ -1,37 +1,37 @@
-# -*- coding:UTF-8 -*-
-import json
-import sys
-import asyncio
-from asyncio import PriorityQueue
-from typing import Optional
-
-
-from crawlo import Request
-
-
-class SpiderPriorityQueue(PriorityQueue):
-    """带超时功能的异步优先级队列"""
-
-    def __init__(self, maxsize: int = 0) -> None:
-        """初始化队列，maxsize为0表示无大小限制"""
-        super().__init__(maxsize)
-
-    async def get(self, timeout: float = 0.1) -> Optional[Request]:
-        """
-        异步获取队列元素，带超时功能
-
-        Args:
-            timeout: 超时时间（秒），默认0.1秒
-
-        Returns:
-            队列元素(优先级, 值)或None(超时)
-        """
-        try:
-            # 根据Python版本选择超时实现方式
-            if sys.version_info >= (3, 11):
-                async with asyncio.timeout(timeout):
-                    return await super().get()
-            else:
-                return await asyncio.wait_for(super().get(), timeout=timeout)
-        except asyncio.TimeoutError:
-            return None
+# -*- coding:UTF-8 -*-
+import json
+import sys
+import asyncio
+from asyncio import PriorityQueue
+from typing import Optional
+
+
+from crawlo import Request
+
+
+class SpiderPriorityQueue(PriorityQueue):
+    """带超时功能的异步优先级队列"""
+
+    def __init__(self, maxsize: int = 0) -> None:
+        """初始化队列，maxsize为0表示无大小限制"""
+        super().__init__(maxsize)
+
+    async def get(self, timeout: float = 0.1) -> Optional[Request]:
+        """
+        异步获取队列元素，带超时功能
+
+        Args:
+            timeout: 超时时间（秒），默认0.1秒
+
+        Returns:
+            队列元素(优先级, 值)或None(超时)
+        """
+        try:
+            # 根据Python版本选择超时实现方式
+            if sys.version_info >= (3, 11):
+                async with asyncio.timeout(timeout):
+                    return await super().get()
+            else:
+                return await asyncio.wait_for(super().get(), timeout=timeout)
+        except asyncio.TimeoutError:
+            return None