zenx 0.6.2__tar.gz → 0.6.4__tar.gz

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (31) hide show
  1. {zenx-0.6.2 → zenx-0.6.4}/PKG-INFO +1 -1
  2. {zenx-0.6.2 → zenx-0.6.4}/pyproject.toml +1 -1
  3. {zenx-0.6.2 → zenx-0.6.4}/zenx/engine.py +20 -0
  4. {zenx-0.6.2 → zenx-0.6.4}/zenx/spiders/base.py +19 -1
  5. {zenx-0.6.2 → zenx-0.6.4}/zenx.egg-info/PKG-INFO +1 -1
  6. {zenx-0.6.2 → zenx-0.6.4}/setup.cfg +0 -0
  7. {zenx-0.6.2 → zenx-0.6.4}/zenx/cli.py +0 -0
  8. {zenx-0.6.2 → zenx-0.6.4}/zenx/clients/__init__.py +0 -0
  9. {zenx-0.6.2 → zenx-0.6.4}/zenx/clients/database.py +0 -0
  10. {zenx-0.6.2 → zenx-0.6.4}/zenx/clients/http.py +0 -0
  11. {zenx-0.6.2 → zenx-0.6.4}/zenx/debug_runner.py +0 -0
  12. {zenx-0.6.2 → zenx-0.6.4}/zenx/discovery.py +0 -0
  13. {zenx-0.6.2 → zenx-0.6.4}/zenx/exceptions.py +0 -0
  14. {zenx-0.6.2 → zenx-0.6.4}/zenx/logger.py +0 -0
  15. {zenx-0.6.2 → zenx-0.6.4}/zenx/pipelines/__init__.py +0 -0
  16. {zenx-0.6.2 → zenx-0.6.4}/zenx/pipelines/base.py +0 -0
  17. {zenx-0.6.2 → zenx-0.6.4}/zenx/pipelines/google_rpc.py +0 -0
  18. {zenx-0.6.2 → zenx-0.6.4}/zenx/pipelines/manager.py +0 -0
  19. {zenx-0.6.2 → zenx-0.6.4}/zenx/pipelines/preprocess.py +0 -0
  20. {zenx-0.6.2 → zenx-0.6.4}/zenx/pipelines/websocket.py +0 -0
  21. {zenx-0.6.2 → zenx-0.6.4}/zenx/resources/proto/__init__.py +0 -0
  22. {zenx-0.6.2 → zenx-0.6.4}/zenx/resources/proto/feed_pb2.py +0 -0
  23. {zenx-0.6.2 → zenx-0.6.4}/zenx/resources/proto/feed_pb2_grpc.py +0 -0
  24. {zenx-0.6.2 → zenx-0.6.4}/zenx/settings.py +0 -0
  25. {zenx-0.6.2 → zenx-0.6.4}/zenx/spiders/__init__.py +0 -0
  26. {zenx-0.6.2 → zenx-0.6.4}/zenx/utils.py +0 -0
  27. {zenx-0.6.2 → zenx-0.6.4}/zenx.egg-info/SOURCES.txt +0 -0
  28. {zenx-0.6.2 → zenx-0.6.4}/zenx.egg-info/dependency_links.txt +0 -0
  29. {zenx-0.6.2 → zenx-0.6.4}/zenx.egg-info/entry_points.txt +0 -0
  30. {zenx-0.6.2 → zenx-0.6.4}/zenx.egg-info/requires.txt +0 -0
  31. {zenx-0.6.2 → zenx-0.6.4}/zenx.egg-info/top_level.txt +0 -0
@@ -1,6 +1,6 @@
1
1
  Metadata-Version: 2.4
2
2
  Name: zenx
3
- Version: 0.6.2
3
+ Version: 0.6.4
4
4
  Summary: mini-framework
5
5
  Requires-Python: >=3.12
6
6
  Requires-Dist: curl-cffi>=0.12.0
@@ -1,6 +1,6 @@
1
1
  [project]
2
2
  name = "zenx"
3
- version = "0.6.2"
3
+ version = "0.6.4"
4
4
  description = "mini-framework"
5
5
  requires-python = ">=3.12"
6
6
  dependencies = [
@@ -26,6 +26,16 @@ class Engine:
26
26
  self.shutdown_event.set()
27
27
 
28
28
 
29
+ async def _log_stats(self, spider: Spider) -> None:
30
+ while True:
31
+ await asyncio.sleep(60)
32
+ try:
33
+ rpm = spider.get_stats().get("rpm")
34
+ spider.logger.info("stats", rpm=rpm)
35
+ except asyncio.CancelledError:
36
+ break
37
+
38
+
29
39
  async def _execute(self, spider_name: str) -> None:
30
40
  loop = asyncio.get_running_loop()
31
41
  loop.add_signal_handler(signal.SIGINT, self._shutdown_handler)
@@ -48,6 +58,7 @@ class Engine:
48
58
 
49
59
  spider = spider_cls(client=client, pm=pm, logger=logger, settings=settings)
50
60
 
61
+ stats_task = asyncio.create_task(self._log_stats(spider))
51
62
  try:
52
63
  if self.forever:
53
64
  while not self.shutdown_event.is_set():
@@ -61,6 +72,15 @@ class Engine:
61
72
  finally:
62
73
  if self.shutdown_event.is_set():
63
74
  logger.info("shutdown", spider=spider_name)
75
+
76
+ stats_task.cancel()
77
+ try:
78
+ await stats_task
79
+ except asyncio.CancelledError:
80
+ pass
81
+ stats = spider.get_stats()
82
+ logger.info("summary", **stats)
83
+
64
84
  await client.close()
65
85
  await db.close()
66
86
  await pm.close_pipelines()
@@ -1,5 +1,7 @@
1
1
  from __future__ import annotations
2
2
  from abc import ABC, abstractmethod
3
+ from collections import deque
4
+ import time
3
5
  from typing import ClassVar, Dict, List, Literal, Type
4
6
  from structlog import BoundLogger
5
7
 
@@ -13,7 +15,7 @@ class Spider(ABC):
13
15
  # central registry
14
16
  name: ClassVar[str]
15
17
  _registry: ClassVar[Dict[str, Type[Spider]]] = {}
16
- pipelines: ClassVar[List[Literal["synoptic_websocket","synoptic_grpc"]]]
18
+ pipelines: ClassVar[List[Literal["preprocess","synoptic_websocket","synoptic_grpc"]]]
17
19
  client_name: ClassVar[Literal["curl_cffi"]] = "curl_cffi"
18
20
 
19
21
 
@@ -44,6 +46,22 @@ class Spider(ABC):
44
46
  self.pm = pm
45
47
  self.logger = logger
46
48
  self.settings = settings
49
+ # stats
50
+ self.requests_timestamps = deque()
51
+ self.total_requests = 0
52
+
53
+
54
+ def get_stats(self) -> Dict:
55
+ # calculate RPM based on rolling window of 1 min
56
+ now = time.time()
57
+ # remove requests older than 60 sec
58
+ while self.requests_timestamps and self.requests_timestamps[0] < (now - 60):
59
+ self.requests_timestamps.popleft()
60
+ rpm = len(self.requests_timestamps)
61
+ return {
62
+ "rpm": rpm,
63
+ "total_requests": self.total_requests,
64
+ }
47
65
 
48
66
 
49
67
  @abstractmethod
@@ -1,6 +1,6 @@
1
1
  Metadata-Version: 2.4
2
2
  Name: zenx
3
- Version: 0.6.2
3
+ Version: 0.6.4
4
4
  Summary: mini-framework
5
5
  Requires-Python: >=3.12
6
6
  Requires-Dist: curl-cffi>=0.12.0
File without changes
File without changes
File without changes
File without changes
File without changes
File without changes
File without changes
File without changes
File without changes
File without changes
File without changes
File without changes
File without changes
File without changes
File without changes
File without changes
File without changes
File without changes
File without changes
File without changes
File without changes