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

{warp_beacon-2.3.47/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.47
+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.47 → warp_beacon-2.3.49}/warp_beacon/scheduler/instagram_human.py

@@ -32,10 +32,10 @@ class InstagramHuman(object):
 			logging.info("Starting morning activity simulation")
 			self.scrapler.timeline_cursor = self.scrapler.download_hndlr(self.scrapler.cl.get_timeline_feed, "pull_to_refresh", self.scrapler.timeline_cursor.get("next_max_id"))
 			time.sleep(random.uniform(3, 7))
-			if random.random() > 0.7:
+			if random.random() > 0.5:
 				self.scrapler.download_hndlr(self.scrapler.cl.direct_active_presence)
 				time.sleep(random.uniform(2, 5))
-			if random.random() > 0.7:
+			if random.random() > 0.3:
 				self.scrapler.download_hndlr(self.scrapler.cl.notification_like_and_comment_on_photo_user_tagged, "everyone")
 				self.random_pause()
 			if random.random() > 0.5:
@@ -53,7 +53,7 @@ class InstagramHuman(object):
 			logging.info("Starting day fast check activity simulation")
 			self.scrapler.download_hndlr(self.scrapler.cl.get_timeline_feed, "pull_to_refresh")
 			time.sleep(random.uniform(2, 5))
-			if random.random() > 0.7:
+			if random.random() > 0.5:
 				self.scrapler.download_hndlr(self.scrapler.cl.get_reels_tray_feed, "pull_to_refresh")
 				self.random_pause()
 		except Exception as e:
@@ -67,10 +67,10 @@ class InstagramHuman(object):
 			time.sleep(random.uniform(2, 5))
 			self.scrapler.download_hndlr(self.scrapler.cl.get_reels_tray_feed, "pull_to_refresh")
 			time.sleep(random.uniform(2, 5))
-			if random.random() > 0.7:
+			if random.random() > 0.5:
 				self.scrapler.download_hndlr(self.scrapler.cl.direct_active_presence)
 				time.sleep(random.uniform(2, 5))
-			if random.random() > 0.7:
+			if random.random() > 0.5:
 				self.scrapler.download_hndlr(self.scrapler.cl.notification_like_and_comment_on_photo_user_tagged, "everyone")
 				self.random_pause()
 			if random.random() > 0.4:
@@ -88,7 +88,7 @@ class InstagramHuman(object):
 	def night_routine(self) -> None:
 		try:
 			logging.info("Starting night activity simulation")
-			if random.random() > 0.8:
+			if random.random() > 0.7:
 				self.scrapler.download_hndlr(self.scrapler.cl.direct_active_presence)
 				self.random_pause(short=True)
 		except Exception as e:
@@ -124,11 +124,10 @@ class InstagramHuman(object):
 
 			time.sleep(random.uniform(2, 5))
 
-			if random.random() > 0.7:
+			if random.random() > 0.5:
 				logging.info("user_medias with target_user_id = '%s' ...", target_user_id)
 				self.scrapler.download_hndlr(self.scrapler.cl.user_medias, target_user_id, amount=random.randint(1, 5))
-
-			self.random_pause()
+				self.random_pause()
 		except Exception as e:
 			logging.warning("Error in profile view")
 			logging.exception(e)

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

@@ -12,11 +12,12 @@ import logging
 
 class IGScheduler(object):
 	state_file = "/var/warp_beacon/scheduler_state.json"
+	yt_sessions_dir = "/var/warp_beacon"
 	downloader = None
 	running = True
 	thread = None
 	event = None
-	state = {"remaining": randrange(8400, 26200)}
+	state = {"remaining": randrange(8400, 26200), "yt_sess_exp": []}
 
 	def __init__(self, downloader: warp_beacon.scraper.AsyncDownloader) -> None:
 		self.downloader = downloader
@@ -29,17 +30,36 @@ class IGScheduler(object):
 		try:
 			with open(self.state_file, 'w+', encoding="utf-8") as f:
 				f.write(json.dumps(self.state))
+			self.load_yt_sessions()
 		except Exception as e:
 			logging.error("Failed to save Scheduler state!")
 			logging.exception(e)
 
+	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}"
+					if os.path.exists(yt_sess_file):
+						with open(yt_sess_file, 'r', encoding="utf-8") as f:
+							yt_sess_data = json.loads(f.read())
+							exp = yt_sess_data.get("expires", "")
+							self.state["yt_sess_exp"].append({"expires": exp, "file_path": yt_sess_file})
+		except Exception as e:
+			logging.error("Failed to load yt sessions!")
+			logging.exception(e)
+
 	def load_state(self) -> None:
 		try:
 			if os.path.exists(self.state_file):
 				with open(self.state_file, 'r', encoding="utf-8") as f:
 					self.state = json.loads(f.read())
 				if "remaining" in self.state:
-					logging.info("Next scheduler activity in '%s' seconds", self.state["remaining"])
+					logging.info("Next scheduler activity in '%d' seconds", int(self.state["remaining"]))
 		except Exception as e:
 			logging.error("Failed to load Scheduler state!")
 			logging.exception(e)
@@ -73,6 +93,20 @@ class IGScheduler(object):
 				session_validation=True,
 				job_origin=Origin.INSTAGRAM
 			))
+			return True
+		except Exception as e:
+			logging.warning("An error occurred while validating instagram session!")
+			logging.exception(e)
+
+		return False
+	
+	def validate_yt_session(self) -> bool:
+		try:
+			self.downloader.queue_task(warp_beacon.jobs.download_job.DownloadJob.build(
+				session_validation=True,
+				job_origin=Origin.YOUTUBE
+			))
+			return True
 		except Exception as e:
 			logging.warning("An error occurred while validating instagram session!")
 			logging.exception(e)
@@ -91,7 +125,7 @@ class IGScheduler(object):
 					self.save_state()
 
 				if self.state["remaining"] <= 0:
-					self.state["remaining"] = randrange(4292, 8623)
+					self.state["remaining"] = randrange(2292, 4623)
 					logging.info("Next scheduler activity in '%s' seconds", self.state["remaining"])
 
 				start_time = time.time()

{warp_beacon-2.3.47 → 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.47 → 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.47 → warp_beacon-2.3.49}/warp_beacon/scraper/youtube/abstract.py

@@ -313,7 +313,7 @@ class YoutubeAbstract(ScraperAbstract):
 		try:
 			ret = self.download_hndlr(self._download, job.url, session=True)
 			return ret
-		except (Unavailable, TimeOut):
+		except (Unavailable, TimeOut, KeyError):
 			logging.warning("Download failed, trying to download with yt_dlp")
 		
 		try:

{warp_beacon-2.3.47 → 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.47
+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.47/warp_beacon/__version__.py

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