warp-beacon 2.4.5__py3-none-any.whl → 2.4.7__py3-none-any.whl

warp_beacon/__version__.py

@@ -1,2 +1,2 @@
-__version__ = "2.4.5"
+__version__ = "2.4.7"
 

warp_beacon/scraper/__init__.py

@@ -288,12 +288,13 @@ class AsyncDownloader(object):
 										break
 									self.send_message_to_admin(
 										f"Task <code>{job.job_id}</code> failed. URL: {job.url}. Reason: '<b>UnknownError</b>'."
-										f"Exception:<br><pre code=\"python\">{exception_msg}<br></pre>"
+										f"Exception:\n<pre code=\"python\">{exception_msg}<br></pre>"
 									)
 									self.uploader.queue_task(job.to_upload_job(
 										job_failed=True,
-										job_failed_msg=f"Unknown error occured. Please <a href=\"https://github.com/sb0y/warp_beacon/issues\">create issue</a> with service logs.\n"
-										f"Task <code>{job.job_id}</code> failed. URL: {job.url}. Reason: '<b>UnknownError</b>'.\n"
+										job_failed_msg=f"Unknown error occured. Please <a href=\"https://github.com/sb0y/warp_beacon/issues\">create issue</a> with service logs.<br>"
+										f"Task <code>{job.job_id}</code> failed. URL: {job.url}.<br>"
+										f"Reason: '<b>UnknownError</b>'.<br>"
 										f"Exception:<br><pre code=\"python\">{exception_msg}</pre>"
 									))
 									break

warp_beacon/scraper/instagram/instagram.py

@@ -13,12 +13,14 @@ import requests
 import urllib3
 from urllib.parse import urljoin, urlparse
 
+from instagrapi import exceptions
+from instagrapi.exceptions import UnknownError as IGUnknownError
 from instagrapi.mixins.story import Story
 from instagrapi.types import Media
 from instagrapi import Client
 from instagrapi.mixins.challenge import ChallengeChoice
-from instagrapi.exceptions import LoginRequired, PleaseWaitFewMinutes, MediaNotFound, ClientNotFoundError, UserNotFound, ChallengeRequired, \
-	ChallengeSelfieCaptcha, ChallengeUnknownStep, UnknownError as IGUnknownError
+#from instagrapi.exceptions import LoginRequired, PleaseWaitFewMinutes, MediaNotFound, ClientNotFoundError, UserNotFound, ChallengeRequired, \
+#	ChallengeSelfieCaptcha, ChallengeUnknownStep, UnknownError as IGUnknownError
 
 from warp_beacon.scraper.exceptions import NotFound, UnknownError, TimeOut, IGRateLimitOccurred, CaptchaIssue, BadProxy, extract_exception_message
 from warp_beacon.scraper.abstract import ScraperAbstract
@@ -155,11 +157,22 @@ class InstagramScraper(ScraperAbstract):
 			except urllib3.exceptions.ProxyError as e:
 				logging.warning("Proxy error!")
 				raise BadProxy(extract_exception_message(e.original_error))
-			except (ChallengeRequired, ChallengeSelfieCaptcha, ChallengeUnknownStep) as e:
+			except exceptions.ClientConnectionError as e:
+				msg = str(e.message)
+				if "ProxyError" in msg:
+					raise BadProxy(msg)
+				logging.warning("Instagram read timeout! Retrying in 2 seconds ...")
+				logging.info("Your `IG_MAX_RETRIES` values is %d", max_retries)
+				logging.exception(e)
+				if max_retries <= retries:
+					raise TimeOut(extract_exception_message(e))
+				retries += 1
+				time.sleep(2)
+			except(exceptions.ChallengeRequired, exceptions.ChallengeSelfieCaptcha, exceptions.ChallengeUnknownStep) as e:
 				logging.warning("Instagram wants Challange!")
 				logging.exception(e)
 				raise CaptchaIssue("a captcha issue arose")
-			except LoginRequired as e:
+			except exceptions.LoginRequired as e:
 				logging.error("LoginRequired occurred in download handler!")
 				logging.exception(e)
 				old_session = self.cl.get_settings()
@@ -289,13 +302,13 @@ class InstagramScraper(ScraperAbstract):
 					logging.info("Stories download mode")
 					res.append(self.download_stories(self.scrap_stories(media_id)))
 				break
-			except PleaseWaitFewMinutes as e:
+			except exceptions.PleaseWaitFewMinutes as e:
 				logging.warning("Please wait a few minutes error.")
 				logging.exception(e)
 				if os.path.exists(self.inst_session_file):
 					os.unlink(self.inst_session_file)
 				raise IGRateLimitOccurred("Instagram ratelimit")
-			except (MediaNotFound, ClientNotFoundError, UserNotFound) as e:
+			except (exceptions.MediaNotFound, exceptions.ClientNotFoundError, exceptions.UserNotFound) as e:
 				raise NotFound(extract_exception_message(e))
 			except IGUnknownError as e:
 				raise UnknownError(extract_exception_message(e))

{warp_beacon-2.4.5.dist-info → warp_beacon-2.4.7.dist-info}/METADATA

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

{warp_beacon-2.4.5.dist-info → warp_beacon-2.4.7.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=lZ8HK2Y4va4k96RbFUXQpmtJoC1-gdwqjeNmyUnBcwA,23
+warp_beacon/__version__.py,sha256=0c0bpB5wFFlErbF0KdROy3tNIFjn1giE6i593iSOKoc,23
 warp_beacon/warp_beacon.py,sha256=7KEtZDj-pdhtl6m-zFLsSojs1ZR4o7L0xbqtdmYPvfE,342
 warp_beacon/yt_auth.py,sha256=GUTKqYr_tzDC-07Lx_ahWXSag8EyLxXBUnQbDBIkEmk,6022
 warp_beacon/compress/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
@@ -22,14 +22,14 @@ 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=8d_CQQi4vy1ESitZxQemogGfRR3d2GaV0MIozWC_cRA,5182
 warp_beacon/scheduler/scheduler.py,sha256=MoPdPKiMNqVD19N-8yDc0wkTlwghFeQV3STBipAgbeQ,4602
-warp_beacon/scraper/__init__.py,sha256=FAwHXz4R3AIW5hSd4_Uc5QeKxHXXNU7tBL-gA6fXozM,18162
+warp_beacon/scraper/__init__.py,sha256=frWsdVQC2_eP2whKb18j8sr5nAltBUceKG8LFqJQ4_4,18181
 warp_beacon/scraper/abstract.py,sha256=jbD-cJO9W6zQNGPql67YB-fqPyIrMp44FqXpi6NCArE,2784
 warp_beacon/scraper/account_selector.py,sha256=1ftgBKyaW_JiC6KX6wPfid3YWk8hRctfOTROrH1OnJ8,6943
 warp_beacon/scraper/exceptions.py,sha256=L4UCZqDOLKu5-TPUcTErIbNDLrAQJghkMaPqzTfsm1g,1376
 warp_beacon/scraper/fail_handler.py,sha256=_blvckfTZ4xWVancQKVRXH5ClKGwfrBxMwvXIFZh1qA,975
 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/instagram.py,sha256=jXqPp4odAh1D_oFW6YwvOypYd5frJnSaJ-08VFGfPUY,14058
+warp_beacon/scraper/instagram/instagram.py,sha256=KyOZnIt6A8wkroXkZcIJMscuy5N5ZEz9-v3Ciwo0C7M,14654
 warp_beacon/scraper/youtube/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 warp_beacon/scraper/youtube/abstract.py,sha256=fIsAe-I9qg-blpsziFFwF-xV3LXq9nOYmXHw51h1TPg,11547
 warp_beacon/scraper/youtube/music.py,sha256=-R6Iys8IpglH5UL7F640UQ3ieYHitvGXA0A2GhSemVA,2927
@@ -44,9 +44,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=9uebX53G16mV7ER7WgfdWBLFHHw14S8HBt9URrIskg0,4440
 warp_beacon/uploader/__init__.py,sha256=e75mOcC0vrUVjrTNMQzVUTgXGdGo4J6n8t5doOnYG5I,5616
-warp_beacon-2.4.5.dist-info/licenses/LICENSE,sha256=xx0jnfkXJvxRnG63LTGOxlggYnIysveWIZ6H3PNdCrQ,11357
-warp_beacon-2.4.5.dist-info/METADATA,sha256=2qkorm8Qzwa5WIbdSVPDohUml17Csg7Vt1mAnFYyE-0,22625
-warp_beacon-2.4.5.dist-info/WHEEL,sha256=CmyFI0kx5cdEMTLiONQRbGQwjIoR1aIYB7eCAQ4KPJ0,91
-warp_beacon-2.4.5.dist-info/entry_points.txt,sha256=eSB61Rb89d56WY0O-vEIQwkn18J-4CMrJcLA_R_8h3g,119
-warp_beacon-2.4.5.dist-info/top_level.txt,sha256=4ML0-mXsezLtRXyxQUntL_ktc5HX9npTeQWzvV8kFvA,1161
-warp_beacon-2.4.5.dist-info/RECORD,,
+warp_beacon-2.4.7.dist-info/licenses/LICENSE,sha256=xx0jnfkXJvxRnG63LTGOxlggYnIysveWIZ6H3PNdCrQ,11357
+warp_beacon-2.4.7.dist-info/METADATA,sha256=Z4is_1X-vYH1NYmsagCWHacg9YDg4m0bCMQXhGBAV4k,22625
+warp_beacon-2.4.7.dist-info/WHEEL,sha256=CmyFI0kx5cdEMTLiONQRbGQwjIoR1aIYB7eCAQ4KPJ0,91
+warp_beacon-2.4.7.dist-info/entry_points.txt,sha256=eSB61Rb89d56WY0O-vEIQwkn18J-4CMrJcLA_R_8h3g,119
+warp_beacon-2.4.7.dist-info/top_level.txt,sha256=4ML0-mXsezLtRXyxQUntL_ktc5HX9npTeQWzvV8kFvA,1161
+warp_beacon-2.4.7.dist-info/RECORD,,