warp-beacon 2.3.36__py3-none-any.whl → 2.3.38__py3-none-any.whl

warp_beacon/__version__.py

@@ -1,2 +1,2 @@
-__version__ = "2.3.36"
+__version__ = "2.3.38"
 

warp_beacon/scraper/youtube/abstract.py

@@ -1,4 +1,5 @@
-import os, io
+import os
+import io
 import pathlib
 import time
 import math
@@ -8,8 +9,8 @@ import ssl
 from typing import Callable, Union, Optional
 import json
 import urllib
-import requests
 import http.client
+import requests
 from PIL import Image
 import numpy as np
 
@@ -181,8 +182,8 @@ class YoutubeAbstract(ScraperAbstract):
 
 		return None
 
-	def download_hndlr(self, func: Callable, *args: tuple[Union[str, int, dict, tuple]], **kwargs: dict[Union[str, int, dict, tuple]]) -> Union[str, dict, io.BytesIO]:
-		ret_val = ''
+	def download_hndlr(self, func: Callable, *args: tuple[Union[str, int, dict, tuple, bool]], **kwargs: dict[Union[str, int, dict, tuple, bool]]) -> Optional[Union[list, dict, str, io.BytesIO]]:
+		ret_val = None
 		max_retries = int(os.environ.get("YT_MAX_RETRIES", default=self.YT_MAX_RETRIES_DEFAULT))
 		pause_secs = int(os.environ.get("YT_PAUSE_BEFORE_RETRY", default=self.YT_PAUSE_BEFORE_RETRY_DEFAULT))
 		timeout = int(os.environ.get("YT_TIMEOUT", default=self.YT_TIMEOUT_DEFAULT))
@@ -224,18 +225,20 @@ class YoutubeAbstract(ScraperAbstract):
 		pass
 		#logging.info("bytes: %d, bytes remaining: %d", chunk, bytes_remaining)
 
-	def build_yt(self, url: str) -> YouTube:
-		InnerTube.send_message_to_admin_func = self.send_message_to_admin_func
-		InnerTube.auth_event = self.auth_event
-		InnerTube.wb_account = self.account
-		InnerTube.fetch_bearer_token = patched_fetch_bearer_token
+	def build_yt(self, url: str, session: bool = True) -> YouTube:
+		if session:
+			InnerTube.send_message_to_admin_func = self.send_message_to_admin_func
+			InnerTube.auth_event = self.auth_event
+			InnerTube.wb_account = self.account
+			InnerTube.fetch_bearer_token = patched_fetch_bearer_token
 		_default_clients["ANDROID"]["innertube_context"]["context"]["client"]["clientVersion"] = "19.08.35"
 		_default_clients["ANDROID_MUSIC"] = _default_clients["ANDROID"]
 		yt_opts = {"url": url, "on_progress_callback": self.yt_on_progress}
-		yt_opts["client"] = "TV_EMBED"
-		yt_opts["use_oauth"] = True
-		yt_opts["allow_oauth_cache"] = True
-		yt_opts["token_file"] = self.YT_SESSION_FILE % self.account_index
+		if session:
+			yt_opts["client"] = "TV_EMBED"
+			yt_opts["use_oauth"] = True
+			yt_opts["allow_oauth_cache"] = True
+			yt_opts["token_file"] = self.YT_SESSION_FILE % self.account_index
 		if self.proxy:
 			proxy_dsn = self.proxy.get("dsn", "")
 			if proxy_dsn:
@@ -252,4 +255,10 @@ class YoutubeAbstract(ScraperAbstract):
 		raise NotImplementedError("You should to implement _download method")
 
 	def download(self, job: DownloadJob) -> list:
-		return self.download_hndlr(self._download, job.url)
+		try:
+			return self.download_hndlr(self._download, job.url, session=False)
+		except Unavailable:
+			logging.warning("Failed sessionless download attempt. Trying with session.")
+			time.sleep(2)
+		
+		return self.download_hndlr(self._download, job.url, session=True)

warp_beacon/scraper/youtube/music.py

@@ -10,10 +10,10 @@ class YoutubeMusicScraper(YoutubeAbstract):
 	YT_TIMEOUT_DEFAULT = 2
 	YT_TIMEOUT_INCREMENT_DEFAULT = 60
 
-	def _download(self, url: str, timeout: int = 0) -> list:
+	def _download(self, url: str, session: bool = True, timeout: int = 0) -> list:
 		res = []
 		thumbnail = None
-		yt = self.build_yt(url)
+		yt = self.build_yt(url, session=session)
 
 		if yt:
 			thumbnail = self.download_hndlr(self.download_thumbnail, yt.video_id)

warp_beacon/scraper/youtube/shorts.py

@@ -12,10 +12,10 @@ class YoutubeShortsScraper(YoutubeAbstract):
 	YT_TIMEOUT_DEFAULT = 2
 	YT_TIMEOUT_INCREMENT_DEFAULT = 60
 
-	def _download(self, url: str, timeout: int = 0) -> list:
+	def _download(self, url: str, session: bool = True, timeout: int = 0) -> list:
 		res = []
 		thumbnail = None
-		yt = self.build_yt(url)
+		yt = self.build_yt(url, session=session)
 		stream = yt.streams.get_highest_resolution()
 
 		if not stream:

warp_beacon/scraper/youtube/youtube.py

@@ -28,11 +28,11 @@ class YoutubeScraper(YoutubeAbstract):
 
 		return False
 
-	def _download(self, url: str, timeout: int = 0) -> list:
+	def _download(self, url: str, session: bool = True, timeout: int = 0) -> list:
 		res = []
 		try:
 			thumbnail = None
-			yt = self.build_yt(url)
+			yt = self.build_yt(url, session=session)
 
 			if self.is_live(yt.initial_data):
 				raise YoutubeLiveError("Youtube Live is not supported")

{warp_beacon-2.3.36.dist-info → warp_beacon-2.3.38.dist-info}/METADATA

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

{warp_beacon-2.3.36.dist-info → warp_beacon-2.3.38.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=vhS365fVuev0xp7fexaRILrS-ld_VdSvV677HuiGsnM,24
+warp_beacon/__version__.py,sha256=UmnivgpTPX3WFWoDJST4G4YTbxaMmCEc5cNERYmejdE,24
 warp_beacon/warp_beacon.py,sha256=7KEtZDj-pdhtl6m-zFLsSojs1ZR4o7L0xbqtdmYPvfE,342
 warp_beacon/compress/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 warp_beacon/compress/video.py,sha256=_PDMVYCyzLYxHv1uZmmzGcG_8rjaZr7BTXsXTTy_oS4,2846
@@ -30,10 +30,10 @@ warp_beacon/scraper/link_resolver.py,sha256=Rc9ZuMyOo3iPywDHwjngy-WRQ2SXhJwxcg-5
 warp_beacon/scraper/instagram/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 warp_beacon/scraper/instagram/instagram.py,sha256=TpIBS9S3zcLbeGax4CENVo6WP75EE6oIttc-MjWYVjs,13815
 warp_beacon/scraper/youtube/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-warp_beacon/scraper/youtube/abstract.py,sha256=4oyx2QTHu1LHD0DKcWXWmBu9oIak_zaOUbFgUpJATi4,9401
-warp_beacon/scraper/youtube/music.py,sha256=MObH7rU6qmg6xG3rRkO4iqmhm8uF4UlF2OqfF4G1eec,1379
-warp_beacon/scraper/youtube/shorts.py,sha256=Ij4IVCOfYGHvmbRbrE4Zli0GiHlM4qhd9wiUzr6qeUE,1230
-warp_beacon/scraper/youtube/youtube.py,sha256=Fz_svj9h7tam4UIfyYgxu6kRgPgdTmPeULmefLE-z2c,2134
+warp_beacon/scraper/youtube/abstract.py,sha256=HnjSTGumo4uzxEZydH18zhsqMrus38Vx3SRGhuuXl0c,9707
+warp_beacon/scraper/youtube/music.py,sha256=6FIU1tqKvW7Osh3jg8fqli2W30Lgp_GM33S9lfOnk0s,1418
+warp_beacon/scraper/youtube/shorts.py,sha256=k3yGF9b8HTzNE6h4VE0zsMGB6kWP-V2xiLhIY3QZXvs,1269
+warp_beacon/scraper/youtube/youtube.py,sha256=TH5od6UPh1lAzDU_UC9Y5uQ-O8scLfk6OWWKWLF6LDo,2173
 warp_beacon/storage/__init__.py,sha256=0Vajd0oITKJfu2vmNx5uQSt3-L6vwIvUYWJo8HZCjco,3398
 warp_beacon/storage/mongo.py,sha256=qC4ZiO8XXvPnP0rJwz4CJx42pqFsyAjCiW10W5QdT6E,527
 warp_beacon/telegram/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
@@ -43,9 +43,9 @@ warp_beacon/telegram/handlers.py,sha256=XXIfdV_RCj7tyZMPXchuKmGoDdweOaR08ADDaBPW
 warp_beacon/telegram/placeholder_message.py,sha256=wN9-BRiyrtHG-EvXtZkGJHt2CX71munQ57ITttjt0mw,6400
 warp_beacon/telegram/utils.py,sha256=9uebX53G16mV7ER7WgfdWBLFHHw14S8HBt9URrIskg0,4440
 warp_beacon/uploader/__init__.py,sha256=E9rlZIf7xlQz6MutMOwJ8S5Vm2uheR5nv23Kv8duRQg,5427
-warp_beacon-2.3.36.dist-info/LICENSE,sha256=xx0jnfkXJvxRnG63LTGOxlggYnIysveWIZ6H3PNdCrQ,11357
-warp_beacon-2.3.36.dist-info/METADATA,sha256=mhh_fss7D1i0oZgN3Dg80jwCDqaV0G8T-_NCiS3YICk,21723
-warp_beacon-2.3.36.dist-info/WHEEL,sha256=beeZ86-EfXScwlR_HKu4SllMC9wUEj_8Z_4FJ3egI2w,91
-warp_beacon-2.3.36.dist-info/entry_points.txt,sha256=eSB61Rb89d56WY0O-vEIQwkn18J-4CMrJcLA_R_8h3g,119
-warp_beacon-2.3.36.dist-info/top_level.txt,sha256=qGjHVVfyf6lTmbdSA-fQq0rHS1YVS4HoJT3rag5xgPE,1141
-warp_beacon-2.3.36.dist-info/RECORD,,
+warp_beacon-2.3.38.dist-info/LICENSE,sha256=xx0jnfkXJvxRnG63LTGOxlggYnIysveWIZ6H3PNdCrQ,11357
+warp_beacon-2.3.38.dist-info/METADATA,sha256=JO259Z3taKEgcBQuqqnH1kRnnuHy8_gcKL9ORRgIf4U,21723
+warp_beacon-2.3.38.dist-info/WHEEL,sha256=beeZ86-EfXScwlR_HKu4SllMC9wUEj_8Z_4FJ3egI2w,91
+warp_beacon-2.3.38.dist-info/entry_points.txt,sha256=eSB61Rb89d56WY0O-vEIQwkn18J-4CMrJcLA_R_8h3g,119
+warp_beacon-2.3.38.dist-info/top_level.txt,sha256=qGjHVVfyf6lTmbdSA-fQq0rHS1YVS4HoJT3rag5xgPE,1141
+warp_beacon-2.3.38.dist-info/RECORD,,