warp-beacon 2.6.46__tar.gz → 2.6.48__tar.gz

{warp_beacon-2.6.46/warp_beacon.egg-info → warp_beacon-2.6.48}/PKG-INFO

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

{warp_beacon-2.6.46 → warp_beacon-2.6.48}/setup.py

@@ -66,7 +66,9 @@ setup(
 		"warp_beacon/telegram/handlers",
 		"warp_beacon/telegram/utils",
 		"warp_beacon/telegram/caption_shortener",
+		"warp_beacon/telegram/progress_bar",
 		"warp_beacon/telegram/progress_file_reader",
+		"warp_beacon/telegram/edit_message",
 		"warp_beacon/jobs/abstract",
 		"warp_beacon/jobs/download_job",
 		"warp_beacon/jobs/upload_job",

warp_beacon-2.6.48/warp_beacon/__version__.py

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

{warp_beacon-2.6.46 → warp_beacon-2.6.48}/warp_beacon/telegram/bot.py

@@ -8,7 +8,6 @@ import logging
 import html
 
 import uvloop
-#from contextlib import ExitStack
 
 from pyrogram import Client, filters
 from pyrogram.enums import ParseMode, ChatType
@@ -29,7 +28,7 @@ from warp_beacon.jobs import Origin
 from warp_beacon.telegram.utils import Utils
 from warp_beacon.telegram.caption_shortener import CaptionShortner
 from warp_beacon.scheduler.scheduler import IGScheduler
-from warp_beacon.telegram.progress_file_reader import ProgressFileReader
+from warp_beacon.telegram.edit_message import EditMessage
 
 class Bot(object):
 	should_exit = None
@@ -42,22 +41,19 @@ class Bot(object):
 	placeholder = None
 	scheduler = None
 	me = None
+	edit_message = None
 
 	def __init__(self, tg_bot_name: str, tg_token: str, tg_api_id: str, tg_api_hash: str) -> None:
 		# Enable logging
 		logging.basicConfig(
-			format="%(asctime)s - %(name)s - %(levelname)s - %(message)s", level=logging.INFO
+			format="%(asctime)s - %(name)s - %(levelname)s - %(message)s",
+			level=logging.INFO
 		)
 
 		logging.getLogger("pyrogram").setLevel(logging.ERROR)
-
 		logging.info("Starting Warp Beacon version '%s' ...", __version__)
-
-		db_connect = DBClient()
-		self.storage = Storage(db_connect)
-
+		self.storage = Storage(DBClient())
 		self.should_exit = asyncio.Event()
-
 		workers_amount = min(32, os.cpu_count() + 4)
 
 		uvloop.install()
@@ -71,6 +67,8 @@ class Bot(object):
 			workers=int(os.environ.get("TG_WORKERS_POOL_SIZE", default=workers_amount))
 		)
 
+		self.editor = EditMessage(self.client)
+
 		self.uploader = AsyncUploader(
 			storage=self.storage,
 			admin_message_callback=self.send_text_to_admin,
@@ -84,7 +82,6 @@ class Bot(object):
 		)
 
 		self.scheduler = IGScheduler(self.downloader)
-
 		self.handlers = Handlers(self)
 
 		self.client.add_handler(MessageHandler(self.handlers.start, filters.command("start")))
@@ -227,7 +224,7 @@ class Bot(object):
 
 		return caption
 
-	def build_tg_args(self, job: UploadJob, file_io: ProgressFileReader = None) -> dict:
+	def build_tg_args(self, job: UploadJob) -> dict:
 		args = {}
 		if job.media_type == JobType.VIDEO:
 			if job.tg_file_id:
@@ -243,7 +240,7 @@ class Bot(object):
 			else:
 				if job.placeholder_message_id:
 					args["media"] = InputMediaVideo(
-						media=file_io,
+						media=job.local_media_path,
 						supports_streaming=True,
 						width=job.media_info["width"],
 						height=job.media_info["height"],
@@ -252,7 +249,7 @@ class Bot(object):
 						caption=self.build_signature_caption(job)
 					)
 				else:
-					args["video"] = file_io
+					args["video"] = job.local_media_path
 					args["supports_streaming"] = True
 					args["width"] = job.media_info["width"]
 					args["height"] = job.media_info["height"]
@@ -274,11 +271,11 @@ class Bot(object):
 			else:
 				if job.placeholder_message_id:
 					args["media"] = InputMediaPhoto(
-						media=file_io,
+						media=job.local_media_path,
 						caption=self.build_signature_caption(job)
 					)
 				else:
-					args["photo"] = file_io
+					args["photo"] = job.local_media_path
 					args["caption"] = self.build_signature_caption(job)
 
 				args["file_name"] = os.path.basename(job.local_media_path)
@@ -294,7 +291,7 @@ class Bot(object):
 			else:
 				if job.placeholder_message_id:
 					args["media"] = InputMediaAudio(
-						media=file_io,
+						media=job.local_media_path,
 						performer=job.media_info["performer"],
 						thumb=job.media_info["thumb"],
 						duration=round(job.media_info["duration"]),
@@ -302,7 +299,7 @@ class Bot(object):
 						caption=self.build_signature_caption(job)
 					)
 				else:
-					args["audio"] = file_io
+					args["audio"] = job.local_media_path
 					args["performer"] = job.media_info["performer"]
 					args["thumb"] = job.media_info["thumb"]
 					args["duration"] = round(job.media_info["duration"])
@@ -323,7 +320,7 @@ class Bot(object):
 			else:
 				if job.placeholder_message_id:
 					args["media"] = InputMediaAnimation(
-						media=file_io,
+						media=job.local_media_path,
 						thumb=job.media_info["thumb"],
 						duration=round(job.media_info["duration"]),
 						width=job.media_info["width"],
@@ -331,7 +328,7 @@ class Bot(object):
 						caption=self.build_signature_caption(job)
 					)
 				else:
-					args["animation"] = file_io
+					args["animation"] = job.local_media_path
 					args["width"] = job.media_info["width"]
 					args["height"] = job.media_info["height"]
 					args["duration"] = round(job.media_info["duration"])
@@ -364,7 +361,7 @@ class Bot(object):
 					for j in chunk:
 						if j.media_type == JobType.VIDEO:
 							vid = InputMediaVideo(
-								media=ProgressFileReader(j.local_media_path, self.progress_callback),
+								media=j.local_media_path,
 								supports_streaming=True,
 								width=j.media_info["width"],
 								height=j.media_info["height"],
@@ -375,7 +372,7 @@ class Bot(object):
 							tg_chunk.append(vid)
 						elif j.media_type == JobType.IMAGE:
 							photo = InputMediaPhoto(
-								media=ProgressFileReader(j.local_media_path, self.progress_callback),
+								media=j.local_media_path,
 								caption=self.build_signature_caption(job)
 							)
 							tg_chunk.append(photo)
@@ -405,8 +402,12 @@ class Bot(object):
 
 		return args
 
-	def progress_callback(self, filename: str, current: int, total: int) -> None:
-		logging.info("[%s] Uploaded %.1f%%", filename, current * 100 / total)
+	async def progress_callback(self, current: int, total: int, chat_id: int | str, message_id: int, label: str) -> None:
+		percents = int(current * 100 / total)
+		if (percents % 40) > 0 or percents == 100:
+			p = round(percents)
+			await self.client.edit_message_caption(chat_id, message_id, f"<b>{p}% <code>{label}</code> uploaded</b>", ParseMode.HTML)
+			logging.info("[%s] Uploaded to Telegram %d%%", label, p)
 
 	async def upload_job(self, job: UploadJob) -> list[str]:
 		tg_file_ids = []
@@ -421,8 +422,7 @@ class Bot(object):
 							await Utils.ensure_me_loaded(self.client)
 						if job.placeholder_message_id:
 							try:
-								with ProgressFileReader(job.local_media_path, self.progress_callback) as f:
-									reply_message = await self.client.edit_message_media(**self.build_tg_args(job, f))
+								reply_message = await self.editor.edit(**self.build_tg_args(job))
 							except MessageIdInvalid:
 								logging.warning("Placeholder message not found. Looks like placeholder message was deleted by administrator.")
 								job.placeholder_message_id = None
@@ -435,41 +435,29 @@ class Bot(object):
 								JobType.ANIMATION: self.client.send_animation
 							}
 							try:
-								with ProgressFileReader(job.local_media_path, self.progress_callback) as f:
-									reply_message = await send_funcs[job.media_type](**self.build_tg_args(job, f))
+								reply_message = await send_funcs[job.media_type](**self.build_tg_args(job))
 							except ValueError as e:
 								err_text = str(e)
 								if "Expected" in err_text:
 									logging.warning("Expectations exceeded reality.")
 									logging.warning(err_text)
 									expectation, reality = Utils.parse_expected_patronum_error(err_text)
-									with ProgressFileReader(job.local_media_path, self.progress_callback) as f:
-										job_args = self.build_tg_args(job, f)
-										job_args[reality.value.lower()] = job_args.pop(expectation.value.lower())
-										reply_message = await send_funcs[reality](**job_args)
+									job_args = self.build_tg_args(job)
+									job_args[reality.value.lower()] = job_args.pop(expectation.value.lower())
+									reply_message = await send_funcs[reality](**job_args)
 
 						tg_file_id = Utils.extract_file_id(reply_message)
 						tg_file_ids.append(tg_file_id)
 						job.tg_file_id = tg_file_id
 						logging.info("Uploaded media file with type '%s' tg_file_id is '%s'", job.media_type.value, job.tg_file_id)
 					elif job.media_type == JobType.COLLECTION:
-						#uploaded_files = await self.upload_with_progress(job)
 						col_job_args = self.build_tg_args(job)
 						sent_messages = []
 						snd_grp_options = {"chat_id": job.chat_id, "reply_to_message_id": job.message_id}
 						for i, media_chunk in enumerate(col_job_args["media"]):
 							snd_grp_options["media"] = media_chunk
-							messages = None
-							try:
-								messages = await self.client.send_media_group(**snd_grp_options)
-							finally:
-								try:
-									for med in snd_grp_options["media"]:
-										med.media.close()
-								except AttributeError:
-									pass
-							if messages:
-								sent_messages += messages
+							messages = await self.client.send_media_group(**snd_grp_options)
+							sent_messages += messages
 							if job.media_collection:
 								for j, _ in enumerate(media_chunk):
 									tg_file_id = Utils.extract_file_id(messages[j])

warp_beacon-2.6.48/warp_beacon/telegram/edit_message.py

@@ -0,0 +1,141 @@
+from pyrogram.client import Client
+from pyrogram.types import InputMedia, InputMediaAudio, InputMediaPhoto, InputMediaVideo, InputMediaAnimation, InlineKeyboardMarkup
+from pyrogram import raw
+from pyrogram import types
+
+#from warp_beacon.telegram.bot import Bot
+from warp_beacon.telegram.progress_bar import ProgressBar
+
+class EditMessage(object):
+	def __init__(self, client: Client) -> None:
+		self.client = client
+
+	def get_wrapped_video(self, raw_file: raw.base.InputFile, raw_thumb: raw.base.InputFile, media: InputMediaVideo, file_name: str = None) -> raw.types.InputMediaUploadedDocument:
+		return raw.types.InputMediaUploadedDocument(
+				file=raw_file,
+				mime_type=self.client.guess_mime_type(media.media) or "video/mp4",
+				thumb=raw_thumb,
+				spoiler=media.has_spoiler,
+				attributes=[
+					raw.types.DocumentAttributeVideo(
+						duration=media.duration,
+						w=media.width,
+						h=media.height,
+						supports_streaming=media.supports_streaming
+					),
+					raw.types.DocumentAttributeFilename(
+						file_name=file_name
+					)
+				]
+			)
+	
+	def get_wrapped_photo(self, raw_file: raw.base.InputFile, media: InputMediaPhoto) -> raw.types.InputMediaUploadedPhoto:
+		return raw.types.InputMediaUploadedPhoto(
+			file=raw_file,
+			spoiler=media.has_spoiler
+		)
+	
+	def get_wrapped_audio(self, raw_file: raw.base.InputFile, raw_thumb: raw.base.InputFile, media: InputMediaAudio, file_name: str = None) -> raw.types.InputMediaUploadedDocument:
+		return raw.types.InputMediaUploadedDocument(
+			mime_type=self.client.guess_mime_type(media.media) or "audio/mpeg",
+			thumb=raw_thumb,
+			file=raw_file,
+			attributes=[
+				raw.types.DocumentAttributeAudio(
+					duration=media.duration,
+					performer=media.performer,
+					title=media.title
+				),
+				raw.types.DocumentAttributeFilename(
+					file_name=file_name
+				)
+			]
+		)
+	
+	def get_wrapped_animation(self, raw_file: raw.base.InputFile, raw_thumb: raw.base.InputFile, media: InputMediaVideo, file_name: str = None) -> raw.types.InputMediaUploadedDocument:
+		return raw.types.InputMediaUploadedDocument(
+			mime_type=self.client.guess_mime_type(media.media) or "video/mp4",
+			thumb=raw_thumb,
+			spoiler=media.has_spoiler,
+			file=raw_file,
+			attributes=[
+				raw.types.DocumentAttributeVideo(
+					supports_streaming=True,
+					duration=media.duration,
+					w=media.width,
+					h=media.height
+				),
+				raw.types.DocumentAttributeFilename(
+					file_name=file_name
+				),
+				raw.types.DocumentAttributeAnimated()
+			]
+		)
+
+	#async def upload_with_progress(self,
+	#	media: InputMedia | InputMediaAudio | InputMediaPhoto | InputMediaVideo | InputMediaAnimation,
+	#	chat_id: int | str,
+	#	message_id: int,
+	#	file_name: str
+	#) -> raw.base.InputFile:
+	#	progress_bar = ProgressBar(self.client)
+	#	progress_id = f"{chat_id}:{message_id}:{file_name}"
+	#	self.progress_bars[progress_id] = progress_bar
+	#	raw_file = await self.client.save_file(path=media.media, progress=progress_bar.progress_callback, progress_args=(chat_id, message_id, file_name,))
+	#	del self.progress_bars[progress_id]
+	#	return raw_file
+
+	async def edit(self,
+		chat_id: int | str,
+		message_id: int,
+		media: InputMedia | InputMediaAudio | InputMediaPhoto | InputMediaVideo | InputMediaAnimation,
+		reply_markup: InlineKeyboardMarkup = None,
+		file_name: str = None
+	) -> None:
+		progress_bar = ProgressBar(self.client)
+		raw_file = await self.client.save_file(path=media.media, progress=progress_bar.progress_callback, progress_args=(chat_id, message_id, file_name,))
+
+		caption = media.caption
+		parse_mode = media.parse_mode
+
+		message, entities = None, None
+
+		if caption is not None:
+			message, entities = (await self.client.parser.parse(caption, parse_mode)).values()
+
+		raw_media = None
+		if isinstance(media, types.InputMediaVideo):
+			progress_bar_thumb = ProgressBar(self.client)
+			raw_file_thumb = await self.client.save_file(path=media.thumb, progress=progress_bar_thumb.progress_callback, progress_args=(chat_id, message_id, "thumbnail",))
+			raw_media = self.get_wrapped_video(raw_file=raw_file, raw_thumb=raw_file_thumb, media=media, file_name=file_name)
+		elif isinstance(media, types.InputMediaPhoto):
+			raw_media = self.get_wrapped_photo(raw_file=raw_file, media=media)
+		elif isinstance(media, types.InputMediaAudio):
+			progress_bar_thumb = ProgressBar(self.client)
+			raw_file_thumb = await self.client.save_file(path=media.thumb, progress=progress_bar_thumb.progress_callback, progress_args=(chat_id, message_id, "thumbnail",))
+			raw_media = self.get_wrapped_audio(raw_file=raw_file, raw_thumb=raw_file_thumb, media=media, file_name=file_name)
+		elif isinstance(media, types.InputMediaAnimation):
+			progress_bar_thumb = ProgressBar(self.client)
+			raw_file_thumb = await self.client.save_file(path=media.thumb, progress=progress_bar_thumb.progress_callback, progress_args=(chat_id, message_id, "thumbnail",))
+			raw_media = self.get_wrapped_animation(raw_file=raw_file, raw_thumb=raw_file_thumb, media=media, file_name=file_name)
+
+		peer = await self.client.resolve_peer(chat_id)
+
+		r = await self.client.invoke(
+			raw.functions.messages.EditMessage(
+				peer=peer,
+				id=message_id,
+				media=raw_media,
+				reply_markup=await reply_markup.write(self.client) if reply_markup else None,
+				message=message,
+				entities=entities
+			)
+		)
+
+		for i in r.updates:
+			if isinstance(i, (raw.types.UpdateEditMessage, raw.types.UpdateEditChannelMessage)):
+				return await types.Message._parse(
+					self.client, i.message,
+					{i.id: i for i in r.users},
+					{i.id: i for i in r.chats}
+				)

warp_beacon-2.6.48/warp_beacon/telegram/progress_bar.py

@@ -0,0 +1,66 @@
+import logging
+
+import hashlib
+
+from pyrogram.enums import ParseMode
+from pyrogram.errors.exceptions.bad_request_400 import MessageNotModified
+from pyrogram import Client
+
+class ProgressBar(object):
+	def __init__(self, client: Client) -> None:
+		self._next_threshold = 20
+		self.client = client
+
+	def make_progress_bar(self, current: int, total: int, length: int = 10) -> str:
+		"""
+		Returns string
+		[████▌────] 55.0%
+		length — amount of characters in bar
+		"""
+		# fraction of completed job from 0.0 to 1.0
+		frac = current / total if total else 0
+		# how much "filled" cells
+		filled = int(frac * length)
+		# part between whole cells, optional may withdraw half
+		half_block = ''
+		if (frac * length) - filled >= 0.5:
+			half_block = '▌'  # or '▏', '▍' and etc.
+		# building bar
+		pbar = '█' * filled + half_block + '─' * (length - filled - len(half_block))
+		percent = frac * 100
+		return f"[{pbar}] {round(percent)}%"
+	
+	def make_emoji_progress_bar(self, current: int, total: int, length: int = 10) -> str:
+		"""
+		Returns string:
+		[🟩🟩🟩⬜️⬜️⬜️⬜️⬜️⬜️⬜️] 30.0%
+		length — common number of emoji cells
+		"""
+		frac = (current / total) if total else 0
+		filled_count = int(frac * length)
+		empty_count = length - filled_count
+		pbar = "🟩" * filled_count + "⬜️" * empty_count
+		percent = frac * 100
+		return f"[{pbar}] {round(percent)}%"
+
+	async def progress_callback(self, current: int, total: int, chat_id: int | str, message_id: int, label: str) -> None:
+		percent = current * 100 / total
+		if percent >= self._next_threshold:
+			#pbar = self.make_progress_bar(percent, 100, 25)
+			pbar = self.make_emoji_progress_bar(percent, 100, 14)
+			logging.info("[%s] Uploaded to Telegram %d%%", label, percent)
+			try:
+				await self.client.edit_message_caption(chat_id, message_id, f"{pbar}<br><b>Uploading <code>{label}</code></b>", ParseMode.HTML)
+			except MessageNotModified:
+				logging.warning("bad_request_400.MessageNotModified")
+			except Exception as e:
+				logging.warning("An error occurred while updating progress bar")
+				logging.exception(e)
+			self._next_threshold += 20
+
+	@staticmethod
+	def make_hash(chat_id: str | int, message_id: int, algorithm: str = 'sha256') -> str:
+		s = f"{chat_id}:{message_id}"
+		# md5, sha1, sha256
+		h = hashlib.new(algorithm, s.encode('utf-8'))
+		return h.hexdigest()

{warp_beacon-2.6.46 → warp_beacon-2.6.48}/warp_beacon/telegram/progress_file_reader.py

@@ -3,27 +3,27 @@ import os
 from types import TracebackType
 from typing import Optional, Callable, Type
 
-class ProgressFileReader(io.BufferedReader):
+class ProgressFileReader(io.FileIO):
 	def __init__(self, file_path: str, callback: Optional[Callable[[str, int, int], None]]) -> None:
-		raw = open(file_path, "rb")
-		super().__init__(raw)
-		self._raw = raw
+		super().__init__(file_path, "rb")
 		self.callback = callback
 		self._total = os.path.getsize(file_path)
 		self._read_bytes = 0
-		self._name = os.path.basename(file_path)
+		self._display_name = os.path.basename(file_path)
+
+	def __fspath__(self) -> str:
+		return self._display_name 
 
 	def read(self, size: int = -1) -> bytes:
 		chunk = super().read(size)
 		self._read_bytes += len(chunk)
 		if self.callback:
-			self.callback(self.name, self._read_bytes, self._total)
+			self.callback(self._display_name, self._read_bytes, self._total)
 		return chunk
 
 	def close(self) -> None:
 		if not self.closed:
 			super().close()
-			self._raw.close()
 
 	def __enter__(self) -> "ProgressFileReader":
 		return self
@@ -33,8 +33,4 @@ class ProgressFileReader(io.BufferedReader):
 		exc_val: Optional[BaseException],
 		exc_tb: Optional[TracebackType]
 	) -> None:
-		self.close()
-
-	@property
-	def name(self) -> str:
-		return self._name
+		self.close()

{warp_beacon-2.6.46 → warp_beacon-2.6.48/warp_beacon.egg-info}/PKG-INFO

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

{warp_beacon-2.6.46 → warp_beacon-2.6.48}/warp_beacon.egg-info/SOURCES.txt

@@ -55,8 +55,10 @@ warp_beacon/storage/mongo.py
 warp_beacon/telegram/__init__.py
 warp_beacon/telegram/bot.py
 warp_beacon/telegram/caption_shortener.py
+warp_beacon/telegram/edit_message.py
 warp_beacon/telegram/handlers.py
 warp_beacon/telegram/placeholder_message.py
+warp_beacon/telegram/progress_bar.py
 warp_beacon/telegram/progress_file_reader.py
 warp_beacon/telegram/utils.py
 warp_beacon/uploader/__init__.py

{warp_beacon-2.6.46 → warp_beacon-2.6.48}/warp_beacon.egg-info/top_level.txt

@@ -34,8 +34,10 @@ warp_beacon/storage/mongo
 warp_beacon/telegram
 warp_beacon/telegram/bot
 warp_beacon/telegram/caption_shortener
+warp_beacon/telegram/edit_message
 warp_beacon/telegram/handlers
 warp_beacon/telegram/placeholder_message
+warp_beacon/telegram/progress_bar
 warp_beacon/telegram/progress_file_reader
 warp_beacon/telegram/utils
 warp_beacon/uploader

warp_beacon-2.6.46/warp_beacon/__version__.py

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