warp-beacon 2.3.48__tar.gz → 2.3.49__tar.gz

{warp_beacon-2.3.48/warp_beacon.egg-info → warp_beacon-2.3.49}/PKG-INFO

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

warp_beacon-2.3.49/warp_beacon/__version__.py

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

{warp_beacon-2.3.48 → warp_beacon-2.3.49}/warp_beacon/scheduler/scheduler.py

@@ -37,6 +37,10 @@ class IGScheduler(object):
 
 	def load_yt_sessions(self) -> None:
 		try:
+			# old versions migration
+			if not "yt_sess_exp" in self.state:
+				self.state["yt_sess_exp"] = []
+			
 			for f in os.listdir(self.yt_sessions_dir):
 				if f.startswith("yt_session") and f.endswith(".json"):
 					yt_sess_file = f"{self.yt_sessions_dir}/{f}"

{warp_beacon-2.3.48 → warp_beacon-2.3.49}/warp_beacon/scraper/__init__.py

@@ -275,13 +275,15 @@ class AsyncDownloader(object):
 										self.job_queue.put(job)
 										break
 									self.send_message_to_admin(
-										f"Task <code>{job.job_id}</code> failed. URL: '{job.url}'. Reason: '<b>UnknownError</b>'."
-										f"Exception:\n<pre code=\"python\">\n{exception_msg}\n</pre>"
+										f"Task <code>{job.job_id}</code> failed. URL: {job.url}. Reason: '<b>UnknownError</b>'."
+										f"Exception:\n<pre code=\"python\">{exception_msg}\n</pre>"
 									)
 									self.uploader.queue_task(job.to_upload_job(
 										job_failed=True,
-										job_failed_msg="WOW, unknown error occured! Please <a href=\"https://github.com/sb0y/warp_beacon/issues\">create issue</a> with service logs.")
-									)
+										job_failed_msg=("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",
+										f"Exception:\n<pre code=\"python\">{exception_msg}\n</pre>")
+									))
 									break
 
 							if items:

{warp_beacon-2.3.48 → warp_beacon-2.3.49}/warp_beacon/scraper/instagram/instagram.py

@@ -18,7 +18,7 @@ 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
+	ChallengeSelfieCaptcha, ChallengeUnknownStep, AssertionError, UnknownError as IGUnknownError
 
 from warp_beacon.scraper.exceptions import NotFound, UnknownError, TimeOut, IGRateLimitOccurred, CaptchaIssue, extract_exception_message
 from warp_beacon.scraper.abstract import ScraperAbstract
@@ -167,6 +167,8 @@ class InstagramScraper(ScraperAbstract):
 					os.unlink(self.inst_session_file)
 				time.sleep(5)
 				self.load_session()
+			except AssertionError as e:
+				raise IGRateLimitOccurred("IG rate limit occurred")
 			except (socket.timeout,
 					ssl.SSLError,
 					requests.exceptions.ConnectionError,

{warp_beacon-2.3.48 → warp_beacon-2.3.49/warp_beacon.egg-info}/PKG-INFO

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

warp_beacon-2.3.48/warp_beacon/__version__.py

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