warp-beacon 2.4.7__tar.gz → 2.4.9__tar.gz

{warp_beacon-2.4.7/warp_beacon.egg-info → warp_beacon-2.4.9}/PKG-INFO

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

warp_beacon-2.4.9/warp_beacon/__version__.py

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

{warp_beacon-2.4.7 → warp_beacon-2.4.9}/warp_beacon/scheduler/instagram_human.py

@@ -33,6 +33,7 @@ class InstagramHuman(object):
 			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.5:
+				logging.info("Checking direct ...")
 				self.scrapler.download_hndlr(self.scrapler.cl.direct_active_presence)
 				time.sleep(random.uniform(2, 5))
 			if random.random() > 0.3:
@@ -71,6 +72,7 @@ class InstagramHuman(object):
 				self.scrapler.download_hndlr(self.scrapler.cl.direct_active_presence)
 				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.random_pause()
 			if random.random() > 0.4:
@@ -123,12 +125,21 @@ 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)
+				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.random_pause()
 
-			time.sleep(random.uniform(2, 5))
-
+			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.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, target_user_id, amount=random.randint(1, 5))
+				self.scrapler.download_hndlr(self.scrapler.cl.user_medias_v1, target_user_id, amount=random.randint(1, 5))
 				self.random_pause()
 		except Exception as e:
 			logging.warning("Error in profile view")

{warp_beacon-2.4.7 → warp_beacon-2.4.9}/warp_beacon/scraper/__init__.py

@@ -116,14 +116,13 @@ class AsyncDownloader(object):
 									time.sleep(2)
 									self.job_queue.put(job)
 									continue
-							actor = None
 							self.acc_selector.set_module(job.job_origin)
 							proxy = selector.get_current_proxy()
 							if job.job_origin is Origin.INSTAGRAM:
 								from warp_beacon.scraper.instagram.instagram import InstagramScraper
 								actor = InstagramScraper(selector.get_current(), proxy)
 								selector.inc_ig_request_count()
-								if selector.get_ig_request_count() >= int(os.environ.get("IG_REQUESTS_PER_ACCOUNT", default="20")):
+								if selector.get_ig_request_count() >= int(os.environ.get("IG_REQUESTS_PER_ACCOUNT", default="10")):
 									logging.info("The account request limit has been reached. Selecting the next account.")
 									selector.reset_ig_request_count()
 									selector.next()
@@ -379,6 +378,9 @@ class AsyncDownloader(object):
 						logging.error("Error inside download worker!")
 						logging.exception(e)
 						self.notify_task_failed(job)
+					finally:
+						if actor:
+							actor.restore_gai()
 				except Empty:
 					pass
 			except Exception as e:

{warp_beacon-2.4.7 → warp_beacon-2.4.9}/warp_beacon/scraper/abstract.py

@@ -92,5 +92,7 @@ class ScraperAbstract(ABC):
 		urllib3_cn.allowed_gai_family = allowed_gai_family
 
 	def restore_gai(self) -> None:
-		logging.info("Restoring normal IP stack ...")
-		urllib3_cn.allowed_gai_family = self.original_gai_family
+		if self.original_gai_family:
+			logging.info("Restoring normal IP stack ...")
+			urllib3_cn.allowed_gai_family = self.original_gai_family
+			self.original_gai_family = None

{warp_beacon-2.4.7 → warp_beacon-2.4.9/warp_beacon.egg-info}/PKG-INFO

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

warp_beacon-2.4.7/warp_beacon/__version__.py

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