warp-beacon 2.7.26__tar.gz → 2.7.28__tar.gz

{warp_beacon-2.7.26/warp_beacon.egg-info → warp_beacon-2.7.28}/PKG-INFO

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

warp_beacon-2.7.28/warp_beacon/__version__.py

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

{warp_beacon-2.7.26 → warp_beacon-2.7.28}/warp_beacon/scheduler/instagram_human.py

@@ -71,34 +71,28 @@ class InstagramHuman(object):
 		logging.info("Simulating stories watch ...")
 		stories = []
 		try:
-			tray = self.reel_tray_feed_if_needed()
-			if not tray:
+			raw_tray = self.reel_tray_feed_if_needed()
+			if not raw_tray:
 				logging.info("No stories tray available.")
 				return
+			logging.info("raw_tray: %s", str(raw_tray))
+			tray = raw_tray.get("tray", [])
 			for user_story in tray:
-				try:
-					user = user_story["user"]
-					#username = user["username"]
-					user_id = user["pk"]
-					_stories = self.scrapler.cl.user_stories(user_id)
-					self.operations_count += 1
-					if _stories:
-						stories.extend(_stories)
-					self.random_pause()
-				except Exception as exc:
-					logging.warning("Failed to fetch stories for user '%s'", user_story.get("user", {}).get("username", ""), exc_info=exc)
-					self.random_pause()
-		except Exception as e:
-			logging.warning("Failed to get user stories!", exc_info=e)
+				user = user_story["user"]
+				user_id = user["pk"]
+				_stories = self.scrapler.cl.user_stories(user_id)
+				self.operations_count += 1
+				if _stories:
+					stories.extend(_stories)
+				self.random_pause()
 
-		if not stories:
-			return
+			if not stories:
+				return
 
-		seen = []
-		explore_user = None
-		if stories:
-			for m in stories[:random.randint(1, len(stories))]:
-				try:
+			seen = []
+			explore_user = None
+			if stories:
+				for m in stories[:random.randint(1, len(stories))]:
 					logging.info("Wathing story with pk '%s'", str(m.id))
 					seen.append(str(m.id))
 					if random.random() > 0.9:
@@ -106,19 +100,16 @@ class InstagramHuman(object):
 						self.operations_count += 1
 						break
 					self.random_pause()
-				except Exception as e:
-					logging.warning("Exception while watching content", exc_info=e)
 
-		if seen:
-			try:
+			if seen:
 				self.scrapler.cl.media_seen(seen)
 				self.operations_count += 1
 				logging.info("Marked '%d' stories as seen", len(seen))
-			except Exception as e:
-				logging.warning("Failed to mark seen watched watch stories!", exc_info=e)
 
-		if explore_user:
-			self.explore_profile(explore_user)
+			if explore_user:
+				self.explore_profile(explore_user)
+		except Exception as e:
+			logging.warning("Failed to get user stories!", exc_info=e)
 
 	def watch_content(self, media: list) -> None:
 		if not media:
@@ -127,22 +118,16 @@ class InstagramHuman(object):
 		seen = []
 		random.seed(time.time())
 		for m in media[:random.randint(1, len(media))]:
-			try:
-				logging.info("Watching content with pk '%s'", str(m.id))
-				seen.append(str(m.id))
-				logging.info("Watched content with id '%s'", str(m.id))
-				if random.random() > 0.9:
-					explore_user = m.user
-					break
-				self.random_pause()
-			except Exception as e:
-				logging.warning("Exception while watching content")
-				logging.exception(e)
-		try:
-			self.scrapler.download_hndlr(self.scrapler.cl.media_seen, seen)
-			self.operations_count += 1
-		except Exception as e:
-			logging.warning("Failed to mark seen watched videos!", exc_info=e)
+			logging.info("Watching content with pk '%s'", str(m.id))
+			seen.append(str(m.id))
+			logging.info("Watched content with id '%s'", str(m.id))
+			if random.random() > 0.9:
+				explore_user = m.user
+				break
+			self.random_pause()
+
+		self.scrapler.download_hndlr(self.scrapler.cl.media_seen, seen)
+		self.operations_count += 1
 
 		if explore_user:
 			self.explore_profile(explore_user)
@@ -289,22 +274,18 @@ class InstagramHuman(object):
 		threads = self.scrapler.download_hndlr(self.scrapler.cl.direct_threads, amount=random.randint(3, 7))
 		self.operations_count += 1
 		for thread in threads:
-			try:
-				messages = self.scrapler.cl.direct_messages(thread.id, amount=random.randint(5, 15))
-				self.operations_count += 1
-				if not messages:
-					continue
-				msg_sample = random.sample(messages, k=random.randint(1, min(len(messages), 5)))
-				for msg in msg_sample:
-					if random.random() < 0.85:
-						#self.scrapler.cl.direct_message_seen(msg.thread_id, msg.id)
-						#self.operations_count += 1
-						logging.info("visual_media: '%s'", msg.visual_media)
-					self.random_pause()
-				self.random_pause()
-			except Exception as e:
-				logging.warning("Failed to read thread %s", thread.id)
-				logging.exception(e)
+			messages = self.scrapler.cl.direct_messages(thread.id, amount=random.randint(5, 15))
+			self.operations_count += 1
+			if not messages:
+				continue
+			#msg_sample = random.sample(messages, k=random.randint(1, min(len(messages), 5)))
+			#for msg in msg_sample:
+				#if random.random() < 0.85:
+					#self.scrapler.cl.direct_message_seen(msg.thread_id, msg.id)
+					#self.operations_count += 1
+					#logging.info("visual_media: '%s'", msg.visual_media)
+				#self.random_pause()
+			#self.random_pause()
 
 	def explore_profile(self, user: UserShort) -> None:
 		try:

{warp_beacon-2.7.26 → warp_beacon-2.7.28}/warp_beacon/scraper/__init__.py

@@ -130,8 +130,10 @@ class AsyncDownloader(object):
 								proxy = selector.get_current_proxy()
 							if job.job_origin is Origin.INSTAGRAM:
 								from warp_beacon.scraper.instagram.instagram import InstagramScraper
-								if not job.scroll_content and selector.get_ig_request_count() >= int(os.environ.get("IG_REQUESTS_PER_ACCOUNT", default="20")):
-									logging.info("The account request limit has been reached. Selecting the next account.")
+								ig_requests_limit = int(os.environ.get("IG_REQUESTS_PER_ACCOUNT", default="20"))
+								ig_requests = selector.get_ig_request_count()
+								if not job.scroll_content and ig_requests >= ig_requests_limit:
+									logging.info("The account requests limit '%d' has been reached value '%d'. Selecting the next account.", ig_requests_limit, ig_requests)
 									selector.reset_ig_request_count()
 									selector.next()
 								actor = InstagramScraper(client_session_id=selector.get_ig_session_id(), account=selector.get_current(), proxy=proxy)
@@ -165,8 +167,10 @@ class AsyncDownloader(object):
 										break
 									if job.session_validation and job.job_origin in (Origin.INSTAGRAM, Origin.YOUTUBE):
 										if job.job_origin is Origin.INSTAGRAM:
-											if selector.get_ig_request_count() >= int(os.environ.get("IG_REQUESTS_PER_ACCOUNT", default="20")):
-												logging.info("The account request limit has been reached. Selecting the next account.")
+											ig_requests_limit = int(os.environ.get("IG_REQUESTS_PER_ACCOUNT", default="20"))
+											if selector.get_ig_request_count() >= ig_requests_limit:
+												ig_requests = selector.get_ig_request_count()
+												logging.info("The account requests limit '%d' has been reached value '%d'. Selecting the next account.", ig_requests_limit, ig_requests)
 												selector.reset_ig_request_count()
 												selector.next()
 										logging.info("Validating '%s' session ...", job.job_origin.value)

{warp_beacon-2.7.26 → warp_beacon-2.7.28}/warp_beacon/scraper/account_selector.py

@@ -257,13 +257,13 @@ class AccountSelector(object):
 		return len(self.accounts[module_name])
 	
 	def inc_ig_request_count(self, amount: int = 1) -> None:
-		self.ig_request_count.value += amount
+		self.ig_request_count.value += int(amount)
 
 	def reset_ig_request_count(self) -> None:
 		self.ig_request_count.value = 0
 
 	def get_ig_request_count(self) -> int:
-		return self.ig_request_count.value
+		return int(self.ig_request_count.value)
 	
 	def get_ig_session_id(self) -> str:
 		with self.lock:

{warp_beacon-2.7.26 → warp_beacon-2.7.28/warp_beacon.egg-info}/PKG-INFO

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

warp_beacon-2.7.26/warp_beacon/__version__.py

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