warp-beacon 2.6.15__tar.gz → 2.6.17__tar.gz

{warp_beacon-2.6.15/warp_beacon.egg-info → warp_beacon-2.6.17}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: warp_beacon
-Version: 2.6.15
+Version: 2.6.17
 Summary: Telegram bot for expanding external media links
 Home-page: https://github.com/sb0y/warp_beacon
 Author: Andrey Bagrintsev

warp_beacon-2.6.17/warp_beacon/__version__.py

@@ -0,0 +1,2 @@
+__version__ = "2.6.17"
+

{warp_beacon-2.6.15 → warp_beacon-2.6.17}/warp_beacon/scraper/__init__.py

@@ -100,11 +100,11 @@ class AsyncDownloader(object):
 		while self.allow_loop.value == 1:
 			try:
 				job: DownloadJob = None
+				actor = None
 				try:
 					job = self.job_queue.get()
 					if job is self.__JOE_BIDEN_WAKEUP:
 						break
-					actor = None
 					try:
 						items = []
 						if job.job_origin is Origin.UNKNOWN:
@@ -249,23 +249,6 @@ class AsyncDownloader(object):
 										f"Task <code>{job.job_id}</code> failed. URL: '{job.url}'. Reason: '<b>YotubeAgeRestrictedError</b>'."
 									)
 									break
-								except AllAccountsFailed as e:
-									logging.error("All accounts failed!")
-									logging.exception(e)
-									self.send_message_to_admin(
-										f"Task <code>{job.job_id}</code> failed. URL: '{job.url}'. Reason: '<b>AllAccountsFailed</b>'."
-									)
-									if job.job_origin == Origin.INSTAGRAM:
-										logging.info("Handling captcha postpone")
-										self.uploader.queue_task(job.to_upload_job(
-											job_warning=True,
-											job_warning_msg="Bot is experiencing issues, video delivery may be delayed.")
-										)
-										#self.try_next_account(selector, job, report_error="captcha")
-										#e.job.job_postponed_until = time.time() + 300
-										#self.job_queue.put(e.job)
-										fail_handler.store_failed_job(job)
-									break
 								except (UnknownError, Exception) as e:
 									logging.warning("UnknownError occurred!")
 									logging.exception(e)
@@ -381,6 +364,22 @@ class AsyncDownloader(object):
 						else:
 							logging.info("Job already in work in parallel worker. Redirecting job to upload worker.")
 							self.uploader.queue_task(job.to_upload_job())
+			
+					except AllAccountsFailed as e:
+						self.send_message_to_admin(
+							f"Task <code>{job.job_id}</code> failed. URL: '{job.url}'. Reason: '<b>AllAccountsFailed</b>'."
+						)
+						if job.job_origin == Origin.INSTAGRAM:
+							logging.info("Handling captcha postpone")
+							self.uploader.queue_task(job.to_upload_job(
+								job_warning=True,
+								job_warning_msg="The bot is currently experiencing technical issues. Message delivery may be delayed.")
+							)
+							#self.try_next_account(selector, job, report_error="captcha")
+							#e.job.job_postponed_until = time.time() + 300
+							#self.job_queue.put(e.job)
+							fail_handler.store_failed_job(job)
+							self.notify_task_failed(job)
 					except Exception as e:
 						logging.error("Error inside download worker!")
 						logging.exception(e)
@@ -398,6 +397,7 @@ class AsyncDownloader(object):
 
 	def stop_all(self) -> None:
 		self.allow_loop.value = 0
+		self.acc_selector.save_ig_request_count()
 		for proc in self.workers:
 			if proc.is_alive():
 				logging.info("stopping process #%d", proc.pid)

{warp_beacon-2.6.15 → warp_beacon-2.6.17}/warp_beacon/scraper/account_selector.py

@@ -40,9 +40,33 @@ class AccountSelector(object):
 			if proxy_file_path:
 				with open(proxy_file_path, 'r', encoding="utf-8") as f:
 					self.proxies = json.loads(f.read())
+
+			self.load_ig_request_count()
 		else:
 			raise ValueError("Accounts file not found")
 
+	def save_ig_request_count(self) -> None:
+		try:
+			state = {"ig_count": self.ig_request_count.value}
+			with open(f"{self.session_dir}/ig_request_counter.json", "w+", encoding="utf-8") as f:
+				f.write(json.dumps(state))
+		except Exception as e:
+			logging.error("Failed to save accounts states!")
+			logging.exception(e)
+
+	def load_ig_request_count(self) -> None:
+		try:
+			state = {}
+			filepath = f"{self.session_dir}/ig_request_counter.json"
+			if os.path.exists(filepath):
+				with open(f"{self.session_dir}/ig_request_counter.json", "r", encoding="utf-8") as f:
+					state = json.loads(f.read())
+				if state:
+					self.ig_request_count.value = int(state.get("ig_count", 0))
+		except Exception as e:
+			logging.error("Failed to save accounts states!")
+			logging.exception(e)
+
 	def get_current_proxy(self) -> Optional[dict]:
 		return self.current_proxy
 

{warp_beacon-2.6.15 → warp_beacon-2.6.17}/warp_beacon/scraper/fail_handler.py

@@ -1,12 +1,10 @@
-import os
-
 import pickle
 
+import logging
+
 from warp_beacon.storage.mongo import DBClient
 from warp_beacon.jobs.download_job import DownloadJob
 
-import logging
-
 class FailHandler(object):
 	client = None
 	db = None

{warp_beacon-2.6.15 → warp_beacon-2.6.17/warp_beacon.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: warp_beacon
-Version: 2.6.15
+Version: 2.6.17
 Summary: Telegram bot for expanding external media links
 Home-page: https://github.com/sb0y/warp_beacon
 Author: Andrey Bagrintsev

warp_beacon-2.6.15/warp_beacon/__version__.py

@@ -1,2 +0,0 @@
-__version__ = "2.6.15"
-