cobweb-launcher 1.3.1__tar.gz → 1.3.3__tar.gz

{cobweb-launcher-1.3.1/cobweb_launcher.egg-info → cobweb-launcher-1.3.3}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: cobweb-launcher
-Version: 1.3.1
+Version: 1.3.3
 Summary: spider_hole
 Home-page: https://github.com/Juannie-PP/cobweb
 Author: Juannie-PP

{cobweb-launcher-1.3.1 → cobweb-launcher-1.3.3}/cobweb/base/__init__.py

@@ -66,11 +66,17 @@ class TaskQueue:
         except Exception as e:
             it.params.retry += 1
             if isinstance(it, Request):
-                TaskQueue.REQUEST.push(it)
+                TaskQueue.DOWNLOAD.push(it)
             elif isinstance(it, Response):
                 TaskQueue.RESPONSE.push(it)
             elif isinstance(it, Seed):
-                TaskQueue.SEED.push(it)
+                TaskQueue.TODO.push(it)
+            elif isinstance(it, BaseItem):
+                TaskQueue.UPLOAD.push(it)
+            logger.info(
+                f"{crawler_func.__name__} failed: "
+                f"{''.join(traceback.format_exception(type(e), e, e.__traceback__))}"
+            )
             time.sleep(1)
 
 
@@ -95,7 +101,7 @@ class Decorators:
         def wrapper(self, *args, **kwargs):
             while not self.pause.is_set():
                 try:
-                    func(self, *args, **kwargs)
+                    func(self)
                 except Exception as e:
                     logger.info(f"{func.__name__}: " + str(e))
                 finally:

{cobweb-launcher-1.3.1 → cobweb-launcher-1.3.3}/cobweb/base/basic.py

@@ -15,11 +15,21 @@ class Params:
 
 
 class Seed:
+    __SEED_PARAMS__ = [
+        "retry",
+        "priority",
+        "version",
+        "status"
+    ]
 
     def __init__(
             self,
             seed,
-            params = Params(),
+            sid=None,
+            retry=None,
+            priority=None,
+            version=None,
+            status=None,
             **kwargs
     ):
         if any(isinstance(seed, t) for t in (str, bytes)):
@@ -37,11 +47,27 @@ class Seed:
                 f"seed: {seed}"
             ))
 
+        seed_params = {
+            "retry": retry,
+            "priority": priority,
+            "version": version,
+            "status": status,
+        }
+
         if kwargs:
+            # for k, v in kwargs.items():
+            #     if k in seed_params.keys():
+            #         seed_params[k] = v
+            #     else:
+            #         self.__setattr__(k, v)
             self._init_seed(kwargs)
-        if not getattr(self, "sid", None):
-            self._init_id()
-        self.params = params or Params()
+            seed_params.update({
+                k: v for k, v in kwargs.items()
+                if k in self.__SEED_PARAMS__
+            })
+        if sid or not getattr(self, "sid", None):
+            self._init_id(sid)
+        self.params = Params(**seed_params)
 
     def __getattr__(self, name):
         return None
@@ -59,13 +85,14 @@ class Seed:
         chars = [f"{k}={v}" for k, v in self.__dict__.items()]
         return f'{self.__class__.__name__}({", ".join(chars)})'
 
-    def _init_seed(self, seed_info:dict):
+    def _init_seed(self, seed_info: dict):
         for k, v in seed_info.items():
             if k not in self.__SEED_PARAMS__:
                 self.__setattr__(k, v)
 
-    def _init_id(self):
-        sid = hashlib.md5(self.to_string.encode()).hexdigest()
+    def _init_id(self, sid):
+        if not sid:
+            sid = hashlib.md5(self.to_string.encode()).hexdigest()
         self.__setattr__("sid", sid)
 
     @property
@@ -85,16 +112,15 @@ class Seed:
 
     @property
     def seed(self):
-        return self
+        return self.to_string
 
 
 class Request:
-
     __SEED_PARAMS__ = [
         "retry",
         "priority",
-        "seed_version",
-        "seed_status"
+        "version",
+        "status"
     ]
 
     __REQUEST_ATTRS__ = {
@@ -122,8 +148,8 @@ class Request:
             check_status_code=True,
             retry=None,
             priority=None,
-            seed_version=None,
-            seed_status=None,
+            version=None,
+            status=None,
             **kwargs
     ):
         self.url = url
@@ -133,10 +159,15 @@ class Request:
         seed_params = {
             "retry": retry,
             "priority": priority,
-            "seed_version": seed_version,
-            "seed_status": seed_status,
+            "version": version,
+            "status": status,
         }
 
+        if isinstance(seed, Seed):
+            kwargs.update(**seed.to_dict)
+        elif isinstance(seed, str):
+            kwargs.update(**json.loads(seed))
+
         for k, v in kwargs.items():
             if k in self.__class__.__REQUEST_ATTRS__:
                 self.request_setting[k] = v
@@ -152,12 +183,7 @@ class Request:
             self._build_header()
 
         self.params = Params(**seed_params)
-
-        if isinstance(seed, Seed):
-            kwargs.update(**seed.to_dict)
-        elif isinstance(seed, str):
-            kwargs.update(**json.loads(seed))
-        self.seed = self.to_string
+        # self.seed = self.to_string
 
     @property
     def _random_ua(self) -> str:
@@ -183,10 +209,19 @@ class Request:
             response.raise_for_status()
         return response
 
+    def __getattr__(self, name):
+        return None
+
+    def __setitem__(self, key, value):
+        setattr(self, key, value)
+
+    def __getitem__(self, item):
+        return getattr(self, item)
+
     @property
     def to_dict(self):
         _dict = self.__dict__.copy()
-        _dict.pop('seed')
+        # _dict.pop('seed')
         _dict.pop('params')
         _dict.pop('check_status_code')
         # _dict.pop('request_setting')
@@ -200,6 +235,10 @@ class Request:
             separators=(",", ":")
         )
 
+    @property
+    def seed(self):
+        return self.to_string
+
 
 class Response:
 
@@ -209,8 +248,8 @@ class Response:
             response,
             retry=None,
             priority=None,
-            seed_version=None,
-            seed_status=None,
+            version=None,
+            status=None,
             **kwargs
     ):
         self.seed = seed
@@ -218,20 +257,24 @@ class Response:
         seed_params = {
             "retry": retry,
             "priority": priority,
-            "seed_version": seed_version,
-            "seed_status": seed_status,
+            "version": version,
+            "status": status,
         }
         for k, v in kwargs.items():
             if k in seed_params.keys():
                 seed_params[k] = v
             else:
                 self.__setattr__(k, v)
+        self.params = Params(**seed_params)
 
     @property
     def to_dict(self):
         _dict = self.__dict__.copy()
         _dict.pop('seed')
         _dict.pop('response')
+        _dict.pop('method')
+        _dict.pop('params')
+        _dict.pop('request_setting')
         return _dict
 
     @property
@@ -241,3 +284,12 @@ class Response:
             ensure_ascii=False,
             separators=(",", ":")
         )
+
+    def __getattr__(self, name):
+        return None
+
+    def __setitem__(self, key, value):
+        setattr(self, key, value)
+
+    def __getitem__(self, item):
+        return getattr(self, item)

{cobweb-launcher-1.3.1 → cobweb-launcher-1.3.3}/cobweb/crawlers/crawler.py

@@ -3,7 +3,7 @@ import time
 import threading
 from typing import Union, Callable, Mapping
 
-import setting
+from cobweb import setting
 from cobweb.base import (
     Seed,
     BaseItem,
@@ -14,7 +14,7 @@ from cobweb.base import (
     TaskQueue,
     logger
 )
-from constant import DealModel
+from cobweb.constant import DealModel
 
 
 class Crawler(threading.Thread):
@@ -66,8 +66,8 @@ class Crawler(threading.Thread):
     def build_download_item(self):
         thread_sleep = 0.1
         if TaskQueue.RESPONSE.length >= self.download_queue_size:
-            logger.info(f"download queue is full, sleep {thread_sleep}s")
             thread_sleep = 5
+            # logger.info(f"download queue is full, sleep {thread_sleep}s")
         elif request_info := TaskQueue.DOWNLOAD.pop():
             member, priority = request_info
             request_setting = json.loads(member)
@@ -79,7 +79,7 @@ class Crawler(threading.Thread):
     def build_parse_item(self):
         thread_sleep = 0.1
         if TaskQueue.UPLOAD.length >= self.upload_queue_size:
-            logger.info(f"upload queue is full, sleep {thread_sleep}s")
+            # logger.info(f"upload queue is full, sleep {thread_sleep}s")
             thread_sleep = 5
         if response_item := TaskQueue.RESPONSE.pop():
             TaskQueue.process_task(response_item, self.parse)

{cobweb-launcher-1.3.1 → cobweb-launcher-1.3.3}/cobweb/launchers/launcher.py

@@ -137,10 +137,10 @@ class Launcher(threading.Thread):
 
     def _add_thread(self, func, num=1, obj=None, name=None, args=()):
         obj = obj or self
-        name = obj.__class__.__name__ + name or func.__name__
+        name = obj.__class__.__name__ + ":" + (name or func.__name__)
         for i in range(num):
             func_name = name + "_" + str(i) if num > 1 else name
-            self._threads.append(threading.Thread(name=func_name, target=func, args=(obj,) + args))
+            self._threads.append(threading.Thread(name=func_name, target=func, args=()))
 
     @Decorators.stop
     def _polling(self):
@@ -150,6 +150,10 @@ class Launcher(threading.Thread):
                 if not self.task_model and run_time > self.before_scheduler_wait_seconds:
                     logger.info("Done! ready to close thread...")
                     self.stop.set()
+                elif TaskQueue.TODO.length or TaskQueue.DOWNLOAD.length:
+                    logger.info(f"Recovery {self.task} task run！")
+                    self.check_emtpy_times = 0
+                    self.pause.clear()
                 else:
                     logger.info("pause! waiting for resume...")
             elif self.check_emtpy_times > 2:
@@ -164,10 +168,6 @@ class Launcher(threading.Thread):
                     f"reset times {3 - self.check_emtpy_times}"
                 )
                 self.check_emtpy_times += 1
-        elif TaskQueue.TODO.length:
-            logger.info(f"Recovery {self.task} task run！")
-            self.check_emtpy_times = 0
-            self.pause.clear()
         else:
             logger.info(LogTemplate.launcher_polling.format(
                 task=self.task,
@@ -179,6 +179,8 @@ class Launcher(threading.Thread):
                 response_queue_len=TaskQueue.RESPONSE.length,
                 done_queue_len=TaskQueue.DONE.length,
                 upload_queue_len=TaskQueue.UPLOAD.length,
+                seed_queue_len=TaskQueue.SEED.length,
+                download_queue_len=TaskQueue.DOWNLOAD.length
             ))
         time.sleep(10)
 

{cobweb-launcher-1.3.1 → cobweb-launcher-1.3.3}/cobweb/launchers/launcher_pro.py

@@ -1,7 +1,7 @@
 import time
 
-from base import TaskQueue, Decorators
-from schedulers.scheduler_redis import RedisScheduler
+from cobweb.base import TaskQueue, Decorators
+from cobweb.schedulers import RedisScheduler
 from .launcher import Launcher
 
 
@@ -21,21 +21,19 @@ class LauncherPro(Launcher):
             (TaskQueue.DOWNLOAD, self._redis_download, self.download_queue_size, self._task_info["download"]),
         ]:
             if q.length < size:
-                for member, priority in self._scheduler.schedule(
-                    key, self.scheduling_size
-                ):
+                for member, priority in self._scheduler.schedule(key, self.scheduling_size):
                     q.push((member, priority), direct_insertion=True)
                     self.add_working_item(key.split(":")[-1], member, priority)
                 thread_sleep = 0.1
         time.sleep(thread_sleep)
 
-    @Decorators.pause
+    @Decorators.stop
     def _heartbeat(self):
         if self._scheduler.working.is_set():
             self._scheduler.set_heartbeat()
         time.sleep(3)
 
-    @Decorators.pause
+    @Decorators.stop
     def _reset(self):
         self._scheduler.reset(
             keys=[self._redis_todo, self._redis_download],
@@ -51,7 +49,7 @@ class LauncherPro(Launcher):
             (TaskQueue.REQUEST, self._redis_download, self.request_queue_size),
         ]:
             item_info = {}
-            while item := q.pop() and len(item_info.keys()) < self.inserting_size:
+            while (item := q.pop()) and len(item_info.keys()) < self.inserting_size:
                 item_info[item.seed] = item.params.priority
             if q.length >= size:
                 thread_sleep = self.inserting_wait_time
@@ -72,9 +70,9 @@ class LauncherPro(Launcher):
             (TaskQueue.DONE, self._redis_download, self.done_queue_size),
         ]:
             items = []
-            while item := q.pop() and len(items) < self.removing_size:
+            while (item := q.pop()) and len(items) < self.removing_size:
                 items.append(item)
-            self._scheduler.delete(key, *items)
+            self._scheduler.delete(key, items)
             self.remove_working_items(key.split(":")[-1], items)
             if q.length >= size:
                 thread_sleep = 0.1
@@ -87,4 +85,4 @@ class LauncherPro(Launcher):
         self._add_thread(func=self._schedule)
         self._add_thread(func=self._insert)
         self._add_thread(func=self._remove)
-        self._add_thread(func=self._polling)
+        # self._add_thread(func=self._polling)

{cobweb-launcher-1.3.1 → cobweb-launcher-1.3.3}/cobweb/pipelines/pipeline.py

@@ -30,7 +30,7 @@ class Pipeline(ABC):
         data_info, seeds = {}, []
         thread_sleep = self.upload_wait_time if TaskQueue.UPLOAD.length < self.upload_queue_size else 0.1
         try:
-            while item := TaskQueue.UPLOAD.pop() and len(seeds) <= self.upload_queue_size:
+            while (item := TaskQueue.UPLOAD.pop()) and len(seeds) <= self.upload_queue_size:
                 data = self.build(item)
                 data_info.setdefault(item.table, []).append(data)
                 seeds.append(item.seed)
@@ -39,6 +39,7 @@ class Pipeline(ABC):
         except Exception as e:
             logger.info(e)
             seeds = None
+            # todo: retry
         finally:
             TaskQueue.DONE.push(seeds)
 

cobweb-launcher-1.3.3/cobweb/schedulers/__init__.py

@@ -0,0 +1 @@
+from .scheduler_redis import RedisScheduler

cobweb-launcher-1.3.3/cobweb/schedulers/scheduler_redis.py

@@ -0,0 +1,69 @@
+import threading
+import time
+
+# from cobweb.base import Seed
+from cobweb.db import RedisDB
+
+
+class RedisScheduler:
+
+    def __init__(self, task, project, scheduler_wait_seconds=30):
+        self._todo_key = "{%s:%s}:todo" % (project, task)
+        self._download_key = "{%s:%s}:download" % (project, task)
+        self._heartbeat_key = "heartbeat:%s_%s" % (project, task)
+        self._speed_control_key = "speed_control:%s_%s" % (project, task)
+        self._reset_lock_key = "lock:reset:%s_%s" % (project, task)
+        self._db = RedisDB()
+
+        self.scheduler_wait_seconds = scheduler_wait_seconds
+        self.working = threading.Event()
+
+    @property
+    def heartbeat(self):
+        return self._db.exists(self._heartbeat_key)
+
+    def set_heartbeat(self):
+        return self._db.setex(self._heartbeat_key, 5)
+
+    def schedule(self, key, count):
+        if not self._db.zcount(key, 0, "(1000"):
+            time.sleep(self.scheduler_wait_seconds)
+        else:
+            source = int(time.time())
+            members = self._db.members(key, source, count=count, _min=0, _max="(1000")
+            for member, priority in members:
+                # seed = Seed(member, priority=priority)
+                yield member.decode(), priority
+
+    def insert(self, key, items):
+        if items:
+            self._db.zadd(key, items, nx=True)
+
+    def reset(self, keys, reset_time=30):
+        if self._db.lock(self._reset_lock_key, t=120):
+
+            if isinstance(keys, str):
+                keys = [keys]
+
+            _min = reset_time - int(time.time()) if self.heartbeat else "-inf"
+
+            for key in keys:
+                self._db.members(key, 0, _min=_min, _max="(0")
+
+            if not self.heartbeat:
+                self.working.set()
+                time.sleep(10)
+
+            self._db.delete(self._reset_lock_key)
+
+    def refresh(self, key, items: dict[str, int]):
+        refresh_time = int(time.time())
+        its = {k: -refresh_time - v / 1000 for k, v in items}
+        self._db.zadd(key, item=its, xx=True)
+
+    def delete(self, key, values):
+        self._db.zrem(key, *values)
+
+
+
+

{cobweb-launcher-1.3.1 → cobweb-launcher-1.3.3/cobweb_launcher.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: cobweb-launcher
-Version: 1.3.1
+Version: 1.3.3
 Summary: spider_hole
 Home-page: https://github.com/Juannie-PP/cobweb
 Author: Juannie-PP

{cobweb-launcher-1.3.1 → cobweb-launcher-1.3.3}/cobweb_launcher.egg-info/SOURCES.txt

@@ -29,6 +29,8 @@ cobweb/pipelines/__init__.py
 cobweb/pipelines/pipeline.py
 cobweb/pipelines/pipeline_console.py
 cobweb/pipelines/pipeline_loghub.py
+cobweb/schedulers/__init__.py
+cobweb/schedulers/scheduler_redis.py
 cobweb/utils/__init__.py
 cobweb/utils/bloom.py
 cobweb/utils/oss.py

{cobweb-launcher-1.3.1 → cobweb-launcher-1.3.3}/setup.py

@@ -5,7 +5,7 @@ with open("README.md", "r", encoding="utf-8") as fh:
 
 setup(
     name="cobweb-launcher",
-    version="1.3.1",
+    version="1.3.3",
     packages=find_packages(),
     url="https://github.com/Juannie-PP/cobweb",
     license="MIT",