warp-beacon 2.6.15__py3-none-any.whl → 2.6.17__py3-none-any.whl

warp_beacon/__version__.py

@@ -1,2 +1,2 @@
-__version__ = "2.6.15"
+__version__ = "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/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/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.dist-info → warp_beacon-2.6.17.dist-info}/METADATA

@@ -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.dist-info → warp_beacon-2.6.17.dist-info}/RECORD

@@ -4,7 +4,7 @@ var/warp_beacon/accounts.json,sha256=OsXdncs6h88xrF_AP6_WDCK1waGBn9SR-uYdIeK37GM
 var/warp_beacon/placeholder.gif,sha256=cE5CGJVaop4Sx21zx6j4AyoHU0ncmvQuS2o6hJfEH88,6064
 var/warp_beacon/proxies.json,sha256=VnjlQDXumOEq72ZFjbh6IqHS1TEHqn8HPYAZqWCeSIA,95
 warp_beacon/__init__.py,sha256=_rThNODmz0nDp_n4mWo_HKaNFE5jk1_7cRhHyYaencI,163
-warp_beacon/__version__.py,sha256=N_pYT1scTiUeGkwbnuIsOUPmaBLyM17-eraLGW8FTi0,24
+warp_beacon/__version__.py,sha256=a1aXAI5iMpUmb-fkAT_xmK2FejqLr_zPFFJYf9nelUY,24
 warp_beacon/warp_beacon.py,sha256=ED43vNzdjDUJ_9qLCbri0bjWLWEJ69BENGj9i7G6AvM,342
 warp_beacon/yt_auth.py,sha256=GUTKqYr_tzDC-07Lx_ahWXSag8EyLxXBUnQbDBIkEmk,6022
 warp_beacon/compress/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
@@ -22,11 +22,11 @@ warp_beacon/mediainfo/video.py,sha256=UBZrhTN5IDI-aYu6tsJEILo9nFkjHhkldGVFmvV7tE
 warp_beacon/scheduler/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 warp_beacon/scheduler/instagram_human.py,sha256=buF6rJzp8gVZvHBAXEkAL-uJjm5iQkEWnfPgwM2oH8g,6276
 warp_beacon/scheduler/scheduler.py,sha256=9OCh7Ta4wY_aTHGAOOZmaKXg56Ftx1N_aV1g6E3ZLKA,4941
-warp_beacon/scraper/__init__.py,sha256=A5LxRpo4dUTFTJ6FUxyXeDmxK2CnJmkpUmWE3KAuVHE,18591
+warp_beacon/scraper/__init__.py,sha256=x5z9NrK_CPXITOR9Uus3U6DvytNThvGt2yDRGlyakJo,18566
 warp_beacon/scraper/abstract.py,sha256=CiOyKCxVYWhPnOUpLAVIRNuHBftN6gmxqATdhjzkaS4,2852
-warp_beacon/scraper/account_selector.py,sha256=mYNxAyAJj4ie9wMMkfb7ONjvAicS8xPEfE3iIe4gCog,6965
+warp_beacon/scraper/account_selector.py,sha256=wm8XO020QSvJO43TG7G06a17G0lFtNdx17V8mC8vKbs,7783
 warp_beacon/scraper/exceptions.py,sha256=EKwoF0oH2xZWbNU-v8DOaWK5skKwa3s1yTIBdlcfMpc,1452
-warp_beacon/scraper/fail_handler.py,sha256=_blvckfTZ4xWVancQKVRXH5ClKGwfrBxMwvXIFZh1qA,975
+warp_beacon/scraper/fail_handler.py,sha256=zcPK3ZVEsu6JmHYcWP7L3naTRK3gWFVRkpP84VBOtJs,964
 warp_beacon/scraper/link_resolver.py,sha256=Rc9ZuMyOo3iPywDHwjngy-WRQ2SXhJwxcg-5ripx7tM,2447
 warp_beacon/scraper/instagram/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 warp_beacon/scraper/instagram/captcha.py,sha256=9UYziuqB3Tsat_ET6ex-cnZDbi6yCnsXHSpmE8MuUHk,4651
@@ -45,9 +45,9 @@ warp_beacon/telegram/handlers.py,sha256=uvR6TPHSqdSxigp3wR-ewiE6t3TvVcbVLVcYGwkg
 warp_beacon/telegram/placeholder_message.py,sha256=wN9-BRiyrtHG-EvXtZkGJHt2CX71munQ57ITttjt0mw,6400
 warp_beacon/telegram/utils.py,sha256=1Lq67aRylVJzbwSyvAgjPAGjJZFATkICvAj3TJGuJiM,4635
 warp_beacon/uploader/__init__.py,sha256=j3qcuKhpchseZLGzSsSiogqe6WdMbkK8d3I-ConhNRs,5687
-warp_beacon-2.6.15.dist-info/licenses/LICENSE,sha256=xx0jnfkXJvxRnG63LTGOxlggYnIysveWIZ6H3PNdCrQ,11357
-warp_beacon-2.6.15.dist-info/METADATA,sha256=oVS20hMXSDfiZ3_xWKSa8g9wRPRSMFdV5p4NtlAJqlc,22706
-warp_beacon-2.6.15.dist-info/WHEEL,sha256=ck4Vq1_RXyvS4Jt6SI0Vz6fyVs4GWg7AINwpsaGEgPE,91
-warp_beacon-2.6.15.dist-info/entry_points.txt,sha256=eSB61Rb89d56WY0O-vEIQwkn18J-4CMrJcLA_R_8h3g,119
-warp_beacon-2.6.15.dist-info/top_level.txt,sha256=4ML0-mXsezLtRXyxQUntL_ktc5HX9npTeQWzvV8kFvA,1161
-warp_beacon-2.6.15.dist-info/RECORD,,
+warp_beacon-2.6.17.dist-info/licenses/LICENSE,sha256=xx0jnfkXJvxRnG63LTGOxlggYnIysveWIZ6H3PNdCrQ,11357
+warp_beacon-2.6.17.dist-info/METADATA,sha256=oWESJ8WFz9XTMXake_tV2ezRui08bIGVwi9b7m3491c,22706
+warp_beacon-2.6.17.dist-info/WHEEL,sha256=ck4Vq1_RXyvS4Jt6SI0Vz6fyVs4GWg7AINwpsaGEgPE,91
+warp_beacon-2.6.17.dist-info/entry_points.txt,sha256=eSB61Rb89d56WY0O-vEIQwkn18J-4CMrJcLA_R_8h3g,119
+warp_beacon-2.6.17.dist-info/top_level.txt,sha256=4ML0-mXsezLtRXyxQUntL_ktc5HX9npTeQWzvV8kFvA,1161
+warp_beacon-2.6.17.dist-info/RECORD,,