warp-beacon 2.6.13__tar.gz → 2.6.14__tar.gz

{warp_beacon-2.6.13/warp_beacon.egg-info → warp_beacon-2.6.14}/PKG-INFO

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

warp_beacon-2.6.14/warp_beacon/__version__.py

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

{warp_beacon-2.6.13 → warp_beacon-2.6.14}/warp_beacon/scheduler/instagram_human.py

@@ -10,9 +10,11 @@ from warp_beacon.scraper.instagram.instagram import InstagramScraper
 class InstagramHuman(object):
 	scrapler = None
 	default_profiles = ["nasa", "natgeo", "9gag", "spotify", "nba"]
+	operations_count = 0
 
 	def __init__(self, scrapler: InstagramScraper) -> None:
 		self.scrapler = scrapler
+		self.operations_count = 0
 
 	def simulate_activity(self) -> None:
 		now = datetime.now()
@@ -31,17 +33,21 @@ class InstagramHuman(object):
 		try:
 			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"))
+			self.operations_count += 1
 			time.sleep(random.uniform(3, 7))
 			if random.random() > 0.5:
 				logging.info("Checking direct ...")
 				self.scrapler.download_hndlr(self.scrapler.cl.direct_active_presence)
+				self.operations_count += 1
 				time.sleep(random.uniform(2, 5))
 			if random.random() > 0.3:
 				self.scrapler.download_hndlr(self.scrapler.cl.notification_like_and_comment_on_photo_user_tagged, "everyone")
+				self.operations_count += 1
 				self.random_pause()
 			if random.random() > 0.5:
 				logging.info("Simulation updating reels tray feed ...")
 				self.scrapler.download_hndlr(self.scrapler.cl.get_reels_tray_feed, "pull_to_refresh")
+				self.operations_count += 1
 				self.random_pause()
 			if random.random() > 0.8:
 				self.profile_view()
@@ -53,9 +59,11 @@ class InstagramHuman(object):
 		try:
 			logging.info("Starting day fast check activity simulation")
 			self.scrapler.download_hndlr(self.scrapler.cl.get_timeline_feed, "pull_to_refresh")
+			self.operations_count += 1
 			time.sleep(random.uniform(2, 5))
 			if random.random() > 0.5:
 				self.scrapler.download_hndlr(self.scrapler.cl.get_reels_tray_feed, "pull_to_refresh")
+				self.operations_count += 1
 				self.random_pause()
 		except Exception as e:
 			logging.warning("Error in daytime_routine")
@@ -65,19 +73,24 @@ class InstagramHuman(object):
 		try:
 			logging.info("Starting evening active user simulation")
 			self.scrapler.download_hndlr(self.scrapler.cl.get_timeline_feed, "pull_to_refresh")
+			self.operations_count += 1
 			time.sleep(random.uniform(2, 5))
 			self.scrapler.download_hndlr(self.scrapler.cl.get_reels_tray_feed, "pull_to_refresh")
+			self.operations_count += 1
 			time.sleep(random.uniform(2, 5))
 			if random.random() > 0.5:
 				self.scrapler.download_hndlr(self.scrapler.cl.direct_active_presence)
+				self.operations_count += 1
 				time.sleep(random.uniform(2, 5))
 			if random.random() > 0.5:
 				logging.info("Checking notifications, tags ...")
 				self.scrapler.download_hndlr(self.scrapler.cl.notification_like_and_comment_on_photo_user_tagged, "everyone")
+				self.operations_count += 1
 				self.random_pause()
 			if random.random() > 0.4:
 				logging.info("Watching reels ...")
 				self.scrapler.download_hndlr(self.scrapler.cl.reels)
+				self.operations_count += 1
 				self.random_pause()
 			if random.random() > 0.6:
 				logging.info("Simulation profile view ...")
@@ -92,6 +105,7 @@ class InstagramHuman(object):
 			logging.info("Starting night activity simulation")
 			if random.random() > 0.7:
 				self.scrapler.download_hndlr(self.scrapler.cl.direct_active_presence)
+				self.operations_count += 1
 				self.random_pause(short=True)
 		except Exception as e:
 			logging.warning("Error in night_routine")
@@ -108,6 +122,7 @@ class InstagramHuman(object):
 			my_user_id = self.scrapler.cl.user_id
 			logging.info("user_following ...")
 			friends = list(self.scrapler.download_hndlr(self.scrapler.cl.user_following, my_user_id, amount=random.randint(5, 50)).values())
+			self.operations_count += 1
 			time.sleep(random.uniform(2, 5))
 			if not friends:
 				friends = self.default_profiles
@@ -119,27 +134,32 @@ class InstagramHuman(object):
 				logging.info("user_info with target_user_id = '%s' ...", target_user_id)
 				#self.scrapler.download_hndlr(self.scrapler.cl.user_info, target_user_id)
 				self.scrapler.download_hndlr(self.scrapler.cl.user_info_v1, target_user_id)
+				self.operations_count += 1
 				time.sleep(random.uniform(2, 5))
 			elif isinstance(random_friend, str):
 				target_user_id = self.scrapler.download_hndlr(self.scrapler.cl.user_id_from_username, random_friend)
 				logging.info("user_info with target_user_id = '%s' ...", target_user_id)
 				#self.scrapler.download_hndlr(self.scrapler.cl.user_info, target_user_id)
 				self.scrapler.download_hndlr(self.scrapler.cl.user_info_v1, target_user_id)
+				self.operations_count += 1
 				time.sleep(random.uniform(2, 5))
 			
 			if random.random() > 0.5:
 				logging.info("Checking direct ...")
 				self.scrapler.download_hndlr(self.scrapler.cl.direct_active_presence)
+				self.operations_count += 1
 				self.random_pause()
 
 			if random.random() > 0.3:
 				logging.info("Checking notifications, tags ...")
 				self.scrapler.download_hndlr(self.scrapler.cl.notification_like_and_comment_on_photo_user_tagged, "everyone")
+				self.operations_count += 1
 				self.random_pause()
 			
 			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_v1, target_user_id, amount=random.randint(1, 5))
+				self.operations_count += 1
 				self.random_pause()
 		except Exception as e:
 			logging.warning("Error in profile view")

{warp_beacon-2.6.13 → warp_beacon-2.6.14}/warp_beacon/scraper/__init__.py

@@ -154,7 +154,9 @@ class AsyncDownloader(object):
 												selector.reset_ig_request_count()
 												selector.next()
 										logging.info("Validating '%s' session ...", job.job_origin.value)
-										actor.validate_session()
+										operations = actor.validate_session()
+										if job.job_origin is Origin.INSTAGRAM and operations:
+											selector.inc_ig_request_count(amount=operations)
 										logging.info("Validation done")
 									else:
 										logging.info("Downloading URL '%s'", job.url)

{warp_beacon-2.6.13 → warp_beacon-2.6.14}/warp_beacon/scraper/instagram/instagram.py

@@ -102,12 +102,13 @@ class InstagramScraper(ScraperAbstract):
 			self.cl.login(username=username, password=password, verification_code="")
 		self.safe_write_session()
 
-	def validate_session(self) -> None:
+	def validate_session(self) -> int:
 		from warp_beacon.scheduler.instagram_human import InstagramHuman
 		self.load_session()
 		inst_human = InstagramHuman(self)
 		inst_human.simulate_activity()
 		self.safe_write_session()
+		return inst_human.operations_count
 
 	def scrap(self, url: str) -> tuple[str]:
 		self.load_session()

{warp_beacon-2.6.13 → warp_beacon-2.6.14}/warp_beacon/scraper/youtube/abstract.py

@@ -34,7 +34,7 @@ class YoutubeAbstract(ScraperAbstract):
 	DOWNLOAD_DIR = "/tmp"
 	YT_SESSION_FILE = '/var/warp_beacon/yt_session_%d.json'
 
-	def validate_session(self) -> None:
+	def validate_session(self) -> int:
 		try:
 			logging.info("Validating YT session(s) ...")
 			session_dir = os.path.dirname(self.YT_SESSION_FILE)
@@ -59,6 +59,8 @@ class YoutubeAbstract(ScraperAbstract):
 			logging.error("Failed to refresh Youtube session!")
 			logging.exception(e)
 
+		return 0
+
 	def rename_local_file(self, filename: str) -> str:
 		if not os.path.exists(filename):
 			raise NameError("No file provided")

{warp_beacon-2.6.13 → warp_beacon-2.6.14}/warp_beacon/uploader/__init__.py

@@ -11,12 +11,12 @@ from warp_beacon.storage import Storage
 
 class AsyncUploader(object):
 	__JOE_BIDEN_WAKEUP = None
-	threads = []
+	threads = None
 	allow_loop = True
 	job_queue = None
-	callbacks = {}
+	callbacks = None
 	storage = None
-	in_process = set()
+	in_process = None
 	loop = None
 	admin_message_callback = None
 	request_yt_auth_callback = None
@@ -29,6 +29,9 @@ class AsyncUploader(object):
 			request_yt_auth_callback: Callable,
 			pool_size: int=min(32, os.cpu_count() + 4)
 		) -> None:
+		self.threads = []
+		self.callbacks = {}
+		self.in_process = set()
 		self.storage = storage
 		self.loop = loop
 		self.job_queue = multiprocessing.Queue()

{warp_beacon-2.6.13 → warp_beacon-2.6.14/warp_beacon.egg-info}/PKG-INFO

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

warp_beacon-2.6.13/warp_beacon/__version__.py

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