warp-beacon 2.2.39__tar.gz → 2.2.41__tar.gz

{warp_beacon-2.2.39/warp_beacon.egg-info → warp_beacon-2.2.41}/PKG-INFO

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

warp_beacon-2.2.41/warp_beacon/__version__.py

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

{warp_beacon-2.2.39 → warp_beacon-2.2.41}/warp_beacon/jobs/abstract.py

@@ -41,6 +41,7 @@ class JobSettings(TypedDict):
 	session_validation: bool
 	chat_type: ChatType
 	account_admins: str
+	job_postponed_until: int
 
 class AbstractJob(ABC):
 	job_id: uuid.UUID = None
@@ -74,6 +75,7 @@ class AbstractJob(ABC):
 	session_validation: bool = False
 	chat_type: ChatType = None
 	account_admins: str = None
+	job_postponed_until: int = -1
 
 	def __init__(self, **kwargs: Unpack[JobSettings]) -> None:
 		if kwargs:

{warp_beacon-2.2.39 → warp_beacon-2.2.41}/warp_beacon/scraper/__init__.py

@@ -1,5 +1,6 @@
 import os
 
+import time
 from typing import Optional
 import multiprocessing
 from queue import Empty
@@ -72,7 +73,7 @@ class AsyncDownloader(object):
 	def try_next_account(self, selector: AccountSelector, job: DownloadJob, report_error: str = None) -> None:
 		logging.warning("Switching account!")
 		if job.account_switches > self.acc_selector.count_service_accounts(job.job_origin):
-			raise AllAccountsFailed("All config accounts failed!")
+			raise AllAccountsFailed("All config accounts failed!", job=job, reason=report_error)
 		if report_error:
 			selector.bump_acc_fail(report_error)
 		selector.next()
@@ -96,6 +97,12 @@ class AsyncDownloader(object):
 							logging.warning("Unknown task origin! Skipping.")
 							continue
 						if not job.in_process:
+							if job.job_postponed_until > 0:
+								if job.job_postponed_until - time.time() > 0:
+									logging.warning("Job '%s' is postponed, rescheduling", job.url)
+									time.sleep(2)
+									self.job_queue.put(job)
+									continue
 							actor = None
 							self.acc_selector.set_module(job.job_origin)
 							if job.job_origin is Origin.INSTAGRAM:
@@ -182,7 +189,7 @@ class AsyncDownloader(object):
 									self.send_message_to_admin(
 										f"Captcha required for account #{acc_index}, login: '{acc_data.get('login', 'unknown')}'."
 									)
-									self.try_next_account(selector, job)
+									self.try_next_account(selector, job, report_error="captcha")
 									self.job_queue.put(job)
 									break
 								except YotubeLiveError as e:
@@ -208,12 +215,16 @@ class AsyncDownloader(object):
 									logging.error("All accounts failed!")
 									logging.exception(e)
 									self.send_message_to_admin(
-										f"Task `{job.job_id}` failed. URL: '{job.url}'. Reason: '**AllAccountsFailed**'."
+										f"Task `{e.job.job_id}` failed. URL: '{e.job.url}'. Reason: '**AllAccountsFailed**'."
 									)
-									self.uploader.queue_task(job.to_upload_job(
+									self.uploader.queue_task(e.job.to_upload_job(
 										job_failed=True,
 										job_failed_msg="All bot accounts failed to download content. Bot administrator noticed about the issue.")
 									)
+									if e.job.job_origin == Origin.INSTAGRAM:
+										self.try_next_account(selector, job, report_error="captcha")
+										e.job.job_timeout = time.time() + 300
+										self.job_queue.put(e.job)
 									break
 								except (UnknownError, Exception) as e:
 									logging.warning("UnknownError occurred!")

{warp_beacon-2.2.39 → warp_beacon-2.2.41}/warp_beacon/scraper/account_selector.py

@@ -56,7 +56,7 @@ class AccountSelector(object):
 			if module_name not in self.accounts_meta_data:
 				self.accounts_meta_data[module_name] = []
 			for index, _ in enumerate(lst):
-				self.accounts_meta_data[module_name].insert(index, {"auth_fails": 0, "rate_limits": 0})
+				self.accounts_meta_data[module_name].insert(index, {"auth_fails": 0, "rate_limits": 0, "cathcha": 0})
 
 	def set_module(self, module_origin: Origin) -> None:
 		module_name = 'youtube' if next((s for s in ("yt", "youtube", "youtu_be") if s in module_origin.value), None) else 'instagram'
@@ -81,7 +81,8 @@ class AccountSelector(object):
 		return self.accounts_meta_data[self.current_module_name][self.account_index[self.current_module_name].value][key]
 	
 	def get_current(self) -> tuple:
-		return (self.account_index[self.current_module_name].value, self.current)
+		idx = self.account_index[self.current_module_name].value
+		return (idx, self.accounts[self.current_module_name][idx])
 	
 	def get_meta_data(self) -> dict:
 		return self.accounts_meta_data[self.current_module_name][self.account_index[self.current_module_name].value]

{warp_beacon-2.2.39 → warp_beacon-2.2.41}/warp_beacon/scraper/exceptions.py

@@ -1,5 +1,3 @@
-from typing import Union
-
 class ScraperError(Exception):
 	def __init__(self, *args, **kwargs):
 		args = list(args)

{warp_beacon-2.2.39 → warp_beacon-2.2.41}/warp_beacon/scraper/youtube/abstract.py

@@ -13,7 +13,7 @@ import http.client
 from PIL import Image
 
 from warp_beacon.scraper.abstract import ScraperAbstract
-#from warp_beacon.mediainfo.abstract import MediaInfoAbstract
+from warp_beacon.mediainfo.abstract import MediaInfoAbstract
 from warp_beacon.scraper.exceptions import TimeOut, Unavailable, extract_exception_message
 
 from pytubefix import YouTube
@@ -118,9 +118,9 @@ class YoutubeAbstract(ScraperAbstract):
 		new_image = Image.new("RGB", target_size, background_color)
 		image.thumbnail(target_size, Image.Resampling.LANCZOS)
 
-		if aspect_ratio_height > 4:
-			image = image.resize((image.size[0], image.size[1]+new_image.size[1]))
-			#height += new_image.size[1] - 5
+		#if aspect_ratio_height > 4:
+		#	image = image.resize((image.size[0], image.size[1]+new_image.size[1]))
+		#	target_height += new_image.size[1] - 5
 
 		paste_position = ((target_width - width) // 2, (target_height - height) // 2)
 		new_image.paste(image, paste_position)
@@ -143,7 +143,11 @@ class YoutubeAbstract(ScraperAbstract):
 						image = Image.open(io.BytesIO(response.content))
 						ratio = self.aspect_ratio(image.size)
 						logging.info("thumb ratio: '%s'", ratio)
-						new_image = self.calculate_size_with_padding(image, ratio[0], ratio[1])
+						new_image = None
+						if ratio[1] > 4:
+							new_image = MediaInfoAbstract.shrink_image_to_fit(image)
+						else:
+							new_image = self.calculate_size_with_padding(image, ratio[0], ratio[1])
 						logging.info("thumb size: '%s'", new_image.size)
 						io_buf = io.BytesIO()
 						new_image.save(io_buf, format='JPEG', subsampling=0, quality=100, progressive=True, optimize=False)

{warp_beacon-2.2.39 → warp_beacon-2.2.41/warp_beacon.egg-info}/PKG-INFO

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

warp_beacon-2.2.39/warp_beacon/__version__.py

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