crawlo 1.0.4__py3-none-any.whl → 1.0.6__py3-none-any.whl

crawlo/pipelines/mongo_pipeline.py

@@ -1,117 +1,117 @@
-# -*- coding: utf-8 -*-
-from typing import Optional
-from motor.motor_asyncio import AsyncIOMotorClient
-from pymongo.errors import PyMongoError
-from crawlo.utils.log import get_logger
-from crawlo.exceptions import ItemDiscard
-
-
-class MongoPipeline:
-    def __init__(self, crawler):
-        self.crawler = crawler
-        self.settings = crawler.settings
-        self.logger = get_logger(self.__class__.__name__, self.settings.get('LOG_LEVEL'))
-
-        # 初始化连接参数
-        self.client = None
-        self.db = None
-        self.collection = None
-
-        # 配置默认值
-        self.mongo_uri = self.settings.get('MONGO_URI', 'mongodb://localhost:27017')
-        self.db_name = self.settings.get('MONGO_DATABASE', 'scrapy_db')
-        self.collection_name = self.settings.get('MONGO_COLLECTION', crawler.spider.name)
-
-        # 注册关闭事件
-        crawler.subscriber.subscribe(self.spider_closed, event='spider_closed')
-
-    @classmethod
-    def from_crawler(cls, crawler):
-        return cls(crawler)
-
-    async def _ensure_connection(self):
-        """确保连接已建立"""
-        if self.client is None:
-            self.client = AsyncIOMotorClient(self.mongo_uri)
-            self.db = self.client[self.db_name]
-            self.collection = self.db[self.collection_name]
-            self.logger.info(f"MongoDB连接建立 (集合: {self.collection_name})")
-
-    async def process_item(self, item, spider) -> Optional[dict]:
-        """处理item的核心方法"""
-        try:
-            await self._ensure_connection()
-
-            item_dict = dict(item)
-            result = await self.collection.insert_one(item_dict)
-
-            # 统计计数
-            self.crawler.stats.inc_value('mongodb/inserted')
-            self.logger.debug(f"插入文档ID: {result.inserted_id}")
-
-            return item
-
-        except Exception as e:
-            self.crawler.stats.inc_value('mongodb/failed')
-            self.logger.error(f"MongoDB插入失败: {e}")
-            raise ItemDiscard(f"MongoDB操作失败: {e}")
-
-    async def spider_closed(self):
-        """关闭爬虫时清理资源"""
-        if self.client:
-            self.client.close()
-            self.logger.info("MongoDB连接已关闭")
-
-
-class MongoPoolPipeline:
-    def __init__(self, crawler):
-        self.crawler = crawler
-        self.settings = crawler.settings
-        self.logger = get_logger(self.__class__.__name__, self.settings.get('LOG_LEVEL'))
-
-        # 连接池配置
-        self.client = AsyncIOMotorClient(
-            self.settings.get('MONGO_URI', 'mongodb://localhost:27017'),
-            maxPoolSize=self.settings.getint('MONGO_MAX_POOL_SIZE', 100),
-            minPoolSize=self.settings.getint('MONGO_MIN_POOL_SIZE', 10),
-            connectTimeoutMS=5000,
-            socketTimeoutMS=30000
-        )
-
-        self.db = self.client[self.settings.get('MONGO_DATABASE', 'scrapy_db')]
-        self.collection = self.db[self.settings.get('MONGO_COLLECTION', crawler.spider.name)]
-
-        crawler.subscriber.subscribe(self.spider_closed, event='spider_closed')
-        self.logger.info(f"MongoDB连接池已初始化 (集合: {self.collection.name})")
-
-    @classmethod
-    def create_instance(cls, crawler):
-        return cls(crawler)
-
-    async def process_item(self, item, spider) -> Optional[dict]:
-        """处理item方法（带重试机制）"""
-        try:
-            item_dict = dict(item)
-
-            # 带重试的插入操作
-            for attempt in range(3):
-                try:
-                    result = await self.collection.insert_one(item_dict)
-                    self.crawler.stats.inc_value('mongodb/insert_success')
-                    self.logger.debug(f"插入成功 [attempt {attempt + 1}]: {result.inserted_id}")
-                    return item
-                except PyMongoError as e:
-                    if attempt == 2:  # 最后一次尝试仍失败
-                        raise
-                    self.logger.warning(f"插入重试中 [attempt {attempt + 1}]: {e}")
-
-        except Exception as e:
-            self.crawler.stats.inc_value('mongodb/insert_failed')
-            self.logger.error(f"MongoDB操作最终失败: {e}")
-            raise ItemDiscard(f"MongoDB操作失败: {e}")
-
-    async def spider_closed(self):
-        """资源清理"""
-        if hasattr(self, 'client'):
-            self.client.close()
+# -*- coding: utf-8 -*-
+from typing import Optional
+from motor.motor_asyncio import AsyncIOMotorClient
+from pymongo.errors import PyMongoError
+from crawlo.utils.log import get_logger
+from crawlo.exceptions import ItemDiscard
+
+
+class MongoPipeline:
+    def __init__(self, crawler):
+        self.crawler = crawler
+        self.settings = crawler.settings
+        self.logger = get_logger(self.__class__.__name__, self.settings.get('LOG_LEVEL'))
+
+        # 初始化连接参数
+        self.client = None
+        self.db = None
+        self.collection = None
+
+        # 配置默认值
+        self.mongo_uri = self.settings.get('MONGO_URI', 'mongodb://localhost:27017')
+        self.db_name = self.settings.get('MONGO_DATABASE', 'scrapy_db')
+        self.collection_name = self.settings.get('MONGO_COLLECTION', crawler.spider.name)
+
+        # 注册关闭事件
+        crawler.subscriber.subscribe(self.spider_closed, event='spider_closed')
+
+    @classmethod
+    def from_crawler(cls, crawler):
+        return cls(crawler)
+
+    async def _ensure_connection(self):
+        """确保连接已建立"""
+        if self.client is None:
+            self.client = AsyncIOMotorClient(self.mongo_uri)
+            self.db = self.client[self.db_name]
+            self.collection = self.db[self.collection_name]
+            self.logger.info(f"MongoDB连接建立 (集合: {self.collection_name})")
+
+    async def process_item(self, item, spider) -> Optional[dict]:
+        """处理item的核心方法"""
+        try:
+            await self._ensure_connection()
+
+            item_dict = dict(item)
+            result = await self.collection.insert_one(item_dict)
+
+            # 统计计数
+            self.crawler.stats.inc_value('mongodb/inserted')
+            self.logger.debug(f"插入文档ID: {result.inserted_id}")
+
+            return item
+
+        except Exception as e:
+            self.crawler.stats.inc_value('mongodb/failed')
+            self.logger.error(f"MongoDB插入失败: {e}")
+            raise ItemDiscard(f"MongoDB操作失败: {e}")
+
+    async def spider_closed(self):
+        """关闭爬虫时清理资源"""
+        if self.client:
+            self.client.close()
+            self.logger.info("MongoDB连接已关闭")
+
+
+class MongoPoolPipeline:
+    def __init__(self, crawler):
+        self.crawler = crawler
+        self.settings = crawler.settings
+        self.logger = get_logger(self.__class__.__name__, self.settings.get('LOG_LEVEL'))
+
+        # 连接池配置
+        self.client = AsyncIOMotorClient(
+            self.settings.get('MONGO_URI', 'mongodb://localhost:27017'),
+            maxPoolSize=self.settings.getint('MONGO_MAX_POOL_SIZE', 100),
+            minPoolSize=self.settings.getint('MONGO_MIN_POOL_SIZE', 10),
+            connectTimeoutMS=5000,
+            socketTimeoutMS=30000
+        )
+
+        self.db = self.client[self.settings.get('MONGO_DATABASE', 'scrapy_db')]
+        self.collection = self.db[self.settings.get('MONGO_COLLECTION', crawler.spider.name)]
+
+        crawler.subscriber.subscribe(self.spider_closed, event='spider_closed')
+        self.logger.info(f"MongoDB连接池已初始化 (集合: {self.collection.name})")
+
+    @classmethod
+    def create_instance(cls, crawler):
+        return cls(crawler)
+
+    async def process_item(self, item, spider) -> Optional[dict]:
+        """处理item方法（带重试机制）"""
+        try:
+            item_dict = dict(item)
+
+            # 带重试的插入操作
+            for attempt in range(3):
+                try:
+                    result = await self.collection.insert_one(item_dict)
+                    self.crawler.stats.inc_value('mongodb/insert_success')
+                    self.logger.debug(f"插入成功 [attempt {attempt + 1}]: {result.inserted_id}")
+                    return item
+                except PyMongoError as e:
+                    if attempt == 2:  # 最后一次尝试仍失败
+                        raise
+                    self.logger.warning(f"插入重试中 [attempt {attempt + 1}]: {e}")
+
+        except Exception as e:
+            self.crawler.stats.inc_value('mongodb/insert_failed')
+            self.logger.error(f"MongoDB操作最终失败: {e}")
+            raise ItemDiscard(f"MongoDB操作失败: {e}")
+
+    async def spider_closed(self):
+        """资源清理"""
+        if hasattr(self, 'client'):
+            self.client.close()
             self.logger.info("MongoDB连接池已释放")

crawlo/pipelines/mysql_batch_pipline.py

@@ -1,134 +1,273 @@
-import asyncio
-import logging
-from crawlo.exceptions import NotConfiguredError
-
-logger = logging.getLogger(__name__)
-
-
-class AsyncmyMySQLPipeline:
-    """
-    异步 MySQL 管道，用于批量将爬取的数据存储到 MySQL 数据库
-    """
-
-    def __init__(self, host, port, user, password, db, batch_size, table_name):
-        self.host = host
-        self.port = port
-        self.user = user
-        self.password = password
-        self.db = db
-        self.batch_size = batch_size
-        self.table_name = table_name
-        self.buffer = []
-        self.pool = None
-        self.flush_task = None
-        self.insert_stmt = None
-
-    @classmethod
-    def from_crawler(cls, crawler):
-        """从爬虫配置中获取数据库连接参数"""
-        batch_size = crawler.settings.get_int('MYSQL_BATCH_SIZE', 100)
-
-        return cls(
-            host=crawler.settings.get('MYSQL_HOST'),
-            port=crawler.settings.get('MYSQL_PORT'),
-            user=crawler.settings.get('MYSQL_USER'),
-            password=crawler.settings.get('MYSQL_PASSWORD'),
-            db=crawler.settings.get('MYSQL_DB'),
-            batch_size=batch_size,
-            table_name=crawler.settings.get('MYSQL_TABLE'),
-        )
-
-    async def open_spider(self, spider):
-        """爬虫启动时初始化数据库连接池"""
-        try:
-            import asyncmy
-            self.pool = await asyncmy.create_pool(
-                host=self.host,
-                port=self.port,
-                user=self.user,
-                password=self.password,
-                db=self.db,
-                autocommit=True,
-                charset='utf8mb4',
-                cursorclass=asyncmy.cursors.DictCursor
-            )
-            logger.info(f"MySQL 连接池已创建，主机: {self.host}, 数据库: {self.db}")
-
-            # 创建自动刷新任务
-            self.flush_task = asyncio.create_task(self._auto_flush())
-
-        except Exception as e:
-            logger.error(f"无法创建 MySQL 连接池: {e}")
-            raise NotConfiguredError(f"MySQL 连接失败: {e}")
-
-    async def process_item(self, item, spider):
-        """处理爬取的每个项目，添加到缓冲区"""
-        self.buffer.append(dict(item))
-
-        # 当缓冲区达到批量大小时自动刷新
-        if len(self.buffer) >= self.batch_size:
-            await self._flush_buffer()
-
-        return item
-
-    async def _flush_buffer(self):
-        """将缓冲区中的数据批量写入数据库"""
-        if not self.buffer:
-            return
-
-        try:
-            async with self.pool.acquire() as conn:
-                async with conn.cursor() as cursor:
-                    # 动态生成插入语句
-                    if not self.insert_stmt:
-                        columns = ', '.join(self.buffer[0].keys())
-                        placeholders = ', '.join(['%s'] * len(self.buffer[0]))
-                        self.insert_stmt = f"INSERT INTO {self.table_name} ({columns}) VALUES ({placeholders})"
-
-                    # 准备批量插入的数据
-                    values = [tuple(item.values()) for item in self.buffer]
-
-                    # 执行批量插入
-                    await cursor.executemany(self.insert_stmt, values)
-                    logger.debug(f"已批量插入 {len(values)} 条记录到 {self.table_name}")
-
-                    # 清空缓冲区
-                    self.buffer.clear()
-
-        except Exception as e:
-            logger.error(f"批量插入失败: {e}")
-            # 发生错误时保留数据，避免数据丢失
-            # 实际生产环境中可能需要更复杂的错误处理策略
-
-    async def _auto_flush(self):
-        """定期自动刷新缓冲区，防止数据长时间停留在内存中"""
-        try:
-            while True:
-                await asyncio.sleep(10)  # 每10秒检查一次
-                if self.buffer:
-                    await self._flush_buffer()
-        except asyncio.CancelledError:
-            logger.info("自动刷新任务已取消")
-
-    async def spider_closed(self, spider):
-        """爬虫关闭时执行清理工作"""
-        try:
-            # 取消自动刷新任务
-            if self.flush_task:
-                self.flush_task.cancel()
-                await self.flush_task  # 等待任务完成取消
-
-            # 确保缓冲区中的剩余数据被写入数据库
-            if self.buffer:
-                await self._flush_buffer()
-
-        except asyncio.CancelledError:
-            logger.info("爬虫关闭过程中自动刷新任务被取消")
-        except Exception as e:
-            logger.error(f"爬虫关闭时发生错误: {e}")
-        finally:
-            # 关闭数据库连接池
-            if self.pool:
-                self.pool.close()
-                await self.pool.wait_closed()
-                logger.info("MySQL 连接池已关闭")
+# -*- coding: utf-8 -*-
+import asyncio
+import aiomysql
+from typing import Optional, List, Dict
+from asyncmy import create_pool
+from crawlo.utils.log import get_logger
+from crawlo.exceptions import ItemDiscard
+from crawlo.utils.tools import make_insert_sql, logger
+
+
+class AsyncmyMySQLPipeline:
+    def __init__(self, crawler):
+        self.crawler = crawler
+        self.settings = crawler.settings
+        self.logger = get_logger(self.__class__.__name__, self.settings.get('LOG_LEVEL'))
+
+        # 配置参数
+        self.table_name = (
+            self.settings.get('MYSQL_TABLE') or
+            getattr(crawler.spider, 'mysql_table', None) or
+            f"{crawler.spider.name}_items"
+        )
+        self.batch_size = self.settings.getint('MYSQL_BATCH_SIZE', 100)
+        self.flush_interval = self.settings.getfloat('MYSQL_FLUSH_INTERVAL', 3.0)  # 秒
+
+        # 连接池相关
+        self._pool_lock = asyncio.Lock()
+        self._pool_initialized = False
+        self.pool = None
+
+        # 缓冲区与锁
+        self.items_buffer: List[Dict] = []
+        self.buffer_lock = asyncio.Lock()
+
+        # 后台任务
+        self.flush_task: Optional[asyncio.Task] = None
+
+        # 注册关闭事件
+        crawler.subscriber.subscribe(self.spider_closed, event='spider_closed')
+
+    @classmethod
+    def from_crawler(cls, crawler):
+        return cls(crawler)
+
+    async def _ensure_pool(self):
+        """确保连接池已初始化（线程安全）"""
+        if self._pool_initialized:
+            return
+
+        async with self._pool_lock:
+            if not self._pool_initialized:
+                try:
+                    self.pool = await create_pool(
+                        host=self.settings.get('MYSQL_HOST', 'localhost'),
+                        port=self.settings.get_int('MYSQL_PORT', 3306),
+                        user=self.settings.get('MYSQL_USER', 'root'),
+                        password=self.settings.get('MYSQL_PASSWORD', ''),
+                        db=self.settings.get('MYSQL_DB', 'scrapy_db'),
+                        minsize=self.settings.get_int('MYSQL_POOL_MIN', 3),
+                        maxsize=self.settings.get_int('MYSQL_POOL_MAX', 10),
+                        echo=self.settings.get_bool('MYSQL_ECHO', False)
+                    )
+                    self._pool_initialized = True
+                    self.logger.debug(f"MySQL连接池初始化完成（表: {self.table_name}）")
+                except Exception as e:
+                    self.logger.error(f"MySQL连接池初始化失败: {e}")
+                    raise
+
+    async def open_spider(self, spider):
+        """爬虫启动时初始化后台刷新任务"""
+        await self._ensure_pool()
+        self.flush_task = asyncio.create_task(self._flush_loop())
+
+    async def _flush_loop(self):
+        """后台循环：定期检查是否需要刷新缓冲区"""
+        while True:
+            await asyncio.sleep(self.flush_interval)
+            if len(self.items_buffer) > 0:
+                await self._flush_buffer()
+
+    async def _flush_buffer(self):
+        """将缓冲区中的数据批量写入数据库"""
+        async with self.buffer_lock:
+            if not self.items_buffer:
+                return
+
+            items_to_insert = self.items_buffer.copy()
+            self.items_buffer.clear()
+
+        try:
+            await self._ensure_pool()
+            first_item = items_to_insert[0]
+            sql = make_insert_sql(table=self.table_name, data=first_item, many=True)
+
+            values = [list(item.values()) for item in items_to_insert]
+
+            async with self.pool.acquire() as conn:
+                async with conn.cursor() as cursor:
+                    affected_rows = await cursor.executemany(sql, values)
+                    await conn.commit()
+
+            spider_name = getattr(self.crawler.spider, 'name', 'unknown')
+            self.logger.info(f"批量插入 {affected_rows} 条记录到 {self.table_name}")
+            self.crawler.stats.inc_value('mysql/insert_success_batch', len(items_to_insert))
+
+        except Exception as e:
+            self.logger.error(f"批量插入失败: {e}")
+            self.crawler.stats.inc_value('mysql/insert_failed_batch', len(items_to_insert))
+            # 可选：重试或丢弃
+            raise ItemDiscard(f"批量插入失败: {e}")
+
+    async def process_item(self, item, spider, kwargs=None) -> dict:
+        """将 item 添加到缓冲区，触发批量插入"""
+        item_dict = dict(item)
+
+        async with self.buffer_lock:
+            self.items_buffer.append(item_dict)
+            if len(self.items_buffer) >= self.batch_size:
+                # 达到批量阈值，立即刷新
+                await self._flush_buffer()
+
+        return item
+
+    async def spider_closed(self):
+        """关闭爬虫时，确保所有剩余数据被写入"""
+        if self.flush_task:
+            self.flush_task.cancel()
+            try:
+                await self.flush_task
+            except asyncio.CancelledError:
+                pass
+
+        # 刷最后一批数据
+        if self.items_buffer:
+            await self._flush_buffer()
+
+        # 关闭连接池
+        if self.pool:
+            self.pool.close()
+            await self.pool.wait_closed()
+            self.logger.info("MySQL连接池已关闭")
+
+
+class AiomysqlMySQLPipeline:
+    def __init__(self, crawler):
+        self.crawler = crawler
+        self.settings = crawler.settings
+        self.logger = get_logger(self.__class__.__name__, self.settings.get('LOG_LEVEL'))
+
+        # 配置
+        self.table_name = (
+            self.settings.get('MYSQL_TABLE') or
+            getattr(crawler.spider, 'mysql_table', None) or
+            f"{crawler.spider.name}_items"
+        )
+        self.batch_size = self.settings.getint('MYSQL_BATCH_SIZE', 100)
+        self.flush_interval = self.settings.getfloat('MYSQL_FLUSH_INTERVAL', 3.0)
+
+        # 连接池
+        self._pool_lock = asyncio.Lock()
+        self._pool_initialized = False
+        self.pool = None
+
+        # 缓冲
+        self.items_buffer: List[Dict] = []
+        self.buffer_lock = asyncio.Lock()
+
+        # 后台任务
+        self.flush_task: Optional[asyncio.Task] = None
+
+        crawler.subscriber.subscribe(self.spider_closed, event='spider_closed')
+
+    @classmethod
+    def create_instance(cls, crawler):
+        return cls(crawler)
+
+    async def _init_pool(self):
+        """延迟初始化连接池（线程安全）"""
+        if self._pool_initialized:
+            return
+
+        async with self._pool_lock:
+            if not self._pool_initialized:
+                try:
+                    self.pool = await aiomysql.create_pool(
+                        host=self.settings.get('MYSQL_HOST', 'localhost'),
+                        port=self.settings.getint('MYSQL_PORT', 3306),
+                        user=self.settings.get('MYSQL_USER', 'root'),
+                        password=self.settings.get('MYSQL_PASSWORD', ''),
+                        db=self.settings.get('MYSQL_DB', 'scrapy_db'),
+                        minsize=self.settings.getint('MYSQL_POOL_MIN', 3),
+                        maxsize=self.settings.getint('MYSQL_POOL_MAX', 10),
+                        cursorclass=aiomysql.DictCursor,
+                        autocommit=False
+                    )
+                    self._pool_initialized = True
+                    self.logger.debug(f"aiomysql连接池已初始化（表: {self.table_name}）")
+                except Exception as e:
+                    self.logger.error(f"aiomysql连接池初始化失败: {e}")
+                    raise
+
+    async def open_spider(self, spider):
+        """爬虫启动时创建后台刷新任务"""
+        await self._init_pool()
+        self.flush_task = asyncio.create_task(self._flush_loop())
+
+    async def _flush_loop(self):
+        """定期刷新缓冲区"""
+        while True:
+            await asyncio.sleep(self.flush_interval)
+            if len(self.items_buffer) > 0:
+                await self._flush_buffer()
+
+    async def _flush_buffer(self):
+        """执行批量插入"""
+        async with self.buffer_lock:
+            if not self.items_buffer:
+                return
+            items_to_insert = self.items_buffer.copy()
+            self.items_buffer.clear()
+
+        try:
+            await self._init_pool()
+            keys = items_to_insert[0].keys()
+            placeholders = ', '.join(['%s'] * len(keys))
+            columns = ', '.join([f'`{k}`' for k in keys])
+            sql = f"INSERT INTO `{self.table_name}` ({columns}) VALUES ({placeholders})"
+
+            values = [list(item.values()) for item in items_to_insert]
+
+            async with self.pool.acquire() as conn:
+                async with conn.cursor() as cursor:
+                    result = await cursor.executemany(sql, values)
+                    await conn.commit()
+
+            spider_name = getattr(self.crawler.spider, 'name', 'unknown')
+            self.logger.info(f"【{spider_name}】批量插入 {result} 条记录到 {self.table_name}")
+            self.crawler.stats.inc_value('mysql/insert_success_batch', len(items_to_insert))
+
+        except aiomysql.Error as e:
+            self.logger.error(f"aiomysql批量插入失败: {e}")
+            self.crawler.stats.inc_value('mysql/insert_failed_batch', len(items_to_insert))
+            raise ItemDiscard(f"MySQL错误: {e.args[1]}")
+        except Exception as e:
+            self.logger.error(f"未知错误: {e}")
+            raise ItemDiscard(f"处理失败: {e}")
+
+    async def process_item(self, item, spider) -> dict:
+        item_dict = dict(item)
+
+        async with self.buffer_lock:
+            self.items_buffer.append(item_dict)
+            if len(self.items_buffer) >= self.batch_size:
+                await self._flush_buffer()
+
+        return item
+
+    async def spider_closed(self):
+        """清理资源并提交剩余数据"""
+        if self.flush_task:
+            self.flush_task.cancel()
+            try:
+                await self.flush_task
+            except asyncio.CancelledError:
+                pass
+
+        if self.items_buffer:
+            await self._flush_buffer()
+
+        if self.pool:
+            self.pool.close()
+            await self.pool.wait_closed()
+            self.logger.info("aiomysql连接池已释放")