crawlo 1.3.3__py3-none-any.whl → 1.3.4__py3-none-any.whl

crawlo/commands/run.py

@@ -1,323 +1,341 @@
-#!/usr/bin/python
-# -*- coding: UTF-8 -*-
-"""
-# @Time    : 2025-08-31 22:36
-# @Author  : crawl-coder
-# @Desc    : 命令行入口：crawlo run <spider_name>|all，用于运行指定爬虫。
-"""
-import os
-import sys
-import asyncio
-import configparser
-from importlib import import_module
-
-from rich import box
-from rich.console import Console
-from rich.panel import Panel
-from rich.progress import Progress, SpinnerColumn, TextColumn
-from rich.table import Table
-from rich.text import Text
-
-from crawlo.commands.stats import record_stats
-from crawlo.crawler import CrawlerProcess
-from crawlo.project import get_settings, _find_project_root
-# 使用自定义日志系统
-from crawlo.utils.log import get_logger
-
-# 延迟获取logger，确保在日志系统配置之后获取
-_logger = None
-
-def logger():
-    """延迟获取logger实例，确保在日志系统配置之后获取"""
-    global _logger
-    if _logger is None:
-        _logger = get_logger(__name__)
-    return _logger
-
-console = Console()
-
-
-def check_redis_connection(settings):
-    """检查Redis连接（分布式模式下）"""
-    try:
-        # 检查是否为分布式模式
-        run_mode = settings.get('RUN_MODE', 'standalone')
-        queue_type = settings.get('QUEUE_TYPE', 'memory')
-        
-        if run_mode == 'distributed' or queue_type == 'redis':
-            import redis.asyncio as redis
-            redis_url = settings.get('REDIS_URL', 'redis://127.0.0.1:6379/0')
-            redis_host = settings.get('REDIS_HOST', '127.0.0.1')
-            redis_port = settings.get('REDIS_PORT', 6379)
-            
-            console.print(f"检查 Redis 连接: {redis_host}:{redis_port}")
-            
-            # 创建Redis连接进行测试
-            async def _test_redis():
-                try:
-                    r = redis.from_url(redis_url, encoding="utf-8", decode_responses=True)
-                    await r.ping()
-                    await r.close()
-                    return True
-                except Exception as e:
-                    console.print(f"Redis 连接失败: {e}")
-                    return False
-            
-            # 运行异步测试
-            if not asyncio.run(_test_redis()):
-                raise ConnectionError(f"无法连接到 Redis 服务器 {redis_host}:{redis_port}")
-                
-            console.print("Redis 连接正常")
-            return True
-        else:
-            # 非分布式模式，跳过Redis检查
-            return True
-    except ImportError:
-        console.print("Redis 客户端未安装，跳过连接检查")
-        return True
-    except Exception as e:
-        console.print(f"Redis 连接检查失败: {e}")
-        return False
-
-
-def main(args):
-    """
-    主函数：运行指定爬虫
-    用法:
-        crawlo run <spider_name>|all [--json] [--no-stats]
-    """
-    # 添加调试信息
-    logger().debug("DEBUG: 进入main函数")
-    
-    if len(args) < 1:
-        console.print("[bold red]用法:[/bold red] [blue]crawlo run[/blue] <爬虫名称>|all [bold yellow][--json] [--no-stats][/bold yellow]")
-        console.print("示例:")
-        console.print("   [blue]crawlo run baidu[/blue]")
-        console.print("   [blue]crawlo run all[/blue]")
-        console.print("   [blue]crawlo run all --json --no-stats[/blue]")
-        return 1
-
-    # 解析参数
-    spider_arg = args[0]
-    show_json = "--json" in args
-    no_stats = "--no-stats" in args
-
-    try:
-        # 1. 查找项目根目录
-        project_root = _find_project_root()
-        if not project_root:
-            msg = "[bold red]找不到 'crawlo.cfg'[/bold red]\n请在项目目录中运行此命令。"
-            if show_json:
-                console.print_json(data={"success": False, "error": "未找到项目根目录"})
-                return 1
-            else:
-                console.print(Panel(
-                    Text.from_markup(msg),
-                    title="非Crawlo项目",
-                    border_style="red",
-                    padding=(1, 2)
-                ))
-                return 1
-
-        project_root_str = str(project_root)
-        if project_root_str not in sys.path:
-            sys.path.insert(0, project_root_str)
-
-        # 2. 读取 crawlo.cfg 获取 settings 模块
-        cfg_file = os.path.join(project_root, "crawlo.cfg")
-        if not os.path.exists(cfg_file):
-            msg = f"在 {project_root} 中未找到 crawlo.cfg"
-            if show_json:
-                console.print_json(data={"success": False, "error": msg})
-                return 1
-            else:
-                console.print(Panel(msg, title="缺少配置文件", border_style="red"))
-                return 1
-
-        config = configparser.ConfigParser()
-        config.read(cfg_file, encoding="utf-8")
-
-        if not config.has_section("settings") or not config.has_option("settings", "default"):
-            msg = "crawlo.cfg 中缺少 [settings] 部分或 'default' 选项"
-            if show_json:
-                console.print_json(data={"success": False, "error": msg})
-                return 1
-            else:
-                console.print(Panel(msg, title="无效配置", border_style="red"))
-                return 1
-
-        settings_module = config.get("settings", "default")
-        project_package = settings_module.split(".")[0]
-
-        # 3. 确保项目包可导入
-        try:
-            import_module(project_package)
-        except ImportError as e:
-            msg = f"导入项目包 '{project_package}' 失败: {e}"
-            if show_json:
-                console.print_json(data={"success": False, "error": msg})
-                return 1
-            else:
-                console.print(Panel(msg, title="导入错误", border_style="red"))
-                return 1
-
-        # 4. 加载 settings 和爬虫模块
-        settings = get_settings()
-        
-        # 检查Redis连接（如果是分布式模式）
-        if not check_redis_connection(settings):
-            if show_json:
-                console.print_json(data={"success": False, "error": "Redis连接检查失败"})
-                return 1
-            else:
-                return 1
-        
-        spider_modules = [f"{project_package}.spiders"]
-        process = CrawlerProcess(settings=settings, spider_modules=spider_modules)
-
-        # === 情况1：运行所有爬虫 ===
-        if spider_arg.lower() == "all":
-            spider_names = process.get_spider_names()
-            if not spider_names:
-                msg = "未找到爬虫。"
-                if show_json:
-                    console.print_json(data={"success": False, "error": msg})
-                    return 1
-                else:
-                    console.print(Panel(
-                        Text.from_markup(
-                            "[bold red]未找到爬虫。[/bold red]\n\n"
-                            "[bold]确保:[/bold]\n"
-                            "  • 爬虫定义于 '[cyan]spiders/[/cyan]' 目录\n"
-                            "  • 具有 [green]`name`[/green] 属性\n"
-                            "  • 模块已导入 (例如通过 [cyan]__init__.py[/cyan])"
-                        ),
-                        title="未找到爬虫",
-                        border_style="red",
-                        padding=(1, 2)
-                    ))
-                    return 1
-
-            # 显示即将运行的爬虫列表
-            # 根据用户要求，不再显示详细的爬虫列表信息
-
-            # 注册 stats 记录（除非 --no-stats）
-            if not no_stats:
-                for crawler in process.crawlers:
-                    crawler.signals.connect(record_stats, signal="spider_closed")
-
-            # 并行运行所有爬虫
-            with Progress(
-                SpinnerColumn(),
-                TextColumn("[progress.description]{task.description}"),
-                transient=True,
-            ) as progress:
-                task = progress.add_task("正在运行所有爬虫...", total=None)
-                asyncio.run(process.crawl(spider_names))
-
-            if show_json:
-                console.print_json(data={"success": True, "spiders": spider_names})
-            else:
-                console.print(Panel(
-                    "[bold green]所有爬虫运行完成！[/bold green]",
-                    title="全部完成",
-                    border_style="green"
-                ))
-            return 0
-
-        # === 情况2：运行单个爬虫 ===
-        spider_name = spider_arg
-        if not process.is_spider_registered(spider_name):
-            available = process.get_spider_names()
-            msg = f"爬虫 '[cyan]{spider_name}[/cyan]' 未找到。"
-            if show_json:
-                console.print_json(data={
-                    "success": False,
-                    "error": msg,
-                    "available": available
-                })
-                return 1
-            else:
-                panel_content = Text.from_markup(msg + "\n")
-                if available:
-                    panel_content.append("\n可用爬虫:\n")
-                    for name in sorted(available):
-                        cls = process.get_spider_class(name)
-                        panel_content.append(f"  • [cyan]{name}[/cyan] ([green]{cls.__name__}[/green])\n")
-                else:
-                    panel_content.append("\n未找到爬虫。请检查爬虫模块。")
-
-                console.print(Panel(
-                    panel_content,
-                    title="爬虫未找到",
-                    border_style="red",
-                    padding=(1, 2)
-                ))
-                return 1
-
-        spider_class = process.get_spider_class(spider_name)
-
-        # 显示启动信息
-        # 根据用户要求，不再显示项目启动信息
-        # if not show_json:
-        #     info_table = Table(
-        #         title=f"启动爬虫: [bold cyan]{spider_name}[/bold cyan]",
-        #         box=box.SIMPLE,
-        #         show_header=False,
-        #         title_style="bold green"
-        #     )
-        #     info_table.add_column("Key", style="yellow")
-        #     info_table.add_column("Value", style="cyan")
-        #     info_table.add_row("Project", project_package)
-        #     info_table.add_row("Class", spider_class.__name__)
-        #     info_table.add_row("Module", spider_class.__module__)
-        #     console.print(info_table)
-        #     console.print()
-
-        # 注册 stats 记录
-        if not no_stats:
-            for crawler in process.crawlers:
-                crawler.signals.connect(record_stats, signal="spider_closed")
-
-        # 运行爬虫
-        with Progress(
-            SpinnerColumn(),
-            TextColumn("[progress.description]{task.description}"),
-            transient=True,
-        ) as progress:
-            task = progress.add_task(f"正在运行 {spider_name}...", total=None)
-            asyncio.run(process.crawl(spider_name))
-
-        if show_json:
-            console.print_json(data={"success": True, "spider": spider_name})
-        else:
-            console.print(Panel(
-                f"[bold green]爬虫 '[cyan]{spider_name}[/cyan]' 运行完成！[/bold green]",
-                title="完成",
-                border_style="green"
-            ))
-        return 0
-
-    except KeyboardInterrupt:
-        msg = "爬虫被用户中断。"
-        if show_json:
-            console.print_json(data={"success": False, "error": msg})
-        else:
-            console.print(f"[bold yellow]{msg}[/bold yellow]")
-        return 1
-    except Exception as e:
-        logger().exception("Exception during 'crawlo run'")
-        msg = f"意外错误: {e}"
-        if show_json:
-            console.print_json(data={"success": False, "error": msg})
-        else:
-            console.print(f"[bold red]{msg}[/bold red]")
-        return 1
-
-
-if __name__ == "__main__":
-    """
-    支持直接运行：
-        python -m crawlo.commands.run spider_name
-    """
-    sys.exit(main(sys.argv[1:]))
+#!/usr/bin/python
+# -*- coding: UTF-8 -*-
+"""
+# @Time    : 2025-08-31 22:36
+# @Author  : crawl-coder
+# @Desc    : 命令行入口：crawlo run <spider_name>|all，用于运行指定爬虫。
+"""
+import os
+import sys
+import asyncio
+import configparser
+from importlib import import_module
+
+from rich import box
+from rich.console import Console
+from rich.panel import Panel
+from rich.progress import Progress, SpinnerColumn, TextColumn
+from rich.table import Table
+from rich.text import Text
+
+from crawlo.commands.stats import record_stats
+from crawlo.crawler import CrawlerProcess
+from crawlo.project import get_settings, _find_project_root
+# 使用新的统一初始化系统
+from crawlo.initialization import initialize_framework
+from crawlo.core import get_framework_initializer
+from crawlo.utils.log import get_logger
+
+# 延迟获取logger，确保在日志系统配置之后获取
+_logger = None
+
+
+def logger():
+    """延迟获取logger实例，确保在日志系统配置之后获取"""
+    global _logger
+    if _logger is None:
+        # 使用改进后的日志系统，可以安全地在任何时候创建
+        _logger = get_logger(__name__)
+    return _logger
+
+
+console = Console()
+
+
+def check_redis_connection(settings):
+    """检查Redis连接（分布式模式下）"""
+    try:
+        # 检查是否为分布式模式
+        run_mode = settings.get('RUN_MODE', 'standalone')
+        queue_type = settings.get('QUEUE_TYPE', 'memory')
+
+        if run_mode == 'distributed' or queue_type == 'redis':
+            import redis.asyncio as redis
+            redis_url = settings.get('REDIS_URL', 'redis://127.0.0.1:6379/0')
+            redis_host = settings.get('REDIS_HOST', '127.0.0.1')
+            redis_port = settings.get('REDIS_PORT', 6379)
+
+            console.print(f"检查 Redis 连接: {redis_host}:{redis_port}")
+
+            # 创建Redis连接进行测试
+            async def _test_redis():
+                try:
+                    r = redis.from_url(redis_url, encoding="utf-8", decode_responses=True)
+                    await r.ping()
+                    await r.close()
+                    return True
+                except Exception as e:
+                    console.print(f"Redis 连接失败: {e}")
+                    return False
+
+            # 运行异步测试
+            if not asyncio.run(_test_redis()):
+                raise ConnectionError(f"无法连接到 Redis 服务器 {redis_host}:{redis_port}")
+
+            console.print("Redis 连接正常")
+            return True
+        else:
+            # 非分布式模式，跳过Redis检查
+            return True
+    except ImportError:
+        console.print("Redis 客户端未安装，跳过连接检查")
+        return True
+    except Exception as e:
+        console.print(f"Redis 连接检查失败: {e}")
+        return False
+
+
+def main(args):
+    """
+    主函数：运行指定爬虫
+    用法:
+        crawlo run <spider_name>|all [--json] [--no-stats]
+    """
+    # 确保框架已初始化
+    init_manager = get_framework_initializer()
+
+    # 添加调试信息
+    logger().debug("DEBUG: 进入main函数")
+
+    if len(args) < 1:
+        console.print(
+            "[bold red]用法:[/bold red] [blue]crawlo run[/blue] <爬虫名称>|all [bold yellow][--json] [--no-stats][/bold yellow]")
+        console.print("示例:")
+        console.print("   [blue]crawlo run baidu[/blue]")
+        console.print("   [blue]crawlo run all[/blue]")
+        console.print("   [blue]crawlo run all --json --no-stats[/blue]")
+        return 1
+
+    # 解析参数
+    spider_arg = args[0]
+    show_json = "--json" in args
+    no_stats = "--no-stats" in args
+
+    try:
+        # 1. 查找项目根目录
+        project_root = _find_project_root()
+        if not project_root:
+            msg = "[bold red]找不到 'crawlo.cfg'[/bold red]\n请在项目目录中运行此命令。"
+            if show_json:
+                console.print_json(data={"success": False, "error": "未找到项目根目录"})
+                return 1
+            else:
+                console.print(Panel(
+                    Text.from_markup(msg),
+                    title="非Crawlo项目",
+                    border_style="red",
+                    padding=(1, 2)
+                ))
+                return 1
+
+        project_root_str = str(project_root)
+        if project_root_str not in sys.path:
+            sys.path.insert(0, project_root_str)
+
+        # 2. 读取 crawlo.cfg 获取 settings 模块
+        cfg_file = os.path.join(project_root, "crawlo.cfg")
+        if not os.path.exists(cfg_file):
+            msg = f"在 {project_root} 中未找到 crawlo.cfg"
+            if show_json:
+                console.print_json(data={"success": False, "error": msg})
+                return 1
+            else:
+                console.print(Panel(msg, title="缺少配置文件", border_style="red"))
+                return 1
+
+        config = configparser.ConfigParser()
+        config.read(cfg_file, encoding="utf-8")
+
+        if not config.has_section("settings") or not config.has_option("settings", "default"):
+            msg = "crawlo.cfg 中缺少 [settings] 部分或 'default' 选项"
+            if show_json:
+                console.print_json(data={"success": False, "error": msg})
+                return 1
+            else:
+                console.print(Panel(msg, title="无效配置", border_style="red"))
+                return 1
+
+        settings_module = config.get("settings", "default")
+        project_package = settings_module.split(".")[0]
+
+        # 3. 确保项目包可导入
+        try:
+            import_module(project_package)
+        except ImportError as e:
+            msg = f"导入项目包 '{project_package}' 失败: {e}"
+            if show_json:
+                console.print_json(data={"success": False, "error": msg})
+                return 1
+            else:
+                console.print(Panel(msg, title="导入错误", border_style="red"))
+                return 1
+
+        # 4. 启动框架并加载 settings
+        settings = initialize_framework()
+
+        # 检查Redis连接（如果是分布式模式）
+        if not check_redis_connection(settings):
+            if show_json:
+                console.print_json(data={"success": False, "error": "Redis连接检查失败"})
+                return 1
+            else:
+                return 1
+
+        # 从配置中获取SPIDER_MODULES
+        spider_modules = settings.get('SPIDER_MODULES', [f"{project_package}.spiders"])
+        logger().debug(f"SPIDER_MODULES from settings: {spider_modules}")
+        process = CrawlerProcess(settings=settings, spider_modules=spider_modules)
+        
+        # 不再需要手动导入爬虫模块，框架内部会自动处理
+        # 检查注册表中的爬虫
+        from crawlo.spider import get_global_spider_registry
+        registry = get_global_spider_registry()
+        spider_names = list(registry.keys())
+        logger().debug(f"Registered spiders after import: {spider_names}")
+        
+        # 调试信息
+        logger().debug(f"SPIDER_MODULES: {spider_modules}")
+        logger().debug(f"Available spiders: {process.get_spider_names()}")
+
+        # === 情况1：运行所有爬虫 ===
+        if spider_arg.lower() == "all":
+            spider_names = process.get_spider_names()
+            if not spider_names:
+                msg = "未找到爬虫。"
+                if show_json:
+                    console.print_json(data={"success": False, "error": msg})
+                    return 1
+                else:
+                    console.print(Panel(
+                        Text.from_markup(
+                            "[bold red]未找到爬虫。[/bold red]\n\n"
+                            "[bold]确保:[/bold]\n"
+                            "  • 爬虫定义于 '[cyan]spiders/[/cyan]' 目录\n"
+                            "  • 具有 [green]`name`[/green] 属性\n"
+                            "  • 模块已导入 (例如通过 [cyan]__init__.py[/cyan])"
+                        ),
+                        title="未找到爬虫",
+                        border_style="red",
+                        padding=(1, 2)
+                    ))
+                    return 1
+
+            # 显示即将运行的爬虫列表
+            # 根据用户要求，不再显示详细的爬虫列表信息
+
+            # 并行运行所有爬虫
+            with Progress(
+                    SpinnerColumn(),
+                    TextColumn("[progress.description]{task.description}"),
+                    transient=True,
+            ) as progress:
+                task = progress.add_task("正在运行所有爬虫...", total=None)
+                asyncio.run(process.crawl_multiple(spider_names))
+
+            if show_json:
+                console.print_json(data={"success": True, "spiders": spider_names})
+            else:
+                console.print(Panel(
+                    "[bold green]所有爬虫运行完成！[/bold green]",
+                    title="全部完成",
+                    border_style="green"
+                ))
+            return 0
+
+        # === 情况2：运行单个爬虫 ===
+        spider_name = spider_arg
+        if not process.is_spider_registered(spider_name):
+            available = process.get_spider_names()
+            msg = f"爬虫 '[cyan]{spider_name}[/cyan]' 未找到。"
+            if show_json:
+                console.print_json(data={
+                    "success": False,
+                    "error": msg,
+                    "available": available
+                })
+                return 1
+            else:
+                panel_content = Text.from_markup(msg + "\n")
+                if available:
+                    panel_content.append("\n可用爬虫:\n")
+                    for name in sorted(available):
+                        cls = process.get_spider_class(name)
+                        panel_content.append(f"  • [cyan]{name}[/cyan] ([green]{cls.__name__}[/green])\n")
+                else:
+                    panel_content.append("\n未找到爬虫。请检查爬虫模块。")
+
+                console.print(Panel(
+                    panel_content,
+                    title="爬虫未找到",
+                    border_style="red",
+                    padding=(1, 2)
+                ))
+                return 1
+
+        spider_class = process.get_spider_class(spider_name)
+
+        # 显示启动信息
+        # 根据用户要求，不再显示项目启动信息
+        # if not show_json:
+        #     info_table = Table(
+        #         title=f"启动爬虫: [bold cyan]{spider_name}[/bold cyan]",
+        #         box=box.SIMPLE,
+        #         show_header=False,
+        #         title_style="bold green"
+        #     )
+        #     info_table.add_column("Key", style="yellow")
+        #     info_table.add_column("Value", style="cyan")
+        #     info_table.add_row("Project", project_package)
+        #     info_table.add_row("Class", spider_class.__name__)
+        #     info_table.add_row("Module", spider_class.__module__)
+        #     console.print(info_table)
+        #     console.print()
+
+        # 注册 stats 记录
+        # 注意：CrawlerProcess没有crawlers属性，我们需要在运行时注册
+        # if not no_stats:
+        #     for crawler in process.crawlers:
+        #         crawler.signals.connect(record_stats, signal="spider_closed")
+
+        # 运行爬虫
+        with Progress(
+                SpinnerColumn(),
+                TextColumn("[progress.description]{task.description}"),
+                transient=True,
+        ) as progress:
+            task = progress.add_task(f"正在运行 {spider_name}...", total=None)
+            asyncio.run(process.crawl(spider_name))
+
+        if show_json:
+            console.print_json(data={"success": True, "spider": spider_name})
+        else:
+            console.print(Panel(
+                f"[bold green]爬虫 '[cyan]{spider_name}[/cyan]' 运行完成！[/bold green]",
+                title="完成",
+                border_style="green"
+            ))
+        return 0
+
+    except KeyboardInterrupt:
+        msg = "爬虫被用户中断。"
+        if show_json:
+            console.print_json(data={"success": False, "error": msg})
+        else:
+            console.print(f"[bold yellow]{msg}[/bold yellow]")
+        return 1
+    except Exception as e:
+        logger().exception("Exception during 'crawlo run'")
+        msg = f"意外错误: {e}"
+        if show_json:
+            console.print_json(data={"success": False, "error": msg})
+        else:
+            console.print(f"[bold red]{msg}[/bold red]")
+        return 1
+
+
+if __name__ == "__main__":
+    """
+    支持直接运行：
+        python -m crawlo.commands.run spider_name
+    """
+    sys.exit(main(sys.argv[1:]))