warp-beacon 2.7.16__py3-none-any.whl → 2.7.17__py3-none-any.whl

warp_beacon/__version__.py

@@ -1,2 +1,2 @@
-__version__ = "2.7.16"
+__version__ = "2.7.17"
 

warp_beacon/scheduler/instagram_human.py

@@ -44,6 +44,7 @@ class InstagramHuman(object):
 							#self.scrapler.cl.media_like(media_id)
 							self.scrapler.cl.media_comments(media_id)
 							self.operations_count += 1
+
 							self.random_pause(short=True)
 						except Exception as e:
 							logging.warning("Failed to see comments to media '%s'", media_id, exc_info=e)
@@ -70,10 +71,14 @@ class InstagramHuman(object):
 			return
 
 		seen = []
+		explore_user = None
 		for m in stories[:random.randint(1, len(stories))]:
 			try:
 				logging.info("Wathing story with pk '%s'", str(m.id))
 				seen.append(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", exc_info=e)
@@ -86,17 +91,22 @@ class InstagramHuman(object):
 			except Exception as e:
 				logging.warning("Failed to mark seen watched watch stories!", exc_info=e)
 
+		if explore_user:
+			self.explore_profile(explore_user)
+
 	def watch_content(self, media: list) -> None:
 		if not media:
 			return
+		explore_user = None
 		seen = []
 		for m in media[:random.randint(1, len(media))]:
 			try:
 				logging.info("Watching content with pk '%s'", str(m.id))
-				#content = self.scrapler.cl.media_info_v1(m.pk)
 				seen.append(str(m.id))
 				logging.info("Watched content with id '%s'", str(m.id))
-				#self.operations_count += 1
+				if random.random() > 0.9:
+					explore_user = m.user
+					break
 				self.random_pause()
 			except Exception as e:
 				logging.warning("Exception while watching content")
@@ -107,12 +117,14 @@ class InstagramHuman(object):
 		except Exception as e:
 			logging.warning("Failed to mark seen watched videos!", exc_info=e)
 
+		if explore_user:
+			self.explore_profile(explore_user)
+
 	def scroll_content(self, last_pk: int) -> None:
 		timeline_initialized = False
 		if random.random() > 0.5:
 			timeline_initialized = True
-			#self.scrapler.timeline_cursor = self.scrapler.download_hndlr(self.scrapler.cl.get_timeline_feed, reason="cold_start_fetch")
-			self.scrapler.timeline_cursor = self.browse_timeline()
+			self.browse_timeline()
 			logging.info("Starting to watch related reels with media_pk '%d'", last_pk)
 			media = self.scrapler.download_hndlr(self.scrapler.cl.reels, amount=random.randint(4, 10), last_media_pk=last_pk)
 			self.operations_count += 1
@@ -121,8 +133,7 @@ class InstagramHuman(object):
 		if random.random() > 0.7:
 			time.sleep(random.uniform(2, 20))
 			if not timeline_initialized:
-				#self.scrapler.timeline_cursor = self.scrapler.download_hndlr(self.scrapler.cl.get_timeline_feed, reason="cold_start_fetch")
-				self.scrapler.timeline_cursor = self.browse_timeline()
+				self.browse_timeline()
 			logging.info("Starting to explore reels with media_pk '%d'", last_pk)
 			media = self.scrapler.download_hndlr(self.scrapler.cl.explore_reels, amount=random.randint(4, 10), last_media_pk=last_pk)
 			self.operations_count += 1
@@ -146,14 +157,14 @@ 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"))
 			#self.operations_count += 1
-			self.scrapler.timeline_cursor = self.browse_timeline()
+			self.browse_timeline()
 			time.sleep(random.uniform(3, 7))
 			if random.random() > 0.5:
 				self.check_direct()
-			if random.random() > 0.6:
-				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.6:
+			#	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.2:
 				logging.info("Simulation updating reels tray feed ...")
 				self.scrapler.download_hndlr(self.scrapler.cl.get_reels_tray_feed, "pull_to_refresh")
@@ -200,11 +211,11 @@ class InstagramHuman(object):
 			time.sleep(random.uniform(2, 5))
 			if random.random() > 0.5:
 				self.check_direct()
-			if random.random() > 0.6:
-				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.6:
+			#	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:
 				self.watch_stories()
 				self.random_pause()
@@ -269,6 +280,20 @@ class InstagramHuman(object):
 				logging.warning("Failed to read thread %s", thread.id)
 				logging.exception(e)
 
+	def explore_profile(self, user: UserShort) -> None:
+		try:
+			logging.info("Exploring user profile '%s'", user.username)
+			user_id = self.scrapler.download_hndlr(self.scrapler.cl.user_id_from_username, user.username)
+			self.operations_count += 1
+			if user_id:
+				user_medias = self.scrapler.download_hndlr(self.scrapler.cl.user_medias, user_id, amount=random.randint(5, 15), sleep=random.randint(3, 7))
+				self.operations_count += 1
+				if user_medias:
+					self.random_pause(short=True)
+					self.watch_content(user_medias)
+		except Exception as e:
+			logging.warning("Failed to explore user profile with username '%s'", user.username, exc_info=e)
+
 	def profile_view(self) -> None:
 		try:
 			logging.info("profile_view ...")
@@ -302,11 +327,11 @@ class InstagramHuman(object):
 			if random.random() > 0.5:
 				self.check_direct()
 
-			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.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)

warp_beacon/scraper/instagram/wb_instagrapi.py

@@ -1,16 +1,18 @@
 import logging
-from typing import Callable
+from typing import Callable, List
 from copy import deepcopy
 from urllib.parse import urlparse, parse_qs, urlencode, urlunparse
 from pathlib import Path
+import time
 import requests
 
 from instagrapi import Client
-from instagrapi.types import Media
+from instagrapi.types import Media, User
 from instagrapi.exceptions import (
-	ClientError,
-	ClientLoginRequired,
-	VideoNotDownload
+	#ClientError,
+	#ClientLoginRequired,
+	VideoNotDownload,
+	PrivateError
 )
 
 from warp_beacon.scraper.utils import ScraperUtils
@@ -190,4 +192,118 @@ class WBClient(Client):
 			self._medias_cache[media_pk] = media
 		return deepcopy(
 			self._medias_cache[media_pk]
-		)  # return copy of cache (dict changes protection)
+		)  # return copy of cache (dict changes protection)
+	
+	def user_info_by_username(self, username: str, use_cache: bool = True) -> User:
+		"""
+		Get user object from username
+
+		Parameters
+		----------
+		username: str
+			User name of an instagram account
+		use_cache: bool, optional
+			Whether or not to use information from cache, default value is True
+
+		Returns
+		-------
+		User
+			An object of User type
+		"""
+		username = str(username).lower()
+		if not use_cache or username not in self._usernames_cache:
+			user = self.user_info_by_username_v1(username)
+			self._users_cache[user.pk] = user
+			self._usernames_cache[user.username] = user.pk
+		return self.user_info(self._usernames_cache[username])
+	
+	def user_info(self, user_id: str, use_cache: bool = True) -> User:
+		"""
+		Get user object from user id
+
+		Parameters
+		----------
+		user_id: str
+			User id of an instagram account
+		use_cache: bool, optional
+			Whether or not to use information from cache, default value is True
+
+		Returns
+		-------
+		User
+			An object of User type
+		"""
+		user_id = str(user_id)
+		if not use_cache or user_id not in self._users_cache:
+			user = self.user_info_v1(user_id)
+			self._users_cache[user_id] = user
+			self._usernames_cache[user.username] = user.pk
+		return deepcopy(
+			self._users_cache[user_id]
+		)  # return copy of cache (dict changes protection)
+	
+	def user_medias(self, user_id: str, amount: int = 0, sleep: int = 0) -> List[Media]:
+		"""
+		Get a user's media
+
+		Parameters
+		----------
+		user_id: str
+		amount: int, optional
+			Maximum number of media to return, default is 0 (all medias)
+		sleep: int, optional
+			Timeout between page iterations
+
+		Returns
+		-------
+		List[Media]
+			A list of objects of Media
+		"""
+		amount = int(amount)
+		user_id = int(user_id)
+		sleep = int(sleep)
+		# User may been private, attempt via Private API
+		# (You can check is_private, but there may be other reasons,
+		#  it is better to try through a Private API)
+		medias = self.user_medias_v1(user_id, amount, sleep)
+		return medias
+	
+	def user_medias_v1(self, user_id: str, amount: int = 0, sleep: int = 0) -> List[Media]:
+		"""
+		Get a user's media by Private Mobile API
+
+		Parameters
+		----------
+		user_id: str
+		amount: int, optional
+			Maximum number of media to return, default is 0 (all medias)
+
+		Returns
+		-------
+		List[Media]
+			A list of objects of Media
+		"""
+		amount = int(amount)
+		user_id = int(user_id)
+		medias = []
+		next_max_id = ""
+		while True:
+			try:
+				medias_page, next_max_id = self.user_medias_paginated_v1(
+					user_id, amount, end_cursor=next_max_id
+				)
+			except PrivateError as e:
+				raise e
+			except Exception as e:
+				self.logger.exception(e)
+				break
+			medias.extend(medias_page)
+			if not next_max_id:
+				break
+			if amount and len(medias) >= amount:
+				break
+			if sleep:
+				time.sleep(sleep)
+		if amount:
+			medias = medias[:amount]
+		return medias

{warp_beacon-2.7.16.dist-info → warp_beacon-2.7.17.dist-info}/METADATA

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

{warp_beacon-2.7.16.dist-info → warp_beacon-2.7.17.dist-info}/RECORD

@@ -4,7 +4,7 @@ var/warp_beacon/accounts.json,sha256=OsXdncs6h88xrF_AP6_WDCK1waGBn9SR-uYdIeK37GM
 var/warp_beacon/placeholder.gif,sha256=cE5CGJVaop4Sx21zx6j4AyoHU0ncmvQuS2o6hJfEH88,6064
 var/warp_beacon/proxies.json,sha256=VnjlQDXumOEq72ZFjbh6IqHS1TEHqn8HPYAZqWCeSIA,95
 warp_beacon/__init__.py,sha256=_rThNODmz0nDp_n4mWo_HKaNFE5jk1_7cRhHyYaencI,163
-warp_beacon/__version__.py,sha256=iot90l0yxUGtwyAwpNXT6lGmpv4GTzZTiGfTAwv87q4,24
+warp_beacon/__version__.py,sha256=9LvXwlPbaoBIl4ZC2lHHNwH7SiPx0wk_JJiO4Elj5yg,24
 warp_beacon/warp_beacon.py,sha256=ADCR30uGXIsDrt9WoiI9Ghu2QtWs0qZIK6x3pQKM_B4,1109
 warp_beacon/yt_auth.py,sha256=GUTKqYr_tzDC-07Lx_ahWXSag8EyLxXBUnQbDBIkEmk,6022
 warp_beacon/compress/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
@@ -20,7 +20,7 @@ warp_beacon/mediainfo/audio.py,sha256=ous88kwQj4bDIChN5wnGil5LqTs0IQHH0d-nyrL0-Z
 warp_beacon/mediainfo/silencer.py,sha256=qxMuViOoVwUYb60uCVvqHiGrqByR1_4_rqMT-XdMkwc,1813
 warp_beacon/mediainfo/video.py,sha256=UBZrhTN5IDI-aYu6tsJEILo9nFkjHhkldGVFmvV7tEI,2480
 warp_beacon/scheduler/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-warp_beacon/scheduler/instagram_human.py,sha256=gqayCcn0xRYSNSFxeSpCGhBJyIwNAbk4Fnt1SCd61iA,11259
+warp_beacon/scheduler/instagram_human.py,sha256=Rm1St5DFzFYd27TvwJ4-m3N_tkVR5W51Lx0JT9yowF0,11789
 warp_beacon/scheduler/scheduler.py,sha256=Bf4sGXjX75Dox3q-yzUHhagtzUAj3hl5GzfnZya-_io,4995
 warp_beacon/scraper/__init__.py,sha256=gQOcBvZNnlxt0Rbbrkl4PLh7eQe2y3igJbx-87hAvrA,20249
 warp_beacon/scraper/abstract.py,sha256=pWbaTu-gDZgi-iFjqMR_uGzPl5KLv-4gTdJ9w6cD4sk,3802
@@ -32,7 +32,7 @@ warp_beacon/scraper/utils.py,sha256=yL-nrdCOAXNZgmIFPurIYFHfPsxHDl8pqif6BYKrzJI,
 warp_beacon/scraper/instagram/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 warp_beacon/scraper/instagram/captcha.py,sha256=9UYziuqB3Tsat_ET6ex-cnZDbi6yCnsXHSpmE8MuUHk,4651
 warp_beacon/scraper/instagram/instagram.py,sha256=oVXP6VweJCeffhyDU-GZLa66ESW06GvfuGcW2V6YdQ4,18629
-warp_beacon/scraper/instagram/wb_instagrapi.py,sha256=M5NCtLwdUvByjmDBZMWljgB275R0LSBFblsGpapluD0,5968
+warp_beacon/scraper/instagram/wb_instagrapi.py,sha256=DvGehtiaMfNYV9MnAngry1wxQwGdRSPBQgFJDPdRJ7w,8854
 warp_beacon/scraper/youtube/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 warp_beacon/scraper/youtube/abstract.py,sha256=-H1AFMJD9w1GmVDTuJKGsFTrgrctdRcgTTrXM2OhLjE,16236
 warp_beacon/scraper/youtube/music.py,sha256=5AeSBQyUgVCJT2hoBCV2WvlyuV9US09SYJhmBG_P9F8,2755
@@ -52,9 +52,9 @@ warp_beacon/telegram/progress_file_reader.py,sha256=e3equyNKlKs764AD-iE9QRsh3YDH
 warp_beacon/telegram/types.py,sha256=Kvdng6uCF1HRoqQgGW1ZYYPJoVuYkFb-LDvMBbW5Hjk,89
 warp_beacon/telegram/utils.py,sha256=S1N_JbHM_ExiM5tS0CeYKWIlvaJMlyq85TQNbK_GVds,5029
 warp_beacon/uploader/__init__.py,sha256=ewvR60k9osJxw_kb5U-TlZkCGR_574biq3w_aR1tjIU,5689
-warp_beacon-2.7.16.dist-info/licenses/LICENSE,sha256=xx0jnfkXJvxRnG63LTGOxlggYnIysveWIZ6H3PNdCrQ,11357
-warp_beacon-2.7.16.dist-info/METADATA,sha256=-tdN3X0fWfgGZ5IzeEIddErRI0KS5OaX076Wo1Gk4HA,23215
-warp_beacon-2.7.16.dist-info/WHEEL,sha256=zaaOINJESkSfm_4HQVc5ssNzHCPXhJm0kEUakpsEHaU,91
-warp_beacon-2.7.16.dist-info/entry_points.txt,sha256=eSB61Rb89d56WY0O-vEIQwkn18J-4CMrJcLA_R_8h3g,119
-warp_beacon-2.7.16.dist-info/top_level.txt,sha256=5YQRN46STNg81V_3jdzZ6bftkMxhe1hTPSFvJugDu84,1405
-warp_beacon-2.7.16.dist-info/RECORD,,
+warp_beacon-2.7.17.dist-info/licenses/LICENSE,sha256=xx0jnfkXJvxRnG63LTGOxlggYnIysveWIZ6H3PNdCrQ,11357
+warp_beacon-2.7.17.dist-info/METADATA,sha256=7YmBckgrYCXBKh7_uj6rtPGsCqdN8fqitKvYgLffp40,23215
+warp_beacon-2.7.17.dist-info/WHEEL,sha256=zaaOINJESkSfm_4HQVc5ssNzHCPXhJm0kEUakpsEHaU,91
+warp_beacon-2.7.17.dist-info/entry_points.txt,sha256=eSB61Rb89d56WY0O-vEIQwkn18J-4CMrJcLA_R_8h3g,119
+warp_beacon-2.7.17.dist-info/top_level.txt,sha256=5YQRN46STNg81V_3jdzZ6bftkMxhe1hTPSFvJugDu84,1405
+warp_beacon-2.7.17.dist-info/RECORD,,